[Pkg-openldap-devel] [openldap] 01/01: Merge tag '2.4.44+dfsg-8' into ubuntu/master
Ryan Tandy
rtandy-guest at moszumanska.debian.org
Tue Jul 18 01:01:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
rtandy-guest pushed a commit to branch ubuntu/master
in repository openldap.
commit 00bb76d55fe38035a012f08e907d5fab53a92500
Merge: 8b250fb 3f2c52c
Author: Ryan Tandy <ryan at nardis.ca>
Date: Sun Jul 16 22:15:18 2017 -0700
Merge tag '2.4.44+dfsg-8' into ubuntu/master
debian/changelog | 56 ++++++++++++++++++++++++++++++++++++++++++++++
debian/control | 2 +-
debian/patches/heimdal-fix | 23 -------------------
debian/patches/series | 1 -
debian/rules | 8 +++++++
5 files changed, 65 insertions(+), 25 deletions(-)
diff --cc debian/changelog
index 4b951d4,4606511..80b9f63
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,13 +1,105 @@@
++openldap (2.4.44+dfsg-8ubuntu1) artful; urgency=medium
++
++ * Merge from Debian unstable. (LP: #1704726) Remaining changes:
++ - Enable AppArmor support:
++ - d/apparmor-profile: add AppArmor profile
++ - d/rules: use dh_apparmor
++ - d/control: Build-Depends on dh-apparmor
++ - d/slapd.README.Debian: add note about AppArmor
++ - Enable GSSAPI support:
++ - d/patches/gssapi.diff, thanks to Jerry Carter (Likewise):
++ - Add --with-gssapi support
++ - Make guess_service_principal() more robust when determining
++ principal
++ - d/configure.options: Configure with --with-gssapi
++ - d/control: Added heimdal-dev as a build depend
++ - d/rules:
++ - Explicitly add -I/usr/include/heimdal to CFLAGS.
++ - Explicitly add -I/usr/lib/<multiarch>/heimdal to LDFLAGS.
++ - Enable ufw support:
++ - d/control: suggest ufw.
++ - d/rules: install ufw profile.
++ - d/slapd.ufw.profile: add ufw profile.
++ - Enable nss overlay:
++ - d/{patches/nssov-build,rules}: Apply, build and package the
++ nss overlay.
++ - d/{rules,slapd.py}: Add apport hook.
++ [ d/rules modification mentioned above was dropped in
++ 2.4.23-6ubuntu1, re-adding it ]
++ - d/slapd.init.ldif: don't set olcRootDN since it's not defined in
++ either the default DIT nor via an Authn mapping.
++ - d/slapd.scripts-common:
++ - add slapcat_opts to local variables.
++ - Fix backup directory naming for multiple reconfiguration.
++ - d/{slapd.default,slapd.README.Debian}: use the new configuration style.
++ - d/rules: Enable -DLDAP_CONNECTIONLESS to build CLDAP (UDP) support
++ in the openldap library, as required by Likewise-Open
++ - Show distribution in version:
++ - d/control: added lsb-release
++ - d/patches/fix-ldap-distribution.patch: show distribution in version
++ [ Refreshed patch ]
++ - d/libldap-2.4-2.symbols: Add symbols not present in Debian.
++ - CLDAP (UDP) was added in 2.4.17-1ubuntu2
++ - GSSAPI support was enabled in 2.4.18-0ubuntu2
++
++ -- Ryan Tandy <ryan at nardis.ca> Sun, 16 Jul 2017 22:13:52 -0700
++
+ openldap (2.4.44+dfsg-8) unstable; urgency=medium
+
+ * Disable test060-mt-hot on ppc64el temporarily to avoid failing tests until
+ the underlying kernel bug #866122 is fixed.
+ * Fix FTBFS with Heimdal 7.2.0: Drop patch heimdal-fix as the
+ hdb_generate_key_set_password change was reverted in heimdal. Depend on an
+ appropriate minimum version of heimdal.
+
+ -- Ryan Tandy <ryan at nardis.ca> Sun, 16 Jul 2017 12:57:41 -0700
+
+openldap (2.4.44+dfsg-7ubuntu1) artful; urgency=medium
+
+ * Merge from Debian unstable. Remaining changes:
+ - Enable AppArmor support:
+ - d/apparmor-profile: add AppArmor profile
+ - d/rules: use dh_apparmor
+ - d/control: Build-Depends on dh-apparmor
+ - d/slapd.README.Debian: add note about AppArmor
+ - Enable GSSAPI support:
+ - d/patches/gssapi.diff, thanks to Jerry Carter (Likewise):
+ - Add --with-gssapi support
+ - Make guess_service_principal() more robust when determining
+ principal
+ - d/configure.options: Configure with --with-gssapi
+ - d/control: Added heimdal-dev as a build depend
+ - d/rules:
+ - Explicitly add -I/usr/include/heimdal to CFLAGS.
+ - Explicitly add -I/usr/lib/<multiarch>/heimdal to LDFLAGS.
+ - Enable ufw support:
+ - d/control: suggest ufw.
+ - d/rules: install ufw profile.
+ - d/slapd.ufw.profile: add ufw profile.
+ - Enable nss overlay:
+ - d/{patches/nssov-build,rules}: Apply, build and package the
+ nss overlay.
+ - d/{rules,slapd.py}: Add apport hook.
+ [ d/rules modification mentioned above was dropped in
+ 2.4.23-6ubuntu1, re-adding it ]
+ - d/slapd.init.ldif: don't set olcRootDN since it's not defined in
+ either the default DIT nor via an Authn mapping.
+ - d/slapd.scripts-common:
+ - add slapcat_opts to local variables.
+ - Fix backup directory naming for multiple reconfiguration.
+ - d/{slapd.default,slapd.README.Debian}: use the new configuration style.
+ - d/rules: Enable -DLDAP_CONNECTIONLESS to build CLDAP (UDP) support
+ in the openldap library, as required by Likewise-Open
+ - Show distribution in version:
+ - d/control: added lsb-release
+ - d/patches/fix-ldap-distribution.patch: show distribution in version
+ [ Refreshed patch ]
+ - d/libldap-2.4-2.symbols: Add symbols not present in Debian.
+ - CLDAP (UDP) was added in 2.4.17-1ubuntu2
+ - GSSAPI support was enabled in 2.4.18-0ubuntu2
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 27 Jun 2017 10:21:41 +0200
+
openldap (2.4.44+dfsg-7) unstable; urgency=medium
* Relax the dependency of libldap-2.4-2 on libldap-common to also permit
diff --cc debian/control
index e8f784b,2bc9a8c..21ca5ec
--- a/debian/control
+++ b/debian/control
@@@ -14,7 -12,7 +14,7 @@@ Build-Depends: debhelper (>= 9.20150501
dh-autoreconf,
dpkg-dev (>= 1.17.14),
groff-base,
- heimdal-dev <!stage1>,
- heimdal-multidev (>= 7.4.0.dfsg.1-1~) <!stage1>,
++ heimdal-dev (>= 7.4.0.dfsg.1-1~) <!stage1>,
libdb5.3-dev <!stage1>,
libgnutls28-dev,
libltdl-dev <!stage1>,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git
More information about the Pkg-openldap-devel
mailing list