Added myself as maintainer, version bump and better init.d/conf.d scripts (see bug #126852).

Package-Manager: portage-2.1_pre6-r4

8 files changed, 90 insertions, 30 deletions

diff --git a/sys-apps/rng-tools/ChangeLog b/sys-apps/rng-tools/ChangeLog
index 8ce258e73874..13d8f445ca1f 100644
--- a/sys-apps/rng-tools/ChangeLog
+++ b/sys-apps/rng-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/rng-tools
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.12 2006/02/08 23:16:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.13 2006/03/20 09:33:00 nelchael Exp $
+
+*rng-tools-2 (20 Mar 2006)
+
+  20 Mar 2006; Krzysiek Pawlik <nelchael@gentoo.org> +files/2/rngd-conf,
+  +files/2/rngd, metadata.xml, -rng-tools-1.0.ebuild, +rng-tools-2.ebuild:
+  Added myself as maintainer, version bump and better init.d/conf.d scripts
+  (see bug #126852).
 
   08 Feb 2006; Aron Griffis <agriffis@gentoo.org> rng-tools-1.1.ebuild:
   Mark 1.1 stable on alpha
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 977de3dadf47..90eb451161c5 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,31 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2bf9156536c4546c63d1d9a1a7268038 ChangeLog 1530
-RMD160 ab0b56ffff2396710753d540da6c7e643e32639b ChangeLog 1530
-SHA256 fab33233fcd26a5ced440a62e48785762703f8ba151b371f3ea3a08b9035a961 ChangeLog 1530
-MD5 25da430ad0aab2964839df1b25d14d45 files/digest-rng-tools-1.0 64
-RMD160 68db8d4f8f1f3329feacea49622d0c067c60054c files/digest-rng-tools-1.0 64
-SHA256 658cd999c964331356c6e109db4f40b53f61523227db445553302f043d6111b3 files/digest-rng-tools-1.0 64
+MD5 745a1d3ce7ccbbe44fe8d3a16525be6e ChangeLog 1804
+RMD160 d2ee5fa7fdeb8fe27240bd831ff2cfdca48daa79 ChangeLog 1804
+SHA256 20b8a58c7cad435fcbfad41133dcd78102445db3dfe2e968dbfba830626858f1 ChangeLog 1804
+MD5 56892712cb7c03fb5a25572b1d760988 files/2/rngd 1302
+RMD160 c691ca6d069979296e1d77d2fcf59132a487139c files/2/rngd 1302
+SHA256 e66174e447879151ecc6a9e0082e90374aa55a259635f4025e18870aff3ec078 files/2/rngd 1302
+MD5 e9e55a5a7508e446c3a993fc4563266e files/2/rngd-conf 259
+RMD160 278957b8acad462fd5c888344fb21a52dffd1c6b files/2/rngd-conf 259
+SHA256 4dff7a0c8406f5344f71d236e755877388e93ff6728eedfdfe6921b3de41d137 files/2/rngd-conf 259
 MD5 ff1ccf65909bb96c328b0c5b5261b3ee files/digest-rng-tools-1.1 64
 RMD160 a32c8c7cb44a2300d8d575a3e6b84e55e37abd0b files/digest-rng-tools-1.1 64
 SHA256 5a9e09c0a63a274fd27f77df2991fe0711408b3293ca20e57a0c0f3cac0529a0 files/digest-rng-tools-1.1 64
+MD5 a762c1994f4fd83591b0663e29931a67 files/digest-rng-tools-2 232
+RMD160 13a42c64c49190829073626bd2fb49c7c5768542 files/digest-rng-tools-2 232
+SHA256 3ccc88dba2178b755570787efc1292ee33e06bb18987d274b1ad31a41191a5bb files/digest-rng-tools-2 232
 MD5 8a54d06ce57e0986d7ec3978f267795e files/rngd 1176
 RMD160 d3be0474b0cdb3d2f5180cb1c41cf8ebd55c9557 files/rngd 1176
 SHA256 aaadf69bfb1099e28bd6e3e77f502726cb0cf9668221d0538191f059188b7128 files/rngd 1176
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
-SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 68969238ecde22a27b010488adfd490b rng-tools-1.0.ebuild 625
-RMD160 14c2d219e445e639c0f6b66b8ace8c300caf4be3 rng-tools-1.0.ebuild 625
-SHA256 8578a2d3e1e282c49d6fb66cdebf45af3cbee672c4490a0c2c0652a0fb730739 rng-tools-1.0.ebuild 625
+MD5 30a69f4bacf2860c8b7ed5ab0d2eb3b1 metadata.xml 231
+RMD160 984878f0848eaa1ef84b38196bb704d218277437 metadata.xml 231
+SHA256 c9a6ce79e19aa9257b980bda6f6b6332d0fcb81f50800bb12c1a1c6d2f5cd443 metadata.xml 231
 MD5 982862e851f1a873f9aca352ef028268 rng-tools-1.1.ebuild 720
 RMD160 7a88cdf12856dddecf1a5e94a6914b2c45410c59 rng-tools-1.1.ebuild 720
 SHA256 2e81c25f60236caf406c6aa1b84336b59688c0ced215cab31986b55e935ed2bf rng-tools-1.1.ebuild 720
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHdoA2+ySkm8kpY0RAvf0AJ9CQOppRpobXnprxo5VwaYo4rDwlQCdHkFc
-DvkAVXsbd7kg/rVmwbpawjE=
-=szsR
------END PGP SIGNATURE-----
+MD5 5a62ce3614dbb52d3049dabeb7afd2e8 rng-tools-2.ebuild 827
+RMD160 71c1c71a20c92f0789622c9312648c011ef0728e rng-tools-2.ebuild 827
+SHA256 66c13dc6db55c552cab52082c6b60765e95303dfe22b895440663921c92d90a0 rng-tools-2.ebuild 827
diff --git a/sys-apps/rng-tools/files/2/rngd b/sys-apps/rng-tools/files/2/rngd
new file mode 100644
index 000000000000..11cd5fde77c2
--- /dev/null
+++ b/sys-apps/rng-tools/files/2/rngd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/2/rngd,v 1.1 2006/03/20 09:33:00 nelchael Exp $
+
+depend() {
+	need localmount
+	after random
+}
+ 
+start() {
+	ebegin "Starting hardware RNG daemon"
+	if [ -e /dev/hw_random ]; then
+		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/hw_random
+		eend $? "Failed to start hardware RNG daemon"
+	elif [ -e /dev/hwrandom ]; then
+		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/hwrandom
+		eend $? "Failed to start hardware RNG daemon"
+	elif [ -e /dev/i810_rng ]; then
+		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/i810_rng
+		eend $? "Failed to start hardware RNG daemon"
+	else
+		einfo "No hardware RNG found, using /dev/urandom as feedback input"
+		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/urandom
+		eend $? "Failed to start hardware RNG daemon"
+	fi
+}
+
+stop() {
+	ebegin "Stopping hardware RNG daemon"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/rngd
+	eend $? "Failed to stop hardware RNG daemon"
+}
diff --git a/sys-apps/rng-tools/files/2/rngd-conf b/sys-apps/rng-tools/files/2/rngd-conf
new file mode 100644
index 000000000000..17c17ec6b915
--- /dev/null
+++ b/sys-apps/rng-tools/files/2/rngd-conf
@@ -0,0 +1,9 @@
+# /etc/conf.d/rngd
+
+# Please see "/usr/sbin/rngd --help" and "man rngd" for more information
+
+# Random step (Number of bytes written to random-device at a time):
+STEP=64
+
+# Timeout (Interval written to random-device when the entropy pool is full):
+TIMEOUT=60
diff --git a/sys-apps/rng-tools/files/digest-rng-tools-1.0 b/sys-apps/rng-tools/files/digest-rng-tools-1.0
deleted file mode 100644
index c95c4287a014..000000000000
--- a/sys-apps/rng-tools/files/digest-rng-tools-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 684ef79f306b9ffc2e3d7b7b80aafeb5 rng-tools-1.0.tar.gz 41400
diff --git a/sys-apps/rng-tools/files/digest-rng-tools-2 b/sys-apps/rng-tools/files/digest-rng-tools-2
new file mode 100644
index 000000000000..ce84f30b52dd
--- /dev/null
+++ b/sys-apps/rng-tools/files/digest-rng-tools-2
@@ -0,0 +1,3 @@
+MD5 63d503191eabed630324c104cc024475 rng-tools-2.tar.gz 86429
+RMD160 c40bc13068ffb48e28e1a8da274c0be40deb0a8a rng-tools-2.tar.gz 86429
+SHA256 1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25ec2b1e rng-tools-2.tar.gz 86429
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index 96a2d586367d..46f110d24c7d 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
+	<maintainer>
+		<email>nelchael@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/rng-tools/rng-tools-1.0.ebuild b/sys-apps/rng-tools/rng-tools-2.ebuild
index cc7aac3f701b..a9979561b1d4 100644
--- a/sys-apps/rng-tools/rng-tools-1.0.ebuild
+++ b/sys-apps/rng-tools/rng-tools-2.ebuild
@@ -1,16 +1,25 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-1.0.ebuild,v 1.6 2004/07/15 02:29:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-2.ebuild,v 1.1 2006/03/20 09:33:00 nelchael Exp $
 
 DESCRIPTION="Daemon to use hardware random number generators."
 HOMEPAGE="http://gkernel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE=""
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	# we want this extra tool
+	cd ${S}
+	echo 'bin_PROGRAMS = randstat' >contrib/Makefile.am
+	aclocal
+	automake
+}
+
 src_compile() {
 	econf || die
 	emake || die
@@ -18,8 +27,9 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	doman rngd.8
 	dodoc AUTHORS ChangeLog
 	exeinto /etc/init.d
-	doexe ${FILESDIR}/rngd
+	doexe ${FILESDIR}/2/rngd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/2/rngd-conf rngd
 }