-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
openldap24: 2.4.56 and Xcode 12 fixes
- Loading branch information
Showing
2 changed files
with
43 additions
and
6 deletions.
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
10.9-libcxx/stable/main/finkinfo/libs/openldap24-xcode12.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| diff -ruN openldap-2.4.56.orig/libraries/libldap/tls2.c openldap-2.4.56/libraries/libldap/tls2.c | ||
| --- openldap-2.4.56.orig/libraries/libldap/tls2.c 2020-11-10 12:22:13.000000000 -0600 | ||
| +++ openldap-2.4.56/libraries/libldap/tls2.c 2020-11-13 19:39:54.000000000 -0600 | ||
| @@ -74,6 +74,9 @@ | ||
| { BER_BVNULL, BER_BVNULL } | ||
| }; | ||
|
|
||
| +static int | ||
| +ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in ); | ||
| + | ||
| #ifdef HAVE_TLS | ||
|
|
||
| void | ||
| @@ -503,7 +506,7 @@ | ||
| return rc; | ||
| } | ||
|
|
||
| -int | ||
| +static int | ||
| ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in ) | ||
| { | ||
| tls_session *session = s; | ||
| diff -ruN openldap-2.4.56.orig/servers/slapd/back-ldap/bind.c openldap-2.4.56/servers/slapd/back-ldap/bind.c | ||
| --- openldap-2.4.56.orig/servers/slapd/back-ldap/bind.c 2020-11-10 12:22:13.000000000 -0600 | ||
| +++ openldap-2.4.56/servers/slapd/back-ldap/bind.c 2020-11-14 04:09:02.000000000 -0600 | ||
| @@ -145,6 +145,9 @@ | ||
| } | ||
| #endif /* LDAP_BACK_PRINT_CONNTREE */ | ||
|
|
||
| +void | ||
| +slap_client_keepalive(LDAP *ld, slap_keepalive *sk); | ||
| + | ||
| static int | ||
| ldap_back_freeconn( ldapinfo_t *li, ldapconn_t *lc, int dolock ); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # -*- coding: ascii; tab-width: 4; x-counterpart: openldap24.patch -*- | ||
| Info4: << | ||
| Package: openldap24 | ||
| Version: 2.4.46 | ||
| Version: 2.4.56 | ||
| Revision: 1 | ||
| Maintainer: Daniel Johnson <[email protected]> | ||
| Source: mirror:custom:openldap-release/openldap-%v.tgz | ||
|
|
@@ -15,20 +15,22 @@ CustomMirror: << | |
| nam-US: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/ | ||
| nam-CA: http://gpl.savoirfairelinux.net/pub/mirrors/openldap/ | ||
| << | ||
| Source-Checksum: SHA256(9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d) | ||
| Source-Checksum: SHA256(25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0) | ||
| # NOTE: configure looks for libicu but doesn't actually use it. | ||
| Depends: %N-shlibs (= %v-%r), daemonic | ||
| BuildDepends: << | ||
| cyrus-sasl2.3-dev (>= 2.1.27-0.8), | ||
| db53-aes, | ||
| fink (>= 0.24.12-1), | ||
| fink (>= 0.30.0-1), | ||
| openssl110-dev (>= 1.1.0h-1) | ||
| << | ||
| Conflicts: openldap-ssl, openldap23, openldap24, openldap24 | ||
| Replaces: openldap-ssl, openldap23, openldap24, openldap24 | ||
| Provides: openldap | ||
| PatchFile: %{ni}.patch | ||
| PatchFile-MD5: 0492da596271831c1eae985c611f1199 | ||
| PatchFile2: %{ni}-xcode12.patch | ||
| PatchFile2-MD5: 4fe35d038a6e6b3a9409d7e31880817c | ||
| PatchScript: << | ||
| %{default_script} | ||
| perl -pi -e 's/1 2 3 4 5/1 2 3 4 5 6 7/' tests/scripts/test058-syncrepl-asymmetric | ||
|
|
@@ -58,9 +60,9 @@ SplitOff: << | |
| Description: Shared libraries for LDAP | ||
| Files: %lib/*-2.4.2*.dylib | ||
| Shlibs: << | ||
| %p/%lib/liblber-2.4.2.dylib 13.0.0 %n (>= 2.4.42-1) | ||
| %p/%lib/libldap-2.4.2.dylib 13.0.0 %n (>= 2.4.42-1) | ||
| %p/%lib/libldap_r-2.4.2.dylib 13.0.0 %n (>= 2.4.42-1) | ||
| %p/%lib/liblber-2.4.2.dylib 14.0.0 %n (>= 2.4.56-1) | ||
| %p/%lib/libldap-2.4.2.dylib 14.0.0 %n (>= 2.4.56-1) | ||
| %p/%lib/libldap_r-2.4.2.dylib 14.0.0 %n (>= 2.4.56-1) | ||
| << | ||
| DocFiles: ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README build/LICENSE-2.0.1 | ||
| << | ||
|
|
||