* [gentoo-commits] gentoo-x86 commit in net-nds/openldap/files: openldap-2.4.28-contrib-smbk5pwd.patch
@ 2012-02-02 20:10 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson (robbat2) @ 2012-02-02 20:10 UTC (permalink / raw
To: gentoo-commits
robbat2 12/02/02 20:10:26
Added: openldap-2.4.28-contrib-smbk5pwd.patch
Log:
Bug #374115: version bump.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Revision Changes Path
1.1 net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch?rev=1.1&content-type=text/plain
Index: openldap-2.4.28-contrib-smbk5pwd.patch
===================================================================
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:
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-nds/openldap/files: openldap-2.4.28-contrib-smbk5pwd.patch
@ 2015-03-08 4:28 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson (robbat2) @ 2015-03-08 4:28 UTC (permalink / raw
To: gentoo-commits
robbat2 15/03/08 04:28:13
Removed: openldap-2.4.28-contrib-smbk5pwd.patch
Log:
Cleanup patches.
(Portage version: 2.2.17/cvs/Linux x86_64, unsigned Manifest commit)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-08 4:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-02 20:10 [gentoo-commits] gentoo-x86 commit in net-nds/openldap/files: openldap-2.4.28-contrib-smbk5pwd.patch Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2015-03-08 4:28 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox