1 |
robbat2 12/02/02 20:10:26 |
2 |
|
3 |
Added: openldap-2.4.28-contrib-smbk5pwd.patch |
4 |
Log: |
5 |
Bug #374115: version bump. |
6 |
|
7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch |
11 |
|
12 |
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 |
13 |
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 |
14 |
|
15 |
Index: openldap-2.4.28-contrib-smbk5pwd.patch |
16 |
=================================================================== |
17 |
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 |
18 |
--- openldap-2.4.28.orig/contrib/slapd-modules/smbk5pwd/Makefile 2011-11-25 10:52:29.000000000 -0800 |
19 |
+++ openldap-2.4.28/contrib/slapd-modules/smbk5pwd/Makefile 2012-02-02 02:37:47.928554958 -0800 |
20 |
@@ -13,21 +13,25 @@ |
21 |
# <http://www.OpenLDAP.org/license.html>. |
22 |
|
23 |
LIBTOOL=../../../libtool |
24 |
-OPT=-g -O2 |
25 |
+#OPT= |
26 |
CC=gcc |
27 |
|
28 |
# Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. |
29 |
-DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW |
30 |
+#DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW |
31 |
|
32 |
-HEIMDAL_INC=-I/usr/heimdal/include |
33 |
+#KRB5_INC= |
34 |
SSL_INC= |
35 |
LDAP_INC=-I../../../include -I../../../servers/slapd |
36 |
-INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) |
37 |
+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC) |
38 |
|
39 |
-HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv |
40 |
+KRB5_LIB=-lkrb5 -lkadm5srv |
41 |
SSL_LIB=-lcrypto |
42 |
-LDAP_LIB=-lldap_r -llber |
43 |
-LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) |
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 |
@@ -41,10 +45,10 @@ |
54 |
|
55 |
|
56 |
smbk5pwd.lo: smbk5pwd.c |
57 |
- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $? |
58 |
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $? |
59 |
|
60 |
smbk5pwd.la: smbk5pwd.lo |
61 |
- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ |
62 |
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \ |
63 |
-rpath $(moduledir) -module -o $@ $? $(LIBS) |
64 |
|
65 |
clean: |