diff options
| -rw-r--r-- | net-fs/netatalk/ChangeLog | 10 | ||||
| -rw-r--r-- | net-fs/netatalk/Manifest | 31 | ||||
| -rw-r--r-- | net-fs/netatalk/files/netatalk-3.0-gentoo.patch | 144 | ||||
| -rw-r--r-- | net-fs/netatalk/files/netatalk.init | 13 | ||||
| -rw-r--r-- | net-fs/netatalk/metadata.xml | 36 | ||||
| -rw-r--r-- | net-fs/netatalk/netatalk-2.0.5-r1.ebuild | 94 | ||||
| -rw-r--r-- | net-fs/netatalk/netatalk-2.2.1-r3.ebuild | 31 | ||||
| -rw-r--r-- | net-fs/netatalk/netatalk-2.2.2.ebuild | 153 | ||||
| -rw-r--r-- | net-fs/netatalk/netatalk-2.2.3.ebuild | 31 | ||||
| -rw-r--r-- | net-fs/netatalk/netatalk-3.0.ebuild | 138 |
10 files changed, 370 insertions, 311 deletions
diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog index 662ccba24e07..b956da63b18c 100644 --- a/net-fs/netatalk/ChangeLog +++ b/net-fs/netatalk/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-fs/netatalk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.86 2012/07/29 16:13:28 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.87 2012/09/10 14:28:03 jlec Exp $ + +*netatalk-3.0 (10 Sep 2012) + + 10 Sep 2012; Justin Lecher <jlec@gentoo.org> -netatalk-2.0.5-r1.ebuild, + netatalk-2.2.1-r3.ebuild, -netatalk-2.2.2.ebuild, netatalk-2.2.3.ebuild, + +netatalk-3.0.ebuild, +files/netatalk-3.0-gentoo.patch, +files/netatalk.init, + metadata.xml: + Version Bump, #427732; removed old 29 Jul 2012; Raúl Porcel <armin76@gentoo.org> netatalk-2.2.1-r3.ebuild: sh/sparc stable wrt #411291 diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest index 40e3ae0f8c03..56097b235e69 100644 --- a/net-fs/netatalk/Manifest +++ b/net-fs/netatalk/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX afpd.init.3 549 SHA256 3583467680406b993602c90e83a7faf8d1ba8612944e99eb66dd3e9a00437799 SHA512 6f2cec35054bd9251821e41a02f1fa941bac7d5173be13eda7d02f407e194cc825473ff39850691a6759968b158a5b0058b34baed2058235eaa1d51984a689bd WHIRLPOOL 42c96babe4405a713c1a712e3ee1a6cd483634a5626f9be586a4a3f69310a54e6f7b4e5853512b43b04ab16a54d854a7be865663ced83fee0f94362edd8fa1d6 AUX atalk_service.init.2 327 SHA256 1592e048af693af36a1c010779eb98f356774ad92c4a41a6199edfe88603c9a2 SHA512 ee96b0ed113760ba44a4f6217fc04d90a77f3f3aa884cbb9cfedeaa821f0a936523bd3937b3bbbaf34e63f9aae1b7490e09053298abc301714b75aa79e54fa82 WHIRLPOOL fcd8d63af0df3b009b16d3f0dba987b1a4709bc9f7befcde2374df0e7672a4decdf2dcc7dce974599ec80e1c4194c34c6ab1310b5a713a169821db8f34054965 @@ -8,20 +8,21 @@ AUX cnid_metad.init.2 408 SHA256 60fca490208ac2e5331da8384b4353a869e345b6bd8d99c AUX netatalk-2.0.5-control-pam.patch 997 SHA256 4cf74450782f9f6395436d1d433d4d4662ea63fad48961dacec76adafdd35f47 SHA512 ce7f11af30ef0aab99123ab54ce6051b26dda6a38febae817900aa63defa910900ca2271aa7a9f75ea1ff08b04a9bf83e1b9de4369302b10a377b161b890d440 WHIRLPOOL 3bce00685aba344dbfb3efbe052eaa26fee0aee176b1832ae18a470ee74c892669afda3678dab9bb2b09ba1b41cac0ffec0c5910eb7790bee194d22247d1ac2a AUX netatalk-2.2.1-gentoo.patch 3476 SHA256 23fd2cb02789191ddc38b867f3cc76373e096a9a1150c64563534afa8922b529 SHA512 cb8dd6de6dae6f4461730186fbbb1f5476e66ff0e08ee8b99e31065a5cb9c26d1fc0210ce49aebc20bdc7c6fedc1b5963294c14be3479ad3af0882a07db96fe4 WHIRLPOOL 14c426f57ea7aa9f2bc8c9ab998a19cca3ca99850dd8c4bdfd93f22d39151c390c4ec31d744b4995e3f5cae0e71efe3aff349fa769caf542d41243657d8c5de4 AUX netatalk-2.2.2-gentoo.patch 3562 SHA256 74b82bcd703a381016e87c67af24243a52ebc0672101adfec3434a621cc0df10 SHA512 51bcb8418a5e63e23dd88db2f73510f0e04807c31b8c5c8456ec84c2ccd6f0e3247e76e0933442762a937e0d186a62dd3a811b8127ea65f73dae4259fce6a17c WHIRLPOOL 10a9325dd31ed463ceea1c7865152da056e7bdd27b3fff73bb052f015d8e3514033a2d89876c513a2bb72f2fd0849aa00887d30af99b8e3ead6d8e16a32a8a68 -DIST netatalk-2.0.5.tar.bz2 993882 SHA256 aa11b26ad5c6cfb6043458fc849ed82b13b6d13219191a6335fce1bc76288b37 -DIST netatalk-2.2.1.tar.bz2 1227602 SHA256 3ab81c6335f8c33fd01ae599459a26c8cfe3b975009ce73640cae823ddc78bbf -DIST netatalk-2.2.2.tar.bz2 1239433 SHA256 443031b90d9dd6270d98659d210f408437d8e71e8094d6f0b71706a5c481e3a0 -DIST netatalk-2.2.3.tar.bz2 1288642 SHA256 b088e6cc6237f7ad98af65812a74bcc830a2d4aebeea71cfd932ace8ef93132c -EBUILD netatalk-2.0.5-r1.ebuild 2958 SHA256 118c0091d6cec839697db7e160ab02c26c142bd9cab7f34c5073795d13aabbd0 SHA512 c5daa6a01f920144119c1f478ee4ec517f713f06d0a4437e5aa43dce485038bc3bac431358b9213e695858ab5e8a27f32f0a961a707f4e543cef04af4418bc47 WHIRLPOOL 8200e4bff6547f0fbfb16d2087b8826ffed1baa53f87c291c729e53aa40c146c098d1ec527c001c0c3c674d867787c54acd5074c96efb8cb78eefca21961b252 -EBUILD netatalk-2.2.1-r3.ebuild 4406 SHA256 98745ec3ba2eab16f39bec93d2219fee9fe5e081b2e05edefbc435f022c2fb28 SHA512 6f1e9c05b4cf6e92b16b39ffe7b8d455b256b2823a6410d34a9f8f1d9f7d0e8e1827236f4d19abd38e002b4ddee02ad8e96f2bed989de1fec55e4f981d5d37a3 WHIRLPOOL 53f39f66986cca68e7c94b9371108b18cc0d53847657b9289ddf8e6f76d8c8443449b4054d41e40ce3170150a798240eb40a8f04894aab12b00640d6d0695027 -EBUILD netatalk-2.2.2.ebuild 4410 SHA256 1fac7f070d4ce924653980b5457cac878e9bc9831ab083ea1bea62d17130b93b SHA512 e593af7a1b38b1935a6681b65060040e12578be1d92c4b3e0a6cd3a39d9b840226518042c46513d639ee7c6a4a1699662c56a69050ab93c627c60a08c472b79b WHIRLPOOL 660742546be465d5496a15a20f8604542de1330dc809edc846b91c57e1e5fc7af71da624cc195c110f0cbef4e2e9e40d59cef3aa6c6bae04cfb4cf146fdc1bb2 -EBUILD netatalk-2.2.3.ebuild 4424 SHA256 a776cf9032cbc9257193cb01e32d1bebc8bad146143b5e8549cdb3f6904e5923 SHA512 02cd5bd2804dcc931131905dee8f210c16306911ea3bfb88c7e7e3cf3e6482c41520c9324295558031647953067774a5ec212a9aefbb8068f9d014e241c73c73 WHIRLPOOL 319310a131d17005637b928d23af3b63fa9edb75dc43845d4a5a43ae10a3477bb983552a2fdb3c624743e215a193d6b07eca2d22aa9951f95e80c0859082c256 -MISC ChangeLog 14468 SHA256 2e7339de5ee67d836f98bc0f2d1be4f8a5ab2bced2ebde5932491841ccb54aed SHA512 2da0250f94255d6ed9e7a9fc1afcd554a28f2c2ad44fcec786569b84c9b0219f6634d155e004dad96690e9b27e6fac5563ba23f47068fa68493a890ac4fd1717 WHIRLPOOL 09be092fef3d4839367a9704cdeb880e8bd0717408ef18a5958ab47e5925cf14caf0a5f52e4b8d25f2f24adc08dd8f6400745405eeae51921e9d2e7feb189758 -MISC metadata.xml 980 SHA256 efe2e7a76f5cd8fc8846c103ec9e0e814c2663330d4bd5101541d6ea48df459a SHA512 e6e0e86b6afef7672248f7fd5220367b07eb67c6455a19ed0f3efbd1ea96b4ab0b4ca6dd65f55a9e0bc014d7047f0fb778cc1185ab3584037b5e44124ec2cce1 WHIRLPOOL 54e6c0bb70c94de34392a4c30ab01297e1ee4905bab66c7eea69e1e06088251f01931cf90d7bb0194b5e698303d6c5f8d288007bdd4d2567713037a681292bb1 +AUX netatalk-3.0-gentoo.patch 5538 SHA256 b9a8be8e0efe21d69d75ed8943d72b836edbd2f4dde7230d104bef1f3e6de1ab SHA512 96282f0f0e494cd4d462d8565276bec0aa9c57e3362602f4173acfe1429a8e4c93589a213c55d6167544b3c73ab33e5170e9186d8abc1b10feb3d3223ed6274c WHIRLPOOL 4d755cd85db2474bf3522bfc0a9d48bc133bd8df949ecd5a658ba6cf1f71ef84409ed97e966505ee94818136409400963cae6c03ccd59e17b9c3a59bdb68e18e +AUX netatalk.init 339 SHA256 fbd73f6315d2e72c7768a222654635a7033797374624eeb0dac2f319a8d1aa33 SHA512 26b4d26ea77d7774351c13ddd71724aa5f21801b8edbbb2dc6a1975c3a6cb6164ae9aacf3046c36e8b94dafd370b1503e8939ce8ce02f26c9f6802eee302e83d WHIRLPOOL 949d181565a0b13effaa72b8213245557d8e9af295405e7e0a2ce210f0ef8dff4ee345a12d37acd393900924bfdaed0a1c922b9f2047335c0e6672c1d38ed4ca +DIST netatalk-2.2.1.tar.bz2 1227602 SHA256 3ab81c6335f8c33fd01ae599459a26c8cfe3b975009ce73640cae823ddc78bbf SHA512 1a487f7a4f56d1b4e5a9e8c961ac8de0ff7148e33e45cd1bf268cfcd35ecf70fc55c1ddcb4c4ba421b3a96c34cd57eed5518c9e6733495aaefd04b6a5719b683 WHIRLPOOL c5cf18d21986d08d8f81fe5681722cdb58d9ce79071d0870c5c2c079172a509727381ae077e54d01a3f73e3b38e01ba94c407b51ffdc09be09492ff0b2cdf038 +DIST netatalk-2.2.3.tar.bz2 1288642 SHA256 b088e6cc6237f7ad98af65812a74bcc830a2d4aebeea71cfd932ace8ef93132c SHA512 ecadbc6129efc8f7518b6221beeadf1623e934fe23889a993e57275e9d1417359cbcd6cbb552985c7b54f3fc5b3dc959ed006ab03a5b2c5ab5fa098c3ec2b596 WHIRLPOOL d3bd1b5f3154dc5497d5f68ef157ffb46d096d8bd95204989a142b4cde4fdb134469d1cea1cdb9545a8497fecd6b13198f3862fe9d2e17516d8d52bef2b66749 +DIST netatalk-3.0.tar.bz2 1628026 SHA256 b7babbc986dbd6f0fca55103637de6947892b29287cb7cfbbaaa77dea3ead54c SHA512 690fa21a72ef1ef119b930cf9aba160dff6e780a7e9aa4668f962d232d00abc21b8b256c1eef99e2a977ddd286fed7405c6b704da27036a4fa89397cf9ad446b WHIRLPOOL ac81c1cc1ec06e5c13dbbf7a688b946f79e846cfa587a187ab088569ed9bbd887f206c4d10016bd86f685420712382ed8f47ce189ee392ab03e797df04651c36 +EBUILD netatalk-2.2.1-r3.ebuild 4393 SHA256 dd4260a41f82eb2aa52f49d627ab047e2b67235d872bc51e6e33f62d5c15bc10 SHA512 e62dc7d44e41c60fe7907ff65347ed8bee5d03c7e95193ae677c70daa0065d13af37ad2df361633af5c0c1b05ed139153f0b151195d671ec3e6c7c0252262136 WHIRLPOOL 514de01217057ccceafbe800730bb729766bf8749cc735cb05ccfd680da0c4c26aaf7b79030274614cc87cd75d41057a81c5efa6767dadeecc6c140bf771792c +EBUILD netatalk-2.2.3.ebuild 4411 SHA256 0ea8e8f655cf86620cec89d39fdfa8aac5aa7023aa734e2f96637a5199701df8 SHA512 c874a50bf1bf96cd17e95c533947922806b3e57043318df7d34be80044aa6a9249e6f8e322b02851786dc5d7b5d9cbe87de1ca7f1a1c3c99f0720c1e6eab7caa WHIRLPOOL 2c5d9bbeded245bdd8f66b54e5f648210305660bffec355a39946f5e0afe639dfb1537a3eccb4df1df04808614b8145e9cfcfc4c9f01420e9d1cac54362e0098 +EBUILD netatalk-3.0.ebuild 3755 SHA256 cba7fca9b3fcc17d890c4425e19f67781e2927f31d2190249acbfa2e27323164 SHA512 ea68a0bf8b799ff09ce08865d8130ce57d899459916be366aebb11a401d852d2edc1424ddca2e7f996fffad7044fd9c173f74650a4e93c9f125d95fb5f08edae WHIRLPOOL 12d007c88d992af674b5a3f069370f9d986aefb63da61898a62dd66066df081a675ffe7e060db9815fdcfd5944786d312f6e75f60fd9a20f14a41c2aadcff906 +MISC ChangeLog 14777 SHA256 e0789684725c6ecee1a1ba889bebd126342448cf4eb863632b1418b30d953062 SHA512 54c983a2ee509aa460ccd46d0a50c6ed26998c9008b6343d62e139815bc97cf69e598b7ad3ae3985281451eafbbf586973612297575f02f95807110d8f9cb420 WHIRLPOOL 1795cec9c8f1709019eabf32b4d75587994b12f0a1113f8516950edba830375f8b1eecc20d215d2e5e49be1f0d807078eeec33c3565edcc2ac9b0d3fffd5de29 +MISC metadata.xml 1087 SHA256 96259ebef2dfc90225c952b18146a3224ccb85374441c946865661826c14829d SHA512 e9336c19f587969a2eb9b6deff748af0232c086c67ad3a419bae43aa2cfc94d1ff996f6b26051fe7771fc80131e7abea9532709c0b64d86824cfa450e82749b4 WHIRLPOOL 6c57b2450a6ebc68b2b68e60ddf9d8c7ef50b9fe4b0e75b3fdb6be3d38f04645a498482fc377da9722ab01feab96d72159d18c4507795c504373445bd99ea36d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) +Comment: GPGTools - http://gpgtools.org -iEYEARECAAYFAlAVYS4ACgkQuQc30/atMkB7WACeMoQlQeltEP73qO3BJfWVnxyA -VjoAoKQoKD2C/AbKRiUylTb2vhBOLXhf -=C73b +iEYEAREIAAYFAlBN+PkACgkQgAnW8HDreRaWzQCgrCZUKoYWlcGIVUXqexg0sM9g +oFIAnjSwpOJx94DVy1EqdTYAC63aj+qx +=ub2G -----END PGP SIGNATURE----- diff --git a/net-fs/netatalk/files/netatalk-3.0-gentoo.patch b/net-fs/netatalk/files/netatalk-3.0-gentoo.patch new file mode 100644 index 000000000000..5f85830d8081 --- /dev/null +++ b/net-fs/netatalk/files/netatalk-3.0-gentoo.patch @@ -0,0 +1,144 @@ + Makefile.am | 8 +------- + etc/afpd/afp_avahi.c | 2 +- + etc/netatalk/Makefile.am | 4 +++- + etc/uams/Makefile.am | 20 ++++++++++---------- + libatalk/dsi/Makefile.am | 1 + + libatalk/vfs/Makefile.am | 1 + + macros/netatalk.m4 | 16 ++++++++-------- + 7 files changed, 25 insertions(+), 27 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 448375a..67ea35f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + # Makefile.am for top level of netatalk package + +-SUBDIRS = libatalk libevent bin config etc man contrib distrib include doc macros test ++SUBDIRS = libatalk bin config etc man contrib distrib include doc macros test + + EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION + +@@ -11,9 +11,3 @@ if USE_BUILTIN_LIBEVENT + SUBDIRS += libevent + endif + +-if RUN_LDCONFIG +-install-exec-hook: +- @printf "Running ldconfig to ensure libraries installed in system library directories are added to the dynamic linker cache ... " +- @-@NETA_LDCONFIG@ +- @printf "done\n" +-endif +diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c +index 5218d51..b68c266 100644 +--- a/etc/afpd/afp_avahi.c ++++ b/etc/afpd/afp_avahi.c +@@ -174,8 +174,8 @@ static void register_stuff(void) { + return; + + fail: +- time(NULL); + // avahi_threaded_poll_quit(ctx->threaded_poll); ++ return; + } + + /* Called when publishing of service data completes */ +diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am +index 10f90ce..e524602 100644 +--- a/etc/netatalk/Makefile.am ++++ b/etc/netatalk/Makefile.am +@@ -20,4 +20,6 @@ netatalk_CFLAGS += \ + + netatalk_LDADD += \ + $(top_builddir)/libevent/libevent.la +-endif +\ No newline at end of file ++else ++netatalk_LDADD += $(LIBEVENT_LIBS) ++endif +diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am +index 3a02b83..70a2f76 100644 +--- a/etc/uams/Makefile.am ++++ b/etc/uams/Makefile.am +@@ -95,16 +95,16 @@ uams_dhx_pam_la_CFLAGS = @SSL_CFLAGS@ @PAM_CFLAGS@ + uams_dhx2_pam_la_CFLAGS = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@ + uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@ + +-uams_guest_la_LDFLAGS = -module -avoid-version +-uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@ +-uams_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ +-uams_pam_la_LDFLAGS = -module -avoid-version @PAM_LIBS@ +-uams_pgp_la_LDFLAGS = -module -avoid-version @SSL_LIBS@ +-uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ +-uams_dhx_pam_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@ +-uams_dhx2_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@ +-uams_dhx2_pam_la_LDFLAGS = -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@ +-uams_gss_la_LDFLAGS = -module -avoid-version @GSSAPI_LIBS@ ++uams_guest_la_LDFLAGS = -shared -module -avoid-version ++uams_randnum_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@ ++uams_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ ++uams_pam_la_LDFLAGS = -shared -module -avoid-version @PAM_LIBS@ ++uams_pgp_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@ ++uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ ++uams_dhx_pam_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@ ++uams_dhx2_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@ ++uams_dhx2_pam_la_LDFLAGS = -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@ ++uams_gss_la_LDFLAGS = -shared -module -avoid-version @GSSAPI_LIBS@ + + # + # module compilation +diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am +index 34fa76e..757c458 100644 +--- a/libatalk/dsi/Makefile.am ++++ b/libatalk/dsi/Makefile.am +@@ -7,3 +7,4 @@ LIBS = @LIBS@ + noinst_LTLIBRARIES = libdsi.la + + 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 ++libdsi_la_LIBADD = $(WRAP_LIBS) +diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am +index aa62aeb..8ac2045 100644 +--- a/libatalk/vfs/Makefile.am ++++ b/libatalk/vfs/Makefile.am +@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea_ad.c ea_sys.c extattr.c + + if HAVE_ACLS + libvfs_la_SOURCES += acl.c ++libvfs_la_LIBADD = $(ACL_LIBS) + endif +diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 +index 3e57077..c02d750 100644 +--- a/macros/netatalk.m4 ++++ b/macros/netatalk.m4 +@@ -19,15 +19,16 @@ AC_DEFUN([AC_NETATALK_LIBEVENT], [ + AC_ARG_ENABLE( + bundled-libevent, + [AS_HELP_STRING([--disable-bundled-libevent],[whether the bundled version of libevent shall not be used (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version) +- ])], +- use_bundled_libevent=$enableval, +- use_bundled_libevent=yes ++ ])] + ) + +- if test x"$use_bundled_libevent" = x"yes" ; then +- AC_CONFIG_SUBDIRS([libevent]) +- fi +- AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes") ++ AS_IF([test x"$enable_bundled_libevent" != x"no"], ++ [AC_CONFIG_SUBDIRS([libevent]) ++ AC_MSG_RESULT([no])], ++ [AC_MSG_RESULT([yes]) ++ PKG_CHECK_MODULES([LIBEVENT], [libevent])]) ++ ++ AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$enable_bundled_libevent" != x"no") + ]) + + dnl Filesystem Hierarchy Standard (FHS) compatibility +@@ -605,7 +606,6 @@ save_CFLAGS="$CFLAGS" + save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" + CFLAGS="" +-LDFLAGS="" + LIBS="" + LDAP_CFLAGS="" + LDAP_LDFLAGS="" diff --git a/net-fs/netatalk/files/netatalk.init b/net-fs/netatalk/files/netatalk.init new file mode 100644 index 000000000000..4b9410abcfee --- /dev/null +++ b/net-fs/netatalk/files/netatalk.init @@ -0,0 +1,13 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/netatalk.init,v 1.1 2012/09/10 14:28:03 jlec Exp $ + +command="/usr/sbin/${SVCNAME}" + +depend() { + need net + need avahi-daemon + use logger dns + after entropy +} diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml index 7291e5f40b7d..ab4f17bdcfc1 100644 --- a/net-fs/netatalk/metadata.xml +++ b/net-fs/netatalk/metadata.xml @@ -7,22 +7,30 @@ </maintainer> <use> <flag name="appletalk"> - Build support for Apple's AppleTalk (DDP) protocol and its - utilities (atalkd, timelord, papd). - </flag> + Build support for Apple's AppleTalk (DDP) protocol and its + utilities (atalkd, timelord, papd). + </flag> <flag name="cups"> - Add support for <pkg>net-print/cups</pkg> printers in papd. This - flag is only considered if appletalk USE flag is enabled, and is - otherwise ignored. - </flag> + Add support for <pkg>net-print/cups</pkg> printers in papd. This + flag is only considered if appletalk USE flag is enabled, and is + otherwise ignored. + </flag> + <flag name="pgp"> + Add support pgp authentication module + </flag> + <flag name="pgp"> + Add support pgp authentication module + </flag> <flag name="quota"> - Add support for user quota on various filesystems. - </flag> + Add support for user quota on various filesystems. + </flag> + <flag name="shadow"> + Add shadow support + </flag> <flag name="ssl"> - Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access - Modules. These are not used with most recent versions of OS X - and can be kept disabled without risks. - </flag> - <flag name="xfs">Enable support for XFS Quota</flag> + Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access + Modules. These are not used with most recent versions of OS X + and can be kept disabled without risks. + </flag> </use> </pkgmetadata> diff --git a/net-fs/netatalk/netatalk-2.0.5-r1.ebuild b/net-fs/netatalk/netatalk-2.0.5-r1.ebuild deleted file mode 100644 index 7663ae42114f..000000000000 --- a/net-fs/netatalk/netatalk-2.0.5-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.5-r1.ebuild,v 1.9 2010/10/15 02:05:39 vapier Exp $ - -EAPI=2 - -inherit eutils pam - -DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite" -HOMEPAGE="http://netatalk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="cracklib cups debug kerberos pam slp ssl tcpd xfs" - -RDEPEND=">=sys-libs/db-4.2.52 - cracklib? ( sys-libs/cracklib ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - tcpd? ( sys-apps/tcp-wrappers ) - slp? ( net-libs/openslp ) - cups? ( net-print/cups ) - kerberos? ( virtual/krb5 ) - >=sys-apps/coreutils-7.1 - !app-text/yudit" -DEPEND="${RDEPEND} - xfs? ( sys-fs/xfsprogs )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-control-pam.patch - - # until someone that understands their config script build - # system gets a patch pushed upstream to make - # --enable-srvloc passed to configure also add slpd to the - # use line on the initscript, we'll need to do it this way - if use slp ; then - sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \ - distrib/initscripts/rc.atalk.gentoo.tmpl || die - fi -} - -src_configure() { - if ! use xfs ; then - eval $(printf '%s\n' {linux,xfs}/{dqblk_xfs,libxfs,xqm,xfs_fs}.h | \ - sed -e 's:[/.]:_:g' -e 's:^:export ac_cv_header_:' -e 's:$:=no:') - fi - - # Ignore --enable-gentoo, we install the init.d by hand and we avoid having - # to sed the Makefiles to not do rc-update. - # --enable-shadow: let build system detect shadow.h in toolchain - econf \ - $(use_with pam) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable tcpd tcp-wrappers) \ - $(use_enable kerberos krbV-uam) \ - --disable-krb4-uam \ - $(use_enable slp srvloc) \ - $(use_with ssl ssl-dir) \ - $(use_with cracklib) \ - $(use_with slp srvloc) \ - --disable-afs \ - --enable-fhs \ - --with-bdb=/usr -} - -src_compile() { - emake || die - - # Create the init script manually (it's more messy to --enable-gentoo) - emake -C distrib/initscripts rc.atalk.gentoo || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc CONTRIBUTORS NEWS README TODO VERSION - - newinitd distrib/initscripts/rc.atalk.gentoo atalk || die - - # The pamd file isn't what we need, use pamd_mimic_system - rm -rf "${D}/etc/pam.d" - pamd_mimic_system netatalk auth account password session - - # Move /usr/include/netatalk to /usr/include/netatalk2 to avoid collisions - # with /usr/include/netatalk/at.h provided by glibc (strange, uh?) - # Packages that wants to link to netatalk should then probably change the - # includepath then, but right now, nothing uses netatalk. - # On a side note, it also solves collisions with freebsd-lib and other libcs - mv "${D}"/usr/include/netatalk{,2} || die - sed -e 's/include <netatalk/include <netatalk2/g' \ - -i "${D}"usr/include/{netatalk2,atalk}/* || die -} diff --git a/net-fs/netatalk/netatalk-2.2.1-r3.ebuild b/net-fs/netatalk/netatalk-2.2.1-r3.ebuild index 6d03f35c5d91..7667693b2943 100644 --- a/net-fs/netatalk/netatalk-2.2.1-r3.ebuild +++ b/net-fs/netatalk/netatalk-2.2.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r3.ebuild,v 1.8 2012/07/29 16:13:28 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r3.ebuild,v 1.9 2012/09/10 14:28:03 jlec Exp $ EAPI="4" @@ -16,30 +16,27 @@ SLOT="0" KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd" -RDEPEND=">=sys-libs/db-4.2.52 - avahi? ( net-dns/avahi[dbus] ) - cracklib? ( sys-libs/cracklib ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - tcpd? ( sys-apps/tcp-wrappers ) - slp? ( net-libs/openslp ) - kerberos? ( virtual/krb5 ) - >=sys-apps/coreutils-7.1 +RDEPEND=" !app-text/yudit dev-libs/libgcrypt - appletalk? ( - cups? ( net-print/cups ) - ) + sys-apps/coreutils + >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) - ldap? ( - net-nds/openldap - ) + appletalk? ( cups? ( net-print/cups ) ) + avahi? ( net-dns/avahi[dbus] ) + cracklib? ( sys-libs/cracklib ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + pam? ( virtual/pam ) + slp? ( net-libs/openslp ) + ssl? ( dev-libs/openssl ) + tcpd? ( sys-apps/tcp-wrappers ) " DEPEND="${RDEPEND}" -RDEPEND="sys-apps/openrc" +PDEPEND="sys-apps/openrc" REQUIRED_USE="ldap? ( acl )" diff --git a/net-fs/netatalk/netatalk-2.2.2.ebuild b/net-fs/netatalk/netatalk-2.2.2.ebuild deleted file mode 100644 index 808f714cc46a..000000000000 --- a/net-fs/netatalk/netatalk-2.2.2.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.2.ebuild,v 1.2 2012/06/26 04:40:58 zmedico Exp $ - -EAPI="4" - -inherit pam eutils flag-o-matic multilib autotools - -RESTRICT="test" -DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities" -HOMEPAGE="http://netatalk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd" - -RDEPEND=">=sys-libs/db-4.2.52 - avahi? ( net-dns/avahi[dbus] ) - cracklib? ( sys-libs/cracklib ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - tcpd? ( sys-apps/tcp-wrappers ) - slp? ( net-libs/openslp ) - kerberos? ( virtual/krb5 ) - >=sys-apps/coreutils-7.1 - !app-text/yudit - dev-libs/libgcrypt - appletalk? ( - cups? ( net-print/cups ) - ) - acl? ( - sys-apps/attr - sys-apps/acl - ) - ldap? ( - net-nds/openldap - ) - " -DEPEND="${RDEPEND}" -RDEPEND="sys-apps/openrc" - -REQUIRED_USE="ldap? ( acl )" - -DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - eautoreconf -} - -src_configure() { - local myconf= - - if use appletalk; then - myconf+=" --enable-ddp --enable-timelord $(use_enable cups)" - else - myconf+=" --disable-ddp --disable-timelord --disable-cups" - fi - - if use acl; then - myconf+=" --with-acls $(use_with ldap)" - else - myconf+=" --without-acls --without-ldap" - fi - - append-flags -fno-strict-aliasing - - # Ignore --enable-gentoo, we install the init.d by hand and we avoid having - # to sed the Makefiles to not do rc-update. - econf \ - $(use_enable avahi zeroconf) \ - $(use_enable debug) \ - $(use_enable kerberos krbV-uam) \ - $(use_enable quota) \ - $(use_enable slp srvloc) \ - $(use_enable static-libs static) \ - $(use_enable tcpd tcp-wrappers) \ - $(use_with cracklib) \ - $(use_with pam) \ - $(use_with ssl ssl-dir) \ - --disable-krb4-uam \ - --disable-afs \ - --enable-fhs \ - --with-bdb=/usr \ - ${myconf} -} - -src_install() { - default - - newinitd "${FILESDIR}"/afpd.init.3 afpd - newinitd "${FILESDIR}"/cnid_metad.init.2 cnid_metad - - if use appletalk; then - newinitd "${FILESDIR}"/atalkd.init atalkd - newinitd "${FILESDIR}"/atalk_service.init.2 timelord - newinitd "${FILESDIR}"/atalk_service.init.2 papd - fi - - use avahi || sed -i -e '/need avahi-daemon/d' "${D}"/etc/init.d/afpd - use slp || sed -i -e '/need slpd/d' "${D}"/etc/init.d/afpd - - use ldap || rm "${D}"/etc/netatalk/afp_ldap.conf - - rm "${D}"/etc/netatalk/netatalk.conf - - # The pamd file isn't what we need, use pamd_mimic_system - rm -rf "${D}/etc/pam.d" - pamd_mimic_system netatalk auth account password session - - # Move /usr/include/netatalk to /usr/include/netatalk2 to avoid collisions - # with /usr/include/netatalk/at.h provided by glibc (strange, uh?) - # Packages that wants to link to netatalk should then probably change the - # includepath then, but right now, nothing uses netatalk. - # On a side note, it also solves collisions with freebsd-lib and other libcs - mv "${D}"/usr/include/netatalk{,2} || die - sed -i \ - -e 's/include <netatalk/include <netatalk2/g' \ - "${D}"usr/include/{netatalk2,atalk}/* || die - - # These are not used at all, as the uams are loaded with their .so - # extension. - rm "${D}"/usr/$(get_libdir)/netatalk/*.la - - use static-libs || rm "${D}"/usr/$(get_libdir)/*.la -} - -pkg_postinst() { - elog "Starting from version 2.2.1-r1 the netatalk init script has been split" - elog "into different services depending on what you need to start." - elog "This was done to make sure that all services are started and reported" - elog "properly." - elog "" - elog "The new services are:" - elog " cnid_metad" - elog " afpd" - if use appletalk; then - elog " atalkd" - elog " timelord" - elog " papd" - fi - elog "" - elog "Dependencies should be resolved automatically depending on settings" - elog "but please report issues with this on https://bugs.gentoo.org/ if" - elog "you find any." - elog "" - elog "The old configuration file /etc/netatalk/netatalk.conf is no longer" - elog "installed, and will be ignored. The new configuration is supposed" - elog "to be done through individual /etc/conf.d files, for everything that" - elog "cannot be set already through their respective configuration files." -} diff --git a/net-fs/netatalk/netatalk-2.2.3.ebuild b/net-fs/netatalk/netatalk-2.2.3.ebuild index 59ee5c7aa872..a2ba387ebb58 100644 --- a/net-fs/netatalk/netatalk-2.2.3.ebuild +++ b/net-fs/netatalk/netatalk-2.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.3.ebuild,v 1.2 2012/06/26 04:40:58 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.3.ebuild,v 1.3 2012/09/10 14:28:03 jlec Exp $ EAPI="4" @@ -15,30 +15,27 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd" -RDEPEND=">=sys-libs/db-4.2.52 - avahi? ( net-dns/avahi[dbus] ) - cracklib? ( sys-libs/cracklib ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - tcpd? ( sys-apps/tcp-wrappers ) - slp? ( net-libs/openslp ) - kerberos? ( virtual/krb5 ) - >=sys-apps/coreutils-7.1 +RDEPEND=" !app-text/yudit dev-libs/libgcrypt - appletalk? ( - cups? ( net-print/cups ) - ) + sys-apps/coreutils + >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) - ldap? ( - net-nds/openldap - ) + appletalk? ( cups? ( net-print/cups ) ) + avahi? ( net-dns/avahi[dbus] ) + cracklib? ( sys-libs/cracklib ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + pam? ( virtual/pam ) + slp? ( net-libs/openslp ) + ssl? ( dev-libs/openssl ) + tcpd? ( sys-apps/tcp-wrappers ) " DEPEND="${RDEPEND}" -RDEPEND="sys-apps/openrc" +PDEPEND="sys-apps/openrc" RESTRICT="test" diff --git a/net-fs/netatalk/netatalk-3.0.ebuild b/net-fs/netatalk/netatalk-3.0.ebuild new file mode 100644 index 000000000000..a9abfb17f7d6 --- /dev/null +++ b/net-fs/netatalk/netatalk-3.0.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.0.ebuild,v 1.1 2012/09/10 14:28:03 jlec Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes + +inherit autotools-utils flag-o-matic multilib pam + +DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities" +HOMEPAGE="http://netatalk.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="acl avahi cracklib debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tcpd" + +RDEPEND=" + !app-text/yudit + dev-libs/libgcrypt + sys-apps/coreutils + >=sys-libs/db-4.2.52 + acl? ( + sys-apps/attr + sys-apps/acl + ) + avahi? ( net-dns/avahi[dbus] ) + cracklib? ( sys-libs/cracklib ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + pam? ( virtual/pam ) + ssl? ( dev-libs/openssl ) + tcpd? ( sys-apps/tcp-wrappers ) + " +DEPEND="${RDEPEND}" +PDEPEND="sys-apps/openrc" + +RESTRICT="test" + +REQUIRED_USE="ldap? ( acl )" + +DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/DEVELOPER ) + +PATCHES=( "${FILESDIR}"/${PN}-3.0-gentoo.patch ) + +src_configure() { + local myeconfargs=() + + append-flags -fno-strict-aliasing + + if use acl; then + myconf+=( --with-acls $(use_with ldap) ) + else + myconf+=( --without-acls --without-ldap ) + fi + + # Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having + # to sed the Makefiles to not do rc-update. + # TODO: + # systemd : --with-init-style=systemd + myeconfargs+=( + --disable-silent-rules + $(use_enable avahi zeroconf) + $(use_enable debug) + $(use_enable debug debugging) + $(use_enable pgp pgp-uam) + $(use_enable kerberos) + $(use_enable kerberos krbV-uam) + $(use_enable quota) + $(use_enable tcpd tcp-wrappers) + $(use_with cracklib) + $(use_with pam) + $(use_with samba smbsharemodes) + $(use_with shadow) + $(use_with ssl ssl-dir) + --enable-overwrite + --disable-krb4-uam + --disable-afs + --disable-bundled-libevent + --with-bdb=/usr + --with-uams-path=/usr/$(get_libdir)/${PN} + --disable-silent-rules + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + newinitd "${FILESDIR}"/${PN}.init ${PN} + + use avahi || sed -i -e '/need avahi-daemon/d' "${D}"/etc/init.d/${PN} + + # The pamd file isn't what we need, use pamd_mimic_system + rm -rf "${D}/etc/pam.d" + pamd_mimic_system netatalk auth account password session +} + +pkg_postinst() { + local fle + if [[ ${REPLACING_VERSIONS} < 3 ]]; then + for fle in afp_signature.conf afp_voluuid.conf; do + if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then + if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then + mv \ + "${ROOT}"etc/netatalk/${fle} \ + "${ROOT}"var/lib/netatalk/ + fi + fi + done + + echo "" + elog "Starting from version 3.0 only uses a single init script again" + elog "Please update your runlevels accordingly" + echo "" + elog "Dependencies should be resolved automatically depending on settings" + elog "but please report issues with this on https://bugs.gentoo.org/ if" + elog "you find any." + echo "" + elog "Following config files are obsolete now:" + elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf" + elog "in favour of" + elog "/etc/afp.conf" + echo "" + elog "Please convert your existing configs before you restart your daemon" + echo "" + elog "The new AppleDouble default backend is appledouble = ea" + elog "Existing entries will be updated on access, but can do an offline" + elog "conversion with" + elog "dbd -ruve /path/to/Volume" + echo "" + elog "For general notes on the upgrade, please visit" + elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html" + echo "" + fi +} |