Added pinstall-execve patch for versions >= 1.2.10

5 files changed, 73 insertions, 13 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 9ec80e5d1d53..85d3a95c2a6a 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/openafs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.27 2003/11/21 18:16:46 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.28 2003/11/21 18:25:30 rphillips Exp $
+
+  21 Nov 2003; <rphillips@gentoo.org> openafs-1.2.10-r1.ebuild,
+  openafs-1.2.10.ebuild, files/openafs-pinstall-execve-1.2.10.patch:
+  added execve patch submitted from Ian on bug #31671 for versions >= 1.2.10
 
   21 Nov 2003; <rphillips@gentoo.org> openafs-1.2.10-r1.ebuild,
   openafs-1.2.10.ebuild, openafs-1.2.8.ebuild, openafs-1.2.9.ebuild:
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 05fc868ef05a..7f2f2a507bac 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,9 +1,9 @@
 MD5 cbdfa955fe205a00df49fb33a154fb3c openafs-1.2.9.ebuild 2377
-MD5 1d916baa88c361eb72d201de7607aa95 openafs-1.2.10.ebuild 2306
+MD5 cd27be8a0ad61a4008a7ca13a261a845 openafs-1.2.10.ebuild 2247
 MD5 42621647c008558f5d5c9a13367edaa4 openafs-1.2.8.ebuild 2863
-MD5 b24fadea38a3a5c7ae7f462904ba210f ChangeLog 4583
+MD5 a596c7497cd1aeb7ae3b96b9ead913bc ChangeLog 4794
 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
-MD5 14f797000606aab87378def0b84f35e0 openafs-1.2.10-r1.ebuild 2300
+MD5 9e9d6e2883086892aa7be910bb43dce4 openafs-1.2.10-r1.ebuild 2249
 MD5 4584cc6910401787e1ebd81cfa06f060 files/CellServDB 41
 MD5 e8488032f070544719cba9c7dbaf8108 files/digest-openafs-1.2.10-r1 73
 MD5 c620f50b47424c46f59dc847eb8c0dd3 files/README 8735
@@ -14,3 +14,4 @@ MD5 e8488032f070544719cba9c7dbaf8108 files/digest-openafs-1.2.10 73
 MD5 0cc0097b5cfc3cb04bd313c127155e52 files/digest-openafs-1.2.8 643
 MD5 a6957d849a3d1a5b766e885105c3d7f4 files/digest-openafs-1.2.9 72
 MD5 56bd1a21b0690f7f543ca903a7d184ab files/afs.rc.rc6 5432
+MD5 36dc33d8c6e647e8aacf8e69849a28a3 files/openafs-pinstall-execve-1.2.10.patch 1242
diff --git a/net-fs/openafs/files/openafs-pinstall-execve-1.2.10.patch b/net-fs/openafs/files/openafs-pinstall-execve-1.2.10.patch
new file mode 100644
index 000000000000..4fd9c4e61cc3
--- /dev/null
+++ b/net-fs/openafs/files/openafs-pinstall-execve-1.2.10.patch
@@ -0,0 +1,58 @@
+--- openafs/src/pinstall/install.c	2003-07-25 04:40:16.000000000 +0000
++++ openafs/src/pinstall/install.c	2003-11-17 21:47:15.000000000 +0000
+@@ -172,6 +172,9 @@
+ char *iname, *oname; {
+ 	int pid;
+ 	pid_t status;
++	static char *env[] = {
++	  0,
++	};
+ 	static char *strip[] = {
+ 		"strip", 0, 0,
+ 	};
+@@ -190,7 +193,7 @@
+ 	    case 0:			/* child	*/
+ 		copy[1] = iname;
+ 		copy[2] = oname;
+-		execve("/bin/cp", copy, (char **)0);
++		execve("/bin/cp", copy, env);
+ 		perror("/bin/cp");
+ 		exit(1);
+ 
+@@ -236,7 +239,7 @@
+ #else
+ #define	STRIP_BIN	"/bin/strip"
+ #endif
+-		execve(STRIP_BIN, strip, (char **)0);
++		execve(STRIP_BIN, strip, env);
+ 		perror(STRIP_BIN);
+ 		exit(1);
+ 
+@@ -281,6 +284,9 @@
+ quickStrip (iname, oname, ignored, copy_only)
+ char *iname, *oname; {
+ 	int pid, status;
++	static char *env[] = {
++	  0,
++	};
+ 	static char *strip[] = {
+ 		"strip", 0, 0,
+ 	};
+@@ -299,7 +305,7 @@
+ 	    case 0:			/* child	*/
+ 		copy[1] = iname;
+ 		copy[2] = oname;
+-		execve("/bin/cp", copy, 0);
++		execve("/bin/cp", copy, env);
+ 		perror("/bin/cp");
+ 		exit(1);
+ 
+@@ -337,7 +343,7 @@
+ 
+ 	    case 0:			/* child	*/
+ 		strip[1] = oname;
+-		execve("/bin/strip", strip, 0);
++		execve("/bin/strip", strip, env);
+ 		perror("/bin/strip");
+ 		exit(1);
+ 
diff --git a/net-fs/openafs/openafs-1.2.10-r1.ebuild b/net-fs/openafs/openafs-1.2.10-r1.ebuild
index 068a39510b7f..eb52edbdf0b5 100644
--- a/net-fs/openafs/openafs-1.2.10-r1.ebuild
+++ b/net-fs/openafs/openafs-1.2.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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-r1.ebuild,v 1.3 2003/11/21 18:16:46 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.2.10-r1.ebuild,v 1.4 2003/11/21 18:25:30 rphillips Exp $
 
 inherit check-kernel
 
@@ -25,7 +25,6 @@ SYS_NAME=i386_linux24
 
 
 pkg_setup() {
-
 	if is_2_5_kernel || is_2_6_kernel
 	then
 		die "OpenAFS does not yet support 2.5 and 2.6 kernels"
@@ -36,9 +35,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	# rphillips - this patch doesn't apply, is it needed?
-	#cd ${S}
-	#epatch ${FILESDIR}/openafs-pinstall-execve.patch
+	cd ${S}
+	epatch ${FILESDIR}/openafs-pinstall-execve-1.2.10.patch
 }
 
 src_compile() {
diff --git a/net-fs/openafs/openafs-1.2.10.ebuild b/net-fs/openafs/openafs-1.2.10.ebuild
index 11b038fd21eb..a576dc177979 100644
--- a/net-fs/openafs/openafs-1.2.10.ebuild
+++ b/net-fs/openafs/openafs-1.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.ebuild,v 1.5 2003/11/21 18:16:46 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.2.10.ebuild,v 1.6 2003/11/21 18:25:30 rphillips Exp $
 
 inherit check-kernel
 
@@ -36,9 +36,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	# rphillips - does not apply correctly.  Is this still needed?
-	#cd ${S}
-	#epatch ${FILESDIR}/openafs-pinstall-execve.patch
+	cd ${S}
+	epatch ${FILESDIR}/openafs-pinstall-execve-1.2.10.patch
 }
 
 src_compile() {