summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-05-19 05:09:45 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-05-19 05:09:45 +0000
commite66e04130459f0007f5ddcd576f978c895cbfcc6 (patch)
tree7e7e26ba1e0677f5f209e18657bb79e7e339283a
parentReleasing progress-linux version 2.4.57+dfsg-2~progress5+u1. (diff)
downloadopenldap-e66e04130459f0007f5ddcd576f978c895cbfcc6.tar.xz
openldap-e66e04130459f0007f5ddcd576f978c895cbfcc6.zip
Merging debian version 2.4.57+dfsg-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/contrib-makefiles4
-rw-r--r--debian/patches/smbk5pwd-makefile-manpage2
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 64a0cce..b188158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openldap (2.4.57+dfsg-3) unstable; urgency=medium
+
+ * Link smbk5pwd with -lkrb5. (Closes: #988565)
+
+ -- Ryan Tandy <ryan@nardis.ca> Sat, 15 May 2021 16:03:34 -0700
+
openldap (2.4.57+dfsg-2~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
diff --git a/debian/patches/contrib-makefiles b/debian/patches/contrib-makefiles
index 0aea4c3..2f20843 100644
--- a/debian/patches/contrib-makefiles
+++ b/debian/patches/contrib-makefiles
@@ -76,8 +76,8 @@
-HEIMDAL_INC = -I/usr/heimdal/include
-HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
-+HEIMDAL_INC = $(shell krb5-config.heimdal --cflags kadm-server)
-+HEIMDAL_LIB = $(shell krb5-config.heimdal --libs kadm-server)
++HEIMDAL_INC = $(shell krb5-config.heimdal --cflags krb5 kadm-server)
++HEIMDAL_LIB = $(shell krb5-config.heimdal --libs krb5 kadm-server)
LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc
diff --git a/debian/patches/smbk5pwd-makefile-manpage b/debian/patches/smbk5pwd-makefile-manpage
index 8b09206..b05cba2 100644
--- a/debian/patches/smbk5pwd-makefile-manpage
+++ b/debian/patches/smbk5pwd-makefile-manpage
@@ -18,7 +18,7 @@ index 676d914..0042a49 100644
--- a/contrib/slapd-modules/smbk5pwd/Makefile
+++ b/contrib/slapd-modules/smbk5pwd/Makefile
@@ -25,6 +25,7 @@
- HEIMDAL_LIB = $(shell krb5-config.heimdal --libs kadm-server)
+ HEIMDAL_LIB = $(shell krb5-config.heimdal --libs krb5 kadm-server)
LIBTOOL = $(LDAP_BUILD)/libtool
+INSTALL = /usr/bin/install