diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2010-07-11 12:02:59 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2010-07-11 12:02:59 +0000 |
| commit | 36ec536c0f34657d73d023d6e3d8e3282d6be0da (patch) | |
| tree | 5dae3cf59dab815f306e6876995ab54479e1d8ca /app-shells | |
| parent | x86 stable, bug #322751 (diff) | |
| download | gentoo-2-36ec536c0f34657d73d023d6e3d8e3282d6be0da.tar.gz gentoo-2-36ec536c0f34657d73d023d6e3d8e3282d6be0da.tar.bz2 gentoo-2-36ec536c0f34657d73d023d6e3d8e3282d6be0da.zip | |
Fix for #307983, thanks to Fabian Koester
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/mksh/ChangeLog | 6 | ||||
| -rw-r--r-- | app-shells/mksh/files/mksh-39c-urandom-write.patch | 20 | ||||
| -rw-r--r-- | app-shells/mksh/mksh-39c.ebuild | 3 |
3 files changed, 27 insertions, 2 deletions
diff --git a/app-shells/mksh/ChangeLog b/app-shells/mksh/ChangeLog index db9c4cec3c45..f8e2faa52d5c 100644 --- 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/files/mksh-39c-urandom-write.patch b/app-shells/mksh/files/mksh-39c-urandom-write.patch new file mode 100644 index 000000000000..59f8a762c5d0 --- /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 6b5445bd7c4b..fd29eaf9f00e 100644 --- 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() { |