net-fs/netatalk: Version Bump, #504520

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 204 insertions, 18 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 47330556b210..85fe3988b7fa 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.107 2014/03/01 22:29:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.108 2014/03/14 07:41:07 jlec Exp $
+
+*netatalk-3.1.1 (14 Mar 2014)
+
+  14 Mar 2014; Justin Lecher <jlec@gentoo.org> +netatalk-3.1.1.ebuild:
+  Version Bump, #504520
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> netatalk-2.2.1-r3.ebuild,
   netatalk-2.2.3.ebuild, netatalk-2.2.5.ebuild, netatalk-3.0.5-r1.ebuild,
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 84b3fd2de286..c16fef7c726b 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX afpd.init.3 549 SHA256 3583467680406b993602c90e83a7faf8d1ba8612944e99eb66dd3e9a00437799 SHA512 6f2cec35054bd9251821e41a02f1fa941bac7d5173be13eda7d02f407e194cc825473ff39850691a6759968b158a5b0058b34baed2058235eaa1d51984a689bd WHIRLPOOL 42c96babe4405a713c1a712e3ee1a6cd483634a5626f9be586a4a3f69310a54e6f7b4e5853512b43b04ab16a54d854a7be865663ced83fee0f94362edd8fa1d6
 AUX atalk_service.init.2 327 SHA256 1592e048af693af36a1c010779eb98f356774ad92c4a41a6199edfe88603c9a2 SHA512 ee96b0ed113760ba44a4f6217fc04d90a77f3f3aa884cbb9cfedeaa821f0a936523bd3937b3bbbaf34e63f9aae1b7490e09053298abc301714b75aa79e54fa82 WHIRLPOOL fcd8d63af0df3b009b16d3f0dba987b1a4709bc9f7befcde2374df0e7672a4decdf2dcc7dce974599ec80e1c4194c34c6ab1310b5a713a169821db8f34054965
@@ -17,29 +17,31 @@ DIST netatalk-2.2.3.tar.bz2 1288642 SHA256 b088e6cc6237f7ad98af65812a74bcc830a2d
 DIST netatalk-2.2.5.tar.bz2 1290761 SHA256 7658afc793ab36f1cda7df5719598acbf366e213e27be1cbbc2d93631c368869 SHA512 77a9b0a49825a0803dfbf16ebf8df0efd7b9244f6cdaed6755936c0af8a62ccb834cac30d47d205ce378bbfb91cf11590eef88896f1d48e6ddbaa8b45e71c612 WHIRLPOOL 1c3c68e9bb7b12f3443c7cbcbc20dc2e77df419f74616998023a26639903c31446f407f7b33f92652aa0e7ebc0fd5a3a0fd4e73219b3bdc13d28b94fd7732e7b
 DIST netatalk-3.0.5.tar.bz2 1713998 SHA256 884247728b56b510347785f576be2df76afb293649870c4cd7fdb3048a64b4a9 SHA512 255bfe379a95949872b0c6d6836617d14701c9a11a5ec838242076696f3cb82158b7459d7a15eec350b3c74ed14c2174c3ac06db6fb9d12a810bd568fa5b3d6a WHIRLPOOL e41ac0f622c5cb0e32b31ab58a858bd5d32ffbd7d0607858a742b9b1f7cfd93295b1e332276ece4d743b41fa7db481dde9e1a5887becdd7d0d64ff3831b3fbad
 DIST netatalk-3.1.0.tar.bz2 1802913 SHA256 18626e1674e4eace896ece44f06650e75f70130f4bf5403dd17152ad3d620db5 SHA512 3f71508c27fabf7fdc25a109857448fcabf6526444a4288a7b40eb62f79e05e27cd11ba43bd9835b3a26b62d452b47898c11f9b6b6c666d2e3df89755ecfb2dc WHIRLPOOL 585afa397695729f8b8bb9f78d89fc3d727e501a1a6d0295bce298be085d63093169f0332d3c42c0e440685d2abb6ce159900e69d9074a53b2e6541fd3ec626c
+DIST netatalk-3.1.1.tar.bz2 1789482 SHA256 1b4e45871d9f17a9b72ddbc6e1978eebd3c729ba2eeffa4ec3b710e023c07727 SHA512 e15ebb71d70b47181adfbc262998fd7d41adfec7bc07a4ffac0b4c51bf6968f696bd15136f10a9fc9f950a174346b940003e06d64a0d5d96c846878ae8c7c8ed WHIRLPOOL 7e293651b6ffb8527872115db27c4eb1ec4e99f4c50b44b845cc1a4388571b230dd782a160a06e8659d98dd3bd17505128cb35f37c1ba2166ea341e6eab0c8dc
 EBUILD netatalk-2.2.1-r3.ebuild 4375 SHA256 cf0d878b47ec580eeebfe39999eaaf280dbdd5724025ba97dc18ae7977a9f7b1 SHA512 0137bc319f49726023fd3316f797ba1c2e347ee080f17964918e7c9704e7f4c4f2bfcbde53cea484f0d89ab4ef228af71495046584f9acb88ff562775d3e27db WHIRLPOOL c70ad2f6a63e827f82398db0dc1e1b12492acd221e051e8a614c13c81406d95cdf84619a41e6aa60272c7a870d474b1f0f54f18afce667cbd6a45c7c157b5c19
 EBUILD netatalk-2.2.3.ebuild 4392 SHA256 5d99d0287aaecb27a274480e9449174bc78bedc5d6db30b5d2a4e8f702838ec1 SHA512 051f822be63b3ce585d952b38e1806666834a92bd755485947ca35ede7c1919bc4d01434ae81b3a8aff26fcce1c3d6cbcf2c320b0d81d35c59db852a9772b66a WHIRLPOOL f1dfcc5589a180472d1ec0bc47240f5f71570e9875fac67d57070a5d516d1fbca629a7e97ac8f7046d59fc1fb4ba9b2bbf3613c33770c5cbffaff823390c3016
 EBUILD netatalk-2.2.5.ebuild 4390 SHA256 d03c994582c773cf9735b85d9615d1e0fb4245c70025053d7f1f29e6aa93070e SHA512 8aefcbd65b301a52beeeff0d57bbc4136d3efda7d56e959546d763868550f304de2847ed52d8be6c3642857c3e18949fd9093518478358be28b19274ae2e3283 WHIRLPOOL db4e6f080b2c18e699af870d7e53475450efb9189b29be1a2e85058e096cb2a995f15e6b15af9ea968e5fbf8fa1529fbed5d30a7d44f474a088c16ff37e5d3ce
 EBUILD netatalk-3.0.5-r1.ebuild 4521 SHA256 5a57d6e81236774914e8302efcf13e6f581bc6e0be67f9f50050ad8f8600a2d2 SHA512 e091a33bcfdcef207d3075d6794b51307e70b51669e2f30caa76c098d4a70c9ec6ddd8452239e13b3822bb493cfd0c44af9a0f67e47a2dc07cc9ec1dfa9b88c1 WHIRLPOOL c4d2b6ba484e5402e406f0742898345ec41c1ed5e0146a77246063dfed97acb9bb5f6abea5dc869d2f919f29e485aedac2d7786d9f28f8d117920cfcb2f44ada
 EBUILD netatalk-3.1.0-r1.ebuild 4963 SHA256 f957d18b3f9a1e350c492b4b6150b4ff674465ffb9587cbdfc797d57465cdec1 SHA512 a96bc78c591386ef0dfa3a881ba915423272a2d4d2ef00c4bb202a684e1fa77f2c879315fcf1fe8fae26e582ff42ea0890ee35f936adad0fd6c372dc49a730f2 WHIRLPOOL 1d657d6f6ec4f227e03fd3ddcac61cb8d9d284a7affe4b8fc902815f3126f75d647606c8371a88c23e7f84ab2417fb1520f8d5c318039b0c7c69870915fe8d10
-MISC ChangeLog 18421 SHA256 baf84375b02f60983248b8dda877eca6a9a1cd4e9241cfcf3b00976aa2c0d031 SHA512 ce45c4d00db1bfadc3d549740874f4ef64b02c83dba6efce5e2fc9e2d42480280b741fbb62d180c32b40edc67d0dc4b94e2215c410333455f4e89f0c996850c5 WHIRLPOOL c5cedf2e7217409256c22558c604b038bbfdfd3216965a7b79b80567ae2c6d26af54eb3988c5859b5982d07b17ce43202db2c8c10337a7cee839a523be0cbf32
+EBUILD netatalk-3.1.1.ebuild 4965 SHA256 8d8fc1c57690356961cccb1237c0058fdb2185d6c9e0efefbdf43f4f74caae69 SHA512 a0a17183faace9665fe976ce791a75099c9274bd8130eb7bd282561c0b3f49c9768aedf0ddd7985637bd748bff5b93ae2070654a708495291751f3dfd22e677c WHIRLPOOL 00f8fb854c855cd8c0e21e011cc53a1d53f97adad8a636b93d807ca956062f491705db4fa0e2bcfefc183b6f572b16ac89dbeb4d4d702d203ab989481ba806b0
+MISC ChangeLog 18546 SHA256 83094dc112e54f697a5e0affe84a45f484991183527f764ef89ee16e1fd6305c SHA512 8ccefeb74d3d40e0562068b1d7319a58e76f08e7a886de2afeffa6f3c12d9816462dc560e0b14c113f08ae85e4888caec82c0f85a4420fee75d839cec064c07f WHIRLPOOL c76ca7f410315ecd931e6c7d6177c070e942187510915f05757e8c5ee2279eafd7efdccb83f14ff70bbd8494d29a7472203f9e6e162c4340cd197a8aeb87bdc7
 MISC metadata.xml 1247 SHA256 e749aa01e28ac562bbb01a0b4f0fa890da57bd6f4a1e22ad91fc75bbc4fe8a76 SHA512 ce9f9f8da7fddc03389b2abcf9cdadb9e796417589eb8d6451fae69799409ca8fa4dc219509187e3dfc8ed3668ed4cf2029ad1103443a57c61a7011ff0c23b3c WHIRLPOOL 8afea3162c4300881a535fa75ce3ef7f81e9661a34976b01b8837b7df3f59ada0426a83c2baf4bb05221c76e43b58a6a79de82ac9fb0b02c146baa108b8d539c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTEl9eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOiOoP/i3EFmXMuRt7zDbQSw1iNpSF
-wy8fwJ/piT1x63vrYJeBE45+NKv2cU7IPeLnn3VEX/mo/lHVnoACR9HCYFqQ3DBu
-yPzKZVhpdSkFmanzT2umoQIX8OoNJK3UqcMN0XH5nKTQ18zNg95/jbOjQJkxk9H8
-GOqh9h5Q0Cfh6TYnkhWuSgbfjfzsZRo/pSnx05TqOCKeAbNxQkZcNt4uAqd6yikR
-/jNzv6l3ZRva8mBe2pAsDeVRvmFjT/5k1tK5b9OOhc29FpbENM2zYP5fPTdtrG36
-6Lging+4Crp0g/jNxyj1bWkznEuVI+8eW8x2hVG34jr9s+yCejCBpnv2psgNgEkX
-0xb3ZXm0F+53/qPjHfqRUMMQNgK18CCko5rjZIxDp31/JCdKPFOeJyLf04qhnrwX
-mROOTpynk8vSAViCYpzVpTG+cGtfEwwxOfC0iC7AhBKtWnWd0/SmhsFqdEk6R4hE
-duJtAp2nuPDdTWzzc6jIwkMyP6F5gWoOwi/Zrr3D/cRyiUhUpDz1jwMcS0v3U5Bx
-uMWa4zORuqwKHf27tf7e/+A8ifcPjUNg6EaLG06dqdL/QLXgvMYWg6PkJ52JjJy+
-RhTRXSaQvqFJHm76W3ThJcFgZk4rhCv3xWHik/8FNZ/nQb/soBOWIzY4E9POYeqh
-GlCvctfCh4U8w1tPil6E
-=psoC
+iQJ8BAEBCgBmBQJTIrKUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirHNsP/1N1qTUT2SGlR1s2YyATqTW4
+e8V00m7+GeSCnsHwwqLPm1q8hi2YItFpqvSAPT8WZqrmTgwnBWoh71MPCDap17I9
+9SFBmtunp5gf2RrVzcA81sMXg06KWWWog4GQcyhAECn68ant9ONqTYW0q6sI9zw3
+Ob5nuGh/T5PL5Za7WLdcMaCYsKYkvzllU5teKOnG7xScCFnf93m5hzN36T2se8WL
+jz86ag1ygf4IfAX3WyZRTjuyioAQmQ8uCiVyKpXx1UAhntTtOzUD46bwbQW6iMMC
+moAU2lQ2+CUEDOq8OcZA1II0fJcPAjojPDo4k3VnMIapg7kiqfnRr1kh/yEx5urG
+CPk5CWVQiSvOJFmCbVk4tmFXeQ+RsZevsVnGdFqObTrp+oki8gq/karJHlnEanCW
+KAuO2eUTgBPunqol1ACOjC9HPoukE7dU7HUvsMI8thHLOzjTpnaNc6MwEDMJnyn5
+G6EA6Sp3202iYo4SJSYkBtb9GKdY9UOSK0Hmmm2ZFByFAhNX31CRXxU/6KefK+HS
+hqcZZ93cTqIw/JQaJRH76UN2A2b6WRvT11tNEvALRqjG252AWZZT4K+KYSY8G/kf
+nXKc/ofvIwGpmvzaIwa6MYLsQM8KDhFDknxOdc8C/ql+JJHCDzJf5KMLDeO9ZBQP
+ub9GfofkckERpCgl3D5z
+=+qEj
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/netatalk-3.1.1.ebuild b/net-fs/netatalk/netatalk-3.1.1.ebuild
new file mode 100644
index 000000000000..d739843f58dc
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.1.1.ebuild,v 1.1 2014/03/14 07:41:07 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
+
+DESCRIPTION="Open Source AFP server"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
+
+CDEPEND="
+	!app-editors/yudit
+	dev-libs/libevent
+	>=dev-libs/libgcrypt-1.2.3:0
+	sys-apps/coreutils
+	>=sys-libs/db-4.2.52
+	sys-libs/tdb
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	avahi? ( net-dns/avahi[dbus,-mdnsresponder-compat] )
+	cracklib? ( sys-libs/cracklib )
+	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tracker? ( app-misc/tracker )
+	utils? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${CDEPEND}
+	utils? (
+		dev-lang/perl
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	)"
+DEPEND="${CDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+
+RESTRICT="test"
+
+REQUIRED_USE="
+	ldap? ( acl )
+	utils? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.0-gentoo.patch )
+
+src_prepare() {
+	if ! use utils; then
+		sed \
+			-e "s:shell_utils::g" \
+			-i contrib/Makefile.am || die
+	fi
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=()
+
+	append-flags -fno-strict-aliasing
+
+	if use acl; then
+		myeconfargs+=( --with-acls $(use_with ldap) )
+	else
+		myeconfargs+=( --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 dbus afpstats)
+		$(use_with pam)
+		$(use_with samba smbsharemodes)
+		$(use_with shadow)
+		$(use_with ssl ssl-dir)
+		$(use_with tracker)
+		$(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
+		--enable-overwrite
+		--disable-krb4-uam
+		--disable-afs
+		--with-libevent-header=/usr/include
+		--with-libevent-lib=/usr/$(get_libdir)
+		--with-bdb=/usr
+		--with-uams-path=/usr/$(get_libdir)/${PN}
+		--disable-silent-rules
+		--with-init-style=gentoo
+		--without-libevent
+		--without-tdb
+		--with-lockfile=/run/lock/${PN}
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use avahi; then
+		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
+	else
+		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
+	fi
+
+	# The pamd file isn't what we need, use pamd_mimic_system
+	rm -rf "${ED}/etc/pam.d" || die
+	pamd_mimic_system netatalk auth account password session
+
+	sed \
+		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
+		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
+		distrib/initscripts/service.systemd.tmpl \
+		> "${T}"/service.systemd || die
+	systemd_newunit "${T}"/service.systemd ${PN}.service
+
+	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
+}
+
+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
+}