bumped sys-apps/acl to latest ~ (2.2.47-r1)

5 files changed, 200 insertions, 0 deletions

diff --git a/metadata/cache/sys-apps/acl-2.2.47-r1 b/metadata/cache/sys-apps/acl-2.2.47-r1
new file mode 100644
index 000000000..ea29acc68
--- /dev/null
+++ b/metadata/cache/sys-apps/acl-2.2.47-r1
@@ -0,0 +1,22 @@
+>=sys-apps/attr-2.4[lib32?] nfs? ( net-libs/libnfsidmap[lib32?] ) nls? ( sys-devel/gettext[lib32?] ) =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-apps/abi-wrapper
+>=sys-apps/attr-2.4[lib32?] nfs? ( net-libs/libnfsidmap[lib32?] ) sys-apps/abi-wrapper
+0
+ftp://oss.sgi.com/projects/xfs/download/cmd_tars/acl_2.2.47-1.tar.gz ftp://xfs.org/mirror/SGI/cmd_tars/acl_2.2.47-1.tar.gz nfs? ( http://www.citi.umich.edu/projects/nfsv4/linux/acl-patches/2.2.42-2/acl-2.2.42-CITI_NFS4_ALL-2.dif )
+
+http://oss.sgi.com/projects/xfs/
+LGPL-2.1
+Access control list utilities, libraries and headers
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+autotools base eutils libtool multilib multilib-native portability toolchain-funcs
+nfs nls lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 5b9c8d8ff..246cd21a2 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,8 +1,11 @@
+AUX 0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch 1749 RMD160 834b85feb012396aa6839c2005b078a24735d0dd SHA1 ef74c7fff85e2946eee5ada4250639a16e424482 SHA256 5b12843fa224eba5abe5665ea38b13a772e3404bdd7a4a730cef27aa226a9200
+AUX 0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch 1487 RMD160 f46fe06bd11ca9001cf0c8bb48734a07b3a615fe SHA1 0bf38292ce1dd5c53dd6b58935c94f3d861fe257 SHA256 a3b53763dc0a55c21935adb5b81eed7aaaa626fe659b821d201b9cc29c67b732
 AUX acl-2.2.32-only-symlink-when-needed.patch 836 RMD160 5b36f392f12d2382dd051c9766ae128a71b659ec SHA1 79fefd16a84e51797165fc8438382382156a149b SHA256 fede0dc42499b8903e42ea976d2ebfe8965750a8b2b116433364e657fbc8189d
 AUX acl-2.2.45-libtool.patch 1144 RMD160 bdb8f729772c296429265586c0b5253f2b1e96ad SHA1 ee9d3dccaf93af4a6f8355e4c36dea5ca2f818b6 SHA256 5d6df5fe58c9dee90a2abe4d7ce6bd3cc61f2431de27d0c8d9cc34ba440bf69b
 AUX acl-2.2.45-linguas.patch 314 RMD160 b2a3965b0918963a9d94bed169a6bbe1cd495954 SHA1 80632125303a9c8ce4cb95685031a8257f5870fe SHA256 a250aa592dd4160a758433db718f5826259eb8db8f1e9afbf24e4c24e1e5ba31
 DIST acl-2.2.42-CITI_NFS4_ALL-2.dif 97276 RMD160 d1cbac2f52d4889a96b3225f301a60cf5e91286e SHA1 543bf9fa9c91dad8c5bfbe58b7122963b712a08c SHA256 10c930e4c6d147d03ad6dc67e38663522fd277525c149d932a8279e2cbe1b95e
 DIST acl_2.2.47-1.tar.gz 154823 RMD160 22e62f828c68adde101222bb9f55cf3e93b9d95b SHA1 989a54cc2c600182cac9efafeaa73a4623852d1d SHA256 240906fbea566f5d2dc354d67c3c9e776ad7f8a35a189da2f411c4e9847969c8
+EBUILD acl-2.2.47-r1.ebuild 2438 RMD160 50f77d98b6e4feb3cd4d57c063a57ec8e8ccfd63 SHA1 d8c9c6dcbaa5e82ffc7ca497c798bc6f952e6e32 SHA256 b35c19c25eea6db2c68a12627a4273f821a70b338d0ab68528ce0253381142ba
 EBUILD acl-2.2.47.ebuild 2244 RMD160 b0b6fb2ef05be74f21a66ea94126c44c8b15f062 SHA1 696a51ed7b0be5cd84a7caa11122035b988c6c67 SHA256 b918c685c6c636069d1574cff44efad8d4730636b15c6041956c96fa722108f9
 MISC ChangeLog 12294 RMD160 40ce43b856990d42cec032d9ec169ced1babd282 SHA1 d68515b91f1fc3df11299d77655b8f831b0746fe SHA256 496cb9f072b9a75d81fd459b3404576b6dba6f76112db119897faea0c8182569
 MISC metadata.xml 232 RMD160 90ec4a1cc6ada64a7fd4876979cf14349fc88ea5 SHA1 3a5ced6e3af6b759ef8adc8e4f6a51dbf91fb8ce SHA256 441f653b762deb6e3674d915c6762f28b9e60f3887628e953df603634acd87ad
diff --git a/sys-apps/acl/acl-2.2.47-r1.ebuild b/sys-apps/acl/acl-2.2.47-r1.ebuild
new file mode 100644
index 000000000..1bd5cf8e6
--- /dev/null
+++ b/sys-apps/acl/acl-2.2.47-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.47-r1.ebuild,v 1.1 2009/07/02 01:30:24 vapier Exp $
+
+EAPI="2"
+
+inherit eutils autotools toolchain-funcs multilib-native
+
+MY_P="${PN}_${PV}-1"
+DESCRIPTION="Access control list utilities, libraries and headers"
+HOMEPAGE="http://oss.sgi.com/projects/xfs/"
+SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz
+	ftp://xfs.org/mirror/SGI/cmd_tars/${MY_P}.tar.gz
+	nfs? ( http://www.citi.umich.edu/projects/nfsv4/linux/acl-patches/2.2.42-2/acl-2.2.42-CITI_NFS4_ALL-2.dif )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nfs nls"
+
+RDEPEND=">=sys-apps/attr-2.4[lib32?]
+	nfs? ( net-libs/libnfsidmap[lib32?] )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext[lib32?] )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+multilib-native_src_prepare_internal() {
+	cd "${S}"
+	if use nfs ; then
+		cp "${DISTDIR}"/acl-2.2.42-CITI_NFS4_ALL-2.dif . || die
+		sed -i '/^diff --git a.debian.changelog b.debian.changelog/,/^diff --git/d' acl-2.2.42-CITI_NFS4_ALL-2.dif || die
+		epatch acl-2.2.42-CITI_NFS4_ALL-2.dif
+	fi
+	epatch \
+		"${FILESDIR}"/0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch 
+		"${FILESDIR}"/0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch #265425
+	epatch "${FILESDIR}"/${PN}-2.2.45-libtool.patch #158068
+	epatch "${FILESDIR}"/${PN}-2.2.45-linguas.patch #205948
+	epatch "${FILESDIR}"/${PN}-2.2.32-only-symlink-when-needed.patch
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
+		include/builddefs.in \
+		|| die "failed to update builddefs"
+	# libtool will clobber install-sh which is really a custom file
+	mv install-sh acl.install-sh || die
+	AT_M4DIR="m4" eautoreconf
+	mv acl.install-sh install-sh || die
+	strip-linguas po
+}
+
+multilib-native_src_configure_internal() {
+	unset PLATFORM #184564
+	export OPTIMIZER=${CFLAGS}
+	export DEBUG=-DNDEBUG
+
+	econf \
+		$(use_enable nls gettext) \
+		--libexecdir=/usr/$(get_libdir) \
+		--bindir=/bin \
+		|| die
+}
+
+multilib-native_src_install_internal() {
+	emake DIST_ROOT="${D}" install install-dev install-lib || die
+	prepalldocs
+
+	# move shared libs to /
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/libacl.so* "${D}"/$(get_libdir)/ || die
+	gen_usr_ldscript libacl.so
+}
diff --git a/sys-apps/acl/files/0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch b/sys-apps/acl/files/0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch
new file mode 100644
index 000000000..7f070a899
--- /dev/null
+++ b/sys-apps/acl/files/0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch
@@ -0,0 +1,53 @@
+http://bugs.gentoo.org/265425
+
+From 1a80c89ee88357137b598fa3357b576933c5746c Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@suse.de>
+Date: Tue, 23 Jun 2009 00:17:49 +0200
+Subject: [PATCH] Introduce new WALK_TREE_DEREFERENCE_TOPLEVEL flag
+
+This flag indicates to dereference top-level symlinks. (If non
+top-level symlinks should be stat()ed as well, the
+WALK_TREE_DEREFERENCE flag must be specified.)
+---
+ include/walk_tree.h |    9 +++++----
+ libmisc/walk_tree.c |    4 +++-
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/include/walk_tree.h b/include/walk_tree.h
+index 53a8fc5..9f1ec34 100644
+--- a/include/walk_tree.h
++++ b/include/walk_tree.h
+@@ -20,10 +20,11 @@
+ #ifndef __WALK_TREE_H
+ #define __WALK_TREE_H
+ 
+-#define WALK_TREE_RECURSIVE	0x1
+-#define WALK_TREE_PHYSICAL	0x2
+-#define WALK_TREE_LOGICAL	0x4
+-#define WALK_TREE_DEREFERENCE	0x8
++#define WALK_TREE_RECURSIVE		0x01
++#define WALK_TREE_PHYSICAL		0x02
++#define WALK_TREE_LOGICAL		0x04
++#define WALK_TREE_DEREFERENCE		0x08
++#define WALK_TREE_DEREFERENCE_TOPLEVEL	0x10
+ 
+ #define WALK_TREE_TOPLEVEL	0x100
+ #define WALK_TREE_SYMLINK	0x200
+diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c
+index 2777145..30ff92a 100644
+--- a/libmisc/walk_tree.c
++++ b/libmisc/walk_tree.c
+@@ -78,7 +78,9 @@ static int walk_tree_rec(const char *path, int walk_flags,
+ 		return func(path, NULL, flags | WALK_TREE_FAILED, arg);
+ 	if (S_ISLNK(st.st_mode)) {
+ 		flags |= WALK_TREE_SYMLINK;
+-		if (flags & WALK_TREE_DEREFERENCE) {
++		if ((flags & WALK_TREE_DEREFERENCE) ||
++		    ((flags & WALK_TREE_TOPLEVEL) &&
++		     (flags & WALK_TREE_DEREFERENCE_TOPLEVEL))) {
+ 			if (stat(path, &st) != 0)
+ 				return func(path, NULL,
+ 					    flags | WALK_TREE_FAILED, arg);
+-- 
+1.6.3.3
+
diff --git a/sys-apps/acl/files/0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch b/sys-apps/acl/files/0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch
new file mode 100644
index 000000000..f3925c760
--- /dev/null
+++ b/sys-apps/acl/files/0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch
@@ -0,0 +1,47 @@
+http://bugs.gentoo.org/265425
+
+From 63451a06b7484d220750ed8574d3ee84e156daf5 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@suse.de>
+Date: Tue, 23 Jun 2009 00:29:45 +0200
+Subject: [PATCH] Make sure that getfacl -R only calls stat(2) on symlinks when it needs to
+
+This fixes http://oss.sgi.com/bugzilla/show_bug.cgi?id=790
+"getfacl follows symlinks, even without -L".
+---
+ getfacl/getfacl.c |    7 ++++---
+
+diff --git a/getfacl/getfacl.c b/getfacl/getfacl.c
+index fc650e3..b3e6200 100644
+--- a/getfacl/getfacl.c
++++ b/getfacl/getfacl.c
+@@ -70,7 +70,7 @@ struct option long_options[] = {
+ const char *progname;
+ const char *cmd_line_options;
+ 
+-int walk_flags = WALK_TREE_DEREFERENCE;
++int walk_flags = WALK_TREE_DEREFERENCE_TOPLEVEL;
+ int opt_print_acl;
+ int opt_print_default_acl;
+ int opt_strip_leading_slash = 1;
+@@ -642,7 +642,7 @@ int main(int argc, char *argv[])
+ 			case 'L':  /* follow all symlinks */
+ 				if (posixly_correct)
+ 					goto synopsis;
+-				walk_flags |= WALK_TREE_LOGICAL;
++				walk_flags |= WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE;
+ 				walk_flags &= ~WALK_TREE_PHYSICAL;
+ 				break;
+ 
+@@ -650,7 +650,8 @@ int main(int argc, char *argv[])
+ 				if (posixly_correct)
+ 					goto synopsis;
+ 				walk_flags |= WALK_TREE_PHYSICAL;
+-				walk_flags &= ~WALK_TREE_LOGICAL;
++				walk_flags &= ~(WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE |
++						WALK_TREE_DEREFERENCE_TOPLEVEL);
+ 				break;
+ 
+ 			case 's':  /* skip files with only base entries */
+-- 
+1.6.3.3
+