[Pkg-openldap-devel] r1237 - in openldap/trunk/debian: . patches

[vorlon at alioth.debian.org]

tags 546885 pending
thanks

Author: vorlon
Date: 2009-09-22 01:11:39 +0000 (Tue, 22 Sep 2009)
New Revision: 1237

Added:
   openldap/trunk/debian/patches/do-not-second-guess-sonames
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
New patch, do-not-second-guess-sonames, to remove an incorrect check for
the Cyrus SASL version number at runtime.  If there's any reason this is
needed, it needs to be addressed in the cyrus-sasl soname and Debian
shlibs, not here.  Closes: #546885.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2009-09-10 00:38:37 UTC (rev 1236)
+++ openldap/trunk/debian/changelog	2009-09-22 01:11:39 UTC (rev 1237)
@@ -9,6 +9,10 @@
     declarations; thanks, Peter Marschall <peter at adpm.de>!  Closes: #517556
   * Add 'status' argument to init script; thanks to Peter Eisentraut
     <petere at debian.org>.  Closes: #545898.
+  * New patch, do-not-second-guess-sonames, to remove an incorrect check for
+    the Cyrus SASL version number at runtime.  If there's any reason this is
+    needed, it needs to be addressed in the cyrus-sasl soname and Debian
+    shlibs, not here.  Closes: #546885.
 
  -- Steve Langasek <vorlon at debian.org>  Tue, 28 Jul 2009 18:03:26 -0700
 

Added: openldap/trunk/debian/patches/do-not-second-guess-sonames
===================================================================
--- openldap/trunk/debian/patches/do-not-second-guess-sonames	                        (rev 0)
+++ openldap/trunk/debian/patches/do-not-second-guess-sonames	2009-09-22 01:11:39 UTC (rev 1237)
@@ -0,0 +1,72 @@
+Rip out code that second-guesses the libsasl soname / Debian shlibs.  If
+cyrus sasl upstream is breaking the ABI, this needs to be fixed upstream
+there, not kludged around upstream here!
+
+Debian bug #546885
+
+To be forwarded upstream.
+
+Index: trunk/libraries/libldap/cyrus.c
+===================================================================
+--- trunk.orig/libraries/libldap/cyrus.c
++++ trunk/libraries/libldap/cyrus.c
+@@ -78,28 +78,6 @@
+ 	/* XXX not threadsafe */
+ 	static int sasl_initialized = 0;
+ 
+-#ifdef HAVE_SASL_VERSION
+-	/* stringify the version number, sasl.h doesn't do it for us */
+-#define VSTR0(maj, min, pat)	#maj "." #min "." #pat
+-#define VSTR(maj, min, pat)	VSTR0(maj, min, pat)
+-#define SASL_VERSION_STRING	VSTR(SASL_VERSION_MAJOR, SASL_VERSION_MINOR, \
+-				SASL_VERSION_STEP)
+-	{ int rc;
+-	sasl_version( NULL, &rc );
+-	if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
+-		(rc & 0xffff) < SASL_VERSION_STEP) {
+-		char version[sizeof("xxx.xxx.xxxxx")];
+-		sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff,
+-			rc & 0xffff );
+-
+-		Debug( LDAP_DEBUG_ANY,
+-		"ldap_int_sasl_init: SASL library version mismatch:"
+-		" expected " SASL_VERSION_STRING ","
+-		" got %s\n", version, 0, 0 );
+-		return -1;
+-	}
+-	}
+-#endif
+ 	if ( sasl_initialized ) {
+ 		return 0;
+ 	}
+Index: trunk/servers/slapd/sasl.c
+===================================================================
+--- trunk.orig/servers/slapd/sasl.c
++++ trunk/servers/slapd/sasl.c
+@@ -1135,26 +1135,6 @@
+ #endif
+ 
+ #ifdef HAVE_CYRUS_SASL
+-#ifdef HAVE_SASL_VERSION
+-	/* stringify the version number, sasl.h doesn't do it for us */
+-#define	VSTR0(maj, min, pat)	#maj "." #min "." #pat
+-#define	VSTR(maj, min, pat)	VSTR0(maj, min, pat)
+-#define	SASL_VERSION_STRING	VSTR(SASL_VERSION_MAJOR, SASL_VERSION_MINOR, \
+-				SASL_VERSION_STEP)
+-
+-	sasl_version( NULL, &rc );
+-	if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
+-		(rc & 0xffff) < SASL_VERSION_STEP)
+-	{
+-		char version[sizeof("xxx.xxx.xxxxx")];
+-		sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff,
+-			rc & 0xffff );
+-		Debug( LDAP_DEBUG_ANY, "slap_sasl_init: SASL library version mismatch:"
+-			" expected %s, got %s\n",
+-			SASL_VERSION_STRING, version, 0 );
+-		return -1;
+-	}
+-#endif
+ 
+ 	sasl_set_mutex(
+ 		ldap_pvt_sasl_mutex_new,

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2009-09-10 00:38:37 UTC (rev 1236)
+++ openldap/trunk/debian/patches/series	2009-09-22 01:11:39 UTC (rev 1237)
@@ -8,3 +8,4 @@
 sasl-default-path 
 libldap-symbol-versions
 getaddrinfo-is-threadsafe
+do-not-second-guess-sonames