Merge lp:~yolanda.robla/ubuntu/saucy/libnss-ldap/debian_merge into lp:ubuntu/saucy/libnss-ldap

[Yolanda Robla]

Merged from latest Debian version (LP: #1200203)

[lp:~yolanda.robla/ubuntu/saucy/libnss-ldap/debian_merge]

32. By Yolanda Robla on 2013-07-16

Merge from Debian unstable (LP: #1200203). Remaining changes:

[Martin Pitt (pitti)]

Can you please update the "Remaining changes" list? there are a lot of other changes, such as the /etc/libnss-ldap.conf → /etc/ldap.conf configuration, dropping of debian/config, addition of a SysV init file (!), the added script debian/nssldap-update-ignoreusers, etc.

review: Needs Fixing

[lp:~yolanda.robla/ubuntu/saucy/libnss-ldap/debian_merge]

33. By Yolanda Robla on 2013-07-23

  + debian/control:
    - Update maintainer
    - Recommends ldap-auth-config
    - move nscd to Suggests
    - Removed Depends on po-debconf and (debconf handled by
      ldap-auth-config now)
  + removed the following files:
    - debian/config
    - debian/libnss-ldap.postinst
    - debian/libnss-ldap.postrm
    - debian/po
    - debian/templates
  + debian/LDAP-Permissions.txt: use /etc/ldap.conf
  + debian/README.Debian: use /etc/ldap.conf
  + debian/rules:
    - don't use --with-ldap-conf-file and --with-ldap-secret-file
    - install initscript
    - add MULTI_OS_DIRECTORY extra arg
    - removed binary-post-install
  + debian/libnss-ldap.install:
    - removed usr/share/libnss-ldap/ldap.conf
    - added usr/sbin/nssldap-update-ignoreusers and
      usr/share/man/man8/nssldap-update-ignoreusers.8
  + debian/libnss-ldap.dirs:
    - removed usr/share/libnss-ldap
    - debian/libnss-ldap.dirs: added var/lib/libnss-ldap
  + debian/patches/series, debian/patches/fix-ethers-truncation.patch:
    Fix lookups for hostname by MAC address
    (http://bugzilla.padl.com/show_bug.cgi?id=388) (LP: #315241)
  + Add patch fix-glibc-test-for-armel-gnueabi to allow linux-gnueabi as
    target_os for armel and an autoreconf patch to update generated files.
  + debian/patches: fix_ldap_sessions_mem_leak.patch
  + added debian/nssldap-update-ignoreusers which update
    nss_initgroups_ignoreusers in /etc/ldap.conf based on
    nss_initgroups_minimum_uid
  + add manpage for nssldap-update-ignoreusers
  + added debian/libnss-ldap.init to call nssldap-update-ignoreusers on
    shutdown
  + debian/patches/minimum_uid.patch: update ldap.conf and manpage for
    nss_initgroups_ignoreusers and nss_initgroups_minimum_uid updates;
    WARNING: this patch is currently not applied and needs testing.

[Yolanda Robla (yolanda.robla)]

> Can you please update the "Remaining changes" list? there are a lot of other
> changes, such as the /etc/libnss-ldap.conf → /etc/ldap.conf configuration,
> dropping of debian/config, addition of a SysV init file (!), the added script
> debian/nssldap-update-ignoreusers, etc.

Please recheck

[Martin Pitt (pitti)]

Thanks; this might be formally correct, but is still hard to grasp. Merely stating something like

14 + + removed the following files:
15 + - debian/config

and then further down something like

27 + + debian/libnss-ldap.install:
28 + - removed usr/share/libnss-ldap/ldap.conf

isn't very useful, as one sees just that from the diff. It's better to group the changes into independent logical units with the changes that belong together, like

 * Switch from static debconf configuration in /etc/foo.conf to a dynamic auto-detected configuration in /var/lib/foo/foo.conf:
   - Drop debian/config debconf script
   - debian/rules: Build with --configure-dynamic
   - debian/control: Add foo-detector dependency
 * Add blacklisting of users:
   - Add minimum_uid.patch: ...
   - debian/rules: Build with --user-blacklist=/etc/...

and so on. I know you didn't introduce the current messy changelog, but it would be a good opportunity to review these, see what can be sent to Debian, which ones are obsolete, etc.

If you don't want to do that, I'm fine with uploading it as-is, but I'll give some time to consider/reply first.

Thanks!

[Martin Pitt (pitti)]

review: Approve

[lp:~yolanda.robla/ubuntu/saucy/libnss-ldap/debian_merge]

34. By Yolanda Robla on 2013-07-23

  + Change dependency on ldap-auth-config to a recommendation only, since
    using LDAP name services does not automatically mean that authentication
    must be via LDAP (LP: #1016592):
    - debian/control: Recommends ldap-auth-config
  + Switch from static debconf configuration in /etc/foo.conf to a dynamic
    auto-detected configuration in /var/lib/foo/foo.conf:
    - Removed the following files: debian/config, debian/libnss-ldap.postinst,
      debian/libnss-ldap.postrm, debian/po, debian/templates
    - debian/LDAP-Permissions.txt: use /etc/ldap.conf
    - debian/README.Debian: use /etc/ldap.conf
    - debian/rules: don't use --with-ldap-conf-file and
      --with-ldap-secret-file, removed binary-post-install
    - debian/libnss-ldap.install: removed usr/share/libnss-ldap/ldap.conf
    - debian/libnss-ldap.dirs: removed usr/share/libnss-ldap
  + Remaining changes from debian unstable for LP: #155947
    - added debian/nssldap-update-ignoreusers which update
      nss_initgroups_ignoreusers in /etc/ldap.conf based on
      nss_initgroups_minimum_uid
    - add manpage for nssldap-update-ignoreusers
    - debian/libnss-ldap.install: added usr/sbin/nssldap-update-ignoreusers
      and usr/share/man/man8/nssldap-update-ignoreusers.8
    - added debian/libnss-ldap.init to call nssldap-update-ignoreusers on
      shutdown
    - debian/rules: install initscript
    - debian/patches/minimum_uid.patch: update ldap.conf and manpage for
      nss_initgroups_ignoreusers and nss_initgroups_minimum_uid updates;
      WARNING: this patch is currently not applied and needs testing.
  + Pass the multiarch dir name to make as MULTI_OS_DIRECTORY, so that the
    upstream build system can actually find libc and nss_files on disk and
    we don't misbuild with wrong filenames:
    - debian/rules: add MULTI_OS_DIRECTORY extra arg
  + Drop number prefixes from Ubuntu-specific patches
    (00fix-ethers-truncation, 01_minimum_uid, and
    02_fix_ldap_sessions_mem_leak) since the package uses a quilt series now.

Unmerged revisions

34. By Yolanda Robla on 2013-07-23

  + Change dependency on ldap-auth-config to a recommendation only, since
    using LDAP name services does not automatically mean that authentication
    must be via LDAP (LP: #1016592):
    - debian/control: Recommends ldap-auth-config
  + Switch from static debconf configuration in /etc/foo.conf to a dynamic
    auto-detected configuration in /var/lib/foo/foo.conf:
    - Removed the following files: debian/config, debian/libnss-ldap.postinst,
      debian/libnss-ldap.postrm, debian/po, debian/templates
    - debian/LDAP-Permissions.txt: use /etc/ldap.conf
    - debian/README.Debian: use /etc/ldap.conf
    - debian/rules: don't use --with-ldap-conf-file and
      --with-ldap-secret-file, removed binary-post-install
    - debian/libnss-ldap.install: removed usr/share/libnss-ldap/ldap.conf
    - debian/libnss-ldap.dirs: removed usr/share/libnss-ldap
  + Remaining changes from debian unstable for LP: #155947
    - added debian/nssldap-update-ignoreusers which update
      nss_initgroups_ignoreusers in /etc/ldap.conf based on
      nss_initgroups_minimum_uid
    - add manpage for nssldap-update-ignoreusers
    - debian/libnss-ldap.install: added usr/sbin/nssldap-update-ignoreusers
      and usr/share/man/man8/nssldap-update-ignoreusers.8
    - added debian/libnss-ldap.init to call nssldap-update-ignoreusers on
      shutdown
    - debian/rules: install initscript
    - debian/patches/minimum_uid.patch: update ldap.conf and manpage for
      nss_initgroups_ignoreusers and nss_initgroups_minimum_uid updates;
      WARNING: this patch is currently not applied and needs testing.
  + Pass the multiarch dir name to make as MULTI_OS_DIRECTORY, so that the
    upstream build system can actually find libc and nss_files on disk and
    we don't misbuild with wrong filenames:
    - debian/rules: add MULTI_OS_DIRECTORY extra arg
  + Drop number prefixes from Ubuntu-specific patches
    (00fix-ethers-truncation, 01_minimum_uid, and
    02_fix_ldap_sessions_mem_leak) since the package uses a quilt series now.

33. By Yolanda Robla on 2013-07-23

  + debian/control:
    - Update maintainer
    - Recommends ldap-auth-config
    - move nscd to Suggests
    - Removed Depends on po-debconf and (debconf handled by
      ldap-auth-config now)
  + removed the following files:
    - debian/config
    - debian/libnss-ldap.postinst
    - debian/libnss-ldap.postrm
    - debian/po
    - debian/templates
  + debian/LDAP-Permissions.txt: use /etc/ldap.conf
  + debian/README.Debian: use /etc/ldap.conf
  + debian/rules:
    - don't use --with-ldap-conf-file and --with-ldap-secret-file
    - install initscript
    - add MULTI_OS_DIRECTORY extra arg
    - removed binary-post-install
  + debian/libnss-ldap.install:
    - removed usr/share/libnss-ldap/ldap.conf
    - added usr/sbin/nssldap-update-ignoreusers and
      usr/share/man/man8/nssldap-update-ignoreusers.8
  + debian/libnss-ldap.dirs:
    - removed usr/share/libnss-ldap
    - debian/libnss-ldap.dirs: added var/lib/libnss-ldap
  + debian/patches/series, debian/patches/fix-ethers-truncation.patch:
    Fix lookups for hostname by MAC address
    (http://bugzilla.padl.com/show_bug.cgi?id=388) (LP: #315241)
  + Add patch fix-glibc-test-for-armel-gnueabi to allow linux-gnueabi as
    target_os for armel and an autoreconf patch to update generated files.
  + debian/patches: fix_ldap_sessions_mem_leak.patch
  + added debian/nssldap-update-ignoreusers which update
    nss_initgroups_ignoreusers in /etc/ldap.conf based on
    nss_initgroups_minimum_uid
  + add manpage for nssldap-update-ignoreusers
  + added debian/libnss-ldap.init to call nssldap-update-ignoreusers on
    shutdown
  + debian/patches/minimum_uid.patch: update ldap.conf and manpage for
    nss_initgroups_ignoreusers and nss_initgroups_minimum_uid updates;
    WARNING: this patch is currently not applied and needs testing.

32. By Yolanda Robla on 2013-07-16

Merge from Debian unstable (LP: #1200203). Remaining changes:

31. By Yolanda Robla on 2013-07-16

* Merge from Debian unstable. Remaining changes:
  - debian/patches: fix-ethers-truncation.patch
  - debian/patches: fix_ldap_sessions_mem_leak.patch
  - debian/patches: fix-glibc-test-for-armel-gnueabi.patch
  - debian/patches: autoreconf.patch
* Dropped patches, superseeded by new patch:
  - debian/patches/fix-glibc-test-for-armel-gnueabi.patch
* Refreshed patches:
  - debian/autoreconf.patch
* Non-maintainer upload.
* Needs to build-depend on automake1.9.
* Non-maintainer upload.
* Apply patch from Peter Green to solve build failure on arm* kfreebsd*
  (closes: #683011).
* Non-maintainer upload.
* Support multi-arch: (closes: #653664)
  - Mark libnss-ldap as same.
  - Adjust build-dependencies.
* Add hack to find correct libc in a multi-arch environment.
* Fix symlink generation.

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-18 14:20:27 +0000
+++ debian/changelog	2013-07-23 14:55:39 +0000
@@ -1,3 +1,86 @@
+libnss-ldap (264-2.5ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable (LP: #1200203).  Remaining changes:
+    + debian/control: 
+      - Update maintainer
+      - move nscd to Suggests
+    + Change dependency on ldap-auth-config to a recommendation only, since
+      using LDAP name services does not automatically mean that authentication
+      must be via LDAP (LP: #1016592):
+      - debian/control: Recommends ldap-auth-config
+    + Switch from static debconf configuration in /etc/foo.conf to a dynamic 
+      auto-detected configuration in /var/lib/foo/foo.conf:
+      - Removed Depends on po-debconf and (debconf handled by 
+        ldap-auth-config now)
+      - Removed the following files: debian/config, debian/libnss-ldap.postinst,
+        debian/libnss-ldap.postrm, debian/po, debian/templates
+      - debian/LDAP-Permissions.txt: use /etc/ldap.conf
+      - debian/README.Debian: use /etc/ldap.conf
+      - debian/rules: don't use --with-ldap-conf-file and 
+        --with-ldap-secret-file, removed binary-post-install
+      - debian/libnss-ldap.install: removed usr/share/libnss-ldap/ldap.conf
+      - debian/libnss-ldap.dirs: removed usr/share/libnss-ldap
+    + Remaining changes from debian unstable for LP: #155947
+      - added debian/nssldap-update-ignoreusers which update
+        nss_initgroups_ignoreusers in /etc/ldap.conf based on
+        nss_initgroups_minimum_uid
+      - add manpage for nssldap-update-ignoreusers
+      - debian/libnss-ldap.install: added usr/sbin/nssldap-update-ignoreusers
+        and usr/share/man/man8/nssldap-update-ignoreusers.8
+      - added debian/libnss-ldap.init to call nssldap-update-ignoreusers on
+        shutdown
+      - debian/rules: install initscript
+      - debian/libnss-ldap.dirs: added var/lib/libnss-ldap
+      - debian/patches/minimum_uid.patch: update ldap.conf and manpage for
+        nss_initgroups_ignoreusers and nss_initgroups_minimum_uid updates;
+        WARNING: this patch is currently not applied and needs testing.
+    + Pass the multiarch dir name to make as MULTI_OS_DIRECTORY, so that the
+      upstream build system can actually find libc and nss_files on disk and
+      we don't misbuild with wrong filenames:
+      - debian/rules: add MULTI_OS_DIRECTORY extra arg
+    + debian/patches/series, debian/patches/fix-ethers-truncation.patch:
+      Fix lookups for hostname by MAC address
+      (http://bugzilla.padl.com/show_bug.cgi?id=388) (LP: #315241)
+    + Add patch fix-glibc-test-for-armel-gnueabi to allow linux-gnueabi as
+      target_os for armel and an autoreconf patch to update generated files.
+    + Drop number prefixes from Ubuntu-specific patches
+      (00fix-ethers-truncation, 01_minimum_uid, and
+      02_fix_ldap_sessions_mem_leak) since the package uses a quilt series now.
+
+  * Dropped patches, superseeded by new patch:
+    - debian/patches/fix-glibc-test-for-armel-gnueabi.patch
+
+  * Refreshed patches:
+    - debian/autoreconf.patch
+
+ -- Yolanda Robla <[e-mail]>  Thu, 11 Jul 2013 14:29:43 +0200
+
+libnss-ldap (264-2.5) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Needs to build-depend on automake1.9.
+
+ -- Thijs Kinkhorst <[e-mail]>  Sat, 29 Sep 2012 15:12:21 +0000
+
+libnss-ldap (264-2.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply patch from Peter Green to solve build failure on arm* kfreebsd*
+    (closes: #683011).
+
+ -- Thijs Kinkhorst <[e-mail]>  Fri, 28 Sep 2012 13:51:01 +0000
+
+libnss-ldap (264-2.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support multi-arch: (closes: #653664)
+    - Mark libnss-ldap as same.
+    - Adjust build-dependencies.
+  * Add hack to find correct libc in a multi-arch environment.
+  * Fix symlink generation.
+
+ -- Bastian Blank <[e-mail]>  Mon, 14 May 2012 10:41:48 +0000
+
 libnss-ldap (264-2.2ubuntu4) quantal; urgency=low
 
   * Fix /usr/lib/libnss_ldap.so broken symlink and location, which was missed

=== modified file 'debian/control'
--- debian/control	2012-06-22 22:09:08 +0000
+++ debian/control	2013-07-23 14:55:39 +0000
@@ -4,7 +4,7 @@
 XSBC-Original-Maintainer: Richard A Nelson (Rick) <[e-mail]>
 Maintainer: Ubuntu Developers <[e-mail]>
 Standards-Version: 3.7.2
-Build-Depends: cdbs (>= 0.4.93~), quilt, patchutils, debhelper (>= 8.1.3~), autotools-dev, libkrb5-dev, libldap2-dev, libsasl2-dev
+Build-Depends: cdbs (>= 0.4.93~), quilt, patchutils, dh-buildinfo (>= 0.9+nmu1~), debhelper (>= 8.1.3~), autotools-dev, automake1.9, libkrb5-dev, libldap2-dev, libsasl2-dev
 
 Package: libnss-ldap
 Architecture: any

=== modified file 'debian/libnss-ldap.install'
--- debian/libnss-ldap.install	2011-12-30 02:55:35 +0000
+++ debian/libnss-ldap.install	2013-07-23 14:55:39 +0000
@@ -3,6 +3,7 @@
 build-tree/*/nsswitch.ldap usr/share/doc/libnss-ldap/examples
 debian/LDAP-Permissions.txt usr/share/doc/libnss-ldap
 debian/tmp/lib/*/*
+debian/tmp/usr/lib/*/*
 debian/examples usr/share/doc/libnss-ldap
 debian/nssldap-update-ignoreusers usr/sbin
 debian/nssldap-update-ignoreusers.8 usr/share/man/man8

=== modified file 'debian/patches/autoreconf.patch'
--- debian/patches/autoreconf.patch	2010-10-17 15:09:41 +0000
+++ debian/patches/autoreconf.patch	2013-07-23 14:55:39 +0000
@@ -7304,17 +7304,6 @@
    GCC_TRUE=
    GCC_FALSE='#'
  else
-@@ -3420,9 +4218,7 @@
-   GCC_FALSE=
- fi
- 
--
--
--if test "$target_os" = "linux" -o "$target_os" = "linux-gnu"; then
-+ if test "$target_os" = "linux" -o "$target_os" = "linux-gnu" -o "$target_os" = "linux-gnueabi"; then
-   GLIBC_TRUE=
-   GLIBC_FALSE='#'
- else
 @@ -3430,9 +4226,7 @@
    GLIBC_FALSE=
  fi

=== removed file 'debian/patches/fix-glibc-test-for-armel-gnueabi.patch'
--- debian/patches/fix-glibc-test-for-armel-gnueabi.patch	2010-10-17 15:09:41 +0000
+++ debian/patches/fix-glibc-test-for-armel-gnueabi.patch	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -98,7 +98,7 @@ linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdi
- esac
- 
- AM_CONDITIONAL(GCC, test "$GCC" = "yes")
--AM_CONDITIONAL(GLIBC, test "$target_os" = "linux" -o "$target_os" = "linux-gnu")
-+AM_CONDITIONAL(GLIBC, test "$target_os" = "linux" -o "$target_os" = "linux-gnu" -o "$target_os" = "linux-gnueabi")
- AM_CONDITIONAL(AIX, test "$TARGET_OS" = AIX)
- AM_CONDITIONAL(HPUX, test "$TARGET_OS" = HPUX)
- 

=== added file 'debian/patches/link'
--- debian/patches/link	1970-01-01 00:00:00 +0000
+++ debian/patches/link	2013-07-23 14:55:39 +0000
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -83,7 +83,7 @@
+ 	$(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED)
+ 	(cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED))
+ 	$(mkinstalldirs) $(DESTDIR)/usr$(libdir)
+-	(cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .)
++	(cd $(DESTDIR)/usr$(libdir); ln -sf $(libdir)/$(NSS_LDAP_NSS_VERSIONED) libnss_ldap.so)
+ else
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ if HPUX
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -680,7 +680,7 @@
+ @AIX_FALSE@@GLIBC_TRUE@	$(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED)
+ @AIX_FALSE@@GLIBC_TRUE@	(cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED))
+ @AIX_FALSE@@GLIBC_TRUE@	$(mkinstalldirs) $(DESTDIR)/usr$(libdir)
+-@AIX_FALSE@@GLIBC_TRUE@	(cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .)
++@AIX_FALSE@@GLIBC_TRUE@	(cd $(DESTDIR)/usr$(libdir); ln -sf $(libdir)/$(NSS_LDAP_NSS_VERSIONED) libnss_ldap.so)
+ @AIX_FALSE@@GLIBC_FALSE@	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ @AIX_FALSE@@GLIBC_FALSE@@HPUX_TRUE@	$(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/libnss_ldap.1
+ @AIX_FALSE@@GLIBC_FALSE@@HPUX_FALSE@	$(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/nss_ldap.so.1

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-06 13:07:50 +0000
+++ debian/patches/series	2013-07-23 14:55:39 +0000
@@ -5,5 +5,6 @@
 uid_t
 fix-ethers-truncation.patch
 fix_ldap_sessions_mem_leak.patch
-fix-glibc-test-for-armel-gnueabi.patch
 autoreconf.patch
+link
+treat-all-debian-systems-like-linux.patch

=== added file 'debian/patches/treat-all-debian-systems-like-linux.patch'
--- debian/patches/treat-all-debian-systems-like-linux.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/treat-all-debian-systems-like-linux.patch	2013-07-23 14:55:39 +0000
@@ -0,0 +1,26 @@
+Index: nss_ldap-264/configure.in
+===================================================================
+--- nss_ldap-264.orig/configure.in	2012-08-07 22:54:21.000000000 +0000
++++ nss_ldap-264/configure.in	2012-08-07 22:54:26.000000000 +0000
+@@ -98,7 +98,7 @@
+ esac
+ 
+ AM_CONDITIONAL(GCC, test "$GCC" = "yes")
+-AM_CONDITIONAL(GLIBC, test "$target_os" = "linux" -o "$target_os" = "linux-gnu")
++AM_CONDITIONAL(GLIBC, test "forcedpass" = "forcedpass")
+ AM_CONDITIONAL(AIX, test "$TARGET_OS" = AIX)
+ AM_CONDITIONAL(HPUX, test "$TARGET_OS" = HPUX)
+ 
+Index: nss_ldap-264/configure
+===================================================================
+--- nss_ldap-264.orig/configure	2008-10-30 20:50:15.000000000 +0000
++++ nss_ldap-264/configure	2012-08-07 22:54:48.000000000 +0000
+@@ -3422,7 +3422,7 @@
+ 
+ 
+ 
+-if test "$target_os" = "linux" -o "$target_os" = "linux-gnu"; then
++if test "forcedpass" = "forcedpass"; then
+   GLIBC_TRUE=
+   GLIBC_FALSE='#'
+ else

=== modified file 'debian/rules'
--- debian/rules	2012-07-18 14:20:27 +0000
+++ debian/rules	2013-07-23 14:55:39 +0000
@@ -28,9 +28,8 @@
 DEB_DH_INSTALLINIT_ARGS = start . stop 20 0 1 6 .
 export LIBS=-lpthread
 
-binary-install/libnss-ldap::
-	dh_link -plibnss-ldap /lib/$(DEB_HOST_MULTIARCH)/libnss_ldap.so.2 \
-	      /usr/lib/$(DEB_HOST_MULTIARCH)/libnss_ldap.so
+# 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::