debian/changelog

@@ -14,6 +14,15 @@ openldap (2.4.47+dfsg-2) UNRELEASED; urgency=medium
     - pw-pbkdf2 (Closes: #794999)
   * Import the slapo-pw-pbkdf2 man page from upstream git master and install
     it with the slapd-contrib package.
+  * Add smbk5pwd to slapd-contrib and turn slapd-smbk5pwd into a transitional
+    package. Drop smbk5pwd README since it now has a man page which is a
+    better resource for users.
+    - Use Breaks to ensure that slapd is not upgraded in between removing the
+      old smbk5pwd module and installing the new one.
+  * Include the apr1-atol.pl and apr1-lota.pl helper scripts in the
+    slapd-contrib package as examples.
+  * Merge remaining contrib Makefile patches into a single contrib-makefiles
+    patch.
 
  -- Ryan Tandy <ryan@nardis.ca>  Mon, 24 Dec 2018 12:14:43 -0800
 

debian/control

@@ -47,20 +47,23 @@ Package: slapd-contrib
 Architecture: any
 Build-Profiles: <!stage1>
 Depends: slapd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: slapd-smbk5pwd
+Breaks: slapd-smbk5pwd (<< 2.4.47+dfsg-2~)
+Replaces: slapd-smbk5pwd (<< 2.4.47+dfsg-2~)
 Description: contributed plugins for OpenLDAP slapd
  This package contains a number of slapd overlays and plugins contributed by
  the OpenLDAP community. While distributed as part of OpenLDAP Software, they
  are not necessarily supported by the OpenLDAP Project.
 
 Package: slapd-smbk5pwd
-Architecture: any
+Architecture: all
+Section: oldlibs
 Build-Profiles: <!stage1>
-Depends: slapd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Keeps Samba and Kerberos passwords in sync within slapd.
- Extends the PasswordModify Extended Operation to update Kerberos keys
- and Samba password hashes for an LDAP user. The Kerberos support is
- written for Heimdal using its hdb-ldap backend. The Samba support is
- written using the Samba 3.0 LDAP schema.
+Depends: slapd-contrib, ${misc:Depends}
+Breaks: slapd (<< 2.4.47+dfsg-2~)
+Description: transitional package for slapd-contrib
+ This is a transitional package from slapd-smbk5pwd to slapd-contrib. It can be
+ safely removed.
 
 Package: ldap-utils
 Architecture: any

debian/patches/smbk5pwd-makefile → debian/patches/contrib-makefiles

+--- a/contrib/slapd-modules/passwd/Makefile
++++ b/contrib/slapd-modules/passwd/Makefile
+@@ -13,7 +13,7 @@
+ INCS = $(LDAP_INC)
+ LIBS = $(LDAP_LIB)
+ 
+-PROGRAMS = pw-kerberos.la pw-netscape.la pw-radius.la pw-apr1.la
++PROGRAMS = pw-netscape.la pw-apr1.la
+ LTVER = 0:0:0
+ 
+ prefix=/usr/local
+--- a/contrib/slapd-modules/passwd/pbkdf2/Makefile
++++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile
+@@ -12,7 +12,7 @@
+ #DEFS = -DSLAPD_PBKDF2_DEBUG
+ 
+ INCS = $(LDAP_INC)
+-LIBS = $(LDAP_LIB) -lcrypto
++LIBS = $(LDAP_LIB) -lnettle
+ 
+ PROGRAMS = pw-pbkdf2.la
+ LTVER = 0:0:0
 --- a/contrib/slapd-modules/smbk5pwd/Makefile
 +++ b/contrib/slapd-modules/smbk5pwd/Makefile
 @@ -19,10 +19,10 @@

debian/patches/passwd-makefile

---- a/contrib/slapd-modules/passwd/Makefile
-+++ b/contrib/slapd-modules/passwd/Makefile
-@@ -13,7 +13,7 @@
- INCS = $(LDAP_INC)
- LIBS = $(LDAP_LIB)
- 
--PROGRAMS = pw-kerberos.la pw-netscape.la pw-radius.la pw-apr1.la
-+PROGRAMS = pw-netscape.la pw-apr1.la
- LTVER = 0:0:0
- 
- prefix=/usr/local

debian/patches/pbkdf2-makefile

---- a/contrib/slapd-modules/passwd/pbkdf2/Makefile
-+++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile
-@@ -12,7 +12,7 @@
- #DEFS = -DSLAPD_PBKDF2_DEBUG
- 
- INCS = $(LDAP_INC)
--LIBS = $(LDAP_LIB) -lcrypto
-+LIBS = $(LDAP_LIB) -lnettle
- 
- PROGRAMS = pw-pbkdf2.la
- LTVER = 0:0:0

debian/patches/series

@@ -8,9 +8,7 @@ sasl-default-path
 libldap-symbol-versions
 getaddrinfo-is-threadsafe
 do-not-second-guess-sonames
-smbk5pwd-makefile
-pbkdf2-makefile
-passwd-makefile
+contrib-makefiles
 smbk5pwd-makefile-manpage
 lastbind-makefile-manpage
 ldap-conf-tls-cacertdir

debian/rules

@@ -158,12 +158,6 @@ endif
 	find $(installdir)/usr/share/man -name \*.8 \
 		| xargs perl -pi -e 's#(\.TH \w+ 8)C#$$1#'
 
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
-override_dh_install-arch:
-	dh_install
-	rm -rf $(CURDIR)/debian/slapd/usr/lib/ldap/smbk5pwd*
-endif
-
 override_dh_installinit:
 	dh_installinit -- "defaults 19 80"
 

debian/slapd-contrib.examples

+contrib/slapd-modules/passwd/apr1-atol.pl
+contrib/slapd-modules/passwd/apr1-ltoa.pl

debian/slapd-contrib.install

@@ -4,3 +4,5 @@ usr/lib/ldap/pw-netscape.so*
 usr/lib/ldap/pw-netscape.la
 usr/lib/ldap/pw-pbkdf2.so*
 usr/lib/ldap/pw-pbkdf2.la
+usr/lib/ldap/smbk5pwd.so*
+usr/lib/ldap/smbk5pwd.la

debian/slapd-smbk5pwd.lintian-overrides → debian/slapd-contrib.lintian-overrides

 # #204975
-slapd-smbk5pwd: package-has-unnecessary-activation-of-ldconfig-trigger
+slapd-contrib: package-has-unnecessary-activation-of-ldconfig-trigger
 # rpath set by krb5-config.heimdal; #868840
 binary-or-shlib-defines-rpath usr/lib/ldap/smbk5pwd.so.0.0.0 /usr/lib/x86_64-linux-gnu/heimdal

debian/slapd-contrib.manpages

 debian/slapo-pw-pbkdf2.5
+debian/tmp/usr/share/man/man5/slapo-smbk5pwd.5

debian/slapd-smbk5pwd.dirs

-usr/lib/ldap

debian/slapd-smbk5pwd.docs

-contrib/slapd-modules/smbk5pwd/README

debian/slapd-smbk5pwd.install

-usr/lib/ldap/smbk5pwd.so*
-usr/lib/ldap/smbk5pwd.la

debian/slapd-smbk5pwd.manpages

-debian/tmp/usr/share/man/man5/slapo-smbk5pwd.5