contrib-makefiles

Gbp-Pq: Name contrib-makefiles

diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile
index 634649603a1364d919550a5fce84ab231305d8df..d5e801a18d57754c0b2608529e9a611a6471fd22 100644 (file)
--- a/contrib/slapd-modules/passwd/Makefile
+++ b/contrib/slapd-modules/passwd/Makefile
@@ -14,7 +14,7 @@ DEFS =
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
 
-PROGRAMS = pw-kerberos.la pw-netscape.la pw-radius.la pw-apr1.la
+PROGRAMS = pw-netscape.la pw-apr1.la
 MANPAGES = slapd-pw-radius.5
 LTVER = 0:0:0
 

diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile
index 6279f50c158668a68558a7bb7b16d17b7dc50507..6e64d41b28954a5adbbf5fe25801a9e99bdcc344 100644 (file)
--- a/contrib/slapd-modules/passwd/pbkdf2/Makefile
+++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile
@@ -13,7 +13,7 @@ OPT = -g -O2
 #DEFS = -DSLAPD_PBKDF2_DEBUG
 
 SSL_INC =
-SSL_LIB = -lcrypto
+SSL_LIB = -lnettle
 
 INCS = $(LDAP_INC) $(SSL_INC)
 LIBS = $(LDAP_LIB) $(SSL_LIB)

diff --git a/contrib/slapd-modules/ppm/Makefile b/contrib/slapd-modules/ppm/Makefile
index 7b6efaddd5a1fb97458af18af30ea13bb7d506ef..2d4d849a6825f98d110e6e114b50828995c0dcba 100644 (file)
--- a/contrib/slapd-modules/ppm/Makefile
+++ b/contrib/slapd-modules/ppm/Makefile
@@ -68,7 +68,7 @@ $(TEST): ppm
        $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(LDFLAGS) $(INCS) $(LDAP_LIBS) -Wl,-rpath=. -o $(TEST) ppm_test.c $(PROGRAMS) $(LDAP_LIBS) $(CRACKLIB)
 
 ppm.o:
-       $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) -c $(INCS) ppm.c
+       $(CC) $(CFLAGS) -fPIC $(OPT) $(CPPFLAGS) $(DEFS) -c $(INCS) ppm.c
 
 ppm: ppm.o
        $(CC) $(LDFLAGS) $(INCS) -shared -o $(PROGRAMS) ppm.o $(CRACKLIB)
@@ -78,7 +78,8 @@ install: ppm
        for p in $(PROGRAMS); do \
                $(LIBTOOL) --mode=install cp $$p $(DESTDIR)/$(moduledir) ; \
        done
-       $(INSTALL) -m 644 $(EXAMPLE) $(DESTDIR)$(sysconfdir)/
+       # installed by debian/slapd-contrib.examples
+       # $(INSTALL) -m 644 $(EXAMPLE) $(DESTDIR)$(sysconfdir)/
        $(INSTALL) -m 644 $(MANDOC) $(DESTDIR)$(man5dir)/
 #      $(INSTALL) -m 755 $(TEST) $(libdir)
 

diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile
index 3931ac5362f92df034d952818bfcd9ce8ede49d8..f3f981bad96c98e7f37de3806d054ff2a0d77883 100644 (file)
--- a/contrib/slapd-modules/smbk5pwd/Makefile
+++ b/contrib/slapd-modules/smbk5pwd/Makefile
@@ -19,10 +19,10 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
        $(LDAP_BUILD)/libraries/liblber/liblber.la
 
 SSL_INC = 
-SSL_LIB = -lcrypto
+SSL_LIB = -lnettle
 
-HEIMDAL_INC = -I/usr/heimdal/include
-HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
+HEIMDAL_INC = $(shell krb5-config.heimdal --cflags krb5 kadm-server)
+HEIMDAL_LIB = $(shell krb5-config.heimdal --libs krb5 kadm-server)
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
@@ -31,7 +31,8 @@ OPT = -g -O2
 # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
 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
 MANPAGES = slapo-smbk5pwd.5