Fix access denied for sandbox, bug#198659

(Portage version: 2.1.3.19)

4 files changed, 24 insertions, 7 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index c3d25950d16a..6f54142f7261 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.63 2007/11/10 13:47:37 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.64 2007/11/10 14:02:39 alonbl Exp $
+
+  10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/johntheripper-1.7.2-mkdir-sandbox.patch,
+  johntheripper-1.7.2-r2.ebuild:
+  Fix access denied for sandbox, bug#198659
 
   10 Nov 2007; Dawid Węgliński <cla@gentoo.org>
   johntheripper-1.7.2-r2.ebuild:
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.7.2 b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2
index a90f5138c57f..9816ad33de35 100644
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.7.2
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2
@@ -1,6 +1,6 @@
-MD5 4429722ba242a5a33ca8ebf45fd42797 john-1.7-all-4.diff.gz 50311
-RMD160 eafed1e75d72beef62664b238adf38ec6e6d4c52 john-1.7-all-4.diff.gz 50311
-SHA256 cb51be6cb03e952a21ea1a85e60253b932c946959b62f8082665ac2c7a792909 john-1.7-all-4.diff.gz 50311
+MD5 1206a4fac6d876307b2c8a4c0db8a450 john-1.7-all-4.diff.gz 2550
+RMD160 e2a9fbed670efd48dd0ce537b1a5511aaf27ed13 john-1.7-all-4.diff.gz 2550
+SHA256 b21e90a995239089d90307641b45de28f167ed1a8c77bbb0bfe590d10ab8d436 john-1.7-all-4.diff.gz 2550
 MD5 78a0294fba77ebd63bdb39837df917c8 john-1.7.2.tar.gz 809308
 RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac john-1.7.2.tar.gz 809308
 SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb john-1.7.2.tar.gz 809308
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch
new file mode 100644
index 000000000000..7a1562413050
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch
@@ -0,0 +1,12 @@
+diff -urNp john-1.7.2.org/src/path.c john-1.7.2/src/path.c
+--- john-1.7.2.org/src/path.c	2003-10-01 04:26:25.000000000 +0300
++++ john-1.7.2/src/path.c	2007-11-10 15:53:23.000000000 +0200
+@@ -55,7 +55,7 @@ void path_init(char **argv)
+ #ifdef JOHN_PRIVATE_HOME
+ 	private = path_expand(JOHN_PRIVATE_HOME);
+ 	if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) {
+-		if (errno != EEXIST) pexit("mkdir: %s", private);
++		if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private);
+ 	} else
+ 		fprintf(stderr, "Created directory: %s\n", private);
+ #endif
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild
index 0f3a3e03927f..948110b24dfb 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild,v 1.4 2007/11/10 13:47:37 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild,v 1.5 2007/11/10 14:02:39 alonbl Exp $
 
 inherit eutils flag-o-matic toolchain-funcs pax-utils
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.openwall.com/john/f/${MY_PBASE}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~ppc64 ~sparc x86"
 IUSE="mmx altivec sse2"
 
 RDEPEND=">=dev-libs/openssl-0.9.7"
@@ -27,7 +27,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${WORKDIR}"/${MY_PNBASE}-1.7.2-all-7.diff
 
-	for p in sha1-memset stackdef.S stackdef-2.S; do
+	for p in sha1-memset stackdef.S stackdef-2.S mkdir-sandbox; do
 		epatch "${FILESDIR}/${P}-${p}.patch"
 	done
 }