diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-03-08 03:52:26 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-03-08 03:52:26 +0000 |
| commit | e0bada678c5de0b8191ce3558deb8b27a8b23c64 (patch) | |
| tree | 77c7486692a11491920937bba2ab9f6ad84f1a08 /net-nds/openldap | |
| parent | Misc upstream fixes, bug #542046 (diff) | |
| download | gentoo-2-e0bada678c5de0b8191ce3558deb8b27a8b23c64.tar.gz gentoo-2-e0bada678c5de0b8191ce3558deb8b27a8b23c64.tar.bz2 gentoo-2-e0bada678c5de0b8191ce3558deb8b27a8b23c64.zip | |
Cleanup patches.
(Portage version: 2.2.17/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-nds/openldap')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch | 51 |
2 files changed, 5 insertions, 52 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 7e5a4e9c1354..cb60aecaedac 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.495 2015/03/08 00:26:20 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.496 2015/03/08 03:52:25 robbat2 Exp $ + + 08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org> + -files/openldap-2.4.19-contrib-smbk5pwd.patch: + Cleanup patches. 08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org> -openldap-2.4.30.ebuild: Cleanup. 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 deleted file mode 100644 index f20fda0c7d53..000000000000 --- a/net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch +++ /dev/null @@ -1,51 +0,0 @@ -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: |