Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/netatalk/files: netatalk-2.2.1-gentoo.patch atalk_service.init cnid_metad.init afpd.init atalkd.init
Date: Thu, 29 Sep 2011 16:55:10
Message-Id: 20110929165501.039A02004C@flycatcher.gentoo.org
1 flameeyes 11/09/29 16:55:01
2
3 Added: netatalk-2.2.1-gentoo.patch atalk_service.init
4 cnid_metad.init afpd.init atalkd.init
5 Log:
6 Add new revision (that I'll maintain); this version includes a number of improvements on USE flags and dependencies, replacing xfs with quota, dropping the extra dependency over xfsprogs, adding proper ldap dependencies rather than leaving it automagic, adding an USE flag to enable or disable appletalk-based utilities, and replacing the upstream-provided init script with two (or five, if using appletalk proper) services that can be started standalone and properly depend on Avahi. Also describe USE flags according to what they actually do.
7
8 (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 net-fs/netatalk/files/netatalk-2.2.1-gentoo.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/netatalk-2.2.1-gentoo.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/netatalk-2.2.1-gentoo.patch?rev=1.1&content-type=text/plain
15
16 Index: netatalk-2.2.1-gentoo.patch
17 ===================================================================
18 Index: netatalk-2.2.1/etc/afpd/afp_avahi.c
19 ===================================================================
20 --- netatalk-2.2.1.orig/etc/afpd/afp_avahi.c
21 +++ netatalk-2.2.1/etc/afpd/afp_avahi.c
22 @@ -176,8 +176,8 @@ static void register_stuff(void) {
23 return;
24
25 fail:
26 - time(NULL);
27 // avahi_threaded_poll_quit(ctx->threaded_poll);
28 + return;
29 }
30
31 /* Called when publishing of service data completes */
32 Index: netatalk-2.2.1/etc/uams/Makefile.am
33 ===================================================================
34 --- netatalk-2.2.1.orig/etc/uams/Makefile.am
35 +++ netatalk-2.2.1/etc/uams/Makefile.am
36 @@ -97,16 +97,16 @@ uams_dhx_pam_la_CFLAGS = @SSL_CFLAGS
37 uams_dhx2_pam_la_CFLAGS = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
38 uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@
39
40 -uams_guest_la_LDFLAGS = -module -avoid-version
41 -uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
42 -uams_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@
43 -uams_pam_la_LDFLAGS = -module -avoid-version @PAM_LIBS@
44 -uams_pgp_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
45 -uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
46 -uams_dhx_pam_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
47 -uams_dhx2_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
48 -uams_dhx2_pam_la_LDFLAGS = -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
49 -uams_gss_la_LDFLAGS = -module -avoid-version @GSSAPI_LIBS@
50 +uams_guest_la_LDFLAGS = -shared -module -avoid-version
51 +uams_randnum_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@
52 +uams_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@
53 +uams_pam_la_LDFLAGS = -shared -module -avoid-version @PAM_LIBS@
54 +uams_pgp_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@
55 +uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
56 +uams_dhx_pam_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
57 +uams_dhx2_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
58 +uams_dhx2_pam_la_LDFLAGS = -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
59 +uams_gss_la_LDFLAGS = -shared -module -avoid-version @GSSAPI_LIBS@
60
61 #
62 # module compilation
63 Index: netatalk-2.2.1/libatalk/Makefile.am
64 ===================================================================
65 --- netatalk-2.2.1.orig/libatalk/Makefile.am
66 +++ netatalk-2.2.1/libatalk/Makefile.am
67 @@ -37,5 +37,3 @@ libatalk_la_DEPENDENCIES = \
68 unicode/libunicode.la \
69 vfs/libvfs.la
70
71 -libatalk_la_LDFLAGS = -static
72 -
73 Index: netatalk-2.2.1/libatalk/vfs/Makefile.am
74 ===================================================================
75 --- netatalk-2.2.1.orig/libatalk/vfs/Makefile.am
76 +++ netatalk-2.2.1/libatalk/vfs/Makefile.am
77 @@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea.c sy
78
79 if HAVE_ACLS
80 libvfs_la_SOURCES += acl.c
81 +libvfs_la_LIBADD = $(ACL_LIBS)
82 endif
83
84
85
86 1.1 net-fs/netatalk/files/atalk_service.init
87
88 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/atalk_service.init?rev=1.1&view=markup
89 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/atalk_service.init?rev=1.1&content-type=text/plain
90
91 Index: atalk_service.init
92 ===================================================================
93 #!/sbin/runscript
94 # Copyright 1999-2011 Gentoo Foundation
95 # Distributed under the terms of the GNU General Public License v2
96 # $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/atalk_service.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
97
98 depend() {
99 need net atalkd
100 use logger dns
101 }
102
103 start() {
104 ebegin "Starting ${SVCNAME}"
105 start-stop-daemon \
106 --start \
107 --exec /usr/sbin/${SVCNAME} --
108 eend $?
109 }
110
111 stop() {
112 ebegin "Stopping ${SVCNAME}"
113 start-stop-daemon \
114 --stop \
115 --exec /usr/sbin/${SVCNAME}
116 eend $?
117 }
118
119
120
121 1.1 net-fs/netatalk/files/cnid_metad.init
122
123 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/cnid_metad.init?rev=1.1&view=markup
124 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/cnid_metad.init?rev=1.1&content-type=text/plain
125
126 Index: cnid_metad.init
127 ===================================================================
128 #!/sbin/runscript
129 # Copyright 1999-2011 Gentoo Foundation
130 # Distributed under the terms of the GNU General Public License v2
131 # $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/cnid_metad.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
132
133 : ${CNID_CONFIG:=-l log_note}
134
135 depend() {
136 need net
137 use logger
138 }
139
140 start() {
141 ebegin "Starting ${SVCNAME}"
142 start-stop-daemon \
143 --start --pidfile "/var/run/${SVCNAME}.pid" \
144 --exec /usr/sbin/${SVCNAME} -- \
145 ${CNID_CONFIG}
146 eend $?
147 }
148
149 stop() {
150 ebegin "Stopping ${SVCNAME}"
151 start-stop-daemon \
152 --stop --pidfile "/var/run/${SVCNAME}.pid" \
153 --exec /usr/sbin/${SVCNAME}
154 eend $?
155 }
156
157
158
159 1.1 net-fs/netatalk/files/afpd.init
160
161 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/afpd.init?rev=1.1&view=markup
162 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/afpd.init?rev=1.1&content-type=text/plain
163
164 Index: afpd.init
165 ===================================================================
166 #!/sbin/runscript
167 # Copyright 1999-2011 Gentoo Foundation
168 # Distributed under the terms of the GNU General Public License v2
169 # $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/afpd.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
170
171 depend() {
172 need net cnid_metad
173 use logger dns atalkd
174
175 if [ ${EXTRA_CONF/-D/} != ${EXTRA_CONF} ]; then
176 need atalkd
177 else
178 config /etc/netatalk/afpd.conf
179
180 sed -e 's:#.*::' /etc/netatalk/afpd.conf | fgrep -q -e -ddp \
181 && need atalkd
182 fi
183
184 need avahi-daemon
185 need slpd
186 }
187
188 start() {
189 ebegin "Starting ${SVCNAME}"
190 start-stop-daemon \
191 --start --pidfile "/var/run/${SVCNAME}.pid" \
192 --exec /usr/sbin/${SVCNAME} -- \
193 ${EXTRA_CONF}
194 eend $?
195 }
196
197 stop() {
198 ebegin "Stopping ${SVCNAME}"
199 start-stop-daemon \
200 --stop --pidfile "/var/run/${SVCNAME}.pid" \
201 --exec /usr/sbin/${SVCNAME}
202 eend $?
203 }
204
205
206
207 1.1 net-fs/netatalk/files/atalkd.init
208
209 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/atalkd.init?rev=1.1&view=markup
210 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/files/atalkd.init?rev=1.1&content-type=text/plain
211
212 Index: atalkd.init
213 ===================================================================
214 #!/sbin/runscript
215 # Copyright 1999-2011 Gentoo Foundation
216 # Distributed under the terms of the GNU General Public License v2
217 # $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/atalkd.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
218
219 : ${ATALK_NAME:=$(hostname -s)}
220 : ${ATALK_UNIX_CHARSET:=LOCALE}
221 : ${ATALK_MAC_CHARSET:=MAC_ROMAN}
222
223 depend() {
224 need net
225 use logger dns
226 }
227
228 start() {
229 ebegin "Starting ${SVCNAME}"
230 start-stop-daemon \
231 --start \
232 --exec /usr/sbin/${SVCNAME} --
233 eend $?
234
235 for reg in \
236 "${ATALK_NAME}:Workstation${ATALK_ZONE}" \
237 "${ATALK_NAME}:netatalk${ATALK_ZONE}"
238 do
239 ebegin " Registering $reg"
240 nbprgstr "$reg"
241 eend $?
242 done
243 }
244
245 stop() {
246 for reg in \
247 "${ATALK_NAME}:Workstation${ATALK_ZONE}" \
248 "${ATALK_NAME}:netatalk${ATALK_ZONE}"
249 do
250 ebegin " Registering $reg"
251 nbpunrgstr "$reg"
252 eend $?
253 done
254
255 ebegin "Stopping ${SVCNAME}"
256 start-stop-daemon \
257 --stop \
258 --exec /usr/sbin/${SVCNAME}
259 eend $?
260 }