[Pkg-openldap-devel] r815 - openldap/trunk-2.3/debian

[Russ Allbery]

Author: rra
Date: 2007-05-31 02:58:46 +0000 (Thu, 31 May 2007)
New Revision: 815

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/configure.options
   openldap/trunk-2.3/debian/libldap-2.3-0.install
   openldap/trunk-2.3/debian/libldap2.3-dev.install
   openldap/trunk-2.3/debian/rules
Log:
* Enable SLAPI support.  (Closes: #390954)

Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2007-05-30 20:30:39 UTC (rev 814)
+++ openldap/trunk-2.3/debian/changelog	2007-05-31 02:58:46 UTC (rev 815)
@@ -5,6 +5,7 @@
     - ITS#4924: client crash on incorrectly tagged result from server.
     - ITS#4925: NOOP modify with BDB backend crashed slapd.
     - ITS#4966: Delete of valsort-controlled entries crashed slapd.
+  * Enable SLAPI support.  (Closes: #390954)
   * Re-enable use of the epoll system call since Debian no longer supports
     2.4 kernels.  This means that the OpenLDAP packages will not work on
     pre-2.6 kernels.
@@ -21,7 +22,7 @@
   * Added commentary and upstream ITS numbers for several patches
     applicable upstream.
 
- -- Russ Allbery <rra at debian.org>  Wed, 30 May 2007 13:30:16 -0700
+ -- Russ Allbery <rra at debian.org>  Wed, 30 May 2007 17:41:38 -0700
 
 openldap2.3 (2.3.30-5) unstable; urgency=low
 

Modified: openldap/trunk-2.3/debian/configure.options
===================================================================
--- openldap/trunk-2.3/debian/configure.options	2007-05-30 20:30:39 UTC (rev 814)
+++ openldap/trunk-2.3/debian/configure.options	2007-05-31 02:58:46 UTC (rev 815)
@@ -95,6 +95,7 @@
 #--enable-rlookups	  enable reverse lookups of client hostnames [no]
 --enable-rlookups
 #--enable-slapi        enable SLAPI support (experimental) [no]
+--enable-slapi
 #--enable-slp          enable SLPv2 support [no]
 --enable-slp
 #--enable-wrappers	  enable tcp wrapper support [no]

Modified: openldap/trunk-2.3/debian/libldap-2.3-0.install
===================================================================
--- openldap/trunk-2.3/debian/libldap-2.3-0.install	2007-05-30 20:30:39 UTC (rev 814)
+++ openldap/trunk-2.3/debian/libldap-2.3-0.install	2007-05-31 02:58:46 UTC (rev 815)
@@ -4,3 +4,5 @@
 debian/tmp/usr/lib/libldap-2.3.so.0.*.* usr/lib
 debian/tmp/usr/lib/libldap_r-2.3.so.0 usr/lib
 debian/tmp/usr/lib/libldap_r-2.3.so.0.*.* usr/lib
+debian/tmp/usr/lib/libslapi-2.3.so.0 usr/lib
+debian/tmp/usr/lib/libslapi-2.3.so.0.*.* usr/lib

Modified: openldap/trunk-2.3/debian/libldap2.3-dev.install
===================================================================
--- openldap/trunk-2.3/debian/libldap2.3-dev.install	2007-05-30 20:30:39 UTC (rev 814)
+++ openldap/trunk-2.3/debian/libldap2.3-dev.install	2007-05-31 02:58:46 UTC (rev 815)
@@ -12,3 +12,5 @@
 debian/tmp/usr/lib/liblber.so usr/lib
 debian/tmp/usr/lib/libldap_r.a usr/lib
 debian/tmp/usr/lib/libldap_r.so usr/lib
+debian/tmp/usr/lib/libslapi.a usr/lib
+debian/tmp/usr/lib/libslapi.so usr/lib

Modified: openldap/trunk-2.3/debian/rules
===================================================================
--- openldap/trunk-2.3/debian/rules	2007-05-30 20:30:39 UTC (rev 814)
+++ openldap/trunk-2.3/debian/rules	2007-05-31 02:58:46 UTC (rev 815)
@@ -58,10 +58,17 @@
 	$(MAKE) -C $(builddir) $(MAKEVARS)
 	touch $@
 
+# Check all built libraries for unresolved symbols except for the libslapi
+# library.  It is a special case since the SLAPI interface depends on symbols
+# defined in slapd itself.  Those symbols will remain unresolved until the
+# plugin is loaded into slapd.
 install: install-stamp
 install-stamp: build-stamp
 	$(MAKE) -C $(builddir) $(MAKEVARS) install
 	for F in $(installdir)/usr/lib/*.so.*.*.*; do \
+	    if echo "$$F" | grep -q libslapi ; then \
+	        continue; \
+	    fi; \
 	    if LD_LIBRARY_PATH=$(installdir)/usr/lib ldd -d -r $$F 2>&1 | grep '^undefined symbol:'; then \
 	        echo; \
 	        echo "library $$F has undefined references.  Please fix this before continuing."; \