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.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 40 insertions, 21 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/Manifest b/app-crypt/ekey-egd-linux/Manifest
index 6bca8199b032..6a8bb2ae9f70 100644
--- a/app-crypt/ekey-egd-linux/Manifest
+++ b/app-crypt/ekey-egd-linux/Manifest
@@ -2,16 +2,16 @@
 Hash: SHA1
 
 AUX ekey-egd-linux-1.1.3-ldflags.patch 654 RMD160 287ab1ae976a3309916fa6170c5f5d97f844fe89 SHA1 b9d1db6e587b3d1ebf3b18daaa4b43142347c845 SHA256 2552e54ac33748031523073f8bfcde6c8a0f077b48e7fa944ac211aafb371632
-AUX ekey-egd-linux.conf 283 RMD160 d65f71d3cfe6b7a7efbfb05988e4641f8fd6b9f2 SHA1 de0a168996b27a77eec52ef038b942c8e160765b SHA256 793100649653c15d19acfed48d5ada542bca385f17e66e4281f05cca5d684d73
-AUX ekey-egd-linux.init 793 RMD160 07deac56b9d4b66484fbee48275aeb8709a50dda SHA1 92d52b010611116f431a5df81f68ed1bb7cbd2ca SHA256 aaf9b2ebeb4777bf6f2ee6667c201ae9d23383c382a5cbd08c61a855b0c22637
+AUX ekey-egd-linux.conf 335 RMD160 96164d1942f3cff760bc9381bec911d3d85ca0e6 SHA1 15bdfc53f94562ec0a27c0ee6f902449b84c05c0 SHA256 4ead2b30c583d004b2a9505404de12816fbae872f048d0025fe75bc0596e029e
+AUX ekey-egd-linux.init 919 RMD160 3c4b7bad1b948c163f2a2b2b73e57b81ceb910cc SHA1 9ebc03fcf7a24ec832e1e88b4367f59859b27d85 SHA256 fa86bb4d4939ba61c5360477de2e10fbfeb46a5355470e3a32c5fb9e7b7bb22f
 DIST ekeyd-1.1.3.tar.gz 95173 RMD160 0af970891d8da67b5b0737fbac9d626a38ccb41a SHA1 a0119105d3804b76df0dd6a5e18e80db3193ece8 SHA256 07c20450e7ab139b723945e3aa0748f55209c0da097253b25074149c847044e4
-EBUILD ekey-egd-linux-1.1.3.ebuild 1557 RMD160 f18e8c2eb380005f2a53a5d9c7a8a4afbb0dc066 SHA1 ede60a597067042fac7bd9f71e61c03436f5d675 SHA256 ee95711b7757ed6b9f15b3b48d32e585cc37370010f8f405e0674d4a90d2e6ee
-MISC ChangeLog 577 RMD160 e0cc5a28236eca71dbd92949af75a6b72932b06f SHA1 2e263a17be429836229aa3e553e01a945842a7f4 SHA256 70d525d9c540af6b949b26ffa4c22e20f893b4eac9aa00f2e79e07675fa8c601
+EBUILD ekey-egd-linux-1.1.3-r1.ebuild 1560 RMD160 13e11e7a72b63835ea63ccd73201709091ced40c SHA1 1ab59453bfc588ab965e3d5ce03e5a910028cb41 SHA256 7598f54a215b956b89aca925d15d21bc47d5fcfaae23cfa42e4feb9283be0053
+MISC ChangeLog 1021 RMD160 bb4f5bb796f3f171ec2b8c5994c7277d9bc8fd9a SHA1 975afadeb04739b4dac381b38d3114283abaf688 SHA256 1cc1599941668a67cbd3db0aaa395c2cb74168ae691d2055b5c156c4d4a5fd6a
 MISC metadata.xml 521 RMD160 1134a1997f3bca6dafc3f23749672a4b09bb9dde SHA1 5fdc861090db74bc22394cc49fa8358529274422 SHA256 37a56495ab8dd05911baef290d1c51c72425c4eda334b42cc6f619a955059cbb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzDGTUACgkQAiZjviIA2XgLxACeLY9bQWSB4btL850R5ePuYxh9
-iSwAn3GW+mFstFMUraeYUWz8i/4OfRoE
-=H6Jd
+iEYEARECAAYFAk2Zt7YACgkQAiZjviIA2XjLngCgiMUansJNJ2XNaX5Pi4INhD8v
+gT8AoLWjoPWHohs04aMS8w0VMBKJwwTy
+=7g6I
 -----END PGP SIGNATURE-----
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 $?
 }
-