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

[matthijs at alioth.debian.org]

tags 443073 pending
thanks

Author: matthijs
Date: 2010-04-18 12:57:00 +0000 (Sun, 18 Apr 2010)
New Revision: 1259

Added:
   openldap/trunk/debian/patches/smbk5pwd-makefile
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/control
   openldap/trunk/debian/patches/series
   openldap/trunk/debian/rules
Log:
 * Added smbk5pwd slapd module.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-04-17 20:14:33 UTC (rev 1258)
+++ openldap/trunk/debian/changelog	2010-04-18 12:57:00 UTC (rev 1259)
@@ -21,8 +21,9 @@
   * Set a rootdn and rootpw if no password is given by debconf (Closes: #231950)
   * Better document the TLSCipherSuite in slapd.conf manpage (Closes: #563113)
   * Better document the TLS_CIPHER_SUITE in ldap.conf manpage (Closes: #510346)
+  * Add smbk5pwd slapd module, used patch from Mark Hymers (Closes: #443073)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sat, 17 Apr 2010 21:34:02 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 18 Apr 2010 14:55:32 +0200
 
 openldap (2.4.17-2.1) unstable; urgency=high
 

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2010-04-17 20:14:33 UTC (rev 1258)
+++ openldap/trunk/debian/control	2010-04-18 12:57:00 UTC (rev 1259)
@@ -12,7 +12,7 @@
  libgnutls-dev (>= 1.7), unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
  libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.40),
- autotools-dev, libtool, automake, autoconf, groff-base, time
+ autotools-dev, libtool, automake, autoconf, groff-base, time, heimdal-dev
 Build-Conflicts: libbind-dev, bind-dev, libicu-dev
 Standards-Version: 3.8.4
 Homepage: http://www.openldap.org/

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2010-04-17 20:14:33 UTC (rev 1258)
+++ openldap/trunk/debian/patches/series	2010-04-18 12:57:00 UTC (rev 1259)
@@ -11,3 +11,4 @@
 do-not-second-guess-sonames
 shutdown-issue-6322
 manpage-tlscyphersuite-additions
+smbk5pwd-makefile

Added: openldap/trunk/debian/patches/smbk5pwd-makefile
===================================================================
--- openldap/trunk/debian/patches/smbk5pwd-makefile	                        (rev 0)
+++ openldap/trunk/debian/patches/smbk5pwd-makefile	2010-04-18 12:57:00 UTC (rev 1259)
@@ -0,0 +1,56 @@
+Index: b/contrib/slapd-modules/smbk5pwd/Makefile
+===================================================================
+--- a/contrib/slapd-modules/smbk5pwd/Makefile
++++ b/contrib/slapd-modules/smbk5pwd/Makefile
+@@ -12,30 +12,30 @@
+ # top-level directory of the distribution or, alternatively, at
+ # <http://www.OpenLDAP.org/license.html>.
+ 
+-LIBTOOL=../../../libtool
++LIBTOOL=../../../debian/build/libtool
+ OPT=-g -O2
+ CC=gcc
+ 
+ # Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
+ DEFS=-DDO_KRB5 -DDO_SAMBA
+ 
+-HEIMDAL_INC=-I/usr/heimdal/include
++HEIMDAL_INC=-I/usr/include
+ SSL_INC=
+-LDAP_INC=-I../../../include -I../../../servers/slapd
++LDAP_INC=-I../../../debian/build/include -I../../../debian/build/servers/slapd -I../../../include -I../../../servers/slapd
+ INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
+ 
+-HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv
+-SSL_LIB=-lcrypto
+-LDAP_LIB=-lldap_r -llber
++HEIMDAL_LIB=-lkrb5 -lkadm5srv
++SSL_LIB=-lgcrypt
++LDAP_LIB=-lldap_r -llber -L../../../debian/build/libraries/libldap_r -L../../../debian/build/libraries/liblber
+ LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
+ 
+-prefix=/usr/local
++prefix=/usr
+ exec_prefix=$(prefix)
+-ldap_subdir=/openldap
++ldap_subdir=/ldap
+ 
+ libdir=$(exec_prefix)/lib
+ libexecdir=$(exec_prefix)/libexec
+-moduledir = $(libexecdir)$(ldap_subdir)
++moduledir = $(libdir)$(ldap_subdir)
+ 
+ all:	smbk5pwd.la
+ 
+@@ -48,8 +48,9 @@
+ 	-rpath $(moduledir) -module -o $@ $? $(LIBS)
+ 
+ clean:
+-	rm -f smbk5pwd.lo smbk5pwd.la
++	$(LIBTOOL) --mode=clean rm -f
+ 
+-install: smbk5pwd.la
++install: all
+ 	mkdir -p $(DESTDIR)$(moduledir)
+ 	$(LIBTOOL) --mode=install cp smbk5pwd.la $(DESTDIR)$(moduledir)
++

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2010-04-17 20:14:33 UTC (rev 1258)
+++ openldap/trunk/debian/rules	2010-04-18 12:57:00 UTC (rev 1259)
@@ -102,6 +102,7 @@
 build-indep:
 build-stamp: configure-stamp
 	$(MAKE) -C $(builddir) $(MAKEVARS)
+	$(MAKE) -C contrib/slapd-modules/smbk5pwd
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	RESOLV_MULTI=off $(MAKE) -C $(builddir) test
 endif
@@ -114,6 +115,7 @@
 install: install-stamp
 install-stamp: build-stamp
 	$(MAKE) -C $(builddir) $(MAKEVARS) install
+	$(MAKE) -C contrib/slapd-modules/smbk5pwd install DESTDIR=$(installdir)
 	for F in $(installdir)/usr/lib/*.so.*.*.*; do \
 	    if echo "$$F" | grep -q libslapi ; then \
 	        continue; \
@@ -197,6 +199,9 @@
 	rm -f contrib/ldapc++/config.sub contrib/ldapc++/config.guess
 	rm -rf $(builddir) $(builddir_notls) $(installdir)
 	rm -rf build/ltmain.sh autom4te.cache configure aclocal.m4
+	
+	# Clean the contrib directory
+	rm -rf contrib/slapd-modules/smbk5pwd/.libs contrib/slapd-modules/smbk5pwd/smbk5pwd.{lo,la,o}
 	dh_clean
 
 .PHONY: binary binary-arch binary-indep build build-arch build-indep clean