[Pkg-openldap-devel] Bug#575900: Include autogroup contrib slapd module

[Mathieu Parent]

Package: slapd
Version: 2.4.17-2.1
Severity: wishlist
Tags: patch

The attached patches add support for autogroup contrib module
(which contrary to dynlist, behave correctly when searching by
attributes).


The attached patches solves this:
- autogroup.diff: upgrade to latest CVS version (should be added to
  debian/patches)
- autogroup-debian-makefile.diff: fix the build (should be added to
  debian/patches)
- debian-rules.diff: actually build during package building

I can rework the patch or send them differently (debdiff?).

I can also make the third patch more generic, accepting a list of
contrib modules to build.

Regards

Mathieu Parent

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (900, 'testing'), (300, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-4-686 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
A non-text attachment was scrubbed...
Name: autogroup.diff
Type: text/x-c
Size: 6792 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-openldap-devel/attachments/20100330/866f26b7/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: autogroup-debian-makefile.diff
Type: text/x-makefile
Size: 1266 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-openldap-devel/attachments/20100330/866f26b7/attachment-0001.bin>
-------------- next part --------------
--- openldap-2.4.17-old/debian/rules	2010-03-30 08:14:29.000000000 +0200
+++ openldap-2.4.17/debian/rules	2010-03-30 11:48:12.000000000 +0200
@@ -36,6 +36,7 @@
 slapddir	:= $(CURDIR)/debian/slapd/usr/sbin
 
 MAKEVARS	:= DESTDIR=$(installdir) STRIP=
+MAKEVARS_autogroup := PREFIX=$(installdir)/usr
 
 # Include the quilt patch system.
 include /usr/share/quilt/quilt.make
@@ -105,6 +106,7 @@
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	RESOLV_MULTI=off $(MAKE) -C $(builddir) test
 endif
+	$(MAKE) -C $(CURDIR)/contrib/slapd-modules/autogroup $(MAKEVARS_autogroup)
 	touch $@
 
 # Check all built libraries for unresolved symbols except for the libslapi
@@ -114,6 +116,7 @@
 install: install-stamp
 install-stamp: build-stamp
 	$(MAKE) -C $(builddir) $(MAKEVARS) install
+	$(MAKE) -C $(CURDIR)/contrib/slapd-modules/autogroup $(MAKEVARS_autogroup) install
 	for F in $(installdir)/usr/lib/*.so.*.*.*; do \
 	    if echo "$$F" | grep -q libslapi ; then \
 	        continue; \
@@ -184,6 +187,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f install-stamp build-stamp configure-stamp
+	$(MAKE) -C $(CURDIR)/contrib/slapd-modules/autogroup $(MAKEVARS_autogroup) clean
 	# Update translation templates for debconf
 	debconf-updatepo
 	# Remove our stripped schema from the upstream source area.