| 1 |
Index: openldap/contrib/slapd-modules/passwd/Makefile |
| 2 |
=================================================================== |
| 3 |
--- openldap.orig/contrib/slapd-modules/passwd/Makefile 2024-12-23 18:38:23.216595713 -0800 |
| 4 |
+++ openldap/contrib/slapd-modules/passwd/Makefile 2024-12-23 18:38:23.212595683 -0800 |
| 5 |
@@ -20,7 +20,7 @@ |
| 6 |
LIBS = $($(PLAT)_LIB) $(LDAP_LIB) |
| 7 |
LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module |
| 8 |
|
| 9 |
-PROGRAMS = pw-kerberos.la pw-netscape.la pw-radius.la pw-apr1.la |
| 10 |
+PROGRAMS = pw-netscape.la pw-apr1.la |
| 11 |
MANPAGES = slapd-pw-radius.5 |
| 12 |
LTVER = 0:0:0 |
| 13 |
|
| 14 |
Index: openldap/contrib/slapd-modules/smbk5pwd/Makefile |
| 15 |
=================================================================== |
| 16 |
--- openldap.orig/contrib/slapd-modules/smbk5pwd/Makefile 2024-12-23 18:38:23.216595713 -0800 |
| 17 |
+++ openldap/contrib/slapd-modules/smbk5pwd/Makefile 2024-12-23 18:38:23.212595683 -0800 |
| 18 |
@@ -21,8 +21,8 @@ |
| 19 |
SSL_INC = |
| 20 |
SSL_LIB = -lcrypto |
| 21 |
|
| 22 |
-HEIMDAL_INC = -I/usr/heimdal/include |
| 23 |
-HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv |
| 24 |
+HEIMDAL_INC = $(shell krb5-config.heimdal --cflags krb5 kadm-server) |
| 25 |
+HEIMDAL_LIB = $(shell krb5-config.heimdal --libs krb5 kadm-server) |
| 26 |
|
| 27 |
PLAT = UNIX |
| 28 |
NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd |
| 29 |
@@ -36,7 +36,8 @@ |
| 30 |
# Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. |
| 31 |
DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW |
| 32 |
INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) |
| 33 |
-LIBS = $($(PLAT)_LIB) $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) |
| 34 |
+# put /usr/lib/heimdal before /usr/lib in case libkrb5-dev is installed, #745356 |
| 35 |
+LIBS = $($(PLAT)_LIB) $(HEIMDAL_LIB) $(LDAP_LIB) $(SSL_LIB) |
| 36 |
LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module |
| 37 |
|
| 38 |
PROGRAMS = smbk5pwd.la |
| 39 |
Index: openldap/contrib/slapd-modules/ppm/Makefile |
| 40 |
=================================================================== |
| 41 |
--- openldap.orig/contrib/slapd-modules/ppm/Makefile 2024-12-23 18:38:23.216595713 -0800 |
| 42 |
+++ openldap/contrib/slapd-modules/ppm/Makefile 2024-12-23 18:38:23.212595683 -0800 |
| 43 |
@@ -68,7 +68,7 @@ |
| 44 |
$(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(LDFLAGS) $(INCS) -Wl,-rpath=. -o $(TEST) ppm_test.c $(PROGRAMS) $(LDAP_LIBS) $(CRACKLIB) |
| 45 |
|
| 46 |
ppm.o: |
| 47 |
- $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) -c $(INCS) ppm.c |
| 48 |
+ $(CC) $(CFLAGS) -fPIC $(OPT) $(CPPFLAGS) $(DEFS) -c $(INCS) ppm.c |
| 49 |
|
| 50 |
ppm: ppm.o |
| 51 |
$(CC) $(LDFLAGS) $(INCS) -shared -o $(PROGRAMS) ppm.o $(CRACKLIB) |
| 52 |
@@ -78,7 +78,8 @@ |
| 53 |
for p in $(PROGRAMS); do \ |
| 54 |
$(LIBTOOL) --mode=install cp $$p $(DESTDIR)/$(moduledir) ; \ |
| 55 |
done |
| 56 |
- $(INSTALL) -m 644 $(EXAMPLE) $(DESTDIR)$(sysconfdir)/ |
| 57 |
+ # installed by debian/slapd-contrib.examples |
| 58 |
+ # $(INSTALL) -m 644 $(EXAMPLE) $(DESTDIR)$(sysconfdir)/ |
| 59 |
$(INSTALL) -m 644 $(MANDOC) $(DESTDIR)$(man5dir)/ |
| 60 |
# $(INSTALL) -m 755 $(TEST) $(libdir) |
| 61 |
|