Maintainer change. Version bump and nfs support (bug #110317): thanks to all testers

(Portage version: 2.1_pre4-r1)

8 files changed, 184 insertions, 4 deletions

diff --git a/sys-fs/unionfs/ChangeLog b/sys-fs/unionfs/ChangeLog
index 705ceb988c83..e6735480135a 100644
--- a/sys-fs/unionfs/ChangeLog
+++ b/sys-fs/unionfs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/unionfs
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.16 2005/10/15 13:43:49 genstef Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.17 2006/02/13 13:41:34 satya Exp $
+
+*unionfs-1.1.2 (13 Feb 2006)
+*unionfs-1.1.1 (13 Feb 2006)
+
+  13 Feb 2006; Christian Andreetta <satya@gentoo.org>
+  +files/unionfs-1.1.1-10-nfs.patch, metadata.xml, +unionfs-1.1.1.ebuild,
+  +unionfs-1.1.2.ebuild:
+  Maintainer change. Version bump and nfs support (bug #110317): thanks to all
+  testers
 
 *unionfs-1.0.14 (15 Oct 2005)
 
diff --git a/sys-fs/unionfs/Manifest b/sys-fs/unionfs/Manifest
index ab410f4d85cf..7f613a0e99ba 100644
--- a/sys-fs/unionfs/Manifest
+++ b/sys-fs/unionfs/Manifest
@@ -1,14 +1,57 @@
 MD5 ed657a8e3a953d5b5ef6089eda966ec4 ChangeLog 3310
+RMD160 a5eafc85f759ee960fefe4e8ce78ff0fcb987ea4 ChangeLog 3310
+SHA256 a12f77e665e327f14ad6dc3b0977733579254b528244cd72d6c2b7e8ef0421d7 ChangeLog 3310
 MD5 2410ef6f38ddf9737cbb13bfe0325c9a files/digest-unionfs-1.0.11 66
+RMD160 311b75718d381cea294a5c830d9d9a09e11cc81a files/digest-unionfs-1.0.11 66
+SHA256 4d05d50e01a972b677a359fd745f2198ea48f9c5f0737fa74322ce574dbfcee5 files/digest-unionfs-1.0.11 66
 MD5 a437f2bf3da231ea3a2a2835949d3a37 files/digest-unionfs-1.0.12a 67
+RMD160 8262ebc09604bc094238b0504802bb7d93445ff8 files/digest-unionfs-1.0.12a 67
+SHA256 efb5e1c39383e3e6e7d4579e930e4d15ff0af4a15d9d1c42a84713923404fc0f files/digest-unionfs-1.0.12a 67
 MD5 c2f37c6131dd9b96868aa3762fa444be files/digest-unionfs-1.0.13 66
+RMD160 725fe1d4a75a9cad7a7e3188e627fe2ad4be71b4 files/digest-unionfs-1.0.13 66
+SHA256 5cba9d5073d6381058e7f4df92557aa6233f2b793e27fb1bc74ed21f36bb5018 files/digest-unionfs-1.0.13 66
 MD5 a8d7fc6d22b85ab4bf8a36a7a1462ca7 files/digest-unionfs-1.0.14 66
+RMD160 a36bfb55d7d93874f483a6664a7284e7792c5ca1 files/digest-unionfs-1.0.14 66
+SHA256 0b16689d9c44105e47f90d13802c59a55c29b3558085271ca557482f12224153 files/digest-unionfs-1.0.14 66
+MD5 133a3cd0fa7248e858bfdad536e47a0f files/digest-unionfs-1.1.1 241
+RMD160 93c8ada69192e2bfe77d2ffc42ac3459fc9ddfd9 files/digest-unionfs-1.1.1 241
+SHA256 7872525da240066ad94966fec2894687ab47a93901e2ca7d340aac51f0572d5f files/digest-unionfs-1.1.1 241
+MD5 fbd38667466c2e1f59ba6da8df0807d2 files/digest-unionfs-1.1.2 241
+RMD160 f858fa4d566875116c0d907b8037f6f5fa0377b4 files/digest-unionfs-1.1.2 241
+SHA256 f340d87b2bbaac0ce5a0ebeb855f944d33f4f5cecf742baa27e060580850c25c files/digest-unionfs-1.1.2 241
 MD5 f9a155123bfab53c81cb6c454492b797 files/unionfs-1.0.11-amd64.patch 586
+RMD160 a36c627298d309ea6821dff64dd38b61ca109ee5 files/unionfs-1.0.11-amd64.patch 586
+SHA256 ceea07689955f530e0fb23130bf20d3c63bb9611a1ac740d528d286368512e64 files/unionfs-1.0.11-amd64.patch 586
 MD5 733bc242378499ba766283fa6441f5cb files/unionfs-1.0.13-amd64.patch 685
+RMD160 33a1b89f870138018ccd7a03d75b3d9a12abeda0 files/unionfs-1.0.13-amd64.patch 685
+SHA256 3dbfb59db79dc6f759acab6cfc7d23f13b6c2240676fcb1d7e27657f37b9e256 files/unionfs-1.0.13-amd64.patch 685
 MD5 f0868138a13d17e35615d074edc5f5d3 files/unionfs-1.0.13-delbranch-fix.patch 356
+RMD160 6a78e0ab5cd8409e10537a33bd3e00ae09cf23b9 files/unionfs-1.0.13-delbranch-fix.patch 356
+SHA256 f5f5ba8cd7ec45682c8bb70f29b2e4cccaddb091dd17f18c5d03a8862dffa3bf files/unionfs-1.0.13-delbranch-fix.patch 356
 MD5 2a23c7c6731b07884a03707903fc13d5 files/unionfs-1.0.14-remove_call_to_ctags.patch 435
+RMD160 0b4fbce6b60e027704646c6e2806de31c38e3a7d files/unionfs-1.0.14-remove_call_to_ctags.patch 435
+SHA256 668d626631cb59fec05b27fd95ac678d78f37c064d273d4489285b13f057f96e files/unionfs-1.0.14-remove_call_to_ctags.patch 435
+MD5 5eba7d426c373210d62be3a1450bb9d9 files/unionfs-1.1.1-10-nfs.patch 944
+RMD160 f78ca5729c11b8ce8c9003415acc758c55c62abb files/unionfs-1.1.1-10-nfs.patch 944
+SHA256 64c6fd10b96f6168365b6b7df79391a394539c299fe879ee2e8ccbdb7de5d589 files/unionfs-1.1.1-10-nfs.patch 944
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
+RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
+SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b metadata.xml 264
 MD5 376c326368cd6cadf7e6b0ded8e03eb8 unionfs-1.0.11.ebuild 1341
+RMD160 11c9249ac4d88cc18eb7f7e6788f516c6da6f633 unionfs-1.0.11.ebuild 1341
+SHA256 b97c202407512b6a429c92c7af34aa102669b67c995ed13e4a3b145bcc7d54df unionfs-1.0.11.ebuild 1341
 MD5 1ff5f88f02335771fec32a90579f38a6 unionfs-1.0.12a.ebuild 1358
+RMD160 7872a77bcefd70577cc0152f5ccbe94cfeabf604 unionfs-1.0.12a.ebuild 1358
+SHA256 85ee8594e367acf3fc2d2b1d6e4b5c32eda775b7a412935f1e0ff333ab0344ef unionfs-1.0.12a.ebuild 1358
 MD5 efcb306b78f98f3a30d53d6d977a7118 unionfs-1.0.13.ebuild 1350
+RMD160 e38e54a28c8dc2efd709503e9f43ad3e570d6246 unionfs-1.0.13.ebuild 1350
+SHA256 a76594dc5a5cad26b560fec5a56f185611b854ed6fb2343e55a02b955e9000b7 unionfs-1.0.13.ebuild 1350
 MD5 3262d5486fbdc93bf0ec35f815046896 unionfs-1.0.14.ebuild 1380
+RMD160 638c88ed3a30dbb869be33dbb5e797243b87e5a6 unionfs-1.0.14.ebuild 1380
+SHA256 241b993a63f479857e1605a314cec0af4394904f9d5109bb60be30e9f8c9b41b unionfs-1.0.14.ebuild 1380
+MD5 c8ccf9947c1ba7228f4d7ba946c3ad3d unionfs-1.1.1.ebuild 1405
+RMD160 88971d13590ff82ea284b57dccfc14ee9fc4e76c unionfs-1.1.1.ebuild 1405
+SHA256 2f76a4c701d2e3efe85fdfd63e1662815e49a3075360eade72ea416b8471d81e unionfs-1.1.1.ebuild 1405
+MD5 2669569144b6a9300c9a393992c64988 unionfs-1.1.2.ebuild 1357
+RMD160 47708c18429f52719b852c077b3be02d1a9f5c68 unionfs-1.1.2.ebuild 1357
+SHA256 a9af539c6b0f6ccdee69374191dcb2a3ea769ff1c7b7a3ca46e286675504db2c unionfs-1.1.2.ebuild 1357
diff --git a/sys-fs/unionfs/files/digest-unionfs-1.1.1 b/sys-fs/unionfs/files/digest-unionfs-1.1.1
new file mode 100644
index 000000000000..f6551dcadfd0
--- /dev/null
+++ b/sys-fs/unionfs/files/digest-unionfs-1.1.1
@@ -0,0 +1,3 @@
+MD5 7fd4922cf9d5be9ee4301aae14827a3e unionfs-1.1.1.tar.gz 144244
+RMD160 efb384c20201e440b37e0aff90f00e70967abed9 unionfs-1.1.1.tar.gz 144244
+SHA256 40639e3a7d2ea1ee37e7af4247c32534f849071ed0e08dfab8de46676dd4d55f unionfs-1.1.1.tar.gz 144244
diff --git a/sys-fs/unionfs/files/digest-unionfs-1.1.2 b/sys-fs/unionfs/files/digest-unionfs-1.1.2
new file mode 100644
index 000000000000..d0edd9c70e6d
--- /dev/null
+++ b/sys-fs/unionfs/files/digest-unionfs-1.1.2
@@ -0,0 +1,3 @@
+MD5 ed0170a3b0f1bd8a213ac2a96052f33a unionfs-1.1.2.tar.gz 151787
+RMD160 4cfe369895924e0152db3842b4c9ab3054366db8 unionfs-1.1.2.tar.gz 151787
+SHA256 833dc2b155ae75d01184342953a11ff5f325415f2849d95829bb88e8d3194184 unionfs-1.1.2.tar.gz 151787
diff --git a/sys-fs/unionfs/files/unionfs-1.1.1-10-nfs.patch b/sys-fs/unionfs/files/unionfs-1.1.1-10-nfs.patch
new file mode 100644
index 000000000000..e895589be0ed
--- /dev/null
+++ b/sys-fs/unionfs/files/unionfs-1.1.1-10-nfs.patch
@@ -0,0 +1,20 @@
+--- inode.c.orig	2005-10-27 10:01:48.000000000 +0200
++++ inode.c	2005-10-27 10:02:50.000000000 +0200
+@@ -826,7 +826,7 @@
+ 
+ /* Basically copied from the kernel vfs permission(), but we've changed
+  * the following: (1) the IS_RDONLY check is skipped, and (2) if you define
+- * -DNFS_SECURITY_HOLE, we assume that -EACCESS means that the export is
++ * -DNFS_SECURITY_HOLE, we assume that -EACCES means that the export is
+  * read-only and we should check standard Unix permissions.  This means
+  * that NFS ACL checks (or other advanced permission features) are bypassed.
+  */
+@@ -856,7 +856,7 @@
+ 		retval = inode->i_op->permission(inode, submask, nd);
+ #ifdef NFS_SECURITY_HOLE
+ #define IS_NFS(inode) (strcmp("nfs", (inode)->i_sb->s_type->s_name))
+-		if ((retval == -EACCESS) && (submask & MAY_WRITE) &&
++		if ((retval == -EACCES) && (submask & MAY_WRITE) &&
+ 		    IS_NFS(inode)) {
+ 			retval = generic_permission(inode, submask, NULL);
+ 		}
diff --git a/sys-fs/unionfs/metadata.xml b/sys-fs/unionfs/metadata.xml
index c8f81b37cf66..7cd5a4b02801 100644
--- a/sys-fs/unionfs/metadata.xml
+++ b/sys-fs/unionfs/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>kernel</herd>
   <maintainer>
-    <email>genstef@gentoo.org</email>
-    <name>Stefan Schweizer</name>
+    <email>satya@gentoo.org</email>
+    <name>Christian Andreetta</name>
   </maintainer>
 </pkgmetadata>
diff --git a/sys-fs/unionfs/unionfs-1.1.1.ebuild b/sys-fs/unionfs/unionfs-1.1.1.ebuild
new file mode 100644
index 000000000000..44dd7a85cb68
--- /dev/null
+++ b/sys-fs/unionfs/unionfs-1.1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.1.1.ebuild,v 1.1 2006/02/13 13:41:34 satya Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="Stackable unification file system, which can appear to merge the contents of several directories"
+HOMEPAGE="http://www.fsl.cs.sunysb.edu/project-unionfs.html"
+SRC_URI="ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="acl debug nfs"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="unionfs(fs:)"
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="LINUXSRC=${KV_DIR} KERNELVERSION=${KV_MAJOR}.${KV_MINOR}"
+}
+
+src_unpack() {
+	local user_Makefile=fistdev.mk EXTRACFLAGS=""
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/unionfs-1.1.1-10-nfs.patch
+
+	if ! use debug; then
+		echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile}
+		EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_NDEBUG"
+	fi
+
+	if use acl; then
+		EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_XATTR" # -DFIST_SETXATTR_CONSTVOID"
+	elif use nfs; then
+		EXTRACFLAGS="${EXTRACFLAGS} -DNFS_SECURITY_HOLE"
+	fi
+
+	echo "EXTRACFLAGS=${EXTRACFLAGS}" >> ${user_Makefile}
+}
+
+src_install() {
+	dosbin unionctl uniondbg unionimap snapmerge
+	doman man/unionfs.4 man/unionctl.8 man/uniondbg.8 man/unionimap.8
+
+	linux-mod_src_install
+
+	dodoc INSTALL NEWS README ChangeLog patch-kernel.sh
+}
+
diff --git a/sys-fs/unionfs/unionfs-1.1.2.ebuild b/sys-fs/unionfs/unionfs-1.1.2.ebuild
new file mode 100644
index 000000000000..adb2d7fc3dff
--- /dev/null
+++ b/sys-fs/unionfs/unionfs-1.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.1.2.ebuild,v 1.1 2006/02/13 13:41:34 satya Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="Stackable unification file system, which can appear to merge the contents of several directories"
+HOMEPAGE="http://www.fsl.cs.sunysb.edu/project-unionfs.html"
+SRC_URI="ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="acl debug nfs"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="unionfs(fs:)"
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="LINUXSRC=${KV_DIR} KERNELVERSION=${KV_MAJOR}.${KV_MINOR}"
+}
+
+src_unpack() {
+	local user_Makefile=fistdev.mk EXTRACFLAGS=""
+
+	unpack ${A}
+	cd ${S}
+
+	if ! use debug; then
+		echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile}
+		EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_NDEBUG"
+	fi
+
+	if use acl; then
+		EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_XATTR" # -DFIST_SETXATTR_CONSTVOID"
+	elif use nfs; then
+		EXTRACFLAGS="${EXTRACFLAGS} -DNFS_SECURITY_HOLE"
+	fi
+
+	echo "EXTRACFLAGS=${EXTRACFLAGS}" >> ${user_Makefile}
+}
+
+src_install() {
+	dosbin unionctl uniondbg unionimap snapmerge
+	doman man/unionfs.4 man/unionctl.8 man/uniondbg.8 man/unionimap.8
+
+	linux-mod_src_install
+
+	dodoc INSTALL NEWS README ChangeLog patch-kernel.sh
+}
+