Fix init script for 2.0.1 (bug 271882), thanks to Tim O'Kelly

Package-Manager: portage-2.1.7.4/cvs/Linux x86_64

8 files changed, 65 insertions, 14 deletions

diff --git a/media-sound/audio-entropyd/ChangeLog b/media-sound/audio-entropyd/ChangeLog
index a2745a53bed6..da299b531d9f 100644
--- a/media-sound/audio-entropyd/ChangeLog
+++ b/media-sound/audio-entropyd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/audio-entropyd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/ChangeLog,v 1.33 2009/11/04 21:02:04 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/ChangeLog,v 1.34 2009/11/12 09:54:20 angelos Exp $
+
+*audio-entropyd-2.0.1-r1 (12 Nov 2009)
+
+  12 Nov 2009; Christoph Mende <angelos@gentoo.org>
+  +files/audio-entropyd.conf-1, +files/audio-entropyd.init-1,
+  audio-entropyd-1.0.5.ebuild, +files/audio-entropyd.conf-2,
+  +files/audio-entropyd.init-2, -audio-entropyd-2.0.1.ebuild,
+  +audio-entropyd-2.0.1-r1.ebuild, -files/audio-entropyd.conf,
+  -files/audio-entropyd.init:
+  Fix init script for 2.0.1 (bug 271882), thanks to Tim O'Kelly
 
   04 Nov 2009; Christoph Mende <angelos@gentoo.org>
   audio-entropyd-2.0.1.ebuild:
diff --git a/media-sound/audio-entropyd/Manifest b/media-sound/audio-entropyd/Manifest
index 59f5fe7a6bf8..6847a3d30fa3 100644
--- a/media-sound/audio-entropyd/Manifest
+++ b/media-sound/audio-entropyd/Manifest
@@ -2,11 +2,13 @@ AUX audio-entropyd-1.0.5-ldflags.patch 355 RMD160 e0c2d091ebac31f3194878358fd672
 AUX audio-entropyd-1.0.5-uclibc.patch 708 RMD160 e2691782d2420d1a5049d38f43b2ee9348d4ac88 SHA1 f7352eb1a532bc01966e1630bb2890f0289dd241 SHA256 78d5f8cf969cc199c8651f6b2d4f451c9b79afba457e5253edffedd7c4f5cc49
 AUX audio-entropyd-2.0.1-ldflags.patch 358 RMD160 c83b574e0cc1b3e9c41b601e1a9d600037bc51db SHA1 fc09b803342035da97ca71920a4bafaa168d9af3 SHA256 466eb7a2e2513708ef11ac9dbf54773ee8861b94ff0c111e6e89ed69dedee479
 AUX audio-entropyd-2.0.1-uclibc.patch 708 RMD160 e2691782d2420d1a5049d38f43b2ee9348d4ac88 SHA1 f7352eb1a532bc01966e1630bb2890f0289dd241 SHA256 78d5f8cf969cc199c8651f6b2d4f451c9b79afba457e5253edffedd7c4f5cc49
-AUX audio-entropyd.conf 524 RMD160 e1620eec8da733c3c89b280d3a8d16c9f85d61b6 SHA1 e4e7bfea2dcde2d0da996c9662253e255af11513 SHA256 3b5f96a29e3b212fc0f0d9e6a05287d7be0f048dce0d99b353fcfabdfa609020
-AUX audio-entropyd.init 809 RMD160 ee3c89ef037938b6c1e21087ab197b80009bd0d7 SHA1 9f5366e304b00017a21fb9952236701af4380945 SHA256 a05a50e836986d2d623b882f4457bd287999b85f7a1a0e41056ee262f4d68d77
+AUX audio-entropyd.conf-1 525 RMD160 3c3281b01fece5fcbd0062575fd70bfddda6346a SHA1 c2db2ef87c8026db7fe1c5b755bcda3cca6cf300 SHA256 efbc451025ced05fd3b162389c52ce2e8d095fd97567378fed9793209f85944b
+AUX audio-entropyd.conf-2 470 RMD160 1ea8a547e2238de04634a44cfb07380f1f0df0fb SHA1 fa575a12205a998b76dff1195869731e02b6f148 SHA256 7181f6c3488d1d5654be68a48f944b5293ce23091c9653024b03f95da690cb99
+AUX audio-entropyd.init-1 811 RMD160 78334ffa21d3b321534c52508b20548d75e8bbda SHA1 4a23896a81af62520514fa4639d0eea3fc64a53d SHA256 95fb16e5df30ca5401f23f8f699b5e0a67c876be42b7b95641a2c815ef420acc
+AUX audio-entropyd.init-2 763 RMD160 4de06660eed1956c523b3e064aa6ebf18f29c774 SHA1 8c9f655b6626030c2925b3bab514e9e5c7805dc9 SHA256 a504fdd6dabc43c071eeb50a1d245345d1b78f4468b92fd6c3516fbdd888a0b5
 DIST audio-entropyd-1.0.5.tgz 18167 RMD160 e3fa70c0e1e1b9393edd1c117c84c56a3016ddea SHA1 3257739c808379abcaee1f86a9477e61b3853c4b SHA256 bd6e4459c08feec081b2bcc6cbddee61de302b45ebcbbf31f0331824f2ecacbb
 DIST audio-entropyd-2.0.1.tgz 16523 RMD160 f489be7871b9350a62899201631c463bb7582d0e SHA1 7eb47966619563f8266af0a6d2a2c8e7eb615c4f SHA256 29d4350ad8ef26233e1b35ba0e8dd0b1138475c0f840008304677812dbdb2c15
-EBUILD audio-entropyd-1.0.5.ebuild 990 RMD160 ada46a8fd7b51344039d4c667da2748148933c59 SHA1 69569e4c94fbdfac2de5d25a2d6233fdcbabe6c5 SHA256 e042bf6c4f999d2a52097b7db2bd12fd35ee4a19dcdbab6801f6d32e7eb30795
-EBUILD audio-entropyd-2.0.1.ebuild 1009 RMD160 0178e43cdd8b51c7c99f2d83623e34f719fadd91 SHA1 3c9e9486c1edb0625034dd71875a867129207b77 SHA256 b501ee447c9c0a7d7963b263c3b250703fe543f0786ecb970072c3f287b1a287
-MISC ChangeLog 4252 RMD160 1d5c9163aceca5e6f35a318588b2f54910b1c351 SHA1 b4614b10452a00a49f3b620c2d67254326262838 SHA256 1a9a5bd95d1591af9c82d0bb235428e0bd46f0f5f0773552b9497c10a4f0e9eb
+EBUILD audio-entropyd-1.0.5.ebuild 995 RMD160 377ff83037ef147a12b6679757e599654ce80856 SHA1 baaee5020e2bb8dc482c4a337e7617d3d1802158 SHA256 61d6ecad3e7e0aa84c913d157d212293ab3d14d1b75fd92bd2823f6caf7daf73
+EBUILD audio-entropyd-2.0.1-r1.ebuild 1016 RMD160 3158ecd4286c6aa47c20db77ebe6c5d1a2958c2a SHA1 1c4e7dec9d3d20688610c63079067863f31166e3 SHA256 d44d053491044eeb53a84c68a714e7993a1ba4493b9ee2047e2799e83614c0e6
+MISC ChangeLog 4687 RMD160 dd5aed69ef3890f363747254d13f5905fefcb76c SHA1 07b6cc4d9482d5255524b48ed58e45d708500b83 SHA256 871ff6a21733ccce9562e20baf42408206425e3bd33053e355827f3a3a1f1aa1
 MISC metadata.xml 356 RMD160 568e872a5ceb11f8d3c1bb62efcc119e6fc27106 SHA1 6eeecb6f29b511f611ad0a7b8952ade06fbb6564 SHA256 6b303bda5a6488a0d54842af09772b893345fc218cef85009a1ed04aa35159f3
diff --git a/media-sound/audio-entropyd/audio-entropyd-1.0.5.ebuild b/media-sound/audio-entropyd/audio-entropyd-1.0.5.ebuild
index 6b81acb66bdf..27e553bbe768 100644
--- a/media-sound/audio-entropyd/audio-entropyd-1.0.5.ebuild
+++ b/media-sound/audio-entropyd/audio-entropyd-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/audio-entropyd-1.0.5.ebuild,v 1.5 2009/04/22 19:47:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/audio-entropyd-1.0.5.ebuild,v 1.6 2009/11/12 09:54:20 angelos Exp $
 
 inherit eutils toolchain-funcs
 
@@ -31,6 +31,6 @@ src_compile() {
 src_install() {
 	dosbin audio-entropyd || die "dosbin failed"
 	dodoc README README.2 TODO
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf" ${PN}
+	newinitd "${FILESDIR}/${PN}.init-1" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf-1" ${PN}
 }
diff --git a/media-sound/audio-entropyd/audio-entropyd-2.0.1.ebuild b/media-sound/audio-entropyd/audio-entropyd-2.0.1-r1.ebuild
index eb99c4df12c4..73a2899f2ba1 100644
--- a/media-sound/audio-entropyd/audio-entropyd-2.0.1.ebuild
+++ b/media-sound/audio-entropyd/audio-entropyd-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/audio-entropyd-2.0.1.ebuild,v 1.2 2009/11/04 21:02:04 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/audio-entropyd-2.0.1-r1.ebuild,v 1.1 2009/11/12 09:54:20 angelos Exp $
 
 inherit eutils toolchain-funcs
 
@@ -32,6 +32,6 @@ src_compile() {
 src_install() {
 	dosbin audio-entropyd || die "dosbin failed"
 	dodoc README TODO
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf" ${PN}
+	newinitd "${FILESDIR}/${PN}.init-2" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf-2" ${PN}
 }
diff --git a/media-sound/audio-entropyd/files/audio-entropyd.conf b/media-sound/audio-entropyd/files/audio-entropyd.conf-1
index 8b5936a64625..75bdbcbe4756 100644
--- a/media-sound/audio-entropyd/files/audio-entropyd.conf
+++ b/media-sound/audio-entropyd/files/audio-entropyd.conf-1
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.conf,v 1.2 2004/08/14 13:37:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.conf-1,v 1.1 2009/11/12 09:54:21 angelos Exp $
 
 # /etc/conf.d/audio-entropyd
 
diff --git a/media-sound/audio-entropyd/files/audio-entropyd.conf-2 b/media-sound/audio-entropyd/files/audio-entropyd.conf-2
new file mode 100644
index 000000000000..76a474874fc9
--- /dev/null
+++ b/media-sound/audio-entropyd/files/audio-entropyd.conf-2
@@ -0,0 +1,13 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.conf-2,v 1.1 2009/11/12 09:54:21 angelos Exp $
+
+# /etc/conf.d/audio-entropyd
+
+# The acceptable values are DEVICE, READSIZE and SAMPLERATE
+# These defaults give the optimum entropy 
+
+#DEVICE="hw:0"
+
+#SAMPLERATE must be a valid sampling rate of your audio source
+SAMPLERATE="44050"
diff --git a/media-sound/audio-entropyd/files/audio-entropyd.init b/media-sound/audio-entropyd/files/audio-entropyd.init-1
index 63d7009750fc..9f58d3474269 100644
--- a/media-sound/audio-entropyd/files/audio-entropyd.init
+++ b/media-sound/audio-entropyd/files/audio-entropyd.init-1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.init,v 1.5 2007/06/24 20:57:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.init-1,v 1.1 2009/11/12 09:54:21 angelos Exp $
 
 depend() {
 	need modules
diff --git a/media-sound/audio-entropyd/files/audio-entropyd.init-2 b/media-sound/audio-entropyd/files/audio-entropyd.init-2
new file mode 100644
index 000000000000..082fcbcd57fd
--- /dev/null
+++ b/media-sound/audio-entropyd/files/audio-entropyd.init-2
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.init-2,v 1.1 2009/11/12 09:54:21 angelos Exp $
+
+depend() {
+	need modules
+	use alsasound
+}
+
+start() {
+	local params=""
+	[ -n "$DEVICE" ] && params="$params -d $DEVICE"
+	[ -n "$SAMPLERATE" ] && params="$params -N $SAMPLERATE"
+
+	ebegin "Starting audio entropy gathering daemon"
+	start-stop-daemon --start --quiet --pidfile /var/run/audio-entropyd.pid \
+		--exec /usr/sbin/audio-entropyd -- ${params}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping audio entropy gathering daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/audio-entropyd.pid
+	eend ${?}
+}