Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/autofs/files: autofs-5.0.5-fix-building-without-ldap.patch
Date: Sat, 30 Apr 2011 18:21:01
Message-Id: 20110430182051.0EEB020057@flycatcher.gentoo.org
1 pva 11/04/30 18:20:51
2
3 Modified: autofs-5.0.5-fix-building-without-ldap.patch
4 Log:
5 Fix ldap linkage yet again, bug #362551, thank Joshua Rich for report.
6
7 (Portage version: 2.1.9.46/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch?r1=1.1&r2=1.2
15
16 Index: autofs-5.0.5-fix-building-without-ldap.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- autofs-5.0.5-fix-building-without-ldap.patch 3 Apr 2011 09:49:15 -0000 1.1
23 +++ autofs-5.0.5-fix-building-without-ldap.patch 30 Apr 2011 18:20:50 -0000 1.2
24 @@ -1,24 +1,41 @@
25 ---- lib/defaults.c.orig
26 -+++ lib/defaults.c
27 -@@ -19,7 +19,9 @@
28 +=== modified file 'Makefile.rules'
29 +--- Makefile.rules 2011-04-30 18:13:36 +0000
30 ++++ Makefile.rules 2011-04-30 18:12:37 +0000
31 +@@ -42,6 +42,10 @@
32 + AUTOFS_LDFLAGS += $(DMALLOCLIB)
33 + endif
34 +
35 ++ifdef SASL
36 ++CFLAGS += $(XML_FLAGS)
37 ++endif
38 ++
39 + # Standard rules
40 +
41 + .SUFFIXES: .c .o .s .so
42 +
43 +=== modified file 'lib/defaults.c'
44 +--- lib/defaults.c 2011-04-30 18:13:36 +0000
45 ++++ lib/defaults.c 2011-04-30 18:12:37 +0000
46 +@@ -19,7 +19,10 @@
47
48 #include "list.h"
49 #include "defaults.h"
50 -+#ifdef HAVE_LDAP
51 ++#include "config.h"
52 ++#ifdef WITH_LDAP
53 #include "lookup_ldap.h"
54 +#endif
55 #include "log.h"
56 #include "automount.h"
57
58 -@@ -197,6 +199,7 @@ static int parse_line(char *line, char *
59 +@@ -197,6 +200,7 @@
60 return 1;
61 }
62
63 -+#ifdef HAVE_LDAP
64 ++#ifdef WITH_LDAP
65 void defaults_free_uris(struct list_head *list)
66 {
67 struct list_head *next;
68 -@@ -252,9 +255,11 @@ static unsigned int add_uris(char *value
69 +@@ -252,9 +256,11 @@
70
71 return 1;
72 }
73 @@ -26,11 +43,11 @@
74
75 struct list_head *defaults_get_uris(void)
76 {
77 -+#ifdef HAVE_LDAP
78 ++#ifdef WITH_LDAP
79 FILE *f;
80 char buf[MAX_LINE_LEN];
81 char *res;
82 -@@ -288,6 +292,9 @@ struct list_head *defaults_get_uris(void
83 +@@ -288,6 +294,9 @@
84
85 fclose(f);
86 return list;
87 @@ -40,15 +57,15 @@
88 }
89
90 /*
91 -@@ -450,6 +457,7 @@ unsigned int defaults_get_ldap_network_t
92 +@@ -450,6 +459,7 @@
93 return res;
94 }
95
96 -+#ifdef HAVE_LDAP
97 ++#ifdef WITH_LDAP
98 struct ldap_schema *defaults_get_default_schema(void)
99 {
100 struct ldap_schema *schema;
101 -@@ -645,6 +653,7 @@ struct ldap_schema *defaults_get_schema(
102 +@@ -645,6 +655,7 @@
103
104 return schema;
105 }
106 @@ -56,3 +73,4 @@
107
108 unsigned int defaults_get_mount_nfs_default_proto(void)
109 {
110 +