Bump with patches for recent kernels, from bug #192115

Package-Manager: portage-2.1.4.1

5 files changed, 187 insertions, 3 deletions

diff --git a/sys-cluster/gfs-kernel/ChangeLog b/sys-cluster/gfs-kernel/ChangeLog
index 62870ace5d88..c9990efb7c61 100644
--- a/sys-cluster/gfs-kernel/ChangeLog
+++ b/sys-cluster/gfs-kernel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/gfs-kernel
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.25 2007/05/12 13:28:14 xmerlin Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.26 2008/02/08 14:48:35 caleb Exp $
+
+*gfs-kernel-1.04.00-r1 (08 Feb 2008)
+
+  08 Feb 2008; Caleb Tennis <caleb@gentoo.org>
+  +files/gfs-kernel-1.04.00-post2.6.12-compilefix.patch,
+  +files/gfs-kernel-1.04.00-post2.6.17-compilefix.patch,
+  +gfs-kernel-1.04.00-r1.ebuild:
+  Bump with patches for recent kernels, bug #192115
 
   12 May 2007; Christian Zoffoli <xmerlin@gentoo.org>
   -files/gfs-kernel-1.04.00-pre2.6.17-compilefix.patch,
diff --git a/sys-cluster/gfs-kernel/Manifest b/sys-cluster/gfs-kernel/Manifest
index 77f0678e806a..54a4cc85a5a8 100644
--- a/sys-cluster/gfs-kernel/Manifest
+++ b/sys-cluster/gfs-kernel/Manifest
@@ -1,6 +1,8 @@
 AUX gfs-kernel-1.02.00-20060714-cvs-compile.patch 339 RMD160 35b90bf495110cd36ffd986108f9eafbcfda8c75 SHA1 602b1bdde1a2419bd31cbde7c64fd12430b373d2 SHA256 16091ba242bf1842b512c2527c91676d57f8d230fd650374123e850db415e2ae
 AUX gfs-kernel-1.03.00-post-2.6.18.patch 8019 RMD160 db788c7ac8f95e02e1ee231146185785aa1663d1 SHA1 788f3a06b0f0f3a7cf20addbfb2dc3f1ac6f8642 SHA256 164a710c54c6ea3f05fecfd14e29a6b255a7b7bae64d9c14a4fc9f651b578bbd
 AUX gfs-kernel-1.03.00-pre2.6.17-compilefix.patch 3849 RMD160 3c6900e139cea9f9b8b04848dd649c185c0f855e SHA1 00e58fb1ed0372e8119f196da3f919acea18db37 SHA256 0653c19687038b93500b764ed3e9c6aa556b25bc80498a56939f78b429245949
+AUX gfs-kernel-1.04.00-post2.6.12-compilefix.patch 1551 RMD160 1b4e7596ed6551475b2291a27377ee389d0e3972 SHA1 b1f4702f0fbe1497c73dcbaa280b92992ba1f6d0 SHA256 55cc92e258d592f177a3b361d1d2ed10d9c88013790ccfe700a3079425fb9e59
+AUX gfs-kernel-1.04.00-post2.6.17-compilefix.patch 1449 RMD160 ad68ebc1853633a43e5528c950f9c7d048c9d136 SHA1 610541fff4b6fcb2ee0e1a24a72f0d2fbf668c49 SHA256 275fa240097bc2ac43ec00b8b23008670f3403e96c275b1a607994108a4ea6e4
 DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 SHA1 d74cadb1ef21d1cfda333b20d7ef20272e0002d6 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849
 DIST cluster-1.03.00.tar.gz 1658274 RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 SHA1 c205d8ec034433c33f26724f7f69b0028d2a63d4 SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b
 DIST cluster-1.04.00.tar.gz 1663798 RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 SHA1 af3bb244a11a6a26c31b142009f6c1f771799337 SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2
@@ -9,6 +11,7 @@ DIST gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086 RMD160 bc10691dbdd4afb6
 EBUILD gfs-kernel-1.02.00-r1.ebuild 1936 RMD160 995f974dcae00aa539419fc3a9ade16cc2af03a0 SHA1 203b9709b09b05afb25c15b5af5ecf6adc3cd8ce SHA256 84edbbcce325748593797d66c0e569ee69c2c4078cbee1965e89b0f4815c84ae
 EBUILD gfs-kernel-1.02.00-r2.ebuild 2188 RMD160 7b5fd209d242e89c9d904563c7e377c94729e548 SHA1 162c1b3d9f8cec27711a2f9f199de87c1f1e2952 SHA256 79d6d91b8bfab4946a78722195e67d1f7b07561aa86f6e0a6a4083b595c11d83
 EBUILD gfs-kernel-1.03.00-r1.ebuild 1648 RMD160 042e61b167aac82c950f87532a6ada82eed8c9f1 SHA1 4b49788a558dee9682c8c1c4a62e14d7f7e1ecd3 SHA256 28855d299b07b5b71f2d6b9b588d7e2e8d00ebf53c2c76c5b622ffbb5d9e78e4
+EBUILD gfs-kernel-1.04.00-r1.ebuild 1823 RMD160 6682ebf5232729eb6850a571ee301c7054cff8cd SHA1 a1da94b2b475f384931d01e7a1325ebb9e2d1ec2 SHA256 f3074d673bcbd8e92fb35b6308267eb2a1bb54ccc24804168d122a8809e75297
 EBUILD gfs-kernel-1.04.00.ebuild 1601 RMD160 f79501e80c19afb7119e7d2cfe872d7640202cc3 SHA1 247aec0788d49911ac288df42c42c48b9f3ddc5a SHA256 0bf50dbbee4a9df233ad3c20bdb06d3a8abac85bbec5590238aa607866b47ece
-MISC ChangeLog 4357 RMD160 006408a6d2a416d128acd457c3944eb749ea8c3b SHA1 0aa68ade29ea6ca8f2af0b2584995f7b1fb71fac SHA256 c78e753292fd66c380472572927344464b90502358fe6ca8ff9e4a0141848f21
+MISC ChangeLog 4640 RMD160 2e31c3ea3d5d369271dcf054a939d56a93dd246d SHA1 41cce11c050fff86d53d33f25f0b3d0137dffef3 SHA256 0eaeebe6e685ec444ddbc47e56577317cc0e2b3fa2c77fca503f83024df6b71b
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.12-compilefix.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.12-compilefix.patch
new file mode 100644
index 000000000000..1d2d1c16e50d
--- /dev/null
+++ b/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.12-compilefix.patch
@@ -0,0 +1,51 @@
+--- cluster-1.04.00/gfs-kernel/src/gfs/diaper.c	2007-09-11 13:20:51.000000000 +0300
++++ cluster-1.04.00/gfs-kernel/src/gfs/diaper.c	2007-09-11 13:20:59.000000000 +0300
+@@ -397,7 +397,7 @@
+  fail_bdput:
+ 	mutex_lock(&diaper->bd_mutex);
+ 	if (!--diaper->bd_openers) {
+-		invalidate_bdev(diaper, 1);
++		invalidate_bdev(diaper);
+ 		diaper->bd_contains = NULL;
+ 		diaper->bd_disk = NULL;
+ 	} else
+@@ -440,7 +440,7 @@
+ 
+ 	mutex_lock(&diaper->bd_mutex);
+ 	if (!--diaper->bd_openers) {
+-		invalidate_bdev(diaper, 1);
++		invalidate_bdev(diaper);
+ 		diaper->bd_contains = NULL;
+ 		diaper->bd_disk = NULL;
+ 	} else
+--- cluster-1.04.00/gfs-kernel/src/gfs/ops_fstype.c	2007-02-23 22:57:29.000000000 +0200
++++ cluster-1.04.00/gfs-kernel/src/gfs/ops_fstype.c	2007-09-11 13:50:46.000000000 +0300
+@@ -726,13 +726,6 @@
+ 			goto error;
+ 		}
+ 		sb->s_flags |= MS_ACTIVE;
+-		/* Equivilant of bdev_uevent(bdev, KOBJ_MOUNT): */
+-		if (real->bd_disk) {
+-			if (real->bd_part)
+-				kobject_uevent(&real->bd_part->kobj, KOBJ_MOUNT);
+-			else
+-				kobject_uevent(&real->bd_disk->kobj, KOBJ_MOUNT);
+-		}
+ 	}
+ 
+ 	return simple_set_mnt(mnt, sb);
+@@ -761,13 +754,6 @@
+ 	struct block_device *real = gfs_diaper_2real(diaper);
+ 	unsigned long bsize = block_size(real);
+ 
+-	/* Equivalent of bdev_uevent(bdev, KOBJ_UMOUNT); */
+-	if (real->bd_disk) {
+-		if (real->bd_part)
+-			kobject_uevent(&real->bd_part->kobj, KOBJ_UMOUNT);
+-		else
+-			kobject_uevent(&real->bd_disk->kobj, KOBJ_UMOUNT);
+-	}
+ 	generic_shutdown_super(sb);
+ 	set_blocksize(diaper, bsize);
+ 	set_blocksize(real, bsize);
+
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.17-compilefix.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.17-compilefix.patch
new file mode 100644
index 000000000000..c372de564f32
--- /dev/null
+++ b/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.17-compilefix.patch
@@ -0,0 +1,44 @@
+diff -uNr cluster-1.04.00.orig/gfs-kernel/src/gfs/ops_file.c cluster-1.03.00/gfs-kernel/src/gfs/ops_file.c
+--- cluster-1.04.00.orig/gfs-kernel/src/gfs/ops_file.c	2006-06-29 18:50:41.000000000 +0200
++++ cluster-1.04.00/gfs-kernel/src/gfs/ops_file.c	2006-08-30 18:18:06.000000000 +0200
+@@ -1465,13 +1465,12 @@
+ 
+ 	if (sdp->sd_args.ar_localflocks) {
+ 		if (IS_GETLK(cmd)) {
+-			struct file_lock tmp;
+-			int ret;
++			struct file_lock *tmp;
+ 			lock_kernel();
+-			ret = posix_test_lock(file, fl, &tmp);
++			tmp = posix_test_lock(file, fl);
+ 			fl->fl_type = F_UNLCK;
+-			if (ret)
+-				memcpy(fl, &tmp, sizeof(struct file_lock));
++			if (tmp)
++				memcpy(fl, tmp, sizeof(struct file_lock));
+ 			unlock_kernel();
+ 		        return 0;
+ 		} else {
+diff -uNr cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c cluster-1.03.00/gfs-kernel/src/nolock/main.c
+--- cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c	2006-08-16 23:53:20.000000000 +0200
++++ cluster-1.03.00/gfs-kernel/src/nolock/main.c	2006-08-30 18:18:06.000000000 +0200
+@@ -243,14 +243,13 @@
+ 		 struct lm_lockname *name,
+ 		 struct file *file, struct file_lock *fl)
+ {
+-	struct file_lock tmp;
+-	int ret;
++	struct file_lock *tmp;
+ 
+ 	lock_kernel();
+-	ret = posix_test_lock(file, fl, &tmp);
++	tmp = posix_test_lock(file, fl);
+ 	fl->fl_type = F_UNLCK;
+-	if (ret)
+-		memcpy(fl, &tmp, sizeof(struct file_lock));
++	if (tmp)
++		memcpy(fl, tmp, sizeof(struct file_lock));
+ 	unlock_kernel();
+ 
+ 	return 0;
+
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.04.00-r1.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.04.00-r1.ebuild
new file mode 100644
index 000000000000..ab4a00590f24
--- /dev/null
+++ b/sys-cluster/gfs-kernel/gfs-kernel-1.04.00-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.04.00-r1.ebuild,v 1.1 2008/02/08 14:48:35 caleb Exp $
+
+inherit eutils linux-mod linux-info
+
+CLUSTER_RELEASE="1.04.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+DESCRIPTION="GFS kernel module"
+HOMEPAGE="http://sources.redhat.com/cluster/"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+DEPEND=">=virtual/linux-sources-2.6.17
+	=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*
+	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
+
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	case ${KV_FULL} in
+		2.2.*|2.4.*) die "${P} supports only 2.6 kernels";;
+	esac
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if kernel_is 2 6; then
+		if [ "$KV_PATCH" -ge "18" ] ; then
+			epatch "${FILESDIR}"/${P}-post2.6.17-compilefix.patch ||	die
+		fi
+		if [ "$KV_PATCH" -ge "22" ] ; then
+			epatch "${FILESDIR}"/${P}-post2.6.22-compilefix.patch ||  die
+		fi
+		if [ "$KV_PATCH" -lt "18" ] ; then
+			sed -i \
+				-e 's|utsrelease.h|version.h|g' \
+				configure \
+				|| die "sed failed"
+
+			sed -i \
+				-e 's|init_utsname()->nodename|system_utsname.nodename|g' \
+				src/gulm/gulm_fs.c \
+				|| die "sed failed"
+		fi
+	fi
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	./configure --kernel_src=${KERNEL_DIR} --verbose || die "configure problem"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" module_dir="${D}"/lib/modules/${KV_FULL} install || die "install problem"
+	rm -f "${D}"/usr/include/linux/* || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
+	einfo ""
+}