1 |
jlec 13/11/02 11:59:14 |
2 |
|
3 |
Added: netatalk-3.1.0-gentoo.patch |
4 |
Log: |
5 |
net-fs/netatalk: Version Bump, #489756 |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-fs/netatalk/files/netatalk-3.1.0-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/netatalk-3.1.0-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/netatalk-3.1.0-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: netatalk-3.1.0-gentoo.patch |
16 |
=================================================================== |
17 |
Makefile.am | 6 ------ |
18 |
bin/uniconv/Makefile.am | 2 +- |
19 |
etc/afpd/afp_avahi.c | 2 +- |
20 |
etc/netatalk/Makefile.am | 5 +++-- |
21 |
etc/uams/Makefile.am | 20 ++++++++++---------- |
22 |
libatalk/dsi/Makefile.am | 3 ++- |
23 |
libatalk/vfs/Makefile.am | 1 + |
24 |
macros/netatalk.m4 | 1 - |
25 |
8 files changed, 18 insertions(+), 22 deletions(-) |
26 |
|
27 |
diff --git a/Makefile.am b/Makefile.am |
28 |
index 0100598..a7b6c22 100644 |
29 |
--- a/Makefile.am |
30 |
+++ b/Makefile.am |
31 |
@@ -11,9 +11,3 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION |
32 |
ACLOCAL_AMFLAGS = -I macros |
33 |
AUTOMAKE_OPTIONS = foreign |
34 |
|
35 |
-if RUN_LDCONFIG |
36 |
-install-exec-hook: |
37 |
- @printf "Running ldconfig to ensure libraries installed in system library directories are added to the dynamic linker cache ... " |
38 |
- @-@NETA_LDCONFIG@ |
39 |
- @printf "done\n" |
40 |
-endif |
41 |
diff --git a/bin/uniconv/Makefile.am b/bin/uniconv/Makefile.am |
42 |
index 202e722..2be527e 100644 |
43 |
--- a/bin/uniconv/Makefile.am |
44 |
+++ b/bin/uniconv/Makefile.am |
45 |
@@ -1,6 +1,6 @@ |
46 |
# Makefile.am for bin/aecho/ |
47 |
|
48 |
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys |
49 |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys |
50 |
|
51 |
bin_PROGRAMS = uniconv |
52 |
|
53 |
diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c |
54 |
index 5218d51..b68c266 100644 |
55 |
--- a/etc/afpd/afp_avahi.c |
56 |
+++ b/etc/afpd/afp_avahi.c |
57 |
@@ -174,8 +174,8 @@ static void register_stuff(void) { |
58 |
return; |
59 |
|
60 |
fail: |
61 |
- time(NULL); |
62 |
// avahi_threaded_poll_quit(ctx->threaded_poll); |
63 |
+ return; |
64 |
} |
65 |
|
66 |
/* Called when publishing of service data completes */ |
67 |
diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am |
68 |
index 06e5a8c..2d4ef20 100644 |
69 |
--- a/etc/netatalk/Makefile.am |
70 |
+++ b/etc/netatalk/Makefile.am |
71 |
@@ -14,6 +14,7 @@ netatalk_LDADD = \ |
72 |
$(top_builddir)/libatalk/libatalk.la |
73 |
|
74 |
netatalk_LDFLAGS = |
75 |
+netatalk_CPPFLAGS = |
76 |
|
77 |
if USE_BUILTIN_LIBEVENT |
78 |
netatalk_CFLAGS += \ |
79 |
@@ -23,6 +24,6 @@ netatalk_CFLAGS += \ |
80 |
netatalk_LDADD += \ |
81 |
$(top_builddir)/libevent/libevent.la |
82 |
else |
83 |
-netatalk_CFLAGS += @LIBEVENT_CFLAGS@ |
84 |
-netatalk_LDFLAGS += @LIBEVENT_LDFLAGS@ -levent |
85 |
+netatalk_CPPFLAGS += @LIBEVENT_CFLAGS@ |
86 |
+netatalk_LDADD += @LIBEVENT_LDFLAGS@ -levent |
87 |
endif |
88 |
diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am |
89 |
index 3a02b83..70a2f76 100644 |
90 |
--- a/etc/uams/Makefile.am |
91 |
+++ b/etc/uams/Makefile.am |
92 |
@@ -95,16 +95,16 @@ uams_dhx_pam_la_CFLAGS = @SSL_CFLAGS@ @PAM_CFLAGS@ |
93 |
uams_dhx2_pam_la_CFLAGS = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@ |
94 |
uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@ @KRB5_CFLAGS@ |
95 |
|
96 |
-uams_guest_la_LDFLAGS = -module -avoid-version |
97 |
-uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@ |
98 |
-uams_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ |
99 |
-uams_pam_la_LDFLAGS = -module -avoid-version @PAM_LIBS@ |
100 |
-uams_pgp_la_LDFLAGS = -module -avoid-version @SSL_LIBS@ |
101 |
-uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ |
102 |
-uams_dhx_pam_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@ |
103 |
-uams_dhx2_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@ |
104 |
-uams_dhx2_pam_la_LDFLAGS = -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@ |
105 |
-uams_gss_la_LDFLAGS = -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@ |
106 |
+uams_guest_la_LDFLAGS = -shared -module -avoid-version |
107 |
+uams_randnum_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@ |
108 |
+uams_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ |
109 |
+uams_pam_la_LDFLAGS = -shared -module -avoid-version @PAM_LIBS@ |
110 |
+uams_pgp_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@ |
111 |
+uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ |
112 |
+uams_dhx_pam_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@ |
113 |
+uams_dhx2_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@ |
114 |
+uams_dhx2_pam_la_LDFLAGS = -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@ |
115 |
+uams_gss_la_LDFLAGS = -shared -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@ |
116 |
|
117 |
# |
118 |
# module compilation |
119 |
diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am |
120 |
index 34fa76e..dbde336 100644 |
121 |
--- a/libatalk/dsi/Makefile.am |
122 |
+++ b/libatalk/dsi/Makefile.am |
123 |
@@ -1,9 +1,10 @@ |
124 |
# Makefile.am for libatalk/dsi/ |
125 |
|
126 |
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys |
127 |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys |
128 |
|
129 |
LIBS = @LIBS@ |
130 |
|
131 |
noinst_LTLIBRARIES = libdsi.la |
132 |
|
133 |
libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c |
134 |
+libdsi_la_LIBADD = $(WRAP_LIBS) |
135 |
diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am |
136 |
index aa62aeb..8ac2045 100644 |
137 |
--- a/libatalk/vfs/Makefile.am |
138 |
+++ b/libatalk/vfs/Makefile.am |
139 |
@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea_ad.c ea_sys.c extattr.c |
140 |
|
141 |
if HAVE_ACLS |
142 |
libvfs_la_SOURCES += acl.c |
143 |
+libvfs_la_LIBADD = $(ACL_LIBS) |
144 |
endif |
145 |
diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 |
146 |
index 7040eb0..5b63285 100644 |
147 |
--- a/macros/netatalk.m4 |
148 |
+++ b/macros/netatalk.m4 |
149 |
@@ -613,7 +613,6 @@ save_CFLAGS="$CFLAGS" |
150 |
save_LDFLAGS="$LDFLAGS" |
151 |
save_LIBS="$LIBS" |
152 |
CFLAGS="" |
153 |
-LDFLAGS="" |
154 |
LIBS="" |
155 |
LDAP_CFLAGS="" |
156 |
LDAP_LDFLAGS="" |