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

Created by Yolanda Robla and last modified
Get this branch:
bzr branch lp:~yolanda.robla/ubuntu/saucy/libnss-ldap/debian_merge
Only Yolanda Robla can upload to this branch. If you are Yolanda Robla please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Yolanda Robla
Status:
Development

Recent revisions

34. By Yolanda Robla

  + 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

  + 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

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

31. By Yolanda Robla

* 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.

30. By Robie Basak

Fix /usr/lib/libnss_ldap.so broken symlink and location, which was missed
when multiarch support was added (LP: #1020152).

29. By Robie Basak

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).

28. By Steve Langasek

releasing version 264-2.2ubuntu2

27. By Steve Langasek

* Build for multiarch.
* Drop dh-buildinfo, which is not multiarch safe and redundant with build
  logs.
* 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.

26. By Loïc Minier

* 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.
* Merge from Debian; remaining changes:
  + debian/control: Depends on ldap-auth-config
  + debian/control: 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
  + debian/libnss-ldap.install: removed usr/share/libnss-ldap/ldap.conf
  + debian/libnss-ldap.dirs: removed usr/share/libnss-ldap
  + debian/control: move nscd to Suggests
  + 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.
* 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.

25. By Loïc Minier

* Add patches 60_fix-glibc-test-for-armel-gnueabi and 90_autoreconf to
  series; this should have been done when merging the new Debian version
  which switched to quilt (264-2ubuntu1).
* Refresh 90_autoreconf; for reference, this is generated with autoreconf
  -fi; rm -rf autom4te.cache *~.
* Rename 60_fix-glibc-test-for-armel-gnueabi to
  fix-glibc-test-for-armel-gnueabi and 90_autoreconf to autoreconf as
  numbers are superfluous and inconsistent with Debian patches now.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/saucy/libnss-ldap
This branch contains Public information 
Everyone can see this information.

Subscribers