Version bump #279057 and block app-text/yudit #247972.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 136 insertions, 3 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index e36796709d49..d89f4cf3d0b4 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/netatalk
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.55 2009/05/21 20:24:33 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.56 2010/01/10 23:10:39 vapier Exp $
+
+*netatalk-2.0.5 (10 Jan 2010)
+
+  10 Jan 2010; Mike Frysinger <vapier@gentoo.org> +netatalk-2.0.5.ebuild,
+  +files/netatalk-2.0.5-control-pam.patch:
+  Version bump #279057 and block app-text/yudit #247972.
 
   21 May 2009; Brent Baude <ranger@gentoo.org> netatalk-2.0.3-r4.ebuild:
   stable ppc, bug 265037
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 59dd82bcad9a..64171bb2b362 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,8 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX netatalk-2.0.3-db43.patch 1224 RMD160 ee8d1e0f3a5abc07f28d26d266fdb55f791bee91 SHA1 0c7278172da52c48a4f85d4ef8307b50c194f99f SHA256 1b731d6b89beb704a4787a9ec4f6c32e1bec7e39904f3c6edb6100d62659c879
 AUX netatalk-2.0.3-newerdb.patch 1183 RMD160 2ae908649d8fa44c436ab8725b57b7d481baf6f1 SHA1 e7e94bf36285c1839bb2e4bc6c2fca527ab8843d SHA256 ca4b6de8f536ac715e4afd15e06dc57155e443a3033383d61762545b93d4a83c
 AUX netatalk-2.0.3-setXid.patch 545 RMD160 2494b98895e2ea7a685959efce1f45534ee096e1 SHA1 6e86c7d4e80eefecbab548dadcc60b8775ee1960 SHA256 9a148e2e1d8fcb86e3a01ac2172e3e369c6b5081bd6f551296820f463d946e7c
 AUX netatalk-2.0.3-xfs.patch 774 RMD160 167f548f97666755fd428467fbee564ad99d26e5 SHA1 ead0b7cb2e0e623cdcb9656cc407fe6a10967e3e SHA256 dfb181612425dfda8f3b94f4a9f6705cd27be3a65a313f5c39d64dc9bdb391d4
+AUX netatalk-2.0.5-control-pam.patch 997 RMD160 a7b11647dd7827288517fa3c7696a37182ec219e SHA1 113f318c15870c6638da6a8a76033d954ca6b41a SHA256 4cf74450782f9f6395436d1d433d4d4662ea63fad48961dacec76adafdd35f47
 DIST netatalk-2.0.3.tar.bz2 1471804 RMD160 29b763400a45797ac4a8e499d5328aa91a091c91 SHA1 ce2d5dd123467ccae72fc62ca4ee3738019455f2 SHA256 25e004732f471de0dd9a21ab129ee799da018fce3b313d4ab5e6f52e6e9e3998
+DIST netatalk-2.0.5.tar.bz2 993882 RMD160 47247d376bf421652d9f9897c75853424215ae0a SHA1 a38f98abc123b02d26628543e393a4de04481e4f SHA256 aa11b26ad5c6cfb6043458fc849ed82b13b6d13219191a6335fce1bc76288b37
 EBUILD netatalk-2.0.3-r4.ebuild 3021 RMD160 741dad45a10482731139b4d66a799ff5cf7aad66 SHA1 8e0b0678e678ef985e7a72e3259664f773a0719e SHA256 52a16a4edafb58fc63e06a62a173f4a5a8cbe42a8b2c5c64ba7551a88589ae37
-MISC ChangeLog 8876 RMD160 736d9b35c77512dea58aa1b7c0d8ca0131377927 SHA1 87cbc43a1d299f70705a7cb843cbaa84ae6aaee8 SHA256 b2a48f08a00f243e4efbc9b8b9489379cb13adb4f6af0125853ecf1c1cd53874
+EBUILD netatalk-2.0.5.ebuild 2954 RMD160 6887b1be843a2def83dbd2db75a80449e0e47cdd SHA1 2cfa06bbaaae1a36bfdd61acca1155c9512c8fca SHA256 1b945a0e93fad82882a151922fa3a3c84bb73eaf5abffc99527b5d0860f3bddb
+MISC ChangeLog 9082 RMD160 990b6fb6862bd9f77e33267c6e72e5854f3116c0 SHA1 f230851467a6622278aa78fe7ad510493a192f38 SHA256 a63abe4431ab46bb41963a3d67108a133c5db52cd99cccba7103538b4927be03
 MISC metadata.xml 321 RMD160 4cf5a812670dc659b0325e35aa5813f24a8e7499 SHA1 bc376e37383b2f1876644258113fc0e954f8b5f0 SHA256 1f2660dd2dd2f8a210ed6df840e16e23bc9a19d5777a3776cbaecad689bcdeee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAktKXoEACgkQTwhj9JtAlp7hEAD+MtswksJ98L2HdeIoCL9nD4La
+X6BureF9jAr+z18jViAA/RLH1AziUqsRrdlFZPQ+YBMoOrdkGyeuZ8el0UH1o4bl
+=/0QQ
+-----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/netatalk-2.0.5-control-pam.patch b/net-fs/netatalk/files/netatalk-2.0.5-control-pam.patch
new file mode 100644
index 000000000000..4c069dcab258
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.0.5-control-pam.patch
@@ -0,0 +1,23 @@
+don't install the pam.d file if pam is disabled
+
+--- a/configure
++++ b/configure
+@@ -28572,12 +28572,16 @@
+ 		LIBS="$savedLIBS"
+ 	fi
+ 
+-	netatalk_cv_install_pam=yes
+-	if test x"$pam_found" = "xyes" -a "x$PAMDIR" = "xNONE"; then
++	if test "x$require_pam" != "xnever"; then
++		netatalk_cv_install_pam=yes
++	if test x"$pam_found" = "xyes" -a "x$PAMDIR" = "xNONE" ; then
+ 		{ echo "$as_me:$LINENO: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path." >&5
+ echo "$as_me: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path." >&2;}
+ 		netatalk_cv_install_pam=no
+ 	fi
++	else
++		netatalk_cv_install_pam=no
++	fi
+ 
+ 	{ echo "$as_me:$LINENO: checking whether to enable PAM support" >&5
+ echo $ECHO_N "checking whether to enable PAM support... $ECHO_C" >&6; }
diff --git a/net-fs/netatalk/netatalk-2.0.5.ebuild b/net-fs/netatalk/netatalk-2.0.5.ebuild
new file mode 100644
index 000000000000..39024ccf3b88
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.0.5.ebuild
@@ -0,0 +1,91 @@
+# 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.ebuild,v 1.1 2010/01/10 23:10:39 vapier Exp $
+
+inherit eutils pam autotools
+
+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="ssl pam tcpd slp cups kerberos krb4 debug cracklib 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 )
+	krb4? ( virtual/krb5 )
+	>=sys-apps/coreutils-7.1
+	!app-text/yudit"
+DEPEND="${RDEPEND}
+	xfs? ( sys-fs/xfsprogs <sys-kernel/linux-headers-2.6.16 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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_compile() {
+	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) \
+		$(use_enable krb4 krb4-uam) \
+		$(use_enable slp srvloc) \
+		$(use_with ssl ssl-dir) \
+		$(use_with cracklib) \
+		$(use_with slp srvloc) \
+		$(use_with xfs) \
+		--disable-afs \
+		--enable-fhs \
+		--with-bdb=/usr
+	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
+}