Package: libnss-ldap
Version: 264-2.3
Severity: serious
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Hi Rick,

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

In the process of preparing this patch, I discovered that libnss-ldap will
misbuild against a multiarch libc because it fails to locate libc and
nss_files and construct an appropriate soname for nss_ldap.  I'm therefore
marking this bug severity: serious, since regardless of whether nss_ldap is
updated to install to the multiarch paths for wheezy, it needs to cope with
a libc that has been.

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/
slanga...@ubuntu.com                                     vor...@debian.org
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2010-03-04 08:46:28 +0000
+++ debian/control	2011-12-30 03:05:06 +0000
@@ -3,10 +3,12 @@
 Priority: extra
 Maintainer: Richard A Nelson (Rick) <cow...@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: cdbs, quilt, patchutils, dh-buildinfo, debhelper (>= 5), autotools-dev, libkrb5-dev, libldap2-dev, libsasl2-dev, po-debconf (>= 0.5.0)
+Build-Depends: cdbs (>= 0.4.93~), quilt, patchutils, debhelper (>= 8.1.3~), autotools-dev, libkrb5-dev, libldap2-dev, libsasl2-dev, po-debconf (>= 0.5.0)
 
 Package: libnss-ldap
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: nscd, libpam-ldap
 Description: NSS module for using LDAP as a naming service

=== modified file 'debian/libnss-ldap.install'
--- debian/libnss-ldap.install	2007-05-14 19:40:00 +0000
+++ debian/libnss-ldap.install	2011-12-30 03:04:17 +0000
@@ -3,5 +3,5 @@
 build-tree/*/ldap.conf usr/share/doc/libnss-ldap/examples
 build-tree/*/nsswitch.ldap usr/share/doc/libnss-ldap/examples
 debian/LDAP-Permissions.txt usr/share/doc/libnss-ldap
-debian/tmp/usr/lib/* lib
+debian/tmp/lib/*/*
 debian/examples usr/share/doc/libnss-ldap

=== modified file 'debian/rules'
--- debian/rules	2009-03-01 04:12:00 +0000
+++ debian/rules	2011-12-30 03:05:45 +0000
@@ -13,6 +13,7 @@
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 MY_INST_DIR = $(CURDIR)/debian/libnss-ldap/usr/share
 DEB_CONFIGURE_EXTRA_FLAGS += \
+	--libdir=/lib/$(DEB_HOST_MULTIARCH) \
 	--enable-rfc2307bis \
 	--with-ldap-lib=openldap \
 	--with-ldap-conf-file=/etc/libnss-ldap.conf \
@@ -24,14 +25,13 @@
 DEB_OPT_FLAG += -fPIC
 export LIBS=-lpthread
 
+# Hack to pick up the soname of libc on the filesystem...
+DEB_MAKE_EXTRA_ARGS += MULTI_OS_DIRECTORY=$(DEB_HOST_MULTIARCH)
+
 # Keep file autoconf list out of the diff
 clean::
 	rm *.cdbs-config_list
 
-# after the directories are created but before dh_compress is run.
-common-binary-post-install-arch::
-	dh_buildinfo
-
 binary-post-install/libnss-ldap::
 	# rename man page
 	mv $(MY_INST_DIR)/man/man5/nss_ldap.5 \

Reply via email to