[Pkg-openldap-devel] [openldap] 03/03: build and install pw-sha2 (#746727)

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit f5f28babeeadf2f55dda3c20da782e761645b463
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Tue Oct 21 01:49:27 2014 +0000

    build and install pw-sha2 (#746727)
---
 debian/changelog                                   |  1 +
 debian/patches/contrib-modules-use-dpkg-buildflags | 17 +++++++++++
 debian/patches/pw-sha2-makefile                    | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  6 ++++
 5 files changed, 60 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e9973f4..593e68a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ openldap (2.4.40-2) UNRELEASED; urgency=medium
   * On upgrade, if an access rule begins with "to * by self write", show a 
     debconf note warning that it should be changed. (Closes: #761406)
   * Build and install the lastbind contrib module. (Closes: #701111)
+  * Build and install the passwd/sha2 contrib module. (Closes: #746727)
 
  -- Ryan Tandy <ryan at nardis.ca>  Sun, 19 Oct 2014 17:34:00 -0700
 
diff --git a/debian/patches/contrib-modules-use-dpkg-buildflags b/debian/patches/contrib-modules-use-dpkg-buildflags
index f26f855..ce828dd 100644
--- a/debian/patches/contrib-modules-use-dpkg-buildflags
+++ b/debian/patches/contrib-modules-use-dpkg-buildflags
@@ -55,3 +55,20 @@ Bug-Debian: http://bugs.debian.org/663724
  	-rpath $(moduledir) -module -o $@ $? $(LIBS)
  
  clean:
+--- a/contrib/slapd-modules/passwd/sha2/Makefile
++++ b/contrib/slapd-modules/passwd/sha2/Makefile
+@@ -28,12 +28,12 @@
+ .SUFFIXES: .c .o .lo
+ 
+ .c.lo:
+-	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
+ 
+ all:		$(PROGRAMS)
+ 
+ pw-sha2.la:	slapd-sha2.lo sha2.lo
+-	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
++	$(LIBTOOL) --mode=link $(CC) $(OPT) $(LDFLAGS) -version-info $(LTVER) \
+ 	-rpath $(moduledir) -module -o $@ $? $(LIBS)
+ 
+ clean:
diff --git a/debian/patches/pw-sha2-makefile b/debian/patches/pw-sha2-makefile
new file mode 100644
index 0000000..417d669
--- /dev/null
+++ b/debian/patches/pw-sha2-makefile
@@ -0,0 +1,35 @@
+--- a/contrib/slapd-modules/passwd/sha2/Makefile
++++ b/contrib/slapd-modules/passwd/sha2/Makefile
+@@ -2,11 +2,11 @@
+ 
+ LDAP_SRC = ../../../..
+ LDAP_BUILD = ../../../..
+-LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
+-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+-	$(LDAP_BUILD)/libraries/liblber/liblber.la
++LDAP_INC = -I$(LDAP_BUILD)/debian/build/include -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
++LDAP_LIB = $(LDAP_BUILD)/debian/build/libraries/libldap_r/libldap_r.la \
++	$(LDAP_BUILD)/debian/build/libraries/liblber/liblber.la
+ 
+-LIBTOOL = $(LDAP_BUILD)/libtool
++LIBTOOL = $(LDAP_BUILD)/debian/build/libtool
+ CC = gcc
+ OPT = -g -O2 -Wall
+ DEFS = 
+@@ -17,13 +17,13 @@
+ PROGRAMS = pw-sha2.la
+ LTVER = 0:0:0
+ 
+-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)
+ 
+ .SUFFIXES: .c .o .lo
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ae05fa9..613612b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@ contrib-modules-use-dpkg-buildflags
 smbk5pwd-makefile
 autogroup-makefile
 lastbind-makefile
+pw-sha2-makefile
 ldap-conf-tls-cacertdir
 add-tlscacert-option-to-ldap-conf
 fix-build-top-mk
diff --git a/debian/rules b/debian/rules
index 599b3e1..ff4f8f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,12 +90,14 @@ override_dh_auto_build:
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd
 	$(MAKE) -C contrib/slapd-modules/autogroup
 	$(MAKE) -C contrib/slapd-modules/lastbind
+	$(MAKE) -C contrib/slapd-modules/passwd/sha2
 
 override_dh_auto_install:
 	dh_auto_install -- $(MAKEVARS)
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd install DESTDIR=$(installdir)
 	$(MAKE) -C contrib/slapd-modules/autogroup install DESTDIR=$(installdir)
 	$(MAKE) -C contrib/slapd-modules/lastbind install DESTDIR=$(installdir)
+	$(MAKE) -C contrib/slapd-modules/passwd/sha2 install DESTDIR=$(installdir)
 
 	# Empty the dependency_libs file in the .la files.
 	for F in $(installdir)/usr/lib/ldap/*.la; do \
@@ -189,3 +191,7 @@ override_dh_auto_clean:
 		contrib/slapd-modules/lastbind/lastbind.lo \
 		contrib/slapd-modules/lastbind/lastbind.la \
 		contrib/slapd-modules/lastbind/lastbind.o
+	rm -rf contrib/slapd-modules/passwd/sha2/.libs \
+		contrib/slapd-modules/passwd/sha2/pw-sha2.lo \
+		contrib/slapd-modules/passwd/sha2/pw-sha2.la \
+		contrib/slapd-modules/passwd/sha2/pw-sha2.o

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git