net-fs/netatalk: Version Bump. #454464

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 175 insertions, 34 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 55162dc8c504..bfe48e0ff33b 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.90 2012/10/07 13:18:02 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.91 2013/01/29 13:48:50 jlec Exp $
+
+*netatalk-3.0.2 (29 Jan 2013)
+
+  29 Jan 2013; Justin Lecher <jlec@gentoo.org> netatalk-3.0.1.ebuild,
+  +netatalk-3.0.2.ebuild, metadata.xml:
+  Version Bump. #454464
 
   07 Oct 2012; Ulrich Müller <ulm@gentoo.org> netatalk-2.2.1-r3.ebuild,
   netatalk-2.2.3.ebuild, netatalk-3.0.ebuild, netatalk-3.0.1.ebuild:
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 08f87957b65a..841bcc047178 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -14,27 +14,19 @@ AUX netatalk.init 339 SHA256 fbd73f6315d2e72c7768a222654635a7033797374624eeb0dac
 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.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.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
-EBUILD netatalk-3.0.1.ebuild 3862 SHA256 caff5f8ed45fd53043f59bdd226cb04564293955b2adb2b80c9ed4e8f6edb08d SHA512 dd3e852891c23357dbbfcc7d7e50866ec37e042d3d18d62a3dbcaf756d74920c573adf2ddeecc0403ad47b00c719f64709da708357596a4440242e343a0d2145 WHIRLPOOL 984728ec17efab5b528f90995e31630e31b2f6a662f52725ed4592a1eaae80ca771c261fa212bbb2af4c6087dac07e0a7380069a30ca698cd038fe3c72d66124
+EBUILD netatalk-3.0.1.ebuild 3877 SHA256 9b5949c5dfe8542489267cf93cb7c2ff7215520f9c601089543a4758fc6f0f6e SHA512 a857952d4a9096f047e05ab321068a2c38a0bd26779c087007f79bfc8d60ec51292dda43d1dce52ecc56d3a6751e2c62e8acdd9f188db90174b726735578041d WHIRLPOOL 8cbef038f08eefceb27b4075eb0997a63d35c37ce884e250c703186d0116e8c9fab59f77a67a70c0fd28b1b1cd4dc26e0324a08f17b14466159173d81d86a4ea
+EBUILD netatalk-3.0.2.ebuild 3884 SHA256 94fa72acffdf5298d4260e6372a0b3d82568136a349d6f58da4278c14083762b SHA512 1b8b9103d2ab4e49e142210a61d6a3857f9f7eae8d6f8158f057d1adb6bc2698bf95bf15df436e7b1365a9ec12b2a02ac0dbb41a07e254921b7b20e78189c90b WHIRLPOOL c0e7abbd91f6c72eb11b631058ead86ab999766e3585fe4062c7ca079511824d30973f6dea7d284820a02e9b4fdfdf60aac453cb3a95d951c4a32a8c83e17bbd
 EBUILD netatalk-3.0.ebuild 3738 SHA256 2c6f60bd2f9394ba2c4d09c1c8ee0940400d64f52cc5d0da96a887907b14f3a0 SHA512 fd3aff9596e6334841dcfbb6141027c98a413b442722f6e54f5ccfe4aa173ab65a50e1b98dfff13c2f22b4b3f1d67849db59e2b72c472d2fd75771cda10fb539 WHIRLPOOL 8e9a21548cd87b46ba7a6f9b9e59cb975f5e99aca6d9d9aa67cf1647fdf9a170d871d1f71ae2587738934db3e0f4e808b06caf119851029d46e871a3f17edfe8
-MISC ChangeLog 15268 SHA256 75c937cdc4175a1a7628c1fef882222457a3412691d7e4b4e7ecd02510590dd5 SHA512 1535a03c0a8bede9ee810332543827e6cc3103d52b428ec8b38d3f6bb49d02580561b6963cc11a3694a205be321b3f6b28fb4435072276333077296e522d03f4 WHIRLPOOL d02b0f99cd07403dabb078b6bc9d4e4216c69559103e0a00558d129ae1a7d19464f5d9852e559e6813bf006dc6f81920198204e80b21b0bd2db7dff02a2b3b7b
-MISC metadata.xml 1087 SHA256 96259ebef2dfc90225c952b18146a3224ccb85374441c946865661826c14829d SHA512 e9336c19f587969a2eb9b6deff748af0232c086c67ad3a419bae43aa2cfc94d1ff996f6b26051fe7771fc80131e7abea9532709c0b64d86824cfa450e82749b4 WHIRLPOOL 6c57b2450a6ebc68b2b68e60ddf9d8c7ef50b9fe4b0e75b3fdb6be3d38f04645a498482fc377da9722ab01feab96d72159d18c4507795c504373445bd99ea36d
+MISC ChangeLog 15435 SHA256 6e99f67b37b8a56f88e10931d235b39e4c29d4f83844238576a78ec349da1635 SHA512 c0f8263b447c20c5240c9c0dd8b04353402b26bd129251a83dd295640b3fca6f0c99d7a4fe6e8c21edad219b6d2e2bd1b6aa0528522d4dbf8aeda85814633606 WHIRLPOOL d110fe33252c309d49519d9e4f9f3ac9c4bb826d99429e31b1f5940bfb14a56b73ccd4b8878216b5b9decd948376b7d0bed450de71b9dadea7794509c8372953
+MISC metadata.xml 1108 SHA256 408d2fe9ff728ef1ae9d4ef925be15bf1be623b3777e4656bb7b431124776aee SHA512 be215b445a3fb581a9c5d5e7c62ac6b0b4de0e71931e3cb899a72f69d4713fc844a7c55fb08a4a2a8a7e46d08659a5f2bb010cdbf24d61618469b4c6ff9b9bf0 WHIRLPOOL 85fc7d3e9d9fab6ab2ccf99afe711e54c5f82c2aeeee45bf4b9b3995e3839627da8cc065c7e7abdff247ea4aab11c3a345b40a3a094e5f167c90e6e2e1f6a34e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQcYM5AAoJEDxpGckxwJCBdJgP+QHImBCe6NxbrhIIzY2K/87x
-uC2GMwvU54N+G1UtWFPHf23nb9wdxWk+XO/+rfdvSGWM/SvJ0dgwotY83UGWVYgh
-cZmldwqtPiUMRtxA7IGLb/Fxf2eorTKmz4skDxTg0fwImvEXwAQO83WJO67CyIdr
-59Vv+qr50/lFcTEhICy3BVm1LOZlgp+SQWRRbruxcldOvN2HgrP9Smv54HulHx9D
-kKBZ0gd/5yRbW6VhgNnnyISviLK5+2amcokuJ1l624og5w7NP5Uk1Lf+fu0gf7eb
-Z/MCwxePYXZM0jJUYRUVPdJ6mB5DhNs8fReAXuppu1KZ+ItwOzVoSrZHzR7BPrQf
-OaEm9F6N7J9Tw2Ip9rkhwgTRiSnr5ZSJlv46imFxDHkVgot5iCNvs56BIUwt0rCv
-PWIHFcknNLFExbYO/eUXvR83PzVdEPw7sy6U4Z/ssgjyKGRXO1oPpMp0IhNLFwMx
-weohQR5wfoq+BXqUo6vz+FlFuDSE+TX20aDooJ32JJNJbCs7pezas5hOSGofz6k4
-m3t+UBlrYLJTtXt2H/hOI8kpXjatAPdLJBho2yAa0RdRFwwD+p9KxTix9OtZZ0Kj
-MruVQtqlJnZnNvDotxlwdPm/gjeqbeAdv6pwpgn/e5y1CAxuKiBu0IH0o81uYy0i
-cg1OWPb+vBBVWdMCCLsV
-=X1yl
+iEYEAREIAAYFAlEH00MACgkQgAnW8HDreRbfYQCgl/zwc1zwarw7FE1Ic6d7yDHM
+lOUAnizw/YQS7/7fgLSC0qRQ/wM6AcOe
+=1K2H
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
index ab4f17bdcfc1..3d3fd3cc9ba9 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/metadata.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-fs</herd>
-	<maintainer restrict="&gt;=net-fs/netatalk-2.2.1-r1">
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="appletalk">
+  <herd>net-fs</herd>
+  <maintainer restrict="&gt;=net-fs/netatalk-2.2.1-r1">
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="appletalk">
 			Build support for Apple's AppleTalk (DDP) protocol and its
 			utilities (atalkd, timelord, papd).
 		</flag>
-		<flag name="cups">
+    <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>
-		<flag name="pgp">
+    <flag name="pgp">
 			Add support pgp authentication module
 		</flag>
-		<flag name="pgp">
+    <flag name="pgp">
 			Add support pgp authentication module
 		</flag>
-		<flag name="quota">
+    <flag name="quota">
 			Add support for user quota on various filesystems.
 		</flag>
-		<flag name="shadow">
+    <flag name="shadow">
 			Add shadow support
 		</flag>
-		<flag name="ssl">
+    <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>
-	</use>
+  </use>
 </pkgmetadata>
diff --git a/net-fs/netatalk/netatalk-3.0.1.ebuild b/net-fs/netatalk/netatalk-3.0.1.ebuild
index a40b5bb83d73..50d72e0c889f 100644
--- a/net-fs/netatalk/netatalk-3.0.1.ebuild
+++ b/net-fs/netatalk/netatalk-3.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.1.ebuild,v 1.2 2012/10/07 13:18:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.0.1.ebuild,v 1.3 2013/01/29 13:48:50 jlec Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit autotools-utils flag-o-matic multilib pam
 
 DESCRIPTION="Open Source AFP server"
 HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
diff --git a/net-fs/netatalk/netatalk-3.0.2.ebuild b/net-fs/netatalk/netatalk-3.0.2.ebuild
new file mode 100644
index 000000000000..3791bf41aa16
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.0.2.ebuild
@@ -0,0 +1,143 @@
+# 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.2.ebuild,v 1.1 2013/01/29 13:48:50 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils flag-o-matic multilib pam
+
+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"
+
+RDEPEND="
+	!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 )
+	"
+DEPEND="${RDEPEND}"
+PDEPEND="sys-apps/openrc"
+
+RESTRICT="test"
+
+REQUIRED_USE="ldap? ( acl )"
+
+DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/DEVELOPER )
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.1-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
+		--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
+}
+
+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
+}