Version bump; add an OpenRC-based init script that actually checks the haveged starte...

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

diff --git a/sys-apps/haveged/ChangeLog b/sys-apps/haveged/ChangeLog
index bfad9286953a359697f788ebccc6ee28c47a707c..fe393430ea613aaf51570bb199a9147ea9781367 100644 (file)
--- a/sys-apps/haveged/ChangeLog
+++ b/sys-apps/haveged/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/haveged
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/ChangeLog,v 1.6 2011/08/06 12:23:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/ChangeLog,v 1.7 2011/10/17 17:20:53 flameeyes Exp $
+
+*haveged-1.2 (17 Oct 2011)
+
+  17 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org> +haveged-1.2.ebuild,
+  +files/haveged-init.d.2:
+  Version bump; add an OpenRC-based init script that actually checks the
+  haveged started status.
 
   06 Aug 2011; Markus Meier <maekke@gentoo.org> haveged-1.1.ebuild:
   x86 stable, bug #368699

diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 48e1623f5c8de11ec3047380a40789b8c95f3bf4..98af4ea826951ba6c2151ff7ce42e5903eabccdc 100644 (file)
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX haveged-conf.d 320 RMD160 0ea68b92b15db733607248dc076efdffa03e29f8 SHA1 5f631e622a644bdee8e563bb84288ad20e3e436b SHA256 3b53f4aabf937766b5aa806561e9b97ab2be49ac25d76ae97f4fca4ab7a42e33
 AUX haveged-init.d 620 RMD160 bf319ed4703def5bfac0fb0a2afc6280d75c92ef SHA1 7450fd518ade9b0c3c651aee50aad4e18b6dc3f0 SHA256 779bc88cbd0d15ad16bf674153deeae7679657f24a0ba15d5af994b124bc2ef8
+AUX haveged-init.d.2 398 RMD160 c4f3a633132963549a01cfe8cb72e2d0d3da2acf SHA1 3351cf58faaaf0a766791c61a3af81d034f22196 SHA256 c00e29e5826ee23f29a48e15d65bf6e398fd53a2647decb0f806d2a961524f86
 DIST haveged-1.01.tar.gz 199499 RMD160 c76c1846efd5c7930f55303d6469928ad072d220 SHA1 ac3240e0418fd09ab38e5491b467e6cfdb8b1ca9 SHA256 68768604b269a42f8ff983b52c2f4c4fc9977e7c4c3cc3eff5ba23616452f316
 DIST haveged-1.1.tar.gz 200273 RMD160 8a2a4d6b7b223161c558356d2c637531c70049e3 SHA1 311a8d63afe9d10866afe9eb7387c3c28e5df3f8 SHA256 2c1b7b9778e058745a1e8c1245627d2d01249101dd377ab4ee04c6b77092a220
+DIST haveged-1.2.tar.gz 206864 RMD160 ea787f7d5b52e3af4301550949e6df4372e00d54 SHA1 5008f96663a04fb34337f80a8081d583e0a671e4 SHA256 2cca4a02644b2d264cd85eaaf141a0e75709dd978c86f83241f68832c0079feb
 EBUILD haveged-1.01.ebuild 877 RMD160 aa31479a802246a9a76ac627049ae65ce4df1a58 SHA1 302af2a25e6ea41a59d106182108831421686ecd SHA256 0cbe815bc52fdfceca1e5580978753f05590ff9e9c7231cc862fd67c5aec0773
 EBUILD haveged-1.1.ebuild 763 RMD160 62f6e8cdf6f75279c96e5e1f2a6b5eb7de6ed16a SHA1 f3ca5c37bd20a8987932bbf3b2985ac621059d0e SHA256 1d4daac26ebdc563db66843525e4a983a4b166940d79e3c1bfd16c1efc720264
-MISC ChangeLog 1021 RMD160 de50aa3f75d23aecd79f5bb29c016a256d8bbfe4 SHA1 39c674e2fb294b4308f64be9fadc712df79a7de9 SHA256 5cc280e790d1262fe534e48eb63083dceb9d391dc62c14630a6a76ceda953227
+EBUILD haveged-1.2.ebuild 785 RMD160 3a63bb99eb3f11d57526740b41aa738d2d1a0e3e SHA1 2627b9fb498d2e7405acc206e2488ef0c6aa7af3 SHA256 b65f873e92ccf397d4cac6b88438e1184268a53b9f8924da82d1d1fc91c42568
+MISC ChangeLog 1256 RMD160 7142229c24d0685e0daa4d842f983698f2dbe47d SHA1 c77dd1daf14c0049bc4d43549139db8cb313848c SHA256 f754447b71e5e5eb080dce73271d741152191b4ab19ceda6c1db01de7d23383e
 MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59sbUACgkQfXuS5UK5QB01rgP9G2BqNqAFbSayHiGf/EbT3npr
-X9RjYD0bJaKQ6RRPAb7A1iNw2ljMoq563eXqArjpP2iilF1AnuB3CBOiYvntcPNO
-Pd3gsQjcHKSaXff5CcPWQNBsKNc0YyQ2DEjIvJPYbrgLc1ac/NvOa9subAzn7bA3
-wOr/oSFJnCcXq76LJwk=
-=ZbQk
+iEYEARECAAYFAk6cY68ACgkQAiZjviIA2Xip4QCfX/FUyy5jgjIqE/PPCwxNEO+S
+pi8AoNuw6j8uM6oFksY3tBfQczCCYam3
+=ew0t
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/haveged/files/haveged-init.d.2 b/sys-apps/haveged/files/haveged-init.d.2
new file mode 100644 (file)
index 0000000..136094c
--- /dev/null
+++ b/sys-apps/haveged/files/haveged-init.d.2
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/files/haveged-init.d.2,v 1.1 2011/10/17 17:20:53 flameeyes Exp $
+
+command="/usr/sbin/${SVCNAME}"
+command_args="-r 0 ${HAVEGED_OPTS}"
+pidfile=/var/run/${SVCNAME}.pid
+
+depend() {
+       provide entropy
+}
+
+# vim:ft=gentoo-init-d:

diff --git a/sys-apps/haveged/haveged-1.2.ebuild b/sys-apps/haveged/haveged-1.2.ebuild
new file mode 100644 (file)
index 0000000..8ca7673
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.2.ebuild,v 1.1 2011/10/17 17:20:53 flameeyes Exp $
+
+EAPI=4
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
+HOMEPAGE="http://www.issihosts.com/haveged/"
+SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/gcc"
+RDEPEND="sys-apps/openrc"
+
+src_configure() {
+       econf --bindir=/usr/sbin --enable-nistest
+}
+
+src_install() {
+       default
+       # This is a RedHat init script
+       rm -rf "${D}"/etc/init.d/haveged
+       # Install gentoo ones instead
+       newinitd "${FILESDIR}"/haveged-init.d.2 haveged
+       newconfd "${FILESDIR}"/haveged-conf.d haveged
+}