Attached is a unified diff (generated by debdiff, if this is
unacceptable let me know) for creating a separate package containing
just the overlay and associated files. As previously specified it is
ugly but fully functional.
It does not introduce a slapd dependency on heimdal.
Pat
On Thu, 2008-01-24 at 12:32 +0000, Steve Langasek wrote:
> On Wed, Jan 23, 2008 at 04:43:17PM -0600, Pat Riehecky wrote:
> > Here is a mockup of changes to make this package.
>
> Please submit this as a unified diff (e.g., the sort generated by debdiff on
> a pair of source packages). I personally have no interest in this
> functionality, and am significantly less likely to work on it if I have to
> sort out a tarball of files instead of a proper diff; I assume the other
> comaintainers are in a similar situation since this bug is still open.
>
diff -Nru /tmp/4AmtDIAE5r/openldap2.3-2.4.7/debian/slapd-smbk5pwd.install /tmp/q2AN6HLevD/openldap2.3-2.4.7/debian/slapd-smbk5pwd.install
--- openldap2.3-2.4.7/debian/slapd-smbk5pwd.install 1969-12-31 18:00:00.000000000 -0600
+++ openldap2.3-2.4.7/debian/slapd-smbk5pwd.install 2008-01-25 15:01:39.000000000 -0600
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/ldap/smbk5pwd.la usr/lib/ldap
+debian/tmp/usr/lib/ldap/smbk5pwd.so.0.*.* usr/lib/ldap
+debian/tmp/usr/lib/ldap/smbk5pwd.so.0 usr/lib/ldap
+debian/tmp/usr/lib/ldap/smbk5pwd.so usr/lib/ldap
+debian/tmp/usr/share/doc/smbk5pwd/README.gz usr/share/doc/smbk5pwd
diff -Nru /tmp/4AmtDIAE5r/openldap2.3-2.4.7/debian/rules /tmp/q2AN6HLevD/openldap2.3-2.4.7/debian/rules
--- openldap2.3-2.4.7/debian/rules 2008-01-25 15:16:51.000000000 -0600
+++ openldap2.3-2.4.7/debian/rules 2008-01-25 15:00:43.000000000 -0600
@@ -133,6 +133,7 @@
dh_installdirs -a
cp -al $(installdir) $(tmpdir)
+ sh debian/make_smbk5pwd
dh_install -a
chmod 0755 $(CURDIR)/debian/slapd/usr/share/slapd/ldiftopasswd
diff -Nru /tmp/4AmtDIAE5r/openldap2.3-2.4.7/debian/make_smbk5pwd /tmp/q2AN6HLevD/openldap2.3-2.4.7/debian/make_smbk5pwd
--- openldap2.3-2.4.7/debian/make_smbk5pwd 1969-12-31 18:00:00.000000000 -0600
+++ openldap2.3-2.4.7/debian/make_smbk5pwd 2008-01-25 15:02:03.000000000 -0600
@@ -0,0 +1,51 @@
+#! /bin/sh
+
+set -e
+
+echo -n "Checking for Heimdal/Samba libs: "
+if [ ! -e /usr/lib/libroken.la ]
+ then
+ echo "Failed, no Heimdal dev files."
+ exit 30
+ else
+ echo "Found."
+fi
+
+cd contrib/slapd-modules/smbk5pwd
+
+perl -pi -e "
+s/LIBTOOL=..\/..\/..\/libtool/LIBTOOL=..\/..\/..\/debian\/build\/libtool/ ;
+s/HEIMDAL_INC=-I\/usr\/heimdal\/include/HEIMDAL_INC=-I\/usr\/include\/gssapi -I\/usr\/include\/kadm5 -I\/usr\/include\/krb5 -I\/usr\/include\/roken/ ;
+s/LDAP_INC=-I..\/..\/..\/include -I..\/..\/..\/servers\/slapd/LDAP_INC=-I..\/..\/..\/debian\/build\/include -I..\/..\/..\/debian\/build\/servers\/slapd -I..\/..\/..\/include -I..\/..\/..\/servers\/slapd/ ;
+s/HEIMDAL_LIB=-L\/usr\/heimdal\/lib -lkrb5 -lkadm5srv/HEIMDAL_LIB=-L\/usr\/lib -lkrb5 -lkadm5srv/ ;
+" Makefile
+
+make
+
+chmod 755 smbk5pwd.la smbk5pwd.o
+
+mv smbk5pwd.o smbk5pwd.so.0.0.0
+ln -s smbk5pwd.so.0.0.0 smbk5pwd.so.0.0
+ln -s smbk5pwd.so.0.0 smbk5pwd.so.0
+ln -s smbk5pwd.so.0 smbk5pwd.so
+
+perl -pi -e "
+s/libdir='\/usr\/local\/libexec\/openldap'/libdir='\/usr\/lib\/ldap'/ ;
+" smbk5pwd.la
+
+gzip --best README
+chmod 644 README.gz
+
+chown root:root *
+
+mkdir -p ../../../debian/tmp/usr/share/doc/smbk5pwd/
+cp -p README.gz ../../../debian/tmp/usr/share/doc/smbk5pwd/
+
+mkdir -p ../../../debian/tmp/usr/lib/ldap
+mv smbk5pwd.so* smbk5pwd.la ../../../debian/tmp/usr/lib/ldap/
+
+gzip -d README.gz
+rm smbk5pwd.lo
+rm -rf .libs
+
+cd ../../../
diff -Nru /tmp/4AmtDIAE5r/openldap2.3-2.4.7/debian/control /tmp/q2AN6HLevD/openldap2.3-2.4.7/debian/control
--- openldap2.3-2.4.7/debian/control 2008-01-25 15:16:51.000000000 -0600
+++ openldap2.3-2.4.7/debian/control 2008-01-25 15:01:08.000000000 -0600
@@ -92,3 +92,14 @@
primarily to permit better backtraces and crash dump analysis after
problems with the libraries. GDB will find this debug information
automatically.
+
+Package: slapd-smbk5pwd
+Section: net
+Priority: extra
+Architecture: any
+Depends: slapd (= ${binary:Version}), libkadm5srv8-heimdal (>= 1.0.1-5), libkrb5-22-heimdal (>= 1.0.1-5), libroken18-heimdal (>= 1.0.1-5), libasn1-8-heimdal (>= 1.0.1-5), libhx509-1-heimdal (>= 1.0.1-5), libhdb9-heimdal (>= 1.0.1-5)
+Description: Smbk5pwd 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.
+
diff -Nru /tmp/4AmtDIAE5r/openldap2.3-2.4.7/debian/changelog /tmp/q2AN6HLevD/openldap2.3-2.4.7/debian/changelog
--- openldap2.3-2.4.7/debian/changelog 2008-01-25 15:16:51.000000000 -0600
+++ openldap2.3-2.4.7/debian/changelog 2008-01-25 15:02:52.000000000 -0600
@@ -1,5 +1,11 @@
openldap2.3 (2.4.7-3) unstable; urgency=low
+ * Add build scripts for smbk5pwd
+
+ -- Pat Riehecky <[EMAIL PROTECTED]> Wed, 23 Jan 2008 14:26:00 -0600
+
+openldap2.3 (2.4.7-3) unstable; urgency=low
+
* Add missing build-dependency on groff-base, to allow use of soelim during
build.
