contrib-makefiles

Gbp-Pq: Name contrib-makefiles

diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile
index efd9678eeff17c6d57d69d993ccc1a604038cd8a..911400bdb819cc1ed24321e6c5a6dacd30979d7c 100644 (file)
--- a/contrib/slapd-modules/autogroup/Makefile
+++ b/contrib/slapd-modules/autogroup/Makefile
@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 autogroup.la: autogroup.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-modules/lastbind/Makefile
index 1745aa8435526f2c35b95abbcebee2c3a000b355..8706ec71b59de2c7ab6e63b72c594419add60244 100644 (file)
--- a/contrib/slapd-modules/lastbind/Makefile
+++ b/contrib/slapd-modules/lastbind/Makefile
@@ -37,12 +37,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 lastbind.la: lastbind.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile
index b4f2b93c9b10d4dee41bcb183c1209cef09fd643..c45472dd1fe8e3b201e954f746fee034abd86d9e 100644 (file)
--- a/contrib/slapd-modules/passwd/Makefile
+++ b/contrib/slapd-modules/passwd/Makefile
@@ -13,7 +13,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
 LTVER = 0:0:0
 
 prefix=/usr/local
@@ -27,24 +27,24 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 pw-kerberos.la:        kerberos.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? -lkrb5
 
 pw-netscape.la:        netscape.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $?
 
 pw-radius.la:  radius.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? -lradius
 
 pw-apr1.la:    apr1.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $?
 
 clean:

diff --git a/contrib/slapd-modules/passwd/argon2/Makefile b/contrib/slapd-modules/passwd/argon2/Makefile
index 0294ba04e95ffad76ad765399195e2f91f709a45..6ee4cb5954a61948cf61d0d9cbd418efff767d53 100644 (file)
--- a/contrib/slapd-modules/passwd/argon2/Makefile
+++ b/contrib/slapd-modules/passwd/argon2/Makefile
@@ -15,7 +15,7 @@ OPT = -g -O2 -Wall
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
 
-implementation = sodium
+implementation = argon2
 
 ifeq ($(implementation),argon2)
 LIBS += -largon2
@@ -44,12 +44,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all:           $(PROGRAMS)
 
 pw-argon2.la: pw-argon2.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile
index 5234629cdd6b918d17556ad4d6671ef0a5bb5fe5..2b78b23c15f99313fc2b1f7618c93e7da1350373 100644 (file)
--- a/contrib/slapd-modules/passwd/pbkdf2/Makefile
+++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile
@@ -12,7 +12,7 @@ OPT = -g -O2 -Wall
 #DEFS = -DSLAPD_PBKDF2_DEBUG
 
 INCS = $(LDAP_INC)
-LIBS = $(LDAP_LIB) -lcrypto
+LIBS = $(LDAP_LIB) -lnettle
 
 PROGRAMS = pw-pbkdf2.la
 LTVER = 0:0:0
@@ -28,12 +28,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all:           $(PROGRAMS)
 
 pw-pbkdf2.la: pw-pbkdf2.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-modules/passwd/sha2/Makefile
index 0abab68f71895f92971687b390983214da856397..f9ec35df0c03c2bc67be3402b3a5e157bbc65d0d 100644 (file)
--- a/contrib/slapd-modules/passwd/sha2/Makefile
+++ b/contrib/slapd-modules/passwd/sha2/Makefile
@@ -28,12 +28,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all:           $(PROGRAMS)
 
 pw-sha2.la:    slapd-sha2.lo sha2.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile
index 7a60bc5fd384fb5d478b8ecc097f0d8e68d6b4c5..e943d1c82332a2a171e624a73fe74dca83925d75 100644 (file)
--- a/contrib/slapd-modules/smbk5pwd/Makefile
+++ b/contrib/slapd-modules/smbk5pwd/Makefile
@@ -19,10 +19,10 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.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
 CC = gcc
@@ -30,7 +30,8 @@ OPT = -g -O2 -Wall
 # 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
 LTVER = 0:0:0
@@ -46,12 +47,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 smbk5pwd.la:   smbk5pwd.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean: