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