Source: openldap Severity: wishlist Tags: patch Please depend on heimdal-multidev rather than heimdal-dev. This makes it possible to build openldap while having libkrb5-dev installed.
The attached patch should also help with bug 706123, although it is not clear to me how that bug could occur in the first place. -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.13-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
>From 9bf3ebf7bad681e0e06d54bb124f3af9f7e81e0f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij <[email protected]> Date: Sun, 20 Apr 2014 20:06:28 +0200 Subject: [PATCH] Depend on heimdal-multidev rather than heimdal-dev. --- debian/changelog | 4 ++++ debian/control | 2 +- debian/patches/smbk5pwd-makefile | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8896d5..cec3599 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ openldap (2.4.39-2) UNRELEASED; urgency=low + [ Ryan Tandy ] * 0001-ITS-7723-fix-reference-counting.patch: import upstream fix for CVE-2013-4449. Thanks to Hideki Yamane for the patch. (Closes: #729367) * slapd.scripts-common: @@ -9,6 +10,9 @@ openldap (2.4.39-2) UNRELEASED; urgency=low - Invoke find, chmod, and chown with -H in case /var/lib/ldap is a symlink. (Closes: #742862) + [ Jelmer Vernooij ] + * Depend on heimdal-multidev rather than heimdal-dev. + -- Ryan Tandy <[email protected]> Mon, 07 Apr 2014 19:36:18 -0700 openldap (2.4.39-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 19592c7..4cc91c8 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 8.9.0~), libgnutls-dev (>= 1.7), unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0), libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3), libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.46-7), - groff-base, time, heimdal-dev, + groff-base, time, heimdal-multidev, dh-autoreconf Build-Conflicts: libbind-dev, bind-dev, libicu-dev, autoconf2.13 Standards-Version: 3.9.1 diff --git a/debian/patches/smbk5pwd-makefile b/debian/patches/smbk5pwd-makefile index 17d1b56..973a167 100644 --- a/debian/patches/smbk5pwd-makefile +++ b/debian/patches/smbk5pwd-makefile @@ -17,8 +17,8 @@ -HEIMDAL_INC = -I/usr/heimdal/include -HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv -+HEIMDAL_INC = -I/usr/include -+HEIMDAL_LIB = -lkrb5 -lkadm5srv ++HEIMDAL_INC = $(shell krb5-config.heimdal --cflags kadm-server) ++HEIMDAL_LIB = $(shell krb5-config.heimdal --libs kadm-server) -LIBTOOL = $(LDAP_BUILD)/libtool +LIBTOOL = $(LDAP_BUILD)/debian/build/libtool -- 1.9.2.657.geaba915
