[Pkg-openldap-devel] [openldap] 02/07: Revert "build and install pw-sha2 contrib module (#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 676e94d4ba0f182ff2142a00110f6af097c9d749
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Mon Aug 25 13:35:19 2014 -0700

    Revert "build and install pw-sha2 contrib module (#746727)"
    
    The proposed slapd-contrib package includes this module. Revert the
    change adding it to slapd for now.
---
 debian/changelog                |  2 --
 debian/patches/pw-sha2-makefile | 44 -----------------------------------------
 debian/patches/series           |  1 -
 debian/rules                    |  8 --------
 4 files changed, 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 955b659..5b7c52e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,6 @@ openldap (2.4.39-2) UNRELEASED; urgency=low
       symlink. (Closes: #742862)
     - When upgrading a database, ignore extra nested directories as they might 
       contain other databases. Patch from Kenny Millington. (LP: #1003854)
-  * debian/rules, debian/patches/pw-sha2-makefile: Build and install the sha2 
-    password module. (Closes: #746727)
   * debian/rules: Enable parallel building.
   * debian/slapd.README.Debian: Add a note about database format upgrades and 
     the consequences of missing one. (Closes: #594711)
diff --git a/debian/patches/pw-sha2-makefile b/debian/patches/pw-sha2-makefile
deleted file mode 100644
index 6603c68..0000000
--- a/debian/patches/pw-sha2-makefile
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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)/debian/build/servers/slapd -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
- 
-@@ -37,7 +37,7 @@
- 	-rpath $(moduledir) -module -o $@ $? $(LIBS)
- 
- clean:
--	rm -rf *.o *.lo *.la .libs
-+	$(LIBTOOL) --mode=clean rm -f
- 
- install:	$(PROGRAMS)
- 	mkdir -p $(DESTDIR)$(moduledir)
diff --git a/debian/patches/series b/debian/patches/series
index 6c8e04f..32554c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,6 +19,5 @@ switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
 no-bdb-ABI-second-guessing
 heimdal-fix
 CVE-2013-4449.patch
-pw-sha2-makefile
 its7430-avoid-gnutls-deprecated-function
 its7877-use-nettle-instead-of-gcrypt
diff --git a/debian/rules b/debian/rules
index 0775cc3..d1f5297 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,13 +89,11 @@ override_dh_auto_build:
 	dh_auto_build -- $(MAKEVARS)
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd
 	$(MAKE) -C contrib/slapd-modules/autogroup
-	$(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/passwd/sha2 install DESTDIR=$(installdir)
 
 	# Empty the dependency_libs file in the .la files.
 	for F in $(installdir)/usr/lib/ldap/*.la; do \
@@ -183,9 +181,3 @@ override_dh_auto_clean:
 		contrib/slapd-modules/autogroup/autogroup.lo \
 		contrib/slapd-modules/autogroup/autogroup.la \
 		contrib/slapd-modules/autogroup/autogroup.o
-	rm -rf contrib/slapd-modules/passwd/sha2/.libs \
-		contrib/slapd-modules/passwd/sha2/pw-sha2.la \
-		contrib/slapd-modules/passwd/sha2/sha2.lo \
-		contrib/slapd-modules/passwd/sha2/sha2.o \
-		contrib/slapd-modules/passwd/sha2/slapd-sha2.lo \
-		contrib/slapd-modules/passwd/sha2/slapd-sha2.o

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