Add support for NFS ACLs #144845 by Christophe Saout.

Package-Manager: portage-2.1.2_pre1

5 files changed, 122 insertions, 5 deletions

diff --git a/sys-apps/acl/ChangeLog b/sys-apps/acl/ChangeLog
index 74d8a435933d..d6585a568467 100644
--- a/sys-apps/acl/ChangeLog
+++ b/sys-apps/acl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/acl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.60 2006/09/05 05:18:19 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.61 2006/09/23 15:40:34 vapier Exp $
+
+*acl-2.2.39-r1 (23 Sep 2006)
+
+  23 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/acl-2.2.29-nfs-glue.patch, +acl-2.2.39-r1.ebuild:
+  Add support for NFS ACLs #144845 by Christophe Saout.
 
   05 Sep 2006; Joshua Kinard <kumba@gentoo.org> acl-2.2.34.ebuild:
   Marked stable on mips.
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index f3e136e63610..26966c21c412 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX acl-2.2.29-nfs-glue.patch 709 RMD160 a7d2199a69cd045ebd094024e2e33ec752c0760a SHA1 cdb28eccefd61252b279eeb4b1fd21810e3c0b7f SHA256 ad9f47e7588f5791ad7327570758a233d79ca7ec2e09c91b03c2c838c51cff56
+MD5 d7db174966517abad8a6ec0ea6a7225e files/acl-2.2.29-nfs-glue.patch 709
+RMD160 a7d2199a69cd045ebd094024e2e33ec752c0760a files/acl-2.2.29-nfs-glue.patch 709
+SHA256 ad9f47e7588f5791ad7327570758a233d79ca7ec2e09c91b03c2c838c51cff56 files/acl-2.2.29-nfs-glue.patch 709
 AUX acl-2.2.32-only-symlink-when-needed.patch 836 RMD160 5b36f392f12d2382dd051c9766ae128a71b659ec SHA1 79fefd16a84e51797165fc8438382382156a149b SHA256 fede0dc42499b8903e42ea976d2ebfe8965750a8b2b116433364e657fbc8189d
 MD5 6204834fe8dda5a8e61bb52b8db06673 files/acl-2.2.32-only-symlink-when-needed.patch 836
 RMD160 5b36f392f12d2382dd051c9766ae128a71b659ec files/acl-2.2.32-only-symlink-when-needed.patch 836
@@ -6,6 +13,7 @@ AUX acl-2.2.34-LDFLAGS.patch 611 RMD160 92927ece6c525908542c4a97a4cbb75c3daf54fe
 MD5 fd221ded991b5761c2d69503d90a0d3f files/acl-2.2.34-LDFLAGS.patch 611
 RMD160 92927ece6c525908542c4a97a4cbb75c3daf54fe files/acl-2.2.34-LDFLAGS.patch 611
 SHA256 82989176be09cec7fb1af9843f3d5936a78512910bc1d2d1fdbcdda3a910ad1b files/acl-2.2.34-LDFLAGS.patch 611
+DIST acl-2.2.29-CITI_NFS4_ALL-3.dif 172937 RMD160 3768f0a235b4f228e0e60f4a3b59d1920a6b0ae4 SHA1 e91139278326d8738e599e361f823f2ea099d867 SHA256 8458adb2d9ed83b5a643143a09e349722f90f98c6d09fc1f6e4c5d5969c3de64
 DIST acl-2.2.32.src.tar.gz 149167 RMD160 7e4d5cffe0c5425062ad13fa2bf9990fd3d32260 SHA1 8fd0ee7ba253141b0354acf6bdb8846522601f67 SHA256 1b60bd2ccfcc48fcefff2bb7c2159d3e2d91b033908568c9e7aef95d2818c4ec
 DIST acl-2.2.34.src.tar.gz 144773 RMD160 2e9164bedeff0e663c70a54a1dc3d2cf1bbadca8 SHA1 b24a6a7386212af5ee0c3bd6a181f372170f4d6a SHA256 314f0e0d14c85d842f25c9a4aa3ee3df87dd533b9eb337dd005631933cb32789
 DIST acl_2.2.39-1.tar.gz 122091 RMD160 5e6797b580c561a52d10b36d82587f8b80024a43 SHA1 596cfa3461e93d5ad402ba2c4f6e8f1d4118a635 SHA256 1c01909c1d293a8599b94f9bc75e41a07878067211f08c09c66b1070924b6066
@@ -17,14 +25,18 @@ EBUILD acl-2.2.34.ebuild 1406 RMD160 9f94ea49064c147e9fdb319945e57d6562cd5d4e SH
 MD5 475bcb2b360ac096f140038b187b295a acl-2.2.34.ebuild 1406
 RMD160 9f94ea49064c147e9fdb319945e57d6562cd5d4e acl-2.2.34.ebuild 1406
 SHA256 73c1a4f91c4336c3f4d91cf726270258d7c216473bc0e08ff439a0f38b7da0ad acl-2.2.34.ebuild 1406
+EBUILD acl-2.2.39-r1.ebuild 1678 RMD160 2b57f315e406f279edf75b2d13dbfed9e9a7d33e SHA1 90a2d0ced178a99023a21a2ba7a237e42b774019 SHA256 bd8d99260afa33813a0c811d3c2c6d986f593e9dd4166e080eba8f04d6fc6378
+MD5 333c4c6c2ef4d4d0defeca36f185c30e acl-2.2.39-r1.ebuild 1678
+RMD160 2b57f315e406f279edf75b2d13dbfed9e9a7d33e acl-2.2.39-r1.ebuild 1678
+SHA256 bd8d99260afa33813a0c811d3c2c6d986f593e9dd4166e080eba8f04d6fc6378 acl-2.2.39-r1.ebuild 1678
 EBUILD acl-2.2.39.ebuild 1399 RMD160 056d8d0c74ea31b015efcae8c05633f75efe42f3 SHA1 a8c1db6900deec200e676f375acaf7ae6fc41c79 SHA256 92da5e58207de9d905bf33f971bba7b4ae8ccd0e82b6a7a3ebfdbc2d01ec171d
 MD5 ded309fd140b323b52b22586059a54dc acl-2.2.39.ebuild 1399
 RMD160 056d8d0c74ea31b015efcae8c05633f75efe42f3 acl-2.2.39.ebuild 1399
 SHA256 92da5e58207de9d905bf33f971bba7b4ae8ccd0e82b6a7a3ebfdbc2d01ec171d acl-2.2.39.ebuild 1399
-MISC ChangeLog 7728 RMD160 d15a94a2c6d76b7b62e6605a3e3cdf06774ac599 SHA1 4670635e1320c85a5e27fa5f84baee5fa60a6bc7 SHA256 1e5f1e4af40d1e275fa31078bce72afff8f099935067be8340a77de02a1046a6
-MD5 c05bb9fd2b0cff46d0e02572a76d48bb ChangeLog 7728
-RMD160 d15a94a2c6d76b7b62e6605a3e3cdf06774ac599 ChangeLog 7728
-SHA256 1e5f1e4af40d1e275fa31078bce72afff8f099935067be8340a77de02a1046a6 ChangeLog 7728
+MISC ChangeLog 7925 RMD160 f4a3038006fb1ab78acf1ac6337d6effb18c1f3c SHA1 5abce624b5ff29a8eab4fba5b840f7309903611a SHA256 70b5364a9694c3b970485577d45f1fc736ed98ca69988571deffdd96e98f3e3a
+MD5 aeedefb28b59d8dbd4d0e05e814ee600 ChangeLog 7925
+RMD160 f4a3038006fb1ab78acf1ac6337d6effb18c1f3c ChangeLog 7925
+SHA256 70b5364a9694c3b970485577d45f1fc736ed98ca69988571deffdd96e98f3e3a ChangeLog 7925
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -38,3 +50,13 @@ SHA256 98e224b93279b22366b3cbd48ea87c81fa784a2ece6ca9ef3186db5d8bcba134 files/di
 MD5 f9721bff0a816a82d3e47759826c19cc files/digest-acl-2.2.39 238
 RMD160 df60603757d0a0f50923f4197f94090e6b1da486 files/digest-acl-2.2.39 238
 SHA256 6135784b9379ee88290af8cffc447900474e0908fe121681c6cd4e73633c96c1 files/digest-acl-2.2.39 238
+MD5 399c16e5e370775b23146111bedc332b files/digest-acl-2.2.39-r1 509
+RMD160 698d48a25fbf4af786b39ad58c713de55ff4007e files/digest-acl-2.2.39-r1 509
+SHA256 c7927ab1d3a389e4c0d8e51eb080fa03af34e6c483eeb234b35b51b07efb9d93 files/digest-acl-2.2.39-r1 509
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFFVV7amhnQswr0vIRAoHZAKCYfkEj2i4VT7t08cYtV0MYoK20+ACgqSXu
+BkeQqhOcwOQ/bFTwv3APLOQ=
+=AiN0
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/acl/acl-2.2.39-r1.ebuild b/sys-apps/acl/acl-2.2.39-r1.ebuild
new file mode 100644
index 000000000000..ee952bb95f00
--- /dev/null
+++ b/sys-apps/acl/acl-2.2.39-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.39-r1.ebuild,v 1.1 2006/09/23 15:40:34 vapier Exp $
+
+WANT_AUTOCONF="latest"
+inherit eutils autotools toolchain-funcs
+
+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.29-3/acl-2.2.29-CITI_NFS4_ALL-3.dif )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nfs nls"
+
+DEPEND=">=sys-apps/attr-2.4
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+	if use nfs ; then
+		cp "${DISTDIR}"/acl-2.2.29-CITI_NFS4_ALL-3.dif . || die
+		epatch \
+			"${FILESDIR}"/acl-2.2.29-nfs-glue.patch \
+			acl-2.2.29-CITI_NFS4_ALL-3.dif
+	fi
+	epatch "${FILESDIR}"/${PN}-2.2.32-only-symlink-when-needed.patch
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in \
+		|| die "failed to update builddefs"
+	eautoconf
+}
+
+src_compile() {
+	export OPTIMIZER=${CFLAGS}
+	export DEBUG=-DNDEBUG
+
+	econf \
+		$(use_enable nls gettext) \
+		--libexecdir=/usr/$(get_libdir) \
+		--bindir=/bin \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make 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/acl-2.2.29-nfs-glue.patch b/sys-apps/acl/files/acl-2.2.29-nfs-glue.patch
new file mode 100644
index 000000000000..9150eb3a79fe
--- /dev/null
+++ b/sys-apps/acl/files/acl-2.2.29-nfs-glue.patch
@@ -0,0 +1,23 @@
+--- ../acl-2.2.29-CITI_NFS4_ALL-3.dif.orig	2006-09-23 11:34:45.000000000 -0400
++++ ../acl-2.2.29-CITI_NFS4_ALL-3.dif	2006-09-23 11:34:54.000000000 -0400
+@@ -68,20 +68,6 @@
+  
+  default: $(CONFIGURE)
+  ifeq ($(HAVE_BUILDDEFS), no)
+-diff --git a/debian/changelog b/debian/changelog
+-index 66e16b7..c431d66 100644
+---- a/debian/changelog
+-+++ b/debian/changelog
+-@@ -1,3 +1,9 @@
+-+acl (2.2.37.nfsv4-1) unstable; urgency=low
+-+
+-+  * Add support for NFSv4 ACLs
+-+
+-+ -- J. Bruce Fields <bfields@fieldses.org>  Tue,  9 May 2006 11:52:32 -0400
+-+
+- acl (2.2.37-1) unstable; urgency=low
+- 
+-   * New upstream release
+ diff --git a/debian/control b/debian/control
+ index 5ff00bc..1d0f356 100644
+ --- a/debian/control
diff --git a/sys-apps/acl/files/digest-acl-2.2.39-r1 b/sys-apps/acl/files/digest-acl-2.2.39-r1
new file mode 100644
index 000000000000..fbbcdbfedca7
--- /dev/null
+++ b/sys-apps/acl/files/digest-acl-2.2.39-r1
@@ -0,0 +1,6 @@
+MD5 c4cc8c7bf270ed5a022c798f155f5b6f acl-2.2.29-CITI_NFS4_ALL-3.dif 172937
+RMD160 3768f0a235b4f228e0e60f4a3b59d1920a6b0ae4 acl-2.2.29-CITI_NFS4_ALL-3.dif 172937
+SHA256 8458adb2d9ed83b5a643143a09e349722f90f98c6d09fc1f6e4c5d5969c3de64 acl-2.2.29-CITI_NFS4_ALL-3.dif 172937
+MD5 4edd450bbee60d6c4b3c51ae80499b00 acl_2.2.39-1.tar.gz 122091
+RMD160 5e6797b580c561a52d10b36d82587f8b80024a43 acl_2.2.39-1.tar.gz 122091
+SHA256 1c01909c1d293a8599b94f9bc75e41a07878067211f08c09c66b1070924b6066 acl_2.2.39-1.tar.gz 122091