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

[vorlon at alioth.debian.org]

tags 651333 pending
thanks

Author: vorlon
Date: 2012-01-05 01:44:06 +0000 (Thu, 05 Jan 2012)
New Revision: 1414

Added:
   openldap/trunk/debian/patches/no-bdb-ABI-second-guessing
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
debian/patches/no-bdb-ABI-second-guessing: don't force an exact match on
the upstream version of libdb; this is redundant with our packaging
system, and causes spurious errors when there's a non-ABI-breaking
BDB upstream release.  Closes: #651333.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2012-01-05 01:24:23 UTC (rev 1413)
+++ openldap/trunk/debian/changelog	2012-01-05 01:44:06 UTC (rev 1414)
@@ -12,6 +12,10 @@
     <en at englightened.de> for the patch.  Closes: #635931.
   * Install ldif.h in libldap2-dev, now that it's been blessed upstream.
     Closes: #644985.
+  * debian/patches/no-bdb-ABI-second-guessing: don't force an exact match on
+    the upstream version of libdb; this is redundant with our packaging
+    system, and causes spurious errors when there's a non-ABI-breaking
+    BDB upstream release.  Closes: #651333.
 
   [ Updated debconf translations ]
   * Dutch, thanks to Jeroen Schot <schot at A-Eskwadraat.nl>.  Closes: #651400.

Added: openldap/trunk/debian/patches/no-bdb-ABI-second-guessing
===================================================================
--- openldap/trunk/debian/patches/no-bdb-ABI-second-guessing	                        (rev 0)
+++ openldap/trunk/debian/patches/no-bdb-ABI-second-guessing	2012-01-05 01:44:06 UTC (rev 1414)
@@ -0,0 +1,44 @@
+Author: Steve Langasek <vorlon at debian.org>
+Description: don't second-guess BDB ABI
+ OpenLDAP upstream conservatively assumes that any change to the version
+ number of libdb can result in an API-breaking change that could impact
+ the database.  In Debian, we know that such changes require bumping the
+ library soname and changing the package name, and demand such rigor from
+ our package maintainers even when upstreams don't deliver; so any such
+ check in the source code works against the packaging system by forcing
+ database upgrades when we know none are required.  Disable this check
+ so we rely on the packaging system to do its job.
+Bug-Debian: http://bugs.debian.org/651333
+Forwarded: not-needed
+
+Index: trunk/servers/slapd/back-bdb/init.c
+===================================================================
+--- trunk.orig/servers/slapd/back-bdb/init.c
++++ trunk/servers/slapd/back-bdb/init.c
+@@ -756,7 +756,7 @@
+ 	bi->bi_controls = controls;
+ 
+ 	{	/* version check */
+-		int major, minor, patch, ver;
++		int major, minor, patch;
+ 		char *version = db_version( &major, &minor, &patch );
+ #ifdef HAVE_EBCDIC
+ 		char v2[1024];
+@@ -770,17 +770,6 @@
+ 		version = v2;
+ #endif
+ 
+-		ver = (major << 24) | (minor << 16) | patch;
+-		if( ver != DB_VERSION_FULL ) {
+-			/* fail if a versions don't match */
+-			Debug( LDAP_DEBUG_ANY,
+-				LDAP_XSTRING(bdb_back_initialize) ": "
+-				"BDB library version mismatch:"
+-				" expected " DB_VERSION_STRING ","
+-				" got %s\n", version, 0, 0 );
+-			return -1;
+-		}
+-
+ 		Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_back_initialize)
+ 			": %s\n", version, 0, 0 );
+ 	}

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2012-01-05 01:24:23 UTC (rev 1413)
+++ openldap/trunk/debian/patches/series	2012-01-05 01:44:06 UTC (rev 1414)
@@ -16,3 +16,4 @@
 fix-build-top-mk
 no-AM_INIT_AUTOMAKE
 switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
+no-bdb-ABI-second-guessing