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

(Portage version: 2.1.3.12)

4 files changed, 114 insertions, 1 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/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
+}