Version bump + 2.6.23 patch, fixes bugs #190533 and #194122

Package-Manager: portage-2.1.3.12

5 files changed, 130 insertions, 5 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index e3cc71b5e4d9..f8a7632ee133 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/openafs-kernel
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.76 2007/10/02 14:18:06 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.77 2007/10/13 14:19:33 stefaan Exp $
+
+*openafs-kernel-1.4.5_pre1 (13 Oct 2007)
+
+  13 Oct 2007; Stefaan De Roeck <stefaan@gentoo.org>
+  +files/openafs-linux-2.6.23.patch, +openafs-kernel-1.4.5_pre1.ebuild:
+  Version bump + 2.6.23 patch, fixes bugs #190533 and #194122
 
   02 Oct 2007; Stefaan De Roeck <stefaan@gentoo.org>
   openafs-kernel-1.4.4_p20070724-r2.ebuild:
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 3ac8bc64ccee..961511dc3ee7 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,3 +1,7 @@
+AUX openafs-linux-2.6.23.patch 1269 RMD160 e65dfd5bb49e3080cf661c929c5d56cd05d79814 SHA1 10bc9da6f01c2396cfbe3ec997a6c3f0cdd48f3a SHA256 e6aa5d0ce318c9b7dcbd5a4c3feeec096344ed6ad292806e06e034c0ccde95a4
+MD5 4b595af82e6750e9291008d33a39a731 files/openafs-linux-2.6.23.patch 1269
+RMD160 e65dfd5bb49e3080cf661c929c5d56cd05d79814 files/openafs-linux-2.6.23.patch 1269
+SHA256 e6aa5d0ce318c9b7dcbd5a4c3feeec096344ed6ad292806e06e034c0ccde95a4 files/openafs-linux-2.6.23.patch 1269
 AUX openafs-ppc64.patch 1070 RMD160 d9ba745792a62d4dc5bdb63e4c5b7025ee97b3d8 SHA1 da72cd463d784707f3488697f2f3ce0f6d4e6b97 SHA256 259d0e883abb46f0f2098b385763815bd4bec5b86b11861f128ae2a6e074e109
 MD5 bcbb6768512967194645626b441b6027 files/openafs-ppc64.patch 1070
 RMD160 d9ba745792a62d4dc5bdb63e4c5b7025ee97b3d8 files/openafs-ppc64.patch 1070
@@ -21,6 +25,7 @@ DIST openafs-1.4.3rc2-src.tar.bz2 12446007 RMD160 c9979778cd1c0a4e767652cecfd609
 DIST openafs-1.4.3rc3-src.tar.bz2 12450825 RMD160 64b02b6050ae153eab64595e5a96bc4a4a3a7338 SHA1 6b70af4e6178032d5feccb42d4c705692613ab8b SHA256 e2fbc94bceb50266d2283e9bcb41e0ed6fb50b53fa5b356e6cdf1409886ad3a8
 DIST openafs-1.4.4-cvs20070724.patch.bz2 86943 RMD160 26daf5867f89691ba2cf6f578a729cae8894c646 SHA1 19645be17b8b6fb765d9c439731aef41f026da72 SHA256 2fffc29f58db15f46eb7b1695744f7982ccb836b84f7964308de893d4345b724
 DIST openafs-1.4.4-src.tar.bz2 12500224 RMD160 712907afc74ced010996dd43f785b341ac24da46 SHA1 07c2854d97fab807ee023c281ec7203f1e9ef723 SHA256 a417c4d5eab6cf68c6082b6bd93d7ca70410635794308b731269b246ba80f7e4
+DIST openafs-1.4.5-pre1-src.tar.bz2 12485880 RMD160 5c1cfbf9e066051888b0f5e68ea01e7ab8375a27 SHA1 7c644fb935ecbdad17a9ca0a1418e3674f1d3e72 SHA256 35c43ef74bf8bce9f2c32b4d9aed5f8fceaea325d450f397e1e971a1e904717d
 DIST openafs-1.5.19-src.tar.bz2 12977541 RMD160 d07ccc1d9f669858c4ddb4823286af1d1f41f51e SHA1 dbe755af030ab45e2dc11749b63158c65321a23f SHA256 6ea85a432a25c615a03141846c8ed86df54fc1e507269c7db93359355e142edf
 DIST openafs-gentoo-0.12.tar.bz2 16630 RMD160 fdc543c1e4318e1685a1f785c615e89d7bbd9b89 SHA1 df7d7aa1894772cac4b7f09082ff0fc86b5f54e1 SHA256 d5b832b938c18d1ed22f4c7353139f86d1c4c750f8a8713128c51cc193be6adb
 DIST openafs-gentoo-0.13.tar.bz2 16814 RMD160 98bd851081bcdccec87b50139e7bd9e52663c12b SHA1 363cd8f6401df484a3d48285f229318f9d37ee87 SHA256 a39c0c9656a82e586bff7bd9543d8ccd175991777d68c7fe47de1c724cbe19f2
@@ -63,14 +68,18 @@ EBUILD openafs-kernel-1.4.4_p20070724.ebuild 1707 RMD160 f7fe4401c8de9ebe2d9ca80
 MD5 4ee51575f8bbfffeadecbb1976d7db5f openafs-kernel-1.4.4_p20070724.ebuild 1707
 RMD160 f7fe4401c8de9ebe2d9ca80a96aeea4bb0cbb4ed openafs-kernel-1.4.4_p20070724.ebuild 1707
 SHA256 60ccd6fbc3dd362d84d8ade588084ee49587e1e7e48666ee11c179c2df5ff334 openafs-kernel-1.4.4_p20070724.ebuild 1707
+EBUILD openafs-kernel-1.4.5_pre1.ebuild 1725 RMD160 9d536e6791689e6d47a1e1c8a55ec19c0d8494f8 SHA1 82a5599ebf2acdc53b01fdbeacac0f4e25cbf152 SHA256 baeb598ecaa5f4624f07490981876cad588540c49c0b2e04deca38f5c52f7d6c
+MD5 fc6c83aa11d2f35a4a5de2f6dab8d281 openafs-kernel-1.4.5_pre1.ebuild 1725
+RMD160 9d536e6791689e6d47a1e1c8a55ec19c0d8494f8 openafs-kernel-1.4.5_pre1.ebuild 1725
+SHA256 baeb598ecaa5f4624f07490981876cad588540c49c0b2e04deca38f5c52f7d6c openafs-kernel-1.4.5_pre1.ebuild 1725
 EBUILD openafs-kernel-1.5.19.ebuild 1509 RMD160 c3d61d83dc4bedb5aaf737190754487cea4543a0 SHA1 aea77c64f4f9efccc115fad44a4a1198940e2a6f SHA256 d63496f8936d9c879d23e59f6965027cf6134dd9907ae4308f2218cce49e4414
 MD5 b93c39148bd46ee4e605225c1040b7af openafs-kernel-1.5.19.ebuild 1509
 RMD160 c3d61d83dc4bedb5aaf737190754487cea4543a0 openafs-kernel-1.5.19.ebuild 1509
 SHA256 d63496f8936d9c879d23e59f6965027cf6134dd9907ae4308f2218cce49e4414 openafs-kernel-1.5.19.ebuild 1509
-MISC ChangeLog 12138 RMD160 a3aff05a75375f1f41266ad9b3a74e0061038541 SHA1 56a50eeca9928a64e79df921ca366e3a4ef83c41 SHA256 cef0421d2f5a25289dce8beff91978e934cebfe858c59ad1b62f661592fbb31a
-MD5 496d80e3283b01e4349b07f0e2fe1e18 ChangeLog 12138
-RMD160 a3aff05a75375f1f41266ad9b3a74e0061038541 ChangeLog 12138
-SHA256 cef0421d2f5a25289dce8beff91978e934cebfe858c59ad1b62f661592fbb31a ChangeLog 12138
+MISC ChangeLog 12368 RMD160 bcf5685ed85c76f2e531886fe6c3381ec3c6a117 SHA1 2874ea2ff98efcf090c98b1c0dbe58a3970a7269 SHA256 6ce28389d8655a5ed7360cb5d53251dca709827e7d47d2269df9c464b7804f6b
+MD5 91ca7f8c450392a9255b77d947c68da2 ChangeLog 12368
+RMD160 bcf5685ed85c76f2e531886fe6c3381ec3c6a117 ChangeLog 12368
+SHA256 6ce28389d8655a5ed7360cb5d53251dca709827e7d47d2269df9c464b7804f6b ChangeLog 12368
 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62
 MD5 833551f00cc2163ac7f9eb367ee9caa8 metadata.xml 254
 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 metadata.xml 254
@@ -102,6 +111,9 @@ SHA256 c5a0baf2fa53493434dffe9213ce93bb3b92b4af61250f28cf1f8c739d872d3d files/di
 MD5 3edb542a9dcbb7d3d4b95280720a7ec3 files/digest-openafs-kernel-1.4.4_p20070724-r2 804
 RMD160 68e2586985ad94ec05fd97b4a1602bf6c4585004 files/digest-openafs-kernel-1.4.4_p20070724-r2 804
 SHA256 c5a0baf2fa53493434dffe9213ce93bb3b92b4af61250f28cf1f8c739d872d3d files/digest-openafs-kernel-1.4.4_p20070724-r2 804
+MD5 ef3c2d1404865493bc967939d3930569 files/digest-openafs-kernel-1.4.5_pre1 536
+RMD160 44c1037e9e143ce96b403f88916819f6e8d2a077 files/digest-openafs-kernel-1.4.5_pre1 536
+SHA256 83e93aa58f95373f10c44619e1cfa52fde2c41cb46aa11f7ad9ac00ee1633197 files/digest-openafs-kernel-1.4.5_pre1 536
 MD5 9519d5974bb9b2d08dbdd5c7c468512d files/digest-openafs-kernel-1.5.19 524
 RMD160 763eba455d7f38850672791a3a3095d7cf5fe6b9 files/digest-openafs-kernel-1.5.19 524
 SHA256 20f00aba0b0cf036b60abe3a0302fcdeb21a23df1e4df48e30619e3049752040 files/digest-openafs-kernel-1.5.19 524
diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.5_pre1 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.5_pre1
new file mode 100644
index 000000000000..120df66dc7a1
--- /dev/null
+++ b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.5_pre1
@@ -0,0 +1,6 @@
+MD5 89918d5f40a85ffdfd8ccf5308639dd6 openafs-1.4.5-pre1-src.tar.bz2 12485880
+RMD160 5c1cfbf9e066051888b0f5e68ea01e7ab8375a27 openafs-1.4.5-pre1-src.tar.bz2 12485880
+SHA256 35c43ef74bf8bce9f2c32b4d9aed5f8fceaea325d450f397e1e971a1e904717d openafs-1.4.5-pre1-src.tar.bz2 12485880
+MD5 9c7119b44628c1f0a7b251e096e94d16 openafs-gentoo-0.13.tar.bz2 16814
+RMD160 98bd851081bcdccec87b50139e7bd9e52663c12b openafs-gentoo-0.13.tar.bz2 16814
+SHA256 a39c0c9656a82e586bff7bd9543d8ccd175991777d68c7fe47de1c724cbe19f2 openafs-gentoo-0.13.tar.bz2 16814
diff --git a/net-fs/openafs-kernel/files/openafs-linux-2.6.23.patch b/net-fs/openafs-kernel/files/openafs-linux-2.6.23.patch
new file mode 100644
index 000000000000..e918ebf39f85
--- /dev/null
+++ b/net-fs/openafs-kernel/files/openafs-linux-2.6.23.patch
@@ -0,0 +1,41 @@
+--- src/afs/LINUX/osi_vfsops.c.org	2007-10-13 11:44:44.000000000 +0200
++++ src/afs/LINUX/osi_vfsops.c	2007-10-13 11:45:53.000000000 +0200
+@@ -263,7 +263,7 @@
+ 
+ 
+ #if defined(STRUCT_SUPER_HAS_ALLOC_INODE)
+-static kmem_cache_t *afs_inode_cachep;
++static struct kmem_cache *afs_inode_cachep;
+ 
+ static struct inode *
+ afs_alloc_inode(struct super_block *sb)
+@@ -288,7 +288,7 @@
+ }
+ 
+ static void
+-init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
++init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
+ {
+     struct vcache *vcp = (struct vcache *) foo;
+ 
+@@ -309,7 +309,7 @@
+     afs_inode_cachep = kmem_cache_create("afs_inode_cache",
+ 					 sizeof(struct vcache),
+ 					 0, SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT,
+-					 init_once, NULL);
++					 init_once);
+     if (afs_inode_cachep == NULL)
+ 	return -ENOMEM;
+     return 0;
+--- src/afs/LINUX/osi_vnodeops.c.org	2007-10-13 11:59:16.000000000 +0200
++++ src/afs/LINUX/osi_vnodeops.c	2007-10-13 11:59:40.000000000 +0200
+@@ -640,9 +640,6 @@
+   .mmap =	afs_linux_mmap,
+   .open =	afs_linux_open,
+   .flush =	afs_linux_flush,
+-#ifdef AFS_LINUX26_ENV
+-  .sendfile =   generic_file_sendfile,
+-#endif
+   .release =	afs_linux_release,
+   .fsync =	afs_linux_fsync,
+   .lock =	afs_linux_lock,
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild
new file mode 100644
index 000000000000..05889a0a06e8
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild,v 1.1 2007/10/13 14:19:33 stefaan Exp $
+
+inherit eutils linux-mod versionator toolchain-funcs
+
+PATCHVER=0.13
+MY_PN=${PN/-kernel}
+MY_PV=${PV/_pre/-pre}
+MY_P=${MY_PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+SRC_URI="http://openafs.org/dl/candidate/${PV}/${MY_P}-src.tar.bz2
+	mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
+
+CONFIG_CHECK="!DEBUG_RODATA"
+DEBUG_RODATA_ERROR="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${MY_P}-src.tar.bz2
+	unpack ${MY_PN}-gentoo-${PATCHVER}.tar.bz2
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	epatch "${FILESDIR}"/openafs-ppc64.patch
+	epatch "${FILESDIR}"/openafs-sparc.patch
+
+	kernel_is ge 2 6 23 && epatch "${FILESDIR}"/openafs-linux-2.6.23.patch
+
+	./regen.sh || die "Failed: regenerating configure script"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf"
+
+	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake"
+}
+
+src_install() {
+	MOD_SRCDIR=$(expr ${S}/src/libafs/MODLOAD-*)
+	[ -f ${MOD_SRCDIR}/libafs.${KV_OBJ} ] \
+			|| die "Couldn't find compiled kernel module"
+
+	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR)'
+
+	linux-mod_src_install
+}