Debian Codegraph @

debian/patches/do-not-second-guess-sonames

raw
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 Index: openldap/libraries/libldap/cyrus.c
10 ===================================================================
11 --- openldap.orig/libraries/libldap/cyrus.c 2022-05-20 17:36:13.661247231 -0400
12 +++ openldap/libraries/libldap/cyrus.c 2022-05-20 17:36:13.661247231 -0400
13 @@ -74,29 +74,6 @@
14 */
15 int ldap_int_sasl_init( void )
16 {
17 -#ifdef HAVE_SASL_VERSION
18 - /* stringify the version number, sasl.h doesn't do it for us */
19 -#define VSTR0(maj, min, pat) #maj "." #min "." #pat
20 -#define VSTR(maj, min, pat) VSTR0(maj, min, pat)
21 -#define SASL_VERSION_STRING VSTR(SASL_VERSION_MAJOR, SASL_VERSION_MINOR, \
22 - SASL_VERSION_STEP)
23 - { int rc;
24 - sasl_version( NULL, &rc );
25 - if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
26 - (rc & 0xffff) < SASL_VERSION_STEP) {
27 - char version[sizeof("xxx.xxx.xxxxx")];
28 - sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff,
29 - rc & 0xffff );
30 -
31 - Debug1( LDAP_DEBUG_ANY,
32 - "ldap_int_sasl_init: SASL library version mismatch:"
33 - " expected " SASL_VERSION_STRING ","
34 - " got %s\n", version );
35 - return -1;
36 - }
37 - }
38 -#endif
39 -
40 /* SASL 2 takes care of its own memory completely internally */
41 #if SASL_VERSION_MAJOR < 2 && !defined(CSRIMALLOC)
42 sasl_set_alloc(
43 Index: openldap/servers/slapd/sasl.c
44 ===================================================================
45 --- openldap.orig/servers/slapd/sasl.c 2022-05-20 17:36:13.661247231 -0400
46 +++ openldap/servers/slapd/sasl.c 2022-05-20 17:36:13.661247231 -0400
47 @@ -1271,26 +1271,6 @@
48 rewrite_mapper_register( &slapd_mapper );
49
50 #ifdef HAVE_CYRUS_SASL
51 -#ifdef HAVE_SASL_VERSION
52 - /* stringify the version number, sasl.h doesn't do it for us */
53 -#define VSTR0(maj, min, pat) #maj "." #min "." #pat
54 -#define VSTR(maj, min, pat) VSTR0(maj, min, pat)
55 -#define SASL_VERSION_STRING VSTR(SASL_VERSION_MAJOR, SASL_VERSION_MINOR, \
56 - SASL_VERSION_STEP)
57 -
58 - sasl_version( NULL, &rc );
59 - if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
60 - (rc & 0xffff) < SASL_VERSION_STEP)
61 - {
62 - char version[sizeof("xxx.xxx.xxxxx")];
63 - sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff,
64 - rc & 0xffff );
65 - Debug( LDAP_DEBUG_ANY, "slap_sasl_init: SASL library version mismatch:"
66 - " expected %s, got %s\n",
67 - SASL_VERSION_STRING, version );
68 - return -1;
69 - }
70 -#endif
71
72 sasl_set_mutex(
73 ldap_pvt_sasl_mutex_new,