net-fs/netatalk: Version BUmp, #472316

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 179 insertions, 5 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 68b871991c20..42606b366f8c 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.95 2013/05/29 15:45:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.96 2013/06/05 06:24:04 jlec Exp $
+
+*netatalk-3.0.4 (05 Jun 2013)
+
+  05 Jun 2013; Justin Lecher <jlec@gentoo.org> +netatalk-3.0.4.ebuild:
+  Version BUmp, #472316
 
   29 May 2013; Justin Lecher <jlec@gentoo.org> netatalk-3.0.3.ebuild:
   Fix usage of new python r1 eclasses (missing PYTHON_REQUIRED_USE)
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 02a24757b354..42f9dc56d4ab 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -16,6 +16,7 @@ DIST netatalk-2.2.3.tar.bz2 1288642 SHA256 b088e6cc6237f7ad98af65812a74bcc830a2d
 DIST netatalk-3.0.1.tar.bz2 1633970 SHA256 31f2a30d8eac0de5a8b8beddbd7b3418ba898a0d60b4d20c3ed6b568e91cc203 SHA512 97b0f02716052b1faaa064ec7feb681fd44ac8283c254aa88884d82f1858b5cf015f2a7eec1fbb630c582000064e2a8c9c1329274ce844b5e5a442814386e075 WHIRLPOOL ddf5cbaf936cab13555bbc0cf971ad9d97a7f67bb138fc5955fca47ddc482968e43b791d1556334b9b291be23ae1f4a01f93f7e4b723617c8b22a37c9f307d6a
 DIST netatalk-3.0.2.tar.bz2 1643396 SHA256 0e414e1afae9726f4819aaefd15bd27658fcdf38800b468cbddc5de4247141fe SHA512 6d5e149e6c1fda885fa5e7a927377f2b5248e0bb5695c76f053ea374f001ff6b9c11b4e4962d39843c5d9a62ebac61ed33ee5787e7874a9b15d32eca3edddb9f WHIRLPOOL e1060280251fe4bae621a88ae005b5dda2ed49f737c204254ed74c9739d2c56348cba6e7c7ebe65e78748b552f85c96d1c90294ba52f2d2f440ef981f0730d8e
 DIST netatalk-3.0.3.tar.bz2 1656819 SHA256 e15e30d54ea720dce527555cd1278947ecc22b4dbde051929204e3818cdd1325 SHA512 634de3edb9f452ada07c059e1f94fa9594668da5ea576afef7b331529d6a5126f4f94e81efaca6f84b4f533ce1691bec9f4438afd96fbdbc57726a84f2465672 WHIRLPOOL 62ce2a9263cef575041aefdf8541d2655dd7c2b7498538e273da7c7bd99dc468c29b2a3b75fc80ea2aa1e8dd013f11404b205d60e90f511d0f075b88da6b37e2
+DIST netatalk-3.0.4.tar.bz2 1708476 SHA256 d7c16b8a7917a85dad4bf5c750e19850db94ec9d9b14440493ef64d415da8bf1 SHA512 b01f705655fe6309edb74dc33f362dc4a762c1b5ea8be921128b6517c918bbc920289d380122c13961a041ce77f309619e4a407bed26999550c798822c373bc9 WHIRLPOOL 298b24d766373a27bb428e6b9770be38652be1a2d74aa899b40f36be1e9b005d78f9681b6d25105449c35d8193c358e92ab5daa501d53ccc4c682733a72e1540
 DIST netatalk-3.0.tar.bz2 1628026 SHA256 b7babbc986dbd6f0fca55103637de6947892b29287cb7cfbbaaa77dea3ead54c SHA512 690fa21a72ef1ef119b930cf9aba160dff6e780a7e9aa4668f962d232d00abc21b8b256c1eef99e2a977ddd286fed7405c6b704da27036a4fa89397cf9ad446b WHIRLPOOL ac81c1cc1ec06e5c13dbbf7a688b946f79e846cfa587a187ab088569ed9bbd887f206c4d10016bd86f685420712382ed8f47ce189ee392ab03e797df04651c36
 EBUILD netatalk-2.2.1-r3.ebuild 4396 SHA256 e53f3bc0245aa1b015604b5df6ae3cfbd2e2d7e9d592e86ebaf58929b22c4684 SHA512 5a566c82f06c169c156f63032a3c58b8e53330cc1ec9f6f04a2a79ea5323a5504ba6937b8ae842b2b6fd10a38a89488207aea9dbc5d03a6b821b5ffc669c090e WHIRLPOOL 655610bfd01fc7f472ef818bf5a2389019c922de37db8c67016514be2276db9715ecf1b44423d11fd4599eb3f193b417c557431ee6ca4181bb6cdcf8e5cdb4ea
 EBUILD netatalk-2.2.3.ebuild 4413 SHA256 654ffdde5ae066afc988a533e84564d6f6f06133ddb5dd3385a7642861e8b85d SHA512 fba567c20349cf718a8be02a7051adbd634104782e6536a6fd37e5a8d3393aff55fe0d550b9e419a91f9144632b34eab13f25f5624ff919d3fc948821ee68a54 WHIRLPOOL 954a6886991c535a1d0ea0a13aa6bc4ffd59bf70db2557f2178ef31ae2e1fc411bd736ebef3886eddec3f65de398bec45e7b5ceffbc0333449337d39a12d455c
@@ -24,13 +25,14 @@ EBUILD netatalk-3.0.2-r2.ebuild 4079 SHA256 cc5bc91f1fc58dae2ed04eb2e97903f2f68f
 EBUILD netatalk-3.0.2-r3.ebuild 4089 SHA256 3234e9e12f496cce49fbed3cb321ed639ad6653e0a38c94a4d2fc4464f8d6b37 SHA512 3cb35b4b1e386eb95465ee898547f3f5762a0766f2bb5677713224b90af709e5eb6436f7978bb9de1dd8a8dfb675b74b192d61c4163126f9ab0075736a7648ff WHIRLPOOL 142b70014252490f2331cc9edef4d4ac3494c79d455268cf415ed1e9fbbf75f3864202f462adbb3af9f157ed8f992bb4cf47c0e92a1ca90b847be76b2df40621
 EBUILD netatalk-3.0.2.ebuild 3884 SHA256 94fa72acffdf5298d4260e6372a0b3d82568136a349d6f58da4278c14083762b SHA512 1b8b9103d2ab4e49e142210a61d6a3857f9f7eae8d6f8158f057d1adb6bc2698bf95bf15df436e7b1365a9ec12b2a02ac0dbb41a07e254921b7b20e78189c90b WHIRLPOOL c0e7abbd91f6c72eb11b631058ead86ab999766e3585fe4062c7ca079511824d30973f6dea7d284820a02e9b4fdfdf60aac453cb3a95d951c4a32a8c83e17bbd
 EBUILD netatalk-3.0.3.ebuild 4483 SHA256 ef686227397d25176907318303c23df36c9f2c9643216bfb5de1b96685642098 SHA512 b8d25ad7a2961d8bc25e1e6baba71472106ce3bff6e64e46d06e011f6b2b3d0ed2e364b0300c1ed244825b60fcc4136b4acfd2490e9a54f463c7d521ca22b1f0 WHIRLPOOL cd9a49848f007946b0d3105d4bb7e543e5a49609d81084dd3e2bf7ab08439424a47ca4236033b8a8dcf754a0d16cf580a9f8b42445362bfbdcaeead873a75c53
+EBUILD netatalk-3.0.4.ebuild 4435 SHA256 4a6c8c8989c9e5067096375c4de3d5654eaf9472cad2e3221940ad2a3b0723eb SHA512 077cb1ff38f5646966fd80155863494ca2ea962d5725546aa49d8c402d1f8f78c833226e7ceec13db1c33d011c5d8117f6394929a6860213f73b6207bf9416dd WHIRLPOOL 53df0a0e669ac5f4f71f75ac2c70bf65dc5c7f4a7ac396e4aaff7b46e9ca63f6ae8ea3251dccec15c8b2c57fb47105056aa57e24ad08b5c1dad2155b38212baf
 EBUILD netatalk-3.0.ebuild 3738 SHA256 2c6f60bd2f9394ba2c4d09c1c8ee0940400d64f52cc5d0da96a887907b14f3a0 SHA512 fd3aff9596e6334841dcfbb6141027c98a413b442722f6e54f5ccfe4aa173ab65a50e1b98dfff13c2f22b4b3f1d67849db59e2b72c472d2fd75771cda10fb539 WHIRLPOOL 8e9a21548cd87b46ba7a6f9b9e59cb975f5e99aca6d9d9aa67cf1647fdf9a170d871d1f71ae2587738934db3e0f4e808b06caf119851029d46e871a3f17edfe8
-MISC ChangeLog 16158 SHA256 38eaa6336291a55020e2799a2264374f98d90911ecd11ac4d185984b19ca4c67 SHA512 0d2b7f4eed0b74329c43cf94220d9d23f343f32d7628e95ebffa9586549e29ceccc1e278d1d6bf8cb4c8abd8f572bb9064e9967d58db399c367df5d0ceb7631f WHIRLPOOL a1abc1b80f5c255fcaa8e0692ae85d409da2d991a18f50eca9dedd4d8ab0120d6f820554a0128d22ef67574f767e322a0470b7dba4e5cd4876f8119379e8078d
+MISC ChangeLog 16285 SHA256 755fe4b0be7aaa2255e84a7de972e2b4b6371dede3da9b908081ebbb49f1b426 SHA512 66380be8761860ac835e845e66abfc2fc913365f5a9d7555d5cf8dac882654454511af9b5bbdb93d2980dd799386dda07bdde92287ebe346d29992f7a017240c WHIRLPOOL cc3d78b6a34c1a126fcaa7e453937099534d1f17ceeed68e1e13193456a21770650dc5b3b81bfe9acd8bfd4a7feb70b1b67b330f1dfff53854ebdcfc93dff4ff
 MISC metadata.xml 1169 SHA256 613ed65fadd393571a5e56d860b2664233fc0c744184dd5ee61fad579c08d9ef SHA512 de1490f028008001f0882f0d6e51b632e1b5a132be30daf82a2138625a4f6fd3821a22365f8afbd60cfc1bf644258fb6fb9944f1bf48650935fa1ce11d64d734 WHIRLPOOL 2f37d1940733a9d875a222731394f9dece2df9880be7ae65acc7e900f3d056f758666b1417d205bb06f89204efd3cee89f3b08b6527e7d24da8a9dadd3e5dedc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGmIrYACgkQgAnW8HDreRZR/ACdHvvLR2ZRbR2zZTB/SrGnOvbC
-JbwAmwTThPhVrIOQb5GVaU39UWOZFcMs
-=7qcY
+iEYEAREKAAYFAlGu2YUACgkQgAnW8HDreRZ/vACfQXKsIhIndyDcwoEkLlyxUApC
+T3QAoKjxRGVE6PlfF1rZtRxBfCLwtFH+
+=4t/V
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/netatalk-3.0.4.ebuild b/net-fs/netatalk/netatalk-3.0.4.ebuild
new file mode 100644
index 000000000000..bba6bb80b9c3
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.0.4.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.0.4.ebuild,v 1.1 2013/06/05 06:24:04 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils flag-o-matic multilib pam python-r1 systemd
+
+DESCRIPTION="Open Source AFP server"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${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 +utils"
+
+DEPEND="
+	!app-editors/yudit
+	dev-libs/libevent
+	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 )
+	utils? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}
+	utils? (
+		dev-lang/perl
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	)"
+PDEPEND="sys-apps/openrc"
+
+RESTRICT="test"
+
+REQUIRED_USE="
+	ldap? ( acl )
+	utils? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.1-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 pam)
+		$(use_with samba smbsharemodes)
+		$(use_with shadow)
+		$(use_with ssl ssl-dir)
+		--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
+		)
+	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 "${D}/etc/pam.d"
+	pamd_mimic_system netatalk auth account password session
+
+	sed \
+		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|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
+}