[Pkg-openldap-devel] [openldap] 02/03: Fix build with Heimdal 7.2.0

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit c6ffc3add95688707dee2a4a0bfabe4446aa5799
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sun Jul 16 11:04:51 2017 -0700

    Fix build with Heimdal 7.2.0
---
 debian/changelog           |  3 +++
 debian/control             |  2 +-
 debian/patches/heimdal-fix | 23 -----------------------
 debian/patches/series      |  1 -
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbae86b2..74e0a40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ openldap (2.4.44+dfsg-8) UNRELEASED; 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 10:30:15 -0700
 
diff --git a/debian/control b/debian/control
index 897d93a..2bc9a8c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9.20150501),
                dh-autoreconf,
                dpkg-dev (>= 1.17.14),
                groff-base,
-               heimdal-multidev <!stage1>,
+               heimdal-multidev (>= 7.4.0.dfsg.1-1~) <!stage1>,
                libdb5.3-dev <!stage1>,
                libgnutls28-dev,
                libltdl-dev <!stage1>,
diff --git a/debian/patches/heimdal-fix b/debian/patches/heimdal-fix
deleted file mode 100644
index 4aad47c..0000000
--- a/debian/patches/heimdal-fix
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
-Description: adapt parameters of hdb_generate_key_set_password() to heimdal 1.6~git20120311
- .
- With version heimdal 1.6~git20120311 heimdal schanged the number of parameters
- of function hdb_generate_key_set_password(), implementing a fallback to "default"
- values when NULL-values are passed for these parameters.
- .
- This patch does exactly that.
- .
-Bug-Debian: 664930
-Reviewed-by: Peter Marschall <peter at adpm.de>
-
---- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
-+++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
-@@ -470,7 +470,7 @@ static int smbk5pwd_exop_passwd(
- 		}
- 
- 		ret = hdb_generate_key_set_password(context, ent.principal,
--			qpw->rs_new.bv_val, &ent.keys.val, &nkeys);
-+			qpw->rs_new.bv_val, NULL, 0, &ent.keys.val, &nkeys);
- 		ent.keys.len = nkeys;
- 		hdb_seal_keys(context, db, &ent);
- 		krb5_free_principal( context, ent.principal );
diff --git a/debian/patches/series b/debian/patches/series
index c098154..90348d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,7 +21,6 @@ fix-build-top-mk
 no-AM_INIT_AUTOMAKE
 switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
 no-bdb-ABI-second-guessing
-heimdal-fix
 ITS6035-olcauthzregex-needs-restart.patch
 set-maintainer-name
 ITS-8554-kFreeBSD-is-like-BSD.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git