[Pkg-openldap-devel] [openldap] 01/01: make sure to link smbk5pwd with heimdal (#745356)

[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 58c0dc3ddd46c8aa712c4023eb843f67c84669bf
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Mon May 5 21:45:36 2014 -0700

    make sure to link smbk5pwd with heimdal (#745356)
---
 debian/changelog                 |  2 +-
 debian/patches/smbk5pwd-makefile | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26d6ef1..e50fa76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ openldap (2.4.39-2) UNRELEASED; urgency=low
     password module. (Closes: #746727)
 
   [ Jelmer Vernooij ]
-  * Depend on heimdal-multidev rather than heimdal-dev.
+  * Depend on heimdal-multidev rather than heimdal-dev. (Closes: #745356)
 
   [ Updated debconf translations ]
   * Turkish, thanks to Atila KOÇ <akoc at artielektronik.com.tr>.
diff --git a/debian/patches/smbk5pwd-makefile b/debian/patches/smbk5pwd-makefile
index 973a167..19b1daf 100644
--- a/debian/patches/smbk5pwd-makefile
+++ b/debian/patches/smbk5pwd-makefile
@@ -1,6 +1,6 @@
 --- a/contrib/slapd-modules/smbk5pwd/Makefile
 +++ b/contrib/slapd-modules/smbk5pwd/Makefile
-@@ -14,17 +14,17 @@
+@@ -14,34 +14,35 @@
  
  LDAP_SRC = ../../..
  LDAP_BUILD = ../../..
@@ -25,7 +25,12 @@
  CC = gcc
  OPT = -g -O2 -Wall
  # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
-@@ -35,13 +35,13 @@ LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_
+ DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
+ INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
+-LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
++# put /usr/lib/heimdal before /usr/lib in case libkrb5-dev is installed, #745356
++LIBS = $(HEIMDAL_LIB) $(LDAP_LIB) $(SSL_LIB)
+ 
  PROGRAMS = smbk5pwd.la
  LTVER = 0:0:0
  
@@ -42,7 +47,7 @@
  
  .SUFFIXES: .c .o .lo
  
-@@ -55,7 +55,7 @@ smbk5pwd.la:	smbk5pwd.lo
+@@ -55,7 +56,7 @@
  	-rpath $(moduledir) -module -o $@ $? $(LIBS)
  
  clean:

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