net-fs/netatalk: Version Bump, #519484

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

3 files changed, 205 insertions, 7 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 2c83f8ad6838..685d22e1eecb 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.110 2014/08/05 11:35:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.111 2014/08/10 11:37:01 jlec Exp $
+
+*netatalk-3.1.4 (10 Aug 2014)
+
+  10 Aug 2014; Justin Lecher <jlec@gentoo.org> +netatalk-3.1.4.ebuild:
+  Version Bump, #519484
 
   05 Aug 2014; Raúl Porcel <armin76@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 93e44ac8b1ab..43c827a53e30 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
@@ -20,6 +20,7 @@ DIST netatalk-3.0.5.tar.bz2 1713998 SHA256 884247728b56b510347785f576be2df76afb2
 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
 DIST netatalk-3.1.3.tar.bz2 1823258 SHA256 e19d289400d7c9600653e2e6155506c00bbd4f5b6fe45f2e53b1843fe15f6b37 SHA512 17082adb4218ba866fb9841bc4e2bbfa977132e1de2cf2fddb4ae8fd6561ab50921f5a23c179fb24b93bf4d59fa6832e9c4182c27ddb2a6d5c66946e98415ba2 WHIRLPOOL 1d635a8c6988dbaf6d3b3ec4e43d5889ffd0952136da4262a959c2bf4028aba95282158a5b6b6b640825e0d72c0668a75beef923ea415c087d79dcd1065ae999
+DIST netatalk-3.1.4.tar.bz2 1821078 SHA256 cac45e24110507d39ac001c73e55835b06c0adc38a82007b53764a6751b2774b SHA512 9b71fc354733f3bc31e0cc4e3ad80f5691d2ed8512ed2a7ec49b3f3d27500a8ca6c3928f70724bc8e49ff1879220bc119afcea1d4d1d5810083e403c723d0d8f WHIRLPOOL c17607edc183295069d500dc02fd38de6f4954b7d2c661909ee9e830d3d39a16e21e1f2969239d1895964fdee627b0dcc79ce29533ee92c3dd6653ee3247bbe3
 EBUILD netatalk-2.2.1-r3.ebuild 4367 SHA256 571e04fffc950c1f6a43fba901ca05df502880af0876ba5fa97cb7753b26d41e SHA512 0fd4ea4c591ddcc196d7e289bb10b2c291d3569e7d0d36acd08858020f71ecf2846c9fcfe01fbe89741e0e3ca238fe00b1dfde1c3770a3d167b4c7f349c19aca WHIRLPOOL 2857bf36f5285761b6eaf2ed82489ba60bd3cbaa5ed43a741549bce774f4d2864aed436aa6ca0fa258b82817b04718e4bf7d5959626a17f4aea7b6359138c3b1
 EBUILD netatalk-2.2.3.ebuild 4382 SHA256 a8e527661d1d41783064f1e8a4cebaf34d5215bd8ce926e4f2f73cfffc1b0d49 SHA512 eeece6919a8daad56df2eb0a98bacca5ea56b2b58233973b2508e35b8745987419da52369b8e2c4b153e6404075e771c3635119fed2cde28d9cf23f2eb990efe WHIRLPOOL f951ec735b4e4ca2688c89075f6e9cec6015a7e8cc9acd1e321a777ecac8012aa7dd19cfcf1d0e4115ca90499bb8c651d5d5d8ed34490717733a7f0941860c40
 EBUILD netatalk-2.2.5.ebuild 4380 SHA256 6a33dc936a17cedbfe72118fd97b04430b2952bae443fca32c352fd9809c37a9 SHA512 815b00278d3588095f0eb9363548644ae919b44b5529c3bd9284b330378209735db350c6908597dcbba54b03a33dc41448a4047aa8894d6b02f165ad6a13786c WHIRLPOOL eefbcc28e8d71519d2268620dca0de7d1b79f35b684994a60904d44d86fbcc24de4bae0c6887f05b0f6a2d18f808f09b259d69de173479ffd755b1649e726c21
@@ -27,12 +28,25 @@ EBUILD netatalk-3.0.5-r1.ebuild 4511 SHA256 8a42209302eeef668e260c46e33d491ea6c6
 EBUILD netatalk-3.1.0-r1.ebuild 4953 SHA256 096dac0e556e9a14c58a4fdb7148b3006dddc031b55dff1407fb1b7546fbf522 SHA512 ad8a951362680281d63dd0a14c001f1efab91a7705b8f062866627cd81d2348b9e42697ee2ad43e5eaf3b3cbc16368828b7c5363fc08e7270d0595a90e900216 WHIRLPOOL 2aa4bfa226243258f8f3c92d4cb8f3ce5c12d3e7ec49638fbec3bb8a24248bc34f4e9ab65ec294fe361d70b5c51ed3f6cd80e2dc91ae07eae0f96f1d9c454716
 EBUILD netatalk-3.1.1.ebuild 4958 SHA256 11c5580561b4421d54e4fd0d374d467c6f7d93b951b2ddfe5de9c943afabe362 SHA512 bc8a155d1176b92baf49e55bdeac8d0632fe6a7324d7ff75d7e5171693a0d385f5ecf5c027f76800da4c7e0f34c5f95ed8bdaf1781c60d9691a1df4bd811a727 WHIRLPOOL e570e517f2e4cb1810e79d8a99f77b31bf139bc30e82f641a7946b21b541b18a0e3e0df3a6174f24ccacb79d887fdcbe5504897e7aa088b9f74ac7ba8b2e1dff
 EBUILD netatalk-3.1.3.ebuild 4946 SHA256 8376860c2ded76726d44678fefab7bd5ab2c3e13a4e1c24ae13b8f7b5cf8ddd8 SHA512 dc74f1b65791ff66db0dd1d4f658e0199dd4951ecaa1e021bb171cdfa10ff0e1d466e481b091af50b204a4e7bad38dfbda538a772d0990f74695aa6699b5a3e1 WHIRLPOOL 1c2eb2ca203834b33d8c168f703ff1b12b9ad6683eae267e6524142d06b955a0b4d8037af8fb813a8d195ef4fe274b6427cc4ac41a424cf9869510d69313d865
-MISC ChangeLog 18963 SHA256 014c490dc9a5e2f94ad1f78154a950091dd9cfe1d6611be415a4159ce3dd51a0 SHA512 0ea119bdd0010e479a6127cc56a96e1df700a709cafa9c9e59302b61c209d069eb6434998a827b9ac6a8d08b54fd52868623b2dc2c84ac4877e14ca6d25f92dc WHIRLPOOL f3a40ca48a0037505e48c14d42c311f3581586d515735e0a8eef52c8ccf885d48f5e988a284b9f59ce9eec5f8ecdfd7e2064f863ee8ea29ed249584fbb499982
+EBUILD netatalk-3.1.4.ebuild 4950 SHA256 a0984a74e878dcbfdb44f1ac38038a56feb36b0c346031744afeab46ca37e910 SHA512 23881cbfa260f03703f9d29548d7f079778eb0d80a67893ee0c00eeeb9f14febcaeecddda5dc3cd806d02b70fe8e83cd182d6a9544c89f22fefbdba4fe56c729 WHIRLPOOL 089eba6d58f521baa1dd1370d360d3c9c00f11cbc7eb25b16b06cb5637778213423582e9a45ae9dcddf404b7d9461ca988a671227027f1e9e5bef63b0c1c5a60
+MISC ChangeLog 19087 SHA256 556fc3ccb2cf308b28851cda10521828aff40cd101803ee273f8489f2eaf5666 SHA512 2d090d6640486772215b2211ade356651bb7457ac1d0f8be9eb32de79b3f1e1011190a39cdf7740fbbe53afc7895c39f7613eb761f00d611f63ecdbc12be5df9 WHIRLPOOL 2688767a954f809ef14ffd0b90d571da6bacef8651bcb8ace3fbc151ff80de220ef36fb6fa19624b1728ea0f2344df87a9f9227d91c77ce2391ce7ad90d9dad1
 MISC metadata.xml 1247 SHA256 e749aa01e28ac562bbb01a0b4f0fa890da57bd6f4a1e22ad91fc75bbc4fe8a76 SHA512 ce9f9f8da7fddc03389b2abcf9cdadb9e796417589eb8d6451fae69799409ca8fa4dc219509187e3dfc8ed3668ed4cf2029ad1103443a57c61a7011ff0c23b3c WHIRLPOOL 8afea3162c4300881a535fa75ce3ef7f81e9661a34976b01b8837b7df3f59ada0426a83c2baf4bb05221c76e43b58a6a79de82ac9fb0b02c146baa108b8d539c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPgwYgACgkQuQc30/atMkBRowCgmPiuzKr13PHAxli/OD3T6Mx7
-lI8AnRIZD4+UJYc0ZEvqq8v9xGDnKtbm
-=AUl5
+iQJ8BAEBCgBmBQJT51ljXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirk5YP/AqDchyLaEGqg/XrjofFx6xs
+SQKful/h8RMNQzbODdgo6TRQTedGJr4/7eXX9qUV516Er8l3/rojTGw1n7zTnr3w
+WplBr6ePAYaJeM51TwJvKgtiO/ZXilHD8zjsFK7CYhMxmWr+a/G+nGkedKHx+m2w
+i8ievKQXbc0mTJGo2yDzjUPuYi+co9FNif00LiA01ncVsA2t1mGGP+jTYmaPBM+4
+WPpPrXQT4RZFp9YypbaIVXYf+fq+9wvFMuqA0sBWxTrXwQLTuRe/HqA+I6Y7znMk
+8KHhrSWZxuuhIDul189MzRuJwx31yRUN3yn82bc/hzibk5mCZnaMmdAAQKPD0Eak
+kl/c8EF/4rjCNs2xWVLmCmr3+viIkxCFZO0ZLBi1thjyupBaxXzRkqyr11h/BnLh
+HasuPp09BkSXnBB/IxsTU2P32IoQFQHAIRVC8YWhZ/Px7zNWyIuwsqec0BZLylHX
+OWUAtb9xf2+bB9kYkF/Nb2gtWUZAOySA3fIX+SM0wr5lh/tiFNY7Ohefh314TbcH
+20FvjC2bKcDxX39JpXk9I5s04jrwlPzMDPIT8KnOJyvRJTUcawi2wtcdyxKXAyMC
+yDUYY7IZnyy54vlmvKarNPmk72dEMZQ9IHFM+D20F3Pwqhgb5nbxC+c3AT08+sas
+ZUnu+5fiEcVcKyPfTL1E
+=BrtP
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/netatalk-3.1.4.ebuild b/net-fs/netatalk/netatalk-3.1.4.ebuild
new file mode 100644
index 000000000000..7af3732ef824
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.4.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.4.ebuild,v 1.1 2014/08/10 11:37:01 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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 ~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.3-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
+}