Improve init script and defaults: default to 8888 for port (used by other EGD services); set variables by default if they are not set by the configuration file; only set watermark if it is configured; start after ekeyd.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

4 files changed, 32 insertions, 13 deletions

diff --git a/app-crypt/ekey-egd-linux/ChangeLog b/app-crypt/ekey-egd-linux/ChangeLog
index 674d40d9dea2..dac44dd949e9 100644
--- a/app-crypt/ekey-egd-linux/ChangeLog
+++ b/app-crypt/ekey-egd-linux/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/ekey-egd-linux
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/ChangeLog,v 1.1 2010/10/23 17:19:32 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/ChangeLog,v 1.2 2011/04/04 12:20:55 flameeyes Exp $
+
+*ekey-egd-linux-1.1.3-r1 (04 Apr 2011)
+
+  04 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ekey-egd-linux-1.1.3.ebuild, +ekey-egd-linux-1.1.3-r1.ebuild,
+  files/ekey-egd-linux.conf, files/ekey-egd-linux.init:
+  Improve init script and defaults: default to 8888 for port (used by other EGD
+  services); set variables by default if they are not set by the configuration
+  file; only set watermark if it is configured; start after ekeyd.
 
 *ekey-egd-linux-1.1.3 (23 Oct 2010)
 
diff --git a/app-crypt/ekey-egd-linux/ekey-egd-linux-1.1.3.ebuild b/app-crypt/ekey-egd-linux/ekey-egd-linux-1.1.3-r1.ebuild
index 62bfe099f967..a013f2a0fe39 100644
--- a/app-crypt/ekey-egd-linux/ekey-egd-linux-1.1.3.ebuild
+++ b/app-crypt/ekey-egd-linux/ekey-egd-linux-1.1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/ekey-egd-linux-1.1.3.ebuild,v 1.1 2010/10/23 17:19:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/ekey-egd-linux-1.1.3-r1.ebuild,v 1.1 2011/04/04 12:20:55 flameeyes Exp $
 
 EAPI=2
 
diff --git a/app-crypt/ekey-egd-linux/files/ekey-egd-linux.conf b/app-crypt/ekey-egd-linux/files/ekey-egd-linux.conf
index c72da63e1c78..0f72288ac534 100644
--- a/app-crypt/ekey-egd-linux/files/ekey-egd-linux.conf
+++ b/app-crypt/ekey-egd-linux/files/ekey-egd-linux.conf
@@ -1,10 +1,12 @@
-# Host IP address to connect to.
-HOST="localhost"
+# Configuration file for ekey-egd-linux
+
+# Hostname or IP address to connect to.
+#HOST="localhost"
 # Port number to connect to.
-PORT="1234"
+#PORT="8888"
 # Time  between reconnect attempts.
-RECONNECTINTERVAL=10
+#RECONNECTINTERVAL=10
 # Set the number of 1024 bit blocks to request each time
-BLOCKS=2
+#BLOCKS=2
 # Low level entropy to trigger egd-linux entropy read
 WATERMARK=1024
diff --git a/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init b/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init
index ad9476e780c2..0f8a77fa6e28 100644
--- a/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init
+++ b/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init
@@ -1,10 +1,16 @@
 #!/sbin/runscript
-# Copyright 2009-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init,v 1.1 2010/10/23 17:19:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init,v 1.2 2011/04/04 12:20:55 flameeyes Exp $
+
+: ${HOST:=localhost}
+: ${PORT:=8888}
+: ${RECONNECTINTERVAL:=10}
+: ${BLOCKS:=2}
 
 depend() {
 	 use net
+	 after ekeyd
 }
 
 start() {
@@ -16,7 +22,10 @@ start() {
 		-r ${RECONNECTINTERVAL} \
 		-b ${BLOCKS} \
 		-D "/var/run/${SVCNAME}.pid"
-	sysctl kernel.random.write_wakeup_threshold=$WATERMARK >/dev/null 2>&1
+
+	[ -n "${WATERMARK}" ] && \
+		sysctl "kernel.random.write_wakeup_threshold=$WATERMARK" >/dev/null 2>&1
+
 	eend $?
 }
 
@@ -27,4 +36,3 @@ stop() {
 		--exec /usr/libexec/ekey-egd-linux
 	eend $?
 }
-