added Jacob Joseph's old_gid_t patch. #10952

4 files changed, 38 insertions, 4 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 3b5041441342..d282e54e0ba7 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/openafs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.37 2004/02/18 05:45:35 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.38 2004/02/20 02:44:16 rphillips Exp $
+
+  19 Feb 2004; Ryan Phillips <rphillips@gentoo.org> openafs-1.2.10-r2.ebuild,
+  files/openafs-typechange.patch:
+  Added Jacob Joseph's old_gid_t -> u16 patch from bug #10952
 
 *openafs-1.2.11 (17 Feb 2004)
 
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 4a05a7a190e9..9576b97faaa9 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,7 +1,7 @@
 MD5 13b6c4e9e6c778a1079cb980681b94cc openafs-1.2.11.ebuild 3369
-MD5 7a7b6d938953c3686f2929498e9accc0 openafs-1.2.10-r2.ebuild 3381
+MD5 22581725ff0a0b36a3498b23e4d332e0 openafs-1.2.10-r2.ebuild 3491
 MD5 af25a4667ed3c1c476fc515c8734af1c openafs-1.2.10.ebuild 2247
-MD5 902c3ee1422cb7c662a856dfca450d58 ChangeLog 5926
+MD5 68ca22fcd71a632d457344bdbad09351 ChangeLog 6101
 MD5 1d3c436cc14252035bf2d97228cd3f58 metadata.xml 224
 MD5 18ae5558a54d73dc8d39bfd93e09e524 openafs-1.2.10-r1.ebuild 2437
 MD5 4584cc6910401787e1ebd81cfa06f060 files/CellServDB 41
@@ -14,5 +14,6 @@ MD5 45e1a76f88876cef88c25ec042a236ed files/openafs-pinstall-execve.patch 1764
 MD5 e8488032f070544719cba9c7dbaf8108 files/digest-openafs-1.2.10 73
 MD5 b8e545b3b694eccaba3c69029e768987 files/digest-openafs-1.2.11 73
 MD5 4f3ec773401fff6eeeacd14345ba89c1 files/afs.rc.rc6 5429
+MD5 28ae5081e8e323cd402a659ac5e0730c files/openafs-typechange.patch 1371
 MD5 36dc33d8c6e647e8aacf8e69849a28a3 files/openafs-pinstall-execve-env.patch 1242
 MD5 36dc33d8c6e647e8aacf8e69849a28a3 files/openafs-pinstall-execve-1.2.10.patch 1242
diff --git a/net-fs/openafs/files/openafs-typechange.patch b/net-fs/openafs/files/openafs-typechange.patch
new file mode 100644
index 000000000000..671518e18fbc
--- /dev/null
+++ b/net-fs/openafs/files/openafs-typechange.patch
@@ -0,0 +1,26 @@
+diff -Naur openafs-1.2.10-old/src/afs/LINUX/osi_groups.c openafs-1.2.10/src/afs/LINUX/osi_groups.c
+--- openafs-1.2.10-old/src/afs/LINUX/osi_groups.c	2003-05-22 00:08:03.000000000 -0400
++++ openafs-1.2.10/src/afs/LINUX/osi_groups.c	2004-02-19 17:24:45.000000000 -0500
+@@ -178,8 +178,8 @@
+ 
+ #if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_AMD64_LINUX20_ENV)
+ /* Intercept the uid16 system call as used by 32bit programs. */
+-extern long (*sys32_setgroupsp)(int gidsetsize, old_gid_t *grouplist);
+-asmlinkage long afs32_xsetgroups(int gidsetsize, old_gid_t *grouplist)
++extern long (*sys32_setgroupsp)(int gidsetsize, u16 *grouplist);
++asmlinkage long afs32_xsetgroups(int gidsetsize, u16 *grouplist)
+ {
+     long code;
+     cred_t *cr = crref();
+diff -Naur openafs-1.2.10-old/src/afs/LINUX/osi_module.c openafs-1.2.10/src/afs/LINUX/osi_module.c
+--- openafs-1.2.10-old/src/afs/LINUX/osi_module.c	2003-07-28 22:01:02.000000000 -0400
++++ openafs-1.2.10/src/afs/LINUX/osi_module.c	2004-02-19 17:23:21.000000000 -0500
+@@ -88,7 +88,7 @@
+ #endif
+ 
+ static void *ia32_ni_syscall = 0;
+-asmlinkage long (*sys32_setgroupsp)(int gidsetsize, old_gid_t *grouplist);
++asmlinkage long (*sys32_setgroupsp)(int gidsetsize, u16 *grouplist);
+ #if defined(__NR_ia32_setgroups32)
+ asmlinkage long (*sys32_setgroups32p)(int gidsetsize, gid_t *grouplist);
+ #endif /* __NR_ia32_setgroups32 */
diff --git a/net-fs/openafs/openafs-1.2.10-r2.ebuild b/net-fs/openafs/openafs-1.2.10-r2.ebuild
index 7f68cd47ded0..901f72544645 100644
--- a/net-fs/openafs/openafs-1.2.10-r2.ebuild
+++ b/net-fs/openafs/openafs-1.2.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.2.10-r2.ebuild,v 1.3 2004/01/21 17:44:50 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.2.10-r2.ebuild,v 1.4 2004/02/20 02:44:17 rphillips Exp $
 
 inherit check-kernel fixheadtails flag-o-matic
 
@@ -37,6 +37,9 @@ src_unpack() {
 	ht_fix_file "configure"
 	ht_fix_file "configure-libafs"
 	epatch ${FILESDIR}/openafs-pinstall-execve-1.2.10.patch
+	#added for bug #10952
+	#tested on x86, alpha, amd64 (rphillips)
+	epatch ${FILESDIR}/openafs-typechange.patch
 }
 
 src_compile() {