diff options
Diffstat (limited to 'recipes-support/openldap/openldap-2.4.39/do-not-second-guess-sonames.patch')
-rw-r--r-- | recipes-support/openldap/openldap-2.4.39/do-not-second-guess-sonames.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/recipes-support/openldap/openldap-2.4.39/do-not-second-guess-sonames.patch b/recipes-support/openldap/openldap-2.4.39/do-not-second-guess-sonames.patch new file mode 100644 index 0000000..31cf652 --- /dev/null +++ b/recipes-support/openldap/openldap-2.4.39/do-not-second-guess-sonames.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | Rip out code that second-guesses the libsasl soname / Debian shlibs. If | ||
2 | cyrus sasl upstream is breaking the ABI, this needs to be fixed upstream | ||
3 | there, not kludged around upstream here! | ||
4 | |||
5 | Debian bug #546885 | ||
6 | |||
7 | Upstream ITS #6302 filed. | ||
8 | |||
9 | --- a/libraries/libldap/cyrus.c | ||
10 | +++ b/libraries/libldap/cyrus.c | ||
11 | @@ -74,28 +74,6 @@ int ldap_int_sasl_init( void ) | ||
12 | /* XXX not threadsafe */ | ||
13 | static int sasl_initialized = 0; | ||
14 | |||
15 | -#ifdef HAVE_SASL_VERSION | ||
16 | - /* stringify the version number, sasl.h doesn't do it for us */ | ||
17 | -#define VSTR0(maj, min, pat) #maj "." #min "." #pat | ||
18 | -#define VSTR(maj, min, pat) VSTR0(maj, min, pat) | ||
19 | -#define SASL_VERSION_STRING VSTR(SASL_VERSION_MAJOR, SASL_VERSION_MINOR, \ | ||
20 | - SASL_VERSION_STEP) | ||
21 | - { int rc; | ||
22 | - sasl_version( NULL, &rc ); | ||
23 | - if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) || | ||
24 | - (rc & 0xffff) < SASL_VERSION_STEP) { | ||
25 | - char version[sizeof("xxx.xxx.xxxxx")]; | ||
26 | - sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff, | ||
27 | - rc & 0xffff ); | ||
28 | - | ||
29 | - Debug( LDAP_DEBUG_ANY, | ||
30 | - "ldap_int_sasl_init: SASL library version mismatch:" | ||
31 | - " expected " SASL_VERSION_STRING "," | ||
32 | - " got %s\n", version, 0, 0 ); | ||
33 | - return -1; | ||
34 | - } | ||
35 | - } | ||
36 | -#endif | ||
37 | if ( sasl_initialized ) { | ||
38 | return 0; | ||
39 | } | ||
40 | --- a/servers/slapd/sasl.c | ||
41 | +++ b/servers/slapd/sasl.c | ||
42 | @@ -1145,26 +1145,6 @@ int slap_sasl_init( void ) | ||
43 | #endif | ||
44 | |||
45 | #ifdef HAVE_CYRUS_SASL | ||
46 | -#ifdef HAVE_SASL_VERSION | ||
47 | - /* stringify the version number, sasl.h doesn't do it for us */ | ||
48 | -#define VSTR0(maj, min, pat) #maj "." #min "." #pat | ||
49 | -#define VSTR(maj, min, pat) VSTR0(maj, min, pat) | ||
50 | -#define SASL_VERSION_STRING VSTR(SASL_VERSION_MAJOR, SASL_VERSION_MINOR, \ | ||
51 | - SASL_VERSION_STEP) | ||
52 | - | ||
53 | - sasl_version( NULL, &rc ); | ||
54 | - if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) || | ||
55 | - (rc & 0xffff) < SASL_VERSION_STEP) | ||
56 | - { | ||
57 | - char version[sizeof("xxx.xxx.xxxxx")]; | ||
58 | - sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff, | ||
59 | - rc & 0xffff ); | ||
60 | - Debug( LDAP_DEBUG_ANY, "slap_sasl_init: SASL library version mismatch:" | ||
61 | - " expected %s, got %s\n", | ||
62 | - SASL_VERSION_STRING, version, 0 ); | ||
63 | - return -1; | ||
64 | - } | ||
65 | -#endif | ||
66 | |||
67 | sasl_set_mutex( | ||
68 | ldap_pvt_sasl_mutex_new, | ||