sys-apps/haveged: Add systemd support, #478148

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 86 insertions, 11 deletions

diff --git a/sys-apps/haveged/ChangeLog b/sys-apps/haveged/ChangeLog
index cc8deb2a8d12..7bdcb9209f40 100644
--- a/sys-apps/haveged/ChangeLog
+++ b/sys-apps/haveged/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/haveged
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/ChangeLog,v 1.26 2013/02/24 06:41:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/ChangeLog,v 1.27 2013/07/25 16:38:09 jlec Exp $
+
+*haveged-1.7a-r1 (25 Jul 2013)
+
+  25 Jul 2013; Justin Lecher <jlec@gentoo.org> +haveged-1.7a-r1.ebuild,
+  +files/haveged.conf, +files/service.gentoo:
+  Add systemd support, #478148
 
 *haveged-1.7a (24 Feb 2013)
 
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index fed92ab491eb..33667da6aec9 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -1,23 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX haveged-conf.d 320 SHA256 3b53f4aabf937766b5aa806561e9b97ab2be49ac25d76ae97f4fca4ab7a42e33 SHA512 7707b14da7edefd9e423539ddf2a8439f7dbe57940ad1f3d3adc9ba12152a38eecdc0906ec3693ba1b73bda827035f9fba05f277e968cef05577ec2b0822cfc1 WHIRLPOOL 2a526a0b5a21835d5754961b5de2cbaae9bc0e48c1e9266f8f0d9c962aa82788e658b5ccfca7f39cdc837f2dad998da3adfc2e44f18688ac50a6cd2c1b27e089
 AUX haveged-init.d.2 427 SHA256 04998aeb504911133e16cc0df8606d363d01b2454168e634310a5c1e902c13b0 SHA512 adc59274c419f8757347032cd2c58dd0de2a46ddd33d7cc0acc9b3e1a30b985e7f8f307a9874a8285baf1a652c0b2bb509efc2c7aad47398885415d1474b9819 WHIRLPOOL f788a2eb7148d487510791ff457b48d95b42c55c8db9a86cb9cbfdcdd0053618dadb7c1421af48d791d6afa680c841b39e4a61dfe5c68977249818bdb6537d6b
 AUX haveged-init.d.3 438 SHA256 365e9cbde2564a0430d8d1c0f8bc367db2bb32937ebf61649196f0e6a1ab5363 SHA512 7231034fd21b1211f3a7e1845cd1258e7873a4c6e88c0fbe76c4b4942b28afd763e91fa9f69ae525e393f2f0607d64050e0a01021e8ef2068500b56ae759af68 WHIRLPOOL a79ae80d25884bfd1018280f0a04bdb8724c6b91d50770ccefd1bdce41c46ab557b94c9bf504c13d68f674b93157d843738a205b6acd9ad537139f534e5093c0
+AUX haveged.conf 255 SHA256 52003fba644f93f9690940c0a57d3a0bbeed619287785bf0f552174c251914a7 SHA512 2813346e4a0043169498cf5959ffcedfe9c1ce035be50fee0692dee901decba6679f5ad06b1830ab93ed706f9871ee3b1359cfd4e4300234477a738e8c6cd705 WHIRLPOOL ec763cb2d2e4b84367b030a2d8e0cb3d8a2183b7484b461a081b5ad5badb062c04431c4b900d8f9c3a6d2f0aa0bc8f9fce7bec232bcdc93ce1e883f4850c9821
+AUX service.gentoo 322 SHA256 715adc956ed6331f3c77dae844579b51d8c11d6aa1bb67f073ce902197b54c4b SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88 WHIRLPOOL e94d9577651af7431e53999e9b2840e094dbc9caf9f5a34038c090d4f3419ae794607d87f504494bcfc5d39b2f3e52ef331249ab22d60f9c5a0c5b6cea402709
 DIST haveged-1.5.tar.gz 243348 SHA256 f7d5a7e995befd4723811b331854fa53fe558546ba0c1dcb4675698e8db3702f SHA512 57952a79d4535267de15c42511991e2b06021db3b1ea90a45b30c5bd5ac65f6b9b6d66373d981280a3e7c0aff24dd6feae5640394e77f08a893dba5f31d86c91 WHIRLPOOL ef4c5acf8c787e18a436fe34ef2479658f325852e5717ad1a06bf19ecbe485e646a2bb132617417de26982d1d388b90293d3c8c31c0e7a0b0db570be80c5e5a4
 DIST haveged-1.7a.tar.gz 458671 SHA256 8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051 SHA512 e98740315b5c9920ec471587362ffd468d0b0f7183bc002982fbe25dfde2252a89f489e4d7604d7d6d2c14d67f3f0d1044de70ccdeaf587d8bdaacfd55669875 WHIRLPOOL f9f808a17767e33ec4285242ccb2fd41889fbe1ee693bd001d4a08e89bf47131d3f84040b566276522940b2a164aab2062b4c6fca18d0b737406814fc56524a3
 EBUILD haveged-1.5.ebuild 806 SHA256 02e26511c70044ded4ca788779c9f177c62aec5caaf595382e262468eaecb646 SHA512 9221a3e6857be42b6107f7b8f492bdd412d152f3e1ea6001925afde12e5b8500c1613b2355ca63779c5cb75ae630d26946b8c5e34b643c281bb5d398e03ea4c0 WHIRLPOOL 55f9604a6e451f79965c4878914b150df6c973779e444ef8abc95a3051b58f876bd5f2ac72e8783726881a5a7ee67d8081deeb6fb96d978d10c02668e2b36745
+EBUILD haveged-1.7a-r1.ebuild 951 SHA256 94288e09143ed9d472fc2660b004398b7506d5c790067e763e00417c82f45609 SHA512 a2ece40081787ae9e67dd2431336bc5b3e9060c9254a233ea260d1dae0a6361804508647cd6edbe8fc488692d32a02c3cee3c12acb97d6c88aba983637093c06 WHIRLPOOL 4ff83f7d559200d2c668ea4f6eef94d7fb76dd86d27d1601357b7aacdad22730c0ed674f9eeccf52719d2c74bdaab5ecd685ce8e35823dcd5cf6f7be0263020c
 EBUILD haveged-1.7a.ebuild 873 SHA256 cd3813f0a358b625606101b7c1a3617055c5bdd82c918939ad5959fc0947316b SHA512 210525b34a9db18210011bf9c846174629586f5c37b9e9f7581c05b8b9b642d8fc9dbc8cd8055348435d24957ad4d779401b6668aa6bbdb81ec7437649cc65af WHIRLPOOL 037e0637c35ea62814a4e5d94f6264dd7db0eae359998d537f1013ca2455ea34fa7e14b70f84c5a440cb165558de85d79de7b5aa0be254b47472a757cca80d07
-MISC ChangeLog 3989 SHA256 4784504bfb28a969ac15e401688038f91a500c3bee5a810f25e62bea354b4acf SHA512 38054e68360757021011979d150ccf8f75cf47e94731e04cfb17cca1fe74bf3a0dace7731d04359f07888b4b71a0425bc8e18ee36f25986041e6e95ecd690b8a WHIRLPOOL d13816b383646b7dc81ad388d74474448ce48828f87e1a77ccaf7066e57c1959a6587a000f47b7032c52c16dc9209fddd833290d53966bd6ea20b80fe322fbb5
+MISC ChangeLog 4166 SHA256 98914305983ba960ca88583b5241dba17d3759cad6ef90a70325924e3fe1e882 SHA512 47254844a0d5eaf92f772807a1a26845599cba3462dbdf18ddea7e1d9949e00c9ec251601107bbb55520f1c33b38b552a2daef46222c166b7a040a5441a088ad WHIRLPOOL c40a408b37bb226518581f170226e03a15136ad9b7fdf2358220b5390fda7004684172f7d82bf0a227b356a25660ff5075f00c34549cfbddb32a8f0d7d123dd0
 MISC metadata.xml 163 SHA256 a8aa48f63dab89c2af1f961029dea0ebf68a618dba59ac4661ea915dc85e18f0 SHA512 1744b806c2ddddbeee4d2b1e23c7f1ccf0d9427f679a65bd22cde617399d3a5bb30aada17ba5b648a3a46d9e1169b9d30ede4551fb8756dffc4e3e9306b199cf WHIRLPOOL b5af95c50999aaf066e6466928866baa34c6425459a580ab0712ba3e3ea518dc37a4082007043307ff169b1f8efe4f6a632d27d016b6fd307bf463cb47b78d55
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRKboRAAoJEBzRPIrUMBNC5IoH/R/uza1ZIIJlDD4NVju1/1Mx
-xD3utAac1JmkfF3FCO5XnYQrZpvDvJJfKQVNiFGmIOkv8y5HR28Pp4fiMQ6Q0JmC
-jBb5wGxbUwu+GNA//d0DNtyIDQ2yGw+lv/DEWn+x7+boQE/d/R/e6DfuZN7ZA6x4
-yNwvK2YiKNhzr4heT9D0EJij3s9VRBjCMNQp0u4ZHxlgK6gdGogciucnlOB7MQCi
-Gy2YomyJmCAubP+CkohvMApcD8XYYuDuqmdxmP3vqySad9IHQ1FUcYnXL54L5/FF
-xtkv6jkalGyucW4LkK+5PjnE2QDDyDcMz+heEIFZ8HQprgY7735DmiSmW2q0LOw=
-=NVXd
+iQIcBAEBCgAGBQJR8VR3AAoJELnU8jG9FVirMKIP/03vCjiU08+pG6rVaFqJRplS
+G3j2wp/ZKTkYvYeFMtEkEWfycwh2cr2TfTRN49+b6viMYeEprDweUyqmycH5GjtX
+j6sNM8DBQ/DXuw0ZhXBm0okI/OJwjErq8AUxYAB2TDZOf4zsTnMios8NzZ3j1jS+
+Y+vIKeB5AojsptgaWN2ovwC1P9+kbiz/nyIaP7JDZkCxi+Pnyd8iD9QRhiFBK5M2
+CGNvUZD1wmm4fb423fZzRhPbLaLk7qZt507r78OfCLPznHU7vRStGdHKMu+LTis7
+meuY8TIrQPbqCR2nFiuiJhjpP+VpxmcGA232fVoea5kOnVYk2Zhvn6PPNj1APJo5
+d+G9LM6MywyKKalWilwJhx0RM7CychHCihgKojmrE1upSxRwmxqaIzDxLXmOp3WO
+G8LKQkIo+a/4wFtBrdsgoaiO+MuVNT2hm163yynT6R90yvpvirokVECpS46mJoMV
+Cin0GHkvgBVsxEO4Tsl0193x4h/pNzH9B3u1q7GT4wjNICduibEzitPd1G506/Ye
+tXpfQQqchkS51MsCQpuCXOjHzEd2MfJqOya3zS6bIAT4ICUiFiML+4tSm2idqyad
+IDr0Kv/GUx71zvBnfQuYc4CVHOrhGdRADLcrMQO27DAQcUDEutAXGTPYVwve6y9M
+7kAiGcLoJSfGSLobXuHg
+=M00o
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/haveged/files/haveged.conf b/sys-apps/haveged/files/haveged.conf
new file mode 100644
index 000000000000..39d9e93e3c36
--- /dev/null
+++ b/sys-apps/haveged/files/haveged.conf
@@ -0,0 +1,7 @@
+# Copyright 2013-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/files/haveged.conf,v 1.1 2013/07/25 16:38:09 jlec Exp $
+
+WATERMARK=1024
+
+# vim:ft=haveged.conf:
diff --git a/sys-apps/haveged/files/service.gentoo b/sys-apps/haveged/files/service.gentoo
new file mode 100644
index 000000000000..f896ed2a9b7a
--- /dev/null
+++ b/sys-apps/haveged/files/service.gentoo
@@ -0,0 +1,12 @@
+[Unit]
+Description=Entropy Daemon based on the HAVEGE algorithm
+Documentation=man:haveged(8) http://www.issihosts.com/haveged/
+
+[Service]
+Type=forking
+PIDFile=/run/haveged.pid
+EnvironmentFile=/etc/haveged.conf
+ExecStart=/usr/sbin/haveged -w ${WATERMARK} -v 1 -p /run/haveged.pid -r 0
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-apps/haveged/haveged-1.7a-r1.ebuild b/sys-apps/haveged/haveged-1.7a-r1.ebuild
new file mode 100644
index 000000000000..a5d044f2f5ed
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.7a-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.7a-r1.ebuild,v 1.1 2013/07/25 16:38:09 jlec Exp $
+
+EAPI=5
+
+inherit autotools-utils systemd
+
+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-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!<sys-apps/openrc-0.11.8"
+
+src_configure() {
+	local myeconfargs=(
+		--bindir=/usr/sbin
+		--enable-nistest
+		--disable-static
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# Install gentoo ones instead
+	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
+	newconfd "${FILESDIR}"/haveged-conf.d haveged
+
+	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/haveged.conf
+}