[Pkg-openldap-devel] r1263 - openldap/trunk/debian

[matthijs at alioth.debian.org]

Author: matthijs
Date: 2010-04-19 14:27:17 +0000 (Mon, 19 Apr 2010)
New Revision: 1263

Added:
   openldap/trunk/debian/slapd-smbk5pwd.dirs
   openldap/trunk/debian/slapd-smbk5pwd.docs
   openldap/trunk/debian/slapd-smbk5pwd.install
Modified:
   openldap/trunk/debian/control
   openldap/trunk/debian/rules
Log:
 * Put smbk5pwd module in a separate package.
 * Put a Build-Conflicts on libssl-dev to prevent it pulled in by accident.


Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2010-04-19 10:00:17 UTC (rev 1262)
+++ openldap/trunk/debian/control	2010-04-19 14:27:17 UTC (rev 1263)
@@ -13,7 +13,7 @@
  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, heimdal-dev
-Build-Conflicts: libbind-dev, bind-dev, libicu-dev
+Build-Conflicts: libbind-dev, bind-dev, libicu-dev, libssl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.openldap.org/
 Vcs-Svn: svn://svn.debian.org/pkg-openldap/openldap/trunk
@@ -37,6 +37,17 @@
  (slapd). The server can be used to provide a standalone directory
  service.
 
+Package: slapd-smbk5pwd
+Section: net
+Priority: extra
+Architecture: any
+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.
+
 Package: ldap-utils
 Section: net
 Priority: optional

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2010-04-19 10:00:17 UTC (rev 1262)
+++ openldap/trunk/debian/rules	2010-04-19 14:27:17 UTC (rev 1263)
@@ -105,7 +105,7 @@
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd
 	$(MAKE) -C contrib/slapd-modules/autogroup
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	#RESOLV_MULTI=off $(MAKE) -C $(builddir) test
+	RESOLV_MULTI=off $(MAKE) -C $(builddir) test
 endif
 	touch $@
 
@@ -146,6 +146,7 @@
 	cp -al $(installdir) $(tmpdir)
 
 	dh_install -a
+	rm -rf $(CURDIR)/debian/slapd/usr/lib/ldap/smbk5pwd*
 	chmod 0755 $(CURDIR)/debian/slapd/usr/share/slapd/ldiftopasswd
 
 	dh_installchangelogs -a
@@ -158,6 +159,7 @@
 	dh_strip -plibldap-2.4-2 --dbg-package=libldap-2.4-2-dbg
 	dh_strip -pslapd --dbg-package=slapd-dbg
 	dh_strip -pldap-utils
+	dh_strip -pslapd-smbk5pwd
 	dh_link -a
 
 	# hardlink these so not confined by apparmor

Added: openldap/trunk/debian/slapd-smbk5pwd.dirs
===================================================================
--- openldap/trunk/debian/slapd-smbk5pwd.dirs	                        (rev 0)
+++ openldap/trunk/debian/slapd-smbk5pwd.dirs	2010-04-19 14:27:17 UTC (rev 1263)
@@ -0,0 +1 @@
+usr/lib/ldap

Added: openldap/trunk/debian/slapd-smbk5pwd.docs
===================================================================
--- openldap/trunk/debian/slapd-smbk5pwd.docs	                        (rev 0)
+++ openldap/trunk/debian/slapd-smbk5pwd.docs	2010-04-19 14:27:17 UTC (rev 1263)
@@ -0,0 +1 @@
+contrib/slapd-modules/smbk5pwd/README

Added: openldap/trunk/debian/slapd-smbk5pwd.install
===================================================================
--- openldap/trunk/debian/slapd-smbk5pwd.install	                        (rev 0)
+++ openldap/trunk/debian/slapd-smbk5pwd.install	2010-04-19 14:27:17 UTC (rev 1263)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/ldap/smbk5pwd.so* usr/lib/ldap
+debian/tmp/usr/lib/ldap/smbk5pwd.la usr/lib/ldap