Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/netatalk/files: netatalk-2.2.2-gentoo.patch
Date: Wed, 02 May 2012 17:13:40
Message-Id: 20120502171325.1C39D2004C@flycatcher.gentoo.org
1 jlec 12/05/02 17:13:25
2
3 Added: netatalk-2.2.2-gentoo.patch
4 Log:
5 net-fs/netatalk: Version Bump
6
7 (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: netatalk-2.2.2-gentoo.patch
16 ===================================================================
17 etc/afpd/afp_avahi.c | 2 +-
18 etc/uams/Makefile.am | 20 ++++++++++----------
19 libatalk/Makefile.am | 2 --
20 libatalk/dsi/Makefile.am | 1 +
21 libatalk/vfs/Makefile.am | 1 +
22 5 files changed, 13 insertions(+), 13 deletions(-)
23
24 diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
25 index 351e001..6ed695f 100644
26 --- a/etc/afpd/afp_avahi.c
27 +++ b/etc/afpd/afp_avahi.c
28 @@ -177,8 +177,8 @@ static void register_stuff(void) {
29 return;
30
31 fail:
32 - time(NULL);
33 // avahi_threaded_poll_quit(ctx->threaded_poll);
34 + return;
35 }
36
37 /* Called when publishing of service data completes */
38 diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
39 index dbe304a..8570a46 100644
40 --- a/etc/uams/Makefile.am
41 +++ b/etc/uams/Makefile.am
42 @@ -97,16 +97,16 @@ uams_dhx_pam_la_CFLAGS = @SSL_CFLAGS@ @PAM_CFLAGS@
43 uams_dhx2_pam_la_CFLAGS = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
44 uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@
45
46 -uams_guest_la_LDFLAGS = -module -avoid-version
47 -uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
48 -uams_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@
49 -uams_pam_la_LDFLAGS = -module -avoid-version @PAM_LIBS@
50 -uams_pgp_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
51 -uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
52 -uams_dhx_pam_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
53 -uams_dhx2_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
54 -uams_dhx2_pam_la_LDFLAGS = -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
55 -uams_gss_la_LDFLAGS = -module -avoid-version @GSSAPI_LIBS@
56 +uams_guest_la_LDFLAGS = -shared -module -avoid-version
57 +uams_randnum_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@
58 +uams_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@
59 +uams_pam_la_LDFLAGS = -shared -module -avoid-version @PAM_LIBS@
60 +uams_pgp_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@
61 +uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
62 +uams_dhx_pam_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
63 +uams_dhx2_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
64 +uams_dhx2_pam_la_LDFLAGS = -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
65 +uams_gss_la_LDFLAGS = -shared -module -avoid-version @GSSAPI_LIBS@
66
67 #
68 # module compilation
69 diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
70 index a241d94..513d5f6 100644
71 --- a/libatalk/Makefile.am
72 +++ b/libatalk/Makefile.am
73 @@ -29,8 +29,6 @@ libatalk_la_DEPENDENCIES = \
74 unicode/libunicode.la \
75 vfs/libvfs.la
76
77 -libatalk_la_LDFLAGS = -static
78 -
79 if USE_APPLETALK
80 SUBDIRS += asp atp nbp netddp
81 libatalk_la_LIBADD += \
82 diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am
83 index d64cbed..5a07c94 100644
84 --- a/libatalk/dsi/Makefile.am
85 +++ b/libatalk/dsi/Makefile.am
86 @@ -7,5 +7,6 @@ LIBS = @LIBS@
87 noinst_LTLIBRARIES = libdsi.la
88
89 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
90 +libdsi_la_LIBADD = $(WRAP_LIBS)
91
92 noinst_HEADERS = dsi_private.h
93 diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am
94 index 9b8d143..1cc83ec 100644
95 --- a/libatalk/vfs/Makefile.am
96 +++ b/libatalk/vfs/Makefile.am
97 @@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea.c sys_ea.c ea_sys.c
98
99 if HAVE_ACLS
100 libvfs_la_SOURCES += acl.c
101 +libvfs_la_LIBADD = $(ACL_LIBS)
102 endif