Package: libpam-ldap
Version: 184-8.5
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu precise ubuntu-patch

Hi Rick,

As for libnss-ldap, I've prepared a patch for libpam-ldap to transition it
to use the multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.  Please find it attached. 
This patch has been tested and included in Ubuntu Precise.

The changelog for the Ubuntu upload is:

  * Build for multiarch.
  * Drop dh-buildinfo, which is not multiarch safe and redundant with build
    logs.
  * Hard-code a versioned dependency on the version of libpam0g that
    supports the multiarch module directory.

Thanks for considering the patch.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
[email protected]                                     [email protected]
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2010-05-23 17:25:49 +0000
+++ debian/control	2011-12-30 08:21:41 +0000
@@ -3,11 +3,12 @@
 Priority: extra
 Maintainer: Richard A Nelson (Rick) <[email protected]>
 Standards-Version: 3.7.2
-Build-Depends: cdbs, quilt, patchutils, dh-buildinfo, debhelper (>= 5), autotools-dev, libldap2-dev, libsasl2-dev, libpam0g-dev, po-debconf (>= 0.5.0)
+Build-Depends: cdbs (>= 0.4.93~), quilt, patchutils, debhelper (>= 8.1.3~), autotools-dev, libldap2-dev, libsasl2-dev, libpam0g-dev, po-debconf (>= 0.5.0)
 
 Package: libpam-ldap
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-6)
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-6), libpam0g (>= 1.1.3-2)
 Suggests: libnss-ldapd | libnss-ldap 
 Description: Pluggable Authentication Module for LDAP
  This package provides an interface between an LDAP server and the PAM

=== modified file 'debian/libpam-ldap.dirs'
--- debian/libpam-ldap.dirs	2003-10-02 16:21:44 +0000
+++ debian/libpam-ldap.dirs	2011-12-30 08:20:52 +0000
@@ -1,3 +1,2 @@
-lib/security
 usr/share/libpam-ldap
 etc

=== modified file 'debian/libpam-ldap.install'
--- debian/libpam-ldap.install	2009-03-04 04:42:00 +0000
+++ debian/libpam-ldap.install	2011-12-30 08:20:52 +0000
@@ -6,5 +6,5 @@
 build-tree/*/pam_ldap.5 usr/share/man/man5
 build-tree/*/ldapns.schema usr/share/doc/libpam-ldap
 debian/LDAP-Permissions.txt usr/share/doc/libpam-ldap
-debian/tmp/usr/lib/security lib
+debian/tmp/lib/*/security
 debian/tmp/usr/share/pam-configs/ldap

=== modified file 'debian/rules'
--- debian/rules	2009-03-04 04:42:00 +0000
+++ debian/rules	2011-12-30 08:21:58 +0000
@@ -13,6 +13,7 @@
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 MY_INSTR_DIR = $(CURDIR)/debian/libpam-ldap
 DEB_CONFIGURE_EXTRA_FLAGS += \
+	--libdir=/lib/$(DEB_HOST_MULTIARCH) \
 	--with-ldap-lib=openldap \
 	--with-ldap-conf-file=/etc/pam_ldap.conf \
 	--with-ldap-secret-file=/etc/pam_ldap.secret
@@ -22,10 +23,6 @@
 clean::
 	rm *.cdbs-config_list
 
-# after the directories are created but before dh_compress is run.
-common-binary-post-install-arch::
-	dh_buildinfo
-
 install/libpam-ldap::
 	install -D -m 644 debian/libpam-ldap.pam-auth-update debian/tmp/usr/share/pam-configs/ldap
 

Reply via email to