patch to fix Bug 517942, sourced from Debian, attached to bug #517942 by cilly, also prompted by proxy maintainer

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

4 files changed, 39 insertions, 6 deletions

diff --git a/sys-apps/rng-tools/ChangeLog b/sys-apps/rng-tools/ChangeLog
index 615c73301568..9458d21297db 100644
--- a/sys-apps/rng-tools/ChangeLog
+++ b/sys-apps/rng-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/rng-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.58 2015/07/17 08:51:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.59 2015/07/17 09:30:21 idella4 Exp $
+
+  17 Jul 2015; Ian Delaney <idella4@gentoo.org> +files/larger-poolsize.patch,
+  rng-tools-5-r1.ebuild, rng-tools-5.ebuild:
+  patch to fix Bug 517942, sourced from Debian, attached to bug #517942 by
+  cilly, also prompted by proxy maintainer
 
 *rng-tools-5-r1 (17 Jul 2015)
 
diff --git a/sys-apps/rng-tools/files/larger-poolsize.patch b/sys-apps/rng-tools/files/larger-poolsize.patch
new file mode 100644
index 000000000000..a0db47b004ab
--- /dev/null
+++ b/sys-apps/rng-tools/files/larger-poolsize.patch
@@ -0,0 +1,26 @@
+diff -urNp rng-tools-4.original/rngd.c rng-tools-4/rngd.c
+--- rng-tools-4.original/rngd.c	2012-08-02 06:19:09.000000000 +0200
++++ rng-tools-4/rngd.c	2013-10-03 13:32:24.069885853 +0200
+@@ -93,7 +93,7 @@ static struct argp_option options[] = {
+ 	  "Number of bytes written to random-device at a time (default: 64)" },
+ 
+ 	{ "fill-watermark", 'W', "n", 0,
+-	  "Do not stop feeding entropy to random-device until at least n bits of entropy are available in the pool (default: 2048), 0 <= n <= 4096" },
++	  "Do not stop feeding entropy to random-device until at least n bits of entropy are available in the pool (default: 2048), 0 <= n <= kernel entropy pool size (in bits)" },
+ 
+ 	{ "quiet", 'q', 0, 0, "Suppress error messages" },
+ 
+@@ -166,8 +166,11 @@ static error_t parse_opt (int key, char
+ 			argp_usage(state);
+ 		break;
+ 	case 'W': {
+-		int n;
+-		if ((sscanf(arg, "%i", &n) == 0) || (n < 0) || (n > 4096))
++		int n, poolsize = 512;
++		FILE *pf;
++		pf = fopen( "/proc/sys/kernel/random/poolsize", "r" );
++		fscanf( pf, "%d", &poolsize );
++		if ((sscanf(arg, "%i", &n) == 0) || (n < 0) || (n > 8*poolsize))
+ 			argp_usage(state);
+ 		else
+ 			arguments->fill_watermark = n;
diff --git a/sys-apps/rng-tools/rng-tools-5-r1.ebuild b/sys-apps/rng-tools/rng-tools-5-r1.ebuild
index fc9b4c394733..7d47738b6d5b 100644
--- a/sys-apps/rng-tools/rng-tools-5-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-5-r1.ebuild,v 1.1 2015/07/17 08:51:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-5-r1.ebuild,v 1.2 2015/07/17 09:30:21 idella4 Exp $
 
 EAPI=5
 
@@ -22,8 +22,10 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
-	epatch "${FILESDIR}"/test-for-argp.patch\
-		"${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch
+	epatch "${FILESDIR}"/test-for-argp.patch \
+                "${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch \
+		"${FILESDIR}"/larger-poolsize.patch
+
 	eautoreconf
 
 	sed -i '/^AR /d' Makefile.in || die
diff --git a/sys-apps/rng-tools/rng-tools-5.ebuild b/sys-apps/rng-tools/rng-tools-5.ebuild
index b399ecf2c34b..0d97b4265f83 100644
--- a/sys-apps/rng-tools/rng-tools-5.ebuild
+++ b/sys-apps/rng-tools/rng-tools-5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-5.ebuild,v 1.1 2014/11/18 19:54:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-5.ebuild,v 1.2 2015/07/17 09:30:21 idella4 Exp $
 
 EAPI=5