From dc22a1cb627b30fadcbb33b589d65efcb2333d3c Mon Sep 17 00:00:00 2001 From: Debian OpenLDAP Maintainers Date: Sun, 16 May 2021 00:03:34 +0100 Subject: [PATCH] contrib-makefiles Gbp-Pq: Name contrib-makefiles --- contrib/slapd-modules/autogroup/Makefile | 4 ++-- contrib/slapd-modules/lastbind/Makefile | 4 ++-- contrib/slapd-modules/passwd/Makefile | 12 ++++++------ contrib/slapd-modules/passwd/argon2/Makefile | 6 +++--- contrib/slapd-modules/passwd/pbkdf2/Makefile | 6 +++--- contrib/slapd-modules/passwd/sha2/Makefile | 4 ++-- contrib/slapd-modules/smbk5pwd/Makefile | 13 +++++++------ 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile index efd9678e..911400bd 100644 --- 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 1745aa84..8706ec71 100644 --- 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 b4f2b93c..c45472dd 100644 --- 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 0294ba04..6ee4cb59 100644 --- 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 5234629c..2b78b23c 100644 --- 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 0abab68f..f9ec35df 100644 --- 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 7a60bc5f..e943d1c8 100644 --- 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: -- 2.30.2