diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-02-02 20:10:26 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-02-02 20:10:26 +0000 |
| commit | e27b634f4167860c496f2ff88d5b22ac9f697970 (patch) | |
| tree | 85561bc75b7a05140407e3e0e7284206c398dee7 /net-nds/openldap/files | |
| parent | Version bump by Julian Ospald (diff) | |
| download | gentoo-2-e27b634f4167860c496f2ff88d5b22ac9f697970.tar.gz gentoo-2-e27b634f4167860c496f2ff88d5b22ac9f697970.tar.bz2 gentoo-2-e27b634f4167860c496f2ff88d5b22ac9f697970.zip | |
Bug #374115: version bump.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'net-nds/openldap/files')
| -rw-r--r-- | net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch new file mode 100644 index 000000000000..6e5972c90449 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch @@ -0,0 +1,49 @@ +diff -Nuar --exclude '*.orig' --exclude '*.rej' openldap-2.4.28.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.28/contrib/slapd-modules/smbk5pwd/Makefile +--- openldap-2.4.28.orig/contrib/slapd-modules/smbk5pwd/Makefile 2011-11-25 10:52:29.000000000 -0800 ++++ openldap-2.4.28/contrib/slapd-modules/smbk5pwd/Makefile 2012-02-02 02:37:47.928554958 -0800 +@@ -13,21 +13,25 @@ + # <http://www.OpenLDAP.org/license.html>. + + LIBTOOL=../../../libtool +-OPT=-g -O2 ++#OPT= + CC=gcc + + # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. +-DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW ++#DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW + +-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) +@@ -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: |