1 |
commit: b7f16b01586e5f58790d2f86bd3481b31b07c5d5 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 5 14:30:39 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 5 15:02:34 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f16b01 |
7 |
|
8 |
net-fs/netatalk: Drop old |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
net-fs/netatalk/Manifest | 2 - |
13 |
net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch | 127 -------------- |
14 |
....1.7-zeroconf-prefer-native-Avahi-support.patch | 97 ----------- |
15 |
net-fs/netatalk/netatalk-3.1.6.ebuild | 182 -------------------- |
16 |
net-fs/netatalk/netatalk-3.1.7-r1.ebuild | 183 --------------------- |
17 |
5 files changed, 591 deletions(-) |
18 |
|
19 |
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest |
20 |
index 2418432..e585b94 100644 |
21 |
--- a/net-fs/netatalk/Manifest |
22 |
+++ b/net-fs/netatalk/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
DIST netatalk-3.1.10.tar.bz2 1811929 SHA256 2b40161985bb32cff5660bf689a4704f15c33bb87565efc7805dd5c75ad1fcc7 SHA512 dd1f49307b5298a784e2b487c0da94459632bab8353cf505cd4b104f4c0b55bbb77caf73e8b4c60af64018b345df78337accac3b5ed6cb5620309b163a86d32b WHIRLPOOL f5996ef249e98e5cb95ab214087f482502e6177bfa4d259119db8362e45665d775ca4e41277b34e627c4c199859915f9732c101adc0f17ba56bdcf64efc7a789 |
25 |
-DIST netatalk-3.1.6.tar.bz2 1817059 SHA256 2df2b3b12be3f11eddb0fc2f88cb39d09a8c95792a4d97d9dd22127c5a5efb21 SHA512 36bfd3df30f1a3228a6f8f05e7744f9551d01d5a59d9c05e581f731e4fe9417bc1a7178e2e6af1128ea9a5c848bfa9a447ecf22691daa201f1fa37adcbe19be8 WHIRLPOOL 9f52d774487781aa43444bfe920fc07d9b7fe6bece45bca7cb44a9b7bc498ed17662c42d64db0628f668098c0bf7b6cb3f9c813d39e0fdac9f59b7eeae359d5d |
26 |
-DIST netatalk-3.1.7.tar.bz2 1780078 SHA256 e4049399e4e7d477f843a9ec4bd64f70eb7c7af946e890311140fd8fbd4bc071 SHA512 e8b22a156235cb93830ed5045e28346613e354fd830e742b2f7c1fc9302f9bdfce7fb2cc329ce8dfd1442857f96e9e54119a4ac177b6855af9143e64fb2208e7 WHIRLPOOL 3dfbc5c3091388fc2b1e811faf60c274549f5d6e9d7ae2c5dc0552a72ae01b2a075c8f7df634ad99188adc83c19c70ba7060aec80fe5f8783a206e4d5db16ecb |
27 |
DIST netatalk-3.1.8.tar.bz2 1802404 SHA256 34668d5f53b780e9f143c2d7ee06ebc1c2bd7758c60ca483c8b08da27dcc4d4c SHA512 734745743b2d5fe39f3d6716f377e6255d6a061e3c615a4fe30db388ec6d848f6db063d733dfa24ccf967f1e9042841bce4824f4bed391952c4304ee11e11b0d WHIRLPOOL dff6050c746b301864d34b9577f9cea7195878434306e4ad83032a51ba6841b4b8537db6cedef27642d751beeefacba62026addd4b8f5056a9fe9b0b07bf98d8 |
28 |
|
29 |
diff --git a/net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch b/net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch |
30 |
deleted file mode 100644 |
31 |
index e5e396b..00000000 |
32 |
--- a/net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch |
33 |
+++ /dev/null |
34 |
@@ -1,127 +0,0 @@ |
35 |
- Makefile.am | 6 ------ |
36 |
- etc/netatalk/afp_avahi.c | 2 +- |
37 |
- etc/netatalk/Makefile.am | 5 +++-- |
38 |
- etc/uams/Makefile.am | 20 ++++++++++---------- |
39 |
- libatalk/dsi/Makefile.am | 3 ++- |
40 |
- libatalk/vfs/Makefile.am | 1 + |
41 |
- macros/netatalk.m4 | 1 - |
42 |
- 8 files changed, 18 insertions(+), 22 deletions(-) |
43 |
- |
44 |
-diff --git a/Makefile.am b/Makefile.am |
45 |
-index 0100598..a7b6c22 100644 |
46 |
---- a/Makefile.am |
47 |
-+++ b/Makefile.am |
48 |
-@@ -11,9 +11,3 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION |
49 |
- ACLOCAL_AMFLAGS = -I macros |
50 |
- AUTOMAKE_OPTIONS = foreign |
51 |
- |
52 |
--if RUN_LDCONFIG |
53 |
--install-exec-hook: |
54 |
-- @printf "Running ldconfig to ensure libraries installed in system library directories are added to the dynamic linker cache ... " |
55 |
-- @-@NETA_LDCONFIG@ |
56 |
-- @printf "done\n" |
57 |
--endif |
58 |
-diff --git a/etc/netatalk/afp_avahi.c b/etc/netatalk/afp_avahi.c |
59 |
-index 5218d51..b68c266 100644 |
60 |
---- a/etc/netatalk/afp_avahi.c |
61 |
-+++ b/etc/netatalk/afp_avahi.c |
62 |
-@@ -174,8 +174,8 @@ static void register_stuff(void) { |
63 |
- return; |
64 |
- |
65 |
- fail: |
66 |
-- time(NULL); |
67 |
- // avahi_threaded_poll_quit(ctx->threaded_poll); |
68 |
-+ return; |
69 |
- } |
70 |
- |
71 |
- /* Called when publishing of service data completes */ |
72 |
-diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am |
73 |
-index 06e5a8c..2d4ef20 100644 |
74 |
---- a/etc/netatalk/Makefile.am |
75 |
-+++ b/etc/netatalk/Makefile.am |
76 |
-@@ -14,6 +14,7 @@ netatalk_LDADD = \ |
77 |
- $(top_builddir)/libatalk/libatalk.la |
78 |
- |
79 |
- netatalk_LDFLAGS = |
80 |
-+netatalk_CPPFLAGS = |
81 |
- |
82 |
- if USE_BUILTIN_LIBEVENT |
83 |
- netatalk_CFLAGS += \ |
84 |
-@@ -23,6 +24,6 @@ netatalk_CFLAGS += \ |
85 |
- netatalk_LDADD += \ |
86 |
- $(top_builddir)/libevent/libevent.la |
87 |
- else |
88 |
--netatalk_CFLAGS += @LIBEVENT_CFLAGS@ |
89 |
--netatalk_LDFLAGS += @LIBEVENT_LDFLAGS@ -levent |
90 |
-+netatalk_CPPFLAGS += @LIBEVENT_CFLAGS@ |
91 |
-+netatalk_LDADD += @LIBEVENT_LDFLAGS@ -levent |
92 |
- endif |
93 |
-diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am |
94 |
-index 3a02b83..70a2f76 100644 |
95 |
---- a/etc/uams/Makefile.am |
96 |
-+++ b/etc/uams/Makefile.am |
97 |
-@@ -95,16 +95,16 @@ uams_dhx_pam_la_CFLAGS = @SSL_CFLAGS@ @PAM_CFLAGS@ |
98 |
- uams_dhx2_pam_la_CFLAGS = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@ |
99 |
- uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@ @KRB5_CFLAGS@ |
100 |
- |
101 |
--uams_guest_la_LDFLAGS = -module -avoid-version |
102 |
--uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@ |
103 |
--uams_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ |
104 |
--uams_pam_la_LDFLAGS = -module -avoid-version @PAM_LIBS@ |
105 |
--uams_pgp_la_LDFLAGS = -module -avoid-version @SSL_LIBS@ |
106 |
--uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ |
107 |
--uams_dhx_pam_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@ |
108 |
--uams_dhx2_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@ |
109 |
--uams_dhx2_pam_la_LDFLAGS = -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@ |
110 |
--uams_gss_la_LDFLAGS = -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@ |
111 |
-+uams_guest_la_LDFLAGS = -shared -module -avoid-version |
112 |
-+uams_randnum_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@ |
113 |
-+uams_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ |
114 |
-+uams_pam_la_LDFLAGS = -shared -module -avoid-version @PAM_LIBS@ |
115 |
-+uams_pgp_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@ |
116 |
-+uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ |
117 |
-+uams_dhx_pam_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@ |
118 |
-+uams_dhx2_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@ |
119 |
-+uams_dhx2_pam_la_LDFLAGS = -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@ |
120 |
-+uams_gss_la_LDFLAGS = -shared -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@ |
121 |
- |
122 |
- # |
123 |
- # module compilation |
124 |
-diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am |
125 |
-index 34fa76e..dbde336 100644 |
126 |
---- a/libatalk/dsi/Makefile.am |
127 |
-+++ b/libatalk/dsi/Makefile.am |
128 |
-@@ -1,9 +1,10 @@ |
129 |
- # Makefile.am for libatalk/dsi/ |
130 |
- |
131 |
--INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys |
132 |
-+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys |
133 |
- |
134 |
- LIBS = @LIBS@ |
135 |
- |
136 |
- noinst_LTLIBRARIES = libdsi.la |
137 |
- |
138 |
- 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 |
139 |
-+libdsi_la_LIBADD = $(WRAP_LIBS) |
140 |
-diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am |
141 |
-index aa62aeb..8ac2045 100644 |
142 |
---- a/libatalk/vfs/Makefile.am |
143 |
-+++ b/libatalk/vfs/Makefile.am |
144 |
-@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea_ad.c ea_sys.c extattr.c |
145 |
- |
146 |
- if HAVE_ACLS |
147 |
- libvfs_la_SOURCES += acl.c |
148 |
-+libvfs_la_LIBADD = $(ACL_LIBS) |
149 |
- endif |
150 |
-diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 |
151 |
-index 7040eb0..5b63285 100644 |
152 |
---- a/macros/netatalk.m4 |
153 |
-+++ b/macros/netatalk.m4 |
154 |
-@@ -613,7 +613,6 @@ save_CFLAGS="$CFLAGS" |
155 |
- save_LDFLAGS="$LDFLAGS" |
156 |
- save_LIBS="$LIBS" |
157 |
- CFLAGS="" |
158 |
--LDFLAGS="" |
159 |
- LIBS="" |
160 |
- LDAP_CFLAGS="" |
161 |
- LDAP_LDFLAGS="" |
162 |
|
163 |
diff --git a/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch b/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch |
164 |
deleted file mode 100644 |
165 |
index c2c74e7..00000000 |
166 |
--- a/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch |
167 |
+++ /dev/null |
168 |
@@ -1,97 +0,0 @@ |
169 |
-From 6b4abfe853ab2143ad2f5b95a15a39c91174fda3 Mon Sep 17 00:00:00 2001 |
170 |
-From: Doug Goldstein <cardoe@××××××.com> |
171 |
-Date: Fri, 9 Oct 2015 00:28:19 -0500 |
172 |
-Subject: [PATCH] zeroconf: prefer native Avahi support over mDNSResponder |
173 |
- |
174 |
-Check first for native Avahi support and use that over mDNSResponder |
175 |
-support to avoid using Avahi's mDNSResponder compatibility layer by |
176 |
-default. |
177 |
- |
178 |
-Bug: https://sourceforge.net/p/netatalk/bugs/586/ |
179 |
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=492716 |
180 |
- |
181 |
-Signed-off-by: Doug Goldstein <cardoe@××××××.com> |
182 |
---- |
183 |
- macros/zeroconf.m4 | 52 ++++++++++++++++++++++++++-------------------------- |
184 |
- 1 file changed, 26 insertions(+), 26 deletions(-) |
185 |
- |
186 |
-diff --git a/macros/zeroconf.m4 b/macros/zeroconf.m4 |
187 |
-index 6916c99..fd2f920 100644 |
188 |
---- a/macros/zeroconf.m4 |
189 |
-+++ b/macros/zeroconf.m4 |
190 |
-@@ -25,46 +25,46 @@ AC_DEFUN([AC_NETATALK_ZEROCONF], [ |
191 |
- zeroconf_dir="$zeroconf" |
192 |
- fi |
193 |
- |
194 |
-- # mDNS support using mDNSResponder |
195 |
-+ # mDNS support using Avahi |
196 |
- AC_CHECK_HEADER( |
197 |
-- dns_sd.h, |
198 |
-+ avahi-client/client.h, |
199 |
- AC_CHECK_LIB( |
200 |
-- dns_sd, |
201 |
-- DNSServiceRegister, |
202 |
-+ avahi-client, |
203 |
-+ avahi_client_new, |
204 |
- AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration])) |
205 |
- ) |
206 |
- |
207 |
-- if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then |
208 |
-- ZEROCONF_LIBS="-ldns_sd" |
209 |
-- AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration]) |
210 |
-+ case "$ac_cv_lib_avahi_client_avahi_client_new" in |
211 |
-+ yes) |
212 |
-+ PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]) |
213 |
-+ PKG_CHECK_MODULES(AVAHI_TPOLL, [ avahi-client >= 0.6.4 ], |
214 |
-+ [AC_DEFINE(HAVE_AVAHI_THREADED_POLL, 1, [Uses Avahis threaded poll implementation])], |
215 |
-+ [AC_MSG_WARN(This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want.)]) |
216 |
-+ ZEROCONF_LIBS="$AVAHI_LIBS" |
217 |
-+ ZEROCONF_CFLAGS="$AVAHI_CFLAGS" |
218 |
-+ AC_DEFINE(HAVE_AVAHI, 1, [Use Avahi/DNS-SD registration]) |
219 |
- found_zeroconf=yes |
220 |
-- fi |
221 |
-+ ;; |
222 |
-+ esac |
223 |
-+ CPPFLAGS="$savedcppflags" |
224 |
-+ LDFLAGS="$savedldflags" |
225 |
- |
226 |
-- # mDNS support using Avahi |
227 |
-+ # mDNS support using mDNSResponder |
228 |
- if test x"$found_zeroconf" != x"yes" ; then |
229 |
- AC_CHECK_HEADER( |
230 |
-- avahi-client/client.h, |
231 |
-+ dns_sd.h, |
232 |
- AC_CHECK_LIB( |
233 |
-- avahi-client, |
234 |
-- avahi_client_new, |
235 |
-+ dns_sd, |
236 |
-+ DNSServiceRegister, |
237 |
- AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration])) |
238 |
- ) |
239 |
- |
240 |
-- case "$ac_cv_lib_avahi_client_avahi_client_new" in |
241 |
-- yes) |
242 |
-- PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]) |
243 |
-- PKG_CHECK_MODULES(AVAHI_TPOLL, [ avahi-client >= 0.6.4 ], |
244 |
-- [AC_DEFINE(HAVE_AVAHI_THREADED_POLL, 1, [Uses Avahis threaded poll implementation])], |
245 |
-- [AC_MSG_WARN(This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want.)]) |
246 |
-- ZEROCONF_LIBS="$AVAHI_LIBS" |
247 |
-- ZEROCONF_CFLAGS="$AVAHI_CFLAGS" |
248 |
-- AC_DEFINE(HAVE_AVAHI, 1, [Use Avahi/DNS-SD registration]) |
249 |
-+ if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then |
250 |
-+ ZEROCONF_LIBS="-ldns_sd" |
251 |
-+ AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration]) |
252 |
- found_zeroconf=yes |
253 |
-- ;; |
254 |
-- esac |
255 |
-- CPPFLAGS="$savedcppflags" |
256 |
-- LDFLAGS="$savedldflags" |
257 |
-- fi |
258 |
-+ fi |
259 |
-+ fi |
260 |
- fi |
261 |
- |
262 |
- netatalk_cv_zeroconf=no |
263 |
--- |
264 |
-2.4.9 |
265 |
- |
266 |
|
267 |
diff --git a/net-fs/netatalk/netatalk-3.1.6.ebuild b/net-fs/netatalk/netatalk-3.1.6.ebuild |
268 |
deleted file mode 100644 |
269 |
index db179d8..00000000 |
270 |
--- a/net-fs/netatalk/netatalk-3.1.6.ebuild |
271 |
+++ /dev/null |
272 |
@@ -1,182 +0,0 @@ |
273 |
-# Copyright 1999-2016 Gentoo Foundation |
274 |
-# Distributed under the terms of the GNU General Public License v2 |
275 |
-# $Id$ |
276 |
- |
277 |
-EAPI=5 |
278 |
- |
279 |
-PYTHON_COMPAT=( python2_7 ) |
280 |
- |
281 |
-AUTOTOOLS_AUTORECONF=yes |
282 |
- |
283 |
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator |
284 |
- |
285 |
-DESCRIPTION="Open Source AFP server" |
286 |
-HOMEPAGE="http://netatalk.sourceforge.net/" |
287 |
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2" |
288 |
- |
289 |
-LICENSE="GPL-2 BSD" |
290 |
-SLOT="0" |
291 |
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" |
292 |
-IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils" |
293 |
- |
294 |
-CDEPEND=" |
295 |
- !app-editors/yudit |
296 |
- dev-libs/libevent |
297 |
- >=dev-libs/libgcrypt-1.2.3:0 |
298 |
- sys-apps/coreutils |
299 |
- >=sys-libs/db-4.2.52:= |
300 |
- sys-libs/tdb |
301 |
- acl? ( |
302 |
- sys-apps/attr |
303 |
- sys-apps/acl |
304 |
- ) |
305 |
- avahi? ( net-dns/avahi[dbus,-mdnsresponder-compat] ) |
306 |
- cracklib? ( sys-libs/cracklib ) |
307 |
- dbus? ( sys-apps/dbus dev-libs/dbus-glib ) |
308 |
- kerberos? ( virtual/krb5 ) |
309 |
- ldap? ( net-nds/openldap ) |
310 |
- pam? ( virtual/pam ) |
311 |
- ssl? ( dev-libs/openssl:0 ) |
312 |
- tcpd? ( sys-apps/tcp-wrappers ) |
313 |
- tracker? ( app-misc/tracker ) |
314 |
- utils? ( ${PYTHON_DEPS} ) |
315 |
- " |
316 |
-RDEPEND="${CDEPEND} |
317 |
- utils? ( |
318 |
- dev-lang/perl |
319 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
320 |
- )" |
321 |
-DEPEND="${CDEPEND} |
322 |
- virtual/yacc |
323 |
- sys-devel/flex" |
324 |
- |
325 |
-RESTRICT="test" |
326 |
- |
327 |
-REQUIRED_USE=" |
328 |
- ldap? ( acl ) |
329 |
- utils? ( ${PYTHON_REQUIRED_USE} )" |
330 |
- |
331 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
332 |
- |
333 |
-src_prepare() { |
334 |
- if ! use utils; then |
335 |
- sed \ |
336 |
- -e "s:shell_utils::g" \ |
337 |
- -i contrib/Makefile.am || die |
338 |
- fi |
339 |
- autotools-utils_src_prepare |
340 |
-} |
341 |
- |
342 |
-src_configure() { |
343 |
- local myeconfargs=() |
344 |
- |
345 |
- append-flags -fno-strict-aliasing |
346 |
- |
347 |
- if use acl; then |
348 |
- myeconfargs+=( --with-acls $(use_with ldap) ) |
349 |
- else |
350 |
- myeconfargs+=( --without-acls --without-ldap ) |
351 |
- fi |
352 |
- |
353 |
- # Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having |
354 |
- # to sed the Makefiles to not do rc-update. |
355 |
- # TODO: |
356 |
- # systemd : --with-init-style=systemd |
357 |
- myeconfargs+=( |
358 |
- --disable-silent-rules |
359 |
- $(use_enable avahi zeroconf) |
360 |
- $(use_enable debug) |
361 |
- $(use_enable debug debugging) |
362 |
- $(use_enable pgp pgp-uam) |
363 |
- $(use_enable kerberos) |
364 |
- $(use_enable kerberos krbV-uam) |
365 |
- $(use_enable quota) |
366 |
- $(use_enable tcpd tcp-wrappers) |
367 |
- $(use_with cracklib) |
368 |
- $(use_with dbus afpstats) |
369 |
- $(use_with pam) |
370 |
- $(use_with samba smbsharemodes) |
371 |
- $(use_with shadow) |
372 |
- $(use_with ssl ssl-dir) |
373 |
- $(use_with tracker) |
374 |
- $(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g'))) |
375 |
- --enable-overwrite |
376 |
- --disable-krb4-uam |
377 |
- --disable-afs |
378 |
- --with-libevent-header=/usr/include |
379 |
- --with-libevent-lib=/usr/$(get_libdir) |
380 |
- --with-bdb=/usr |
381 |
- --with-uams-path=/usr/$(get_libdir)/${PN} |
382 |
- --disable-silent-rules |
383 |
- --with-init-style=gentoo |
384 |
- --without-libevent |
385 |
- --without-tdb |
386 |
- --with-lockfile=/run/lock/${PN} |
387 |
- ) |
388 |
- autotools-utils_src_configure |
389 |
-} |
390 |
- |
391 |
-src_install() { |
392 |
- autotools-utils_src_install |
393 |
- |
394 |
- if use avahi; then |
395 |
- sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die |
396 |
- else |
397 |
- sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die |
398 |
- fi |
399 |
- |
400 |
- # The pamd file isn't what we need, use pamd_mimic_system |
401 |
- rm -rf "${ED}/etc/pam.d" || die |
402 |
- pamd_mimic_system netatalk auth account password session |
403 |
- |
404 |
- sed \ |
405 |
- -e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \ |
406 |
- -e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \ |
407 |
- distrib/initscripts/service.systemd.tmpl \ |
408 |
- > "${T}"/service.systemd || die |
409 |
- systemd_newunit "${T}"/service.systemd ${PN}.service |
410 |
- |
411 |
- use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats |
412 |
-} |
413 |
- |
414 |
-pkg_postinst() { |
415 |
- local fle v |
416 |
- for v in ${REPLACING_VERSIONS}; do |
417 |
- if ! version_is_at_least 3 ${v}; then |
418 |
- for fle in afp_signature.conf afp_voluuid.conf; do |
419 |
- if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then |
420 |
- if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then |
421 |
- mv \ |
422 |
- "${ROOT}"etc/netatalk/${fle} \ |
423 |
- "${ROOT}"var/lib/netatalk/ |
424 |
- fi |
425 |
- fi |
426 |
- done |
427 |
- |
428 |
- echo "" |
429 |
- elog "Starting from version 3.0 only uses a single init script again" |
430 |
- elog "Please update your runlevels accordingly" |
431 |
- echo "" |
432 |
- elog "Dependencies should be resolved automatically depending on settings" |
433 |
- elog "but please report issues with this on https://bugs.gentoo.org/ if" |
434 |
- elog "you find any." |
435 |
- echo "" |
436 |
- elog "Following config files are obsolete now:" |
437 |
- elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf" |
438 |
- elog "in favour of" |
439 |
- elog "/etc/afp.conf" |
440 |
- echo "" |
441 |
- elog "Please convert your existing configs before you restart your daemon" |
442 |
- echo "" |
443 |
- elog "The new AppleDouble default backend is appledouble = ea" |
444 |
- elog "Existing entries will be updated on access, but can do an offline" |
445 |
- elog "conversion with" |
446 |
- elog "dbd -ruve /path/to/Volume" |
447 |
- echo "" |
448 |
- elog "For general notes on the upgrade, please visit" |
449 |
- elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html" |
450 |
- echo "" |
451 |
- break |
452 |
- fi |
453 |
- done |
454 |
-} |
455 |
|
456 |
diff --git a/net-fs/netatalk/netatalk-3.1.7-r1.ebuild b/net-fs/netatalk/netatalk-3.1.7-r1.ebuild |
457 |
deleted file mode 100644 |
458 |
index a9a7d72..00000000 |
459 |
--- a/net-fs/netatalk/netatalk-3.1.7-r1.ebuild |
460 |
+++ /dev/null |
461 |
@@ -1,183 +0,0 @@ |
462 |
-# Copyright 1999-2016 Gentoo Foundation |
463 |
-# Distributed under the terms of the GNU General Public License v2 |
464 |
-# $Id$ |
465 |
- |
466 |
-EAPI=5 |
467 |
- |
468 |
-PYTHON_COMPAT=( python2_7 ) |
469 |
- |
470 |
-AUTOTOOLS_AUTORECONF=yes |
471 |
- |
472 |
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator |
473 |
- |
474 |
-DESCRIPTION="Open Source AFP server" |
475 |
-HOMEPAGE="http://netatalk.sourceforge.net/" |
476 |
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2" |
477 |
- |
478 |
-LICENSE="GPL-2 BSD" |
479 |
-SLOT="0" |
480 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" |
481 |
-IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils" |
482 |
- |
483 |
-CDEPEND=" |
484 |
- !app-editors/yudit |
485 |
- dev-libs/libevent |
486 |
- >=dev-libs/libgcrypt-1.2.3:0 |
487 |
- sys-apps/coreutils |
488 |
- >=sys-libs/db-4.2.52:= |
489 |
- sys-libs/tdb |
490 |
- acl? ( |
491 |
- sys-apps/attr |
492 |
- sys-apps/acl |
493 |
- ) |
494 |
- avahi? ( net-dns/avahi[dbus] ) |
495 |
- cracklib? ( sys-libs/cracklib ) |
496 |
- dbus? ( sys-apps/dbus dev-libs/dbus-glib ) |
497 |
- kerberos? ( virtual/krb5 ) |
498 |
- ldap? ( net-nds/openldap ) |
499 |
- pam? ( virtual/pam ) |
500 |
- ssl? ( dev-libs/openssl:0 ) |
501 |
- tcpd? ( sys-apps/tcp-wrappers ) |
502 |
- tracker? ( app-misc/tracker ) |
503 |
- utils? ( ${PYTHON_DEPS} ) |
504 |
- " |
505 |
-RDEPEND="${CDEPEND} |
506 |
- utils? ( |
507 |
- dev-lang/perl |
508 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
509 |
- )" |
510 |
-DEPEND="${CDEPEND} |
511 |
- virtual/yacc |
512 |
- sys-devel/flex" |
513 |
- |
514 |
-RESTRICT="test" |
515 |
- |
516 |
-REQUIRED_USE=" |
517 |
- ldap? ( acl ) |
518 |
- utils? ( ${PYTHON_REQUIRED_USE} )" |
519 |
- |
520 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch |
521 |
- "${FILESDIR}"/${P}-zeroconf-prefer-native-Avahi-support.patch ) |
522 |
- |
523 |
-src_prepare() { |
524 |
- if ! use utils; then |
525 |
- sed \ |
526 |
- -e "s:shell_utils::g" \ |
527 |
- -i contrib/Makefile.am || die |
528 |
- fi |
529 |
- autotools-utils_src_prepare |
530 |
-} |
531 |
- |
532 |
-src_configure() { |
533 |
- local myeconfargs=() |
534 |
- |
535 |
- append-flags -fno-strict-aliasing |
536 |
- |
537 |
- if use acl; then |
538 |
- myeconfargs+=( --with-acls $(use_with ldap) ) |
539 |
- else |
540 |
- myeconfargs+=( --without-acls --without-ldap ) |
541 |
- fi |
542 |
- |
543 |
- # Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having |
544 |
- # to sed the Makefiles to not do rc-update. |
545 |
- # TODO: |
546 |
- # systemd : --with-init-style=systemd |
547 |
- myeconfargs+=( |
548 |
- --disable-silent-rules |
549 |
- $(use_enable avahi zeroconf) |
550 |
- $(use_enable debug) |
551 |
- $(use_enable debug debugging) |
552 |
- $(use_enable pgp pgp-uam) |
553 |
- $(use_enable kerberos) |
554 |
- $(use_enable kerberos krbV-uam) |
555 |
- $(use_enable quota) |
556 |
- $(use_enable tcpd tcp-wrappers) |
557 |
- $(use_with cracklib) |
558 |
- $(use_with dbus afpstats) |
559 |
- $(use_with pam) |
560 |
- $(use_with samba smbsharemodes) |
561 |
- $(use_with shadow) |
562 |
- $(use_with ssl ssl-dir) |
563 |
- $(use_with tracker) |
564 |
- $(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g'))) |
565 |
- --enable-overwrite |
566 |
- --disable-krb4-uam |
567 |
- --disable-afs |
568 |
- --with-libevent-header=/usr/include |
569 |
- --with-libevent-lib=/usr/$(get_libdir) |
570 |
- --with-bdb=/usr |
571 |
- --with-uams-path=/usr/$(get_libdir)/${PN} |
572 |
- --disable-silent-rules |
573 |
- --with-init-style=gentoo |
574 |
- --without-libevent |
575 |
- --without-tdb |
576 |
- --with-lockfile=/run/lock/${PN} |
577 |
- ) |
578 |
- autotools-utils_src_configure |
579 |
-} |
580 |
- |
581 |
-src_install() { |
582 |
- autotools-utils_src_install |
583 |
- |
584 |
- if use avahi; then |
585 |
- sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die |
586 |
- else |
587 |
- sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die |
588 |
- fi |
589 |
- |
590 |
- # The pamd file isn't what we need, use pamd_mimic_system |
591 |
- rm -rf "${ED}/etc/pam.d" || die |
592 |
- pamd_mimic_system netatalk auth account password session |
593 |
- |
594 |
- sed \ |
595 |
- -e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \ |
596 |
- -e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \ |
597 |
- distrib/initscripts/service.systemd.tmpl \ |
598 |
- > "${T}"/service.systemd || die |
599 |
- systemd_newunit "${T}"/service.systemd ${PN}.service |
600 |
- |
601 |
- use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats |
602 |
-} |
603 |
- |
604 |
-pkg_postinst() { |
605 |
- local fle v |
606 |
- for v in ${REPLACING_VERSIONS}; do |
607 |
- if ! version_is_at_least 3 ${v}; then |
608 |
- for fle in afp_signature.conf afp_voluuid.conf; do |
609 |
- if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then |
610 |
- if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then |
611 |
- mv \ |
612 |
- "${ROOT}"etc/netatalk/${fle} \ |
613 |
- "${ROOT}"var/lib/netatalk/ |
614 |
- fi |
615 |
- fi |
616 |
- done |
617 |
- |
618 |
- echo "" |
619 |
- elog "Starting from version 3.0 only uses a single init script again" |
620 |
- elog "Please update your runlevels accordingly" |
621 |
- echo "" |
622 |
- elog "Dependencies should be resolved automatically depending on settings" |
623 |
- elog "but please report issues with this on https://bugs.gentoo.org/ if" |
624 |
- elog "you find any." |
625 |
- echo "" |
626 |
- elog "Following config files are obsolete now:" |
627 |
- elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf" |
628 |
- elog "in favour of" |
629 |
- elog "/etc/afp.conf" |
630 |
- echo "" |
631 |
- elog "Please convert your existing configs before you restart your daemon" |
632 |
- echo "" |
633 |
- elog "The new AppleDouble default backend is appledouble = ea" |
634 |
- elog "Existing entries will be updated on access, but can do an offline" |
635 |
- elog "conversion with" |
636 |
- elog "dbd -ruve /path/to/Volume" |
637 |
- echo "" |
638 |
- elog "For general notes on the upgrade, please visit" |
639 |
- elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html" |
640 |
- echo "" |
641 |
- break |
642 |
- fi |
643 |
- done |
644 |
-} |