Fix for #307983, thanks to Fabian Koester

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-shells/mksh/ChangeLog b/app-shells/mksh/ChangeLog
index db9c4cec3c45c6c312a2d98ebc25d45ac2f34ada..f8e2faa52d5c0351d29554a03830cc1ab998b487 100644 (file)
--- a/app-shells/mksh/ChangeLog
+++ b/app-shells/mksh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/mksh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.18 2010/03/06 23:13:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.19 2010/07/11 12:02:59 patrick Exp $
+
+  11 Jul 2010; Patrick Lauer <patrick@gentoo.org> mksh-39c.ebuild,
+  +files/mksh-39c-urandom-write.patch:
+  Fix for #307983, thanks to Fabian Koester
 
 *mksh-39c (06 Mar 2010)
 

diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 011a578b0329e6e7d2886b2c5992f3b6ca53f67f..346d6f89c129f5cf2dbd16f7f9b24e39844ea35f 100644 (file)
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,3 +1,4 @@
+AUX mksh-39c-urandom-write.patch 479 RMD160 e7290e8fdd2886996aa6d22695cca207f3ec805e SHA1 2bd66d708e061791ea4ee17420519bf2aa8526e3 SHA256 77ff00ee60aa0f7164a4c02d63ec17d7e6b31a15d2ddb39808e3d2e029ae0879
 DIST arc4random.c.1.12 10407 RMD160 48496795d070737217a5e1cdc97752fdf6605ed3 SHA1 aa6cb4dea4cdb96e449d3ce189af16a49c75ad58 SHA256 abd8cfd145dad33de2d191dceebbdea4c41af36e8f4c9de7d9dcf180a599302d
 DIST arc4random.c.1.14 10456 RMD160 9055fd90a2fe871f55662af3901faf2a21f3412a SHA1 0e11adddb09121a3df8ed4914a9c34223703ae3f SHA256 bf9788f3aea26bed40b9f2ed53b764a2ce0555257587ac7fb3d0d7b31b9a5c32
 DIST mksh-R36b.cpio.gz 264821 RMD160 67e03ee461991e969a7abcb7a2dc17af54ab179d SHA1 4c95b394de42c07b178d553fd0582f8cf36536b3 SHA256 885df4f5419dd91902828c46cdf57e47573e3205e403f4dee175cd40e6c639e0
@@ -9,6 +10,6 @@ EBUILD mksh-36b.ebuild 911 RMD160 3b153954b94b9c078ecd014fe3c4265c54e3a648 SHA1
 EBUILD mksh-38c.ebuild 911 RMD160 65c5a519bee3c7d31174998adfcfbfc7973c8f74 SHA1 77b467d606aac37a7288982ee9b52621db173de7 SHA256 a54d32205d62ad49b9f70efc57be7f0009c763aed5655d7a7141928f7c168ec7
 EBUILD mksh-39.ebuild 912 RMD160 f29a3c80e6ee5b3eb0c405b4650e3a41510d1d48 SHA1 1c54bbe26216bb20dc9350fdf746c23d6b6a3403 SHA256 5e6bba28a9248ecffe253bf755142e24b12539bc13239c4159e7753ae779629f
 EBUILD mksh-39b.ebuild 913 RMD160 0113c5c7a4328ba6702705a8284540a65f1a428b SHA1 099d8966bc6f7166933a281d6bd00c807a273168 SHA256 e40ccd9d5d9c4f350706d2ed58e94fce8c0bf528c3f46aa56c82f78d5df6d13d
-EBUILD mksh-39c.ebuild 913 RMD160 f827193a4123c964568506b1885b2af738db405c SHA1 6cb5b5d25b5aadae5907adb75fe078fe5dcf1a36 SHA256 7a056df6694f4d7773a514a6afc9059650e12c2bbae055145d3cbc55c3e460a4
-MISC ChangeLog 2284 RMD160 5ee35f06da074ef7148da9dd9d4585c744b555df SHA1 0cfec71b3523099e567d683e7336819f2981bdcd SHA256 c420b02adc64034f5b733d9e3d68970e5154c94fd5c3170b4b18fbb30585ead6
+EBUILD mksh-39c.ebuild 960 RMD160 f22c717a5635f44b20d0297dbdf086c40c0a939f SHA1 e843966edb01b9aa5c29c201405e3469d4875456 SHA256 ad34aa7c80d3a10aa8a3d4e7c281d1943a4f851c8339dc0c253ae7b01889a0d6
+MISC ChangeLog 2435 RMD160 f468dd545f5abfb279174eca3ea74f41df25e07d SHA1 5e0f6b0da975fdb3ab05a8496b56903ae7310dd0 SHA256 b173cb09fba1d023d2e8e2c4893e5b93d74b7a72c91fc68176e1c3f9a4e62ae5
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669

diff --git a/app-shells/mksh/files/mksh-39c-urandom-write.patch b/app-shells/mksh/files/mksh-39c-urandom-write.patch
new file mode 100644 (file)
index 0000000..59f8a76
--- /dev/null
+++ b/app-shells/mksh/files/mksh-39c-urandom-write.patch
@@ -0,0 +1,20 @@
+Index: work/mksh/arc4random.c
+===================================================================
+--- work.orig/mksh/arc4random.c
++++ work/mksh/arc4random.c
+@@ -367,14 +367,7 @@ arc4_writeback(uint8_t *buf, size_t len,
+       memcpy(buf, &num, sizeof (num));
+       return (do_rd ? 0 : 1);
+ #else
+-      int fd;
+-
+-      if ((fd = open(__randomdev, O_WRONLY)) != -1) {
+-              if (write(fd, buf, len) < 4)
+-                      do_rd = 1;
+-              close(fd);
+-      }
+-      return (do_rd || fd == -1 ? 0 : 1);
++      return (0);
+ #endif
+ }
+ 

diff --git a/app-shells/mksh/mksh-39c.ebuild b/app-shells/mksh/mksh-39c.ebuild
index 6b5445bd7c4bd81644ee4547765eb04abb75a128..fd29eaf9f00e26196b2c43f939bc865ba7d6ef16 100644 (file)
--- a/app-shells/mksh/mksh-39c.ebuild
+++ b/app-shells/mksh/mksh-39c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-39c.ebuild,v 1.1 2010/03/06 23:13:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-39c.ebuild,v 1.2 2010/07/11 12:02:59 patrick Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ S="${WORKDIR}/${PN}"
 src_unpack() {
        gzip -dc "${DISTDIR}/${PN}-R${PV}.cpio.gz" | cpio -mid
        cp "${DISTDIR}/arc4random.c.${ARC4_VERSION}" "${S}/arc4random.c" || die
+       epatch "${FILESDIR}/${P}-urandom-write.patch"
 }
 
 src_compile() {