| 1 |
robbat2 09/11/03 21:13:59 |
| 2 |
|
| 3 |
Added: openldap-2.4.19-contrib-smbk5pwd.patch |
| 4 |
Log: |
| 5 |
Version bump per bug #290345 (CVE-2009-3767). Also fix: #286427 disable-syslog w/ USE=minimal. #280986 ldflags. |
| 6 |
(Portage version: 2.2_rc48/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: openldap-2.4.19-contrib-smbk5pwd.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nuar openldap-2.4.19.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.19/contrib/slapd-modules/smbk5pwd/Makefile |
| 17 |
--- openldap-2.4.19.orig/contrib/slapd-modules/smbk5pwd/Makefile 2009-10-02 21:16:53.000000000 +0000 |
| 18 |
+++ openldap-2.4.19/contrib/slapd-modules/smbk5pwd/Makefile 2009-11-03 21:01:41.199550611 +0000 |
| 19 |
@@ -13,22 +13,26 @@ |
| 20 |
# <http://www.OpenLDAP.org/license.html>. |
| 21 |
|
| 22 |
LIBTOOL=../../../libtool |
| 23 |
-OPT=-g -O2 |
| 24 |
+#OPT= |
| 25 |
CC=gcc |
| 26 |
|
| 27 |
# Omit DO_KRB5 or DO_SAMBA if you don't want to support it. |
| 28 |
-DEFS=-DDO_KRB5 -DDO_SAMBA |
| 29 |
+#DEFS= |
| 30 |
|
| 31 |
-HEIMDAL_INC=-I/usr/heimdal/include |
| 32 |
+#KRB5_INC= |
| 33 |
SSL_INC= |
| 34 |
LDAP_INC=-I../../../include -I../../../servers/slapd |
| 35 |
-INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) |
| 36 |
+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC) |
| 37 |
|
| 38 |
-HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv |
| 39 |
+KRB5_LIB=-lkrb5 -lkadm5srv |
| 40 |
SSL_LIB=-lcrypto |
| 41 |
-LDAP_LIB=-lldap_r -llber |
| 42 |
-LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) |
| 43 |
- |
| 44 |
+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber |
| 45 |
+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS))) |
| 46 |
+ LIBS=$(LDAP_LIB) $(SSL_LIB) |
| 47 |
+else |
| 48 |
+ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB) |
| 49 |
+endif |
| 50 |
+ |
| 51 |
prefix=/usr/local |
| 52 |
exec_prefix=$(prefix) |
| 53 |
ldap_subdir=/openldap |
| 54 |
@@ -41,10 +45,10 @@ |
| 55 |
|
| 56 |
|
| 57 |
smbk5pwd.lo: smbk5pwd.c |
| 58 |
- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $? |
| 59 |
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $? |
| 60 |
|
| 61 |
smbk5pwd.la: smbk5pwd.lo |
| 62 |
- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ |
| 63 |
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \ |
| 64 |
-rpath $(moduledir) -module -o $@ $? $(LIBS) |
| 65 |
|
| 66 |
clean: |
Archives