diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-11-03 21:13:59 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-11-03 21:13:59 +0000 |
| commit | eea30a8358aa89b9c1a9d7c9e81910c019c46827 (patch) | |
| tree | da1dc7b0b1053d62fd8846b314fa9b58bfe26405 /net-nds/openldap/files | |
| parent | amd64 stable wrt #284863 (diff) | |
| download | gentoo-2-eea30a8358aa89b9c1a9d7c9e81910c019c46827.tar.gz gentoo-2-eea30a8358aa89b9c1a9d7c9e81910c019c46827.tar.bz2 gentoo-2-eea30a8358aa89b9c1a9d7c9e81910c019c46827.zip | |
Version bump per bug #290345 (CVE-2009-3767). Also fix: #286427 disable-syslog w/ USE=minimal. #280986 ldflags.
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'net-nds/openldap/files')
| -rw-r--r-- | net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch new file mode 100644 index 000000000000..f20fda0c7d53 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch @@ -0,0 +1,51 @@ +diff -Nuar openldap-2.4.19.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.19/contrib/slapd-modules/smbk5pwd/Makefile +--- openldap-2.4.19.orig/contrib/slapd-modules/smbk5pwd/Makefile 2009-10-02 21:16:53.000000000 +0000 ++++ openldap-2.4.19/contrib/slapd-modules/smbk5pwd/Makefile 2009-11-03 21:01:41.199550611 +0000 +@@ -13,22 +13,26 @@ + # <http://www.OpenLDAP.org/license.html>. + + LIBTOOL=../../../libtool +-OPT=-g -O2 ++#OPT= + CC=gcc + + # Omit DO_KRB5 or DO_SAMBA if you don't want to support it. +-DEFS=-DDO_KRB5 -DDO_SAMBA ++#DEFS= + +-HEIMDAL_INC=-I/usr/heimdal/include ++#KRB5_INC= + SSL_INC= + LDAP_INC=-I../../../include -I../../../servers/slapd +-INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) ++INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC) + +-HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv ++KRB5_LIB=-lkrb5 -lkadm5srv + SSL_LIB=-lcrypto +-LDAP_LIB=-lldap_r -llber +-LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) +- ++LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber ++ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS))) ++ LIBS=$(LDAP_LIB) $(SSL_LIB) ++else ++ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB) ++endif ++ + prefix=/usr/local + exec_prefix=$(prefix) + ldap_subdir=/openldap +@@ -41,10 +45,10 @@ + + + smbk5pwd.lo: smbk5pwd.c +- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $? ++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $? + + smbk5pwd.la: smbk5pwd.lo +- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $? $(LIBS) + + clean: |