Version bump. Thanks to klondike for updating the textrel patch. Fixes bug #518210. Cleanup old.

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

15 files changed, 128 insertions, 418 deletions

diff --git a/sys-apps/rng-tools/ChangeLog b/sys-apps/rng-tools/ChangeLog
index 4039e7875774..554f703113fe 100644
--- a/sys-apps/rng-tools/ChangeLog
+++ b/sys-apps/rng-tools/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/rng-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.56 2014/11/11 10:46:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.57 2014/11/18 19:54:10 mrueg Exp $
+
+*rng-tools-5 (18 Nov 2014)
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  +files/rng-tools-5-fix-textrels-on-PIC-x86.patch, +rng-tools-5.ebuild,
+  -files/2/rngd, -files/2/rngd-conf, -files/rngd-confd-3, -files/rngd-confd-4,
+  -files/rngd-initd-3, -files/rngd-initd-4, -rng-tools-2-r1.ebuild,
+  -rng-tools-3-r1.ebuild, -rng-tools-3.ebuild, -rng-tools-4-r1.ebuild,
+  -rng-tools-4-r5.ebuild, -rng-tools-4-r6.ebuild:
+  Version bump. Thanks to klondike for updating the textrel patch. Fixes bug
+  #518210. Cleanup old.
 
   11 Nov 2014; Agostino Sarubbo <ago@gentoo.org> rng-tools-4-r7.ebuild:
   Stable for ia64, wrt bug #516838
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 8dff8aff095c..49e76ff90729 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,43 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 2/rngd 1488 SHA256 00f8d05292565feb750d20af4ff6ff8ee20a14ae09c0164ec7b6b4b1ee67028d SHA512 8cd36378028c8e62e8e0b3f8afac155b65a0751c62f69f939f8273958eed6d53e450ae71ab4c400d41efdba3b76c1f08247560e8cc798d6d0e4175bdb4398464 WHIRLPOOL 1bbe2c0f47a66534b40d3ed12896d569774f4d3fa4d1fdd0a36fe91c34bdc51efb71603eb4030ee6b464c50acd51792f97b08e77d84ebdf4698d6770e3775a39
-AUX 2/rngd-conf 259 SHA256 4dff7a0c8406f5344f71d236e755877388e93ff6728eedfdfe6921b3de41d137 SHA512 68e08ff2dbcbb6b4dc6235ba86070b296aa6439f17dbf61d8d992e08790a57d52cece0fc2c3b384b10df66868676ae2202621eb2fc18154eb2c7ba2cd8f74ee5 WHIRLPOOL 58f6e9e8975bf8abee0ef944ce48e4eced5c0d06e157b3e3fafdb55dee218399a47d2f7bbd04376e6d4d20e426ec7d2f75e1729f854e8062c997b3a972d801e8
 AUX fix-textrels-on-PIC-x86.patch 1971 SHA256 55d277a1b4dfed429bf82ca430371f2487e47948630203969bb66fc63fad39cb SHA512 201300211d322ca36e945f5adf225d072881f285b4d4a8710baf1416a532386befa91eec6da7131278fb1fbcecbf67d47742e563deecfd6d363f60b477462d09 WHIRLPOOL 92f189ee66e35f4242d2d4e7b6fc7d314775cfe1c211a900a5442f82fa3c18cbb8d375d8c7b80229ee21e8ff5fa4617c56d10a787b6b08831d7ae72cca9d0c35
-AUX rngd-confd-3 714 SHA256 542ef931152a71888b8d1ebb2c1f5d43edefcd2902d616d635e1d15a0e742519 SHA512 398c31775d10e8f54717c05228bfc9166d260ae51e90c9819109ffd6086d41c7b48236e3c56dd71e0dacb6f10a881349bb14cf02e942933093fd15ca0068bd0a WHIRLPOOL 0e2d71c005452c865dee38bded6a9ddea048e28c09ee17160fd7da51913987d38e7a96d4ff517105b567e6f25783441834ca4621f590227747a4b55e29519b85
-AUX rngd-confd-4 625 SHA256 f2d91a9a3ae1d765bf705a5498cbb201427f9ef475e3eb31aa43b1eb8b88af42 SHA512 9a0f938e7df70a4dbc5eaed48fe6f7713fae17b32993da500bc3066e9b55e9e59b646eb2c730e5cd57ce7f966d90c4a91a046d070c456f0dcb7f7032ef61ef80 WHIRLPOOL 2b8e9a9a157a922837e525fdca398f0c5de63e9fe3dfe7673320731d5bf359ada4b47cfb05f37b3e7fdb3099c334101a9fb0147a46cb7e4f6d11955b076a2ef1
+AUX rng-tools-5-fix-textrels-on-PIC-x86.patch 2677 SHA256 71fac69129bf3ac6f54cabdd995db2946d5ccc279212de42608cea19fa3c2ada SHA512 8c7c6bced6e0982069ba6ef99c169609ff452a55c32543c25f198a59f81d4e976caf400867cb52bbe2996363f22943ff73c678427da43ad3a019bbe29bd29ce1 WHIRLPOOL 2346261e9891f77a48e8ea54e647fc77e40ec79d099597dec4fd06e265ac3a255eec8d6e2ed46ae00e90fd900998b48a6c3a963bb89d9b81e3cba24cefb7ba11
 AUX rngd-confd-4.1 562 SHA256 cdbd39f7446f12a9b78e87e9f135cfd0f6f364c4fa4ade0c96084b85c32afc38 SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b WHIRLPOOL 87634cea70a1c8ffa7598cc8b0d93c79578433cc21b58bb13bc9144502b9502e2c4f151bcf282ad4ccef44a931f1be5d1e87ff7b9b6d07cfa0a4c288b4172ec3
-AUX rngd-initd-3 1821 SHA256 74f04c2536b1abf21489365e7fdb3f84a785bdf066781077a956d769ce13a2de SHA512 3c63aa3db5ccfd7ed69f5197cb6af4691bc6f081dd3f46c9f0fe90ad7b0a4aa1291080f2d8e6de9bb0f05b321fe7cecaf150843eb917cd8832caa01eddcbdeea WHIRLPOOL e38470c021f403060424f96b05c9e0215216670c47608974fa639cc038b1d60e5704c3769710f343d5e75496da00985bc4beae043c8db8a409d9e89974d4835e
-AUX rngd-initd-4 1599 SHA256 09ebd57d724f6a4ee1bda5c30937151780555a4ece96c378b91924d19e9f63b2 SHA512 4fc124ae383aee1a7615ad6f8ad129bb15870d8614b5d700dc73759062a260d21f956d4a2d4b618370e81d8bd88d4c71d7671d4620ce5b219ec13ccb813e3ccc WHIRLPOOL fad8f9e11dd4616257d4e949158dce475418864442b1943dbbf1d396ded015cd45b4448253bfa37106d229320ab8ae30f4b850fdfb21ee7686d7989e273fd548
 AUX rngd-initd-4.1 897 SHA256 56780a5d0a3348a08ab19ba56e591f60f84665417ce9893d7b669fbc442bf1d4 SHA512 43d6612c6d6376a21b4522369688908e24544311632277a8dadc2a7c91ed664f7cf6610bab6592040fb10ca4adb98d2136134879bcfeeb25159c55cf9c0f6799 WHIRLPOOL c740a965b0e47dcae0d2ac01d01d3cf5e3f9ce4c5df626d75de82f3b5fe232391bafd43be099439cf6445f362ad7681d782db9497e6a13008d221fb8663579e5
 AUX rngd.service 133 SHA256 a05b1075157d39302106221594e1640479fae5dee4595de09442901a3a2d1648 SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2 WHIRLPOOL 093b0cd19a147abd9fc10f366c2c5a167d31b839d755cf2e56f6ae35409b6eb764db0651858d20dc95b71fe1d90b4ca33bde88053c80e40665613d132357366a
 AUX test-for-argp.patch 1318 SHA256 222ee3b8bfbe4827140a67af4b8d170aaa135d5317e3a40b236f8d79a06c4274 SHA512 9418bea246052391e9dab1583a7e44c47f87c34d39860c76bf11090fd397ea70ec76cb7e4c91afbe1f18a19c6f8767e0e6ceec02fbd7ef8204e8ab168f3077d8 WHIRLPOOL a54d1e8f4d3e1070cda067120318d775f0a768836984c831cc84929801d29e5f7c694e90e96926e52af57d509a52d4340c3cf9ee847782927d3dfa16fa3f758b
-DIST rng-tools-2.tar.gz 86429 SHA256 1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25ec2b1e SHA512 9a4835c0a9f1e9cef05ebaad98658bd4a405b3cd644f7330a308958337d089263409a5920f7533bf24c0b4d9edf7cc809152cc954148832c31896c1084fa93b1 WHIRLPOOL 8a4e9d054405ac93be6df1b1ae6c63f1bfad8082bd0515100d87a8f49b54d913fc8363d2d7d513ace506096961cbbb66cf18f1191c8561c8c613c1ba345d7ecf
-DIST rng-tools-3.tar.gz 102366 SHA256 27f8041836f74342268aed4acdc28bcc0438b8461695d277cb81096d7ecaf4cc SHA512 37818c4c77627828e7d6527d18b7fb3a810dc68e6c2138bbccd470ceba0e497e91d2f1b96af2264494f36216eb81efd79a1eb35f3134dca9928d838db585e295 WHIRLPOOL 716258c1fb24ac129e7041d619560029bf0b1a68d1587374e8057af429d08b58f0563d2ea693980185a2828b67a24bc9b4febf4d3279e22710948c817678f96e
 DIST rng-tools-4.tar.gz 110943 SHA256 b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195 SHA512 328627a9ede924026c7a7c391b04be05f098d713d35f7f38d939d52b794853b4f6db3ae125568710ab5a59640236b343f3e9fc0f735806b020cc675c02f80b08 WHIRLPOOL da58bc7d3b7d9cdf6d83d258717f22ba3552482a690311fa2c820e4ce125a5e6c6e498e0b63461ed6c9dc16dff77b2cb47377933845fb9397efa205183346e5b
-EBUILD rng-tools-2-r1.ebuild 777 SHA256 d56948484fc0a5e1764a6f757c50f47ae75e3ae9501e2b6c4802b0384fd2ecb3 SHA512 6962942cac8c47a3e7652d28ec4d7ef2109a0873a8b7a6d39dacf49d4ea052204399ba13e892639cc87caa7d43782fa5fd330a34a88d9bbf28052a4ae4de3db0 WHIRLPOOL a273e592cda397b54b8c17b709dd5ccfd15f25329987658601a60ebc4bb292d99e989c23e2a0fd7deb22e3b296145d89a9a3de2dde206f49e60cfe50c835b171
-EBUILD rng-tools-3-r1.ebuild 809 SHA256 5d4a38ea8727459853343575ca095d345c0d76a90cff9f07bcc901ce774df46e SHA512 ceb75cfb20f1a2c923daa41f325708e0ca360cf5fd37288d234061c87dd4a1503bb276664d96a143f45ea0e12ae27320246dd93d65d4f6ad9051ec0ca298b835 WHIRLPOOL 8c92bce97ab764e3569849f943a68e240689e0071f3ff402d50e94ab080a939c703372ea9e00b3f965e3fb1fdb4e675c0b98818b59b97620c6dd409670beaf4a
-EBUILD rng-tools-3.ebuild 757 SHA256 56e60c64b91e31fb6d222f3d44a63a36632786aa50b3c0e9d483ee4435ba3f40 SHA512 1f5eb9216754acadb7149071786f572084b962767fe3bafe71bc8b2de805b388d3a4dc75b0bf799fd63cb64a5d26ecf20394490d855b6efd5f8c8bf269050bc6 WHIRLPOOL 2f600f18c1cd44f2b996c4dc53847316fdf352139c8dea74e7ffc170f8b86b3a9adc5af37e000db36780b02626cc619dec78a2ded1b1757b8e025e41583df178
-EBUILD rng-tools-4-r1.ebuild 792 SHA256 38f15cf03a21bf6360a66fcdb346767d361f5f1f6dafdf517f168e0310294324 SHA512 ab99f62ca397099fa2953759e4528729cf78e5c701d8689a9fbe41f3015f5c2d35196e2729e77916bef376f6b2697458b196a4b5dac240e590fadeff6d7c28f4 WHIRLPOOL 66e403e660ef5a144698237c27da8f5a16ca700898080cd285ef99ab4ac9e83b97ca873d7c4ad9479ce1e6d715be1da7bc2482782a8fff19e0d98043ffc8ec99
-EBUILD rng-tools-4-r5.ebuild 864 SHA256 e59bd1300543fc7ceadf223314845385b66c110dc4f187f92f4eef70e3ccfd24 SHA512 25402c194c21ff445945aa7f12eb2ffe16692697b0b594696baef749e5fe80f0ec4421b880e8c80eb49f6a76ccf997c2fe8fa9075a24960d93bf24d924a52398 WHIRLPOOL c1b626b40f3d3cc991eaa3c1e30585b06fcb18d911e9fe96fa2c315cfb58abee8e8564d12a41040d16d253cf045bbce0fe6bd2acb677c747e39157a7761a0f5e
-EBUILD rng-tools-4-r6.ebuild 921 SHA256 5c94a533ad956df91a2e0e1f087fba3a88087d2ad04ed2d85a6fe26a8e7459f4 SHA512 c60e2824d615dade49c4374ccc2ecfc84ac400c6e67e72d8eef826fa1412b88d334c421bc5a0ccc95410ba9791a4d53372f74b0e3b5321448775acf605134e61 WHIRLPOOL 8844c693154bd22852aac46cee2170bab4bb47d5b9d24c987dbb5011bf6991ac8548be6c7f1eed282073df62bf26e1c0d7f43d9ca6253cb4bdd0755a0f892efe
+DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50 WHIRLPOOL 073dbeb9d27189db44658a9f25657b93a320b125fbfc8230f7ce7849b8e7c1f7802b4c3a53de3417525b02739194fab8a6e5eb03d5db317a23deb275d72fbb21
 EBUILD rng-tools-4-r7.ebuild 956 SHA256 00abc3affa477a0a0aa41cbaa306559d2572be3057da98075a865acd0cab74e3 SHA512 73ea16875d26b57a0650f125cbe25a930f06904a383c9af5bc5ec01e6e1eb22e7341c312a41505aac0fed3e8a6176286151401b4d0aa27d2eaaedf2490dd67c4 WHIRLPOOL 3a8a73cb5587acadfae50ef0f912e0fcaa78dd43c96bf7129330c5a1fef3fc21560aaca370569da0f4950584441fd13ffa9b04b51b40f98592e8429442177f04
-MISC ChangeLog 9047 SHA256 bc1c57f86acb733966ffc5f0e5166460724e38f8ec177002820600aec2e336b4 SHA512 e85ea392aff6446999c4e3f6625fcd21b5650274c0e8f276dbede167c0110e75cfc4a4034dbc17dda6417f41ea22eef9df14081ad8abef74cab74ccc853b9de8 WHIRLPOOL 79c331d055b753b64ffcf4ff88eaa35f5d2c6d70edceef3cc03e5c3a5fec56c4e9f067c65cfb9385e4b2eff1b7710aedc0292f9e24a831c9a3475632cd34b1c6
+EBUILD rng-tools-5.ebuild 1019 SHA256 8c4e1a5f5f07ccbf1ec8b235f672d3256dca7a034e1811f5a14ecf4d599be7bf SHA512 cce5c741e64cbdebc64fd11f0cde7c83a7d3aa679824e13df737192fcbc2792e855b8eb0f674beb4fb29b1ca8507acfba65212ff95dfedcfa5f785697bcf9a91 WHIRLPOOL 48731352dd258b8b203801f632c87e3e7cf22a170584963ffb084f70e991d0cc9a60383d7fe53fa4a988018cfaf65e6be4d2cbc63addce90c7e3f964b62ffd5c
+MISC ChangeLog 9568 SHA256 796f5413c30ad7ddaae9b4b195b9e44baa8e9ebb4857645552697ac6be17e7d2 SHA512 5d0bf0d5f5adb31e7a13bf39486008b4dc63e6cdd1c1bd50a178d769a0bb818c23433e5c42fb3a9327dd2ce7b23daf0f29a8613f5c4f6d3866e07f3ce868d9d7 WHIRLPOOL 427612588c648f96f205c749d0bf26b995fe21e23f16cb2d92c8d46d697f67fb55d45536e43bcdc72a6e74ab80f90ea1e69b68f20708fc4b3c2ec22bcae770ed
 MISC metadata.xml 165 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a SHA512 3f1bee5d098a4e5874df3af56169397cc3ed526f9c56004b9ccaa4c5cf02d4affd894400b88f50f3c19bf5ba3ae06f3d4d2cfa5c15e97b7d4c33053e5f0f63c5 WHIRLPOOL 070ba3ff0b1ea000c90d8af13cdac14693dc5d9dcc8d8ba89cf9bdbe91196e3cf9e72bd2f01cd5efc1ddab63b83184159298d1ee891bc123107ea6891ad612d2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUYejvAAoJELp701BxlEWfJOAQAK6U3B5i0QEbv7XgaKN0iq8l
-198HjehvetzeXTbtXIs2jGxp10JUzTHXyM+EOstBk2gd+VowjAfAts+S6PvzyspG
-nijRO7KT26diePhz0T2mJJnQoRjSfHq1aXXVfanbE2lW18anaN15Ix1tauenzz4G
-K1WJWsnmVMMz+GVljAvSvSnJZOWWdBiPPdTJdrpyOhAG825QTUwo1+v6NUua7Zq/
-YjTfbGeasmqooP+JrdV00DZ4kXlW5lw1wIRRmab2azMXhWqaZlGA+Y/IPInPWies
-Oa8cbLMU6paFe7mHY6KQKy6D1CbEN6Lz2fOh6mBxzC139DC3GX6VMdiV+ciwPCM0
-WKASRN+uegjU/6ejPDRJupfEwY0ypf5EBDkOaQt8TCPAFsPxhHbiaEGNR1LydhUL
-Oqhm9YNtAQ+f57deKAiL93H5CoJu8xaxySqqtym7QEMH26VPj45K9Wj9nfe7pGOk
-LnL4+FCFxYdDsZP0X0O2bRk1veiZxjq5AfrKhb/E4Q0Tco929XAeVkX0C3s6IXLV
-jfBx+k8l9186BBY/1YO9dUMCQZxwaBKFMFmhrkUSCtTMBX9vjj7pd26jNsvKMqzh
-qg0wToP9XnxdJ9DEln+1f1jrHoz9mhClfbaIkWHDL+3fobZuLnzhJAMntmY1rcgE
-kDX/Rmh+Me+nJNGIRmJr
-=t6+Q
------END PGP SIGNATURE-----
diff --git a/sys-apps/rng-tools/files/2/rngd b/sys-apps/rng-tools/files/2/rngd
deleted file mode 100644
index e11425552528..000000000000
--- a/sys-apps/rng-tools/files/2/rngd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/2/rngd,v 1.2 2009/07/15 19:47:25 nelchael Exp $
-
-depend() {
-	need localmount
-	after random
-}
-
-start() {
-	ebegin "Starting hardware RNG daemon"
-	if [ -e /dev/hw_random ]; then
-		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/hw_random
-		eend $? "Failed to start hardware RNG daemon"
-	elif [ -e /dev/hwrandom ]; then
-		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/hwrandom
-		eend $? "Failed to start hardware RNG daemon"
-	elif [ -e /dev/i810_rng ]; then
-		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/i810_rng
-		eend $? "Failed to start hardware RNG daemon"
-	elif [ -e /dev/hwrng ]; then
-		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/hwrng
-		eend $? "Failed to start hardware RNG daemon"
-	else
-		einfo "No hardware RNG found, using /dev/urandom as feedback input"
-		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/urandom
-		eend $? "Failed to start hardware RNG daemon"
-	fi
-}
-
-stop() {
-	ebegin "Stopping hardware RNG daemon"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/rngd
-	eend $? "Failed to stop hardware RNG daemon"
-}
diff --git a/sys-apps/rng-tools/files/2/rngd-conf b/sys-apps/rng-tools/files/2/rngd-conf
deleted file mode 100644
index 17c17ec6b915..000000000000
--- a/sys-apps/rng-tools/files/2/rngd-conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/conf.d/rngd
-
-# Please see "/usr/sbin/rngd --help" and "man rngd" for more information
-
-# Random step (Number of bytes written to random-device at a time):
-STEP=64
-
-# Timeout (Interval written to random-device when the entropy pool is full):
-TIMEOUT=60
diff --git a/sys-apps/rng-tools/files/rng-tools-5-fix-textrels-on-PIC-x86.patch b/sys-apps/rng-tools/files/rng-tools-5-fix-textrels-on-PIC-x86.patch
new file mode 100644
index 000000000000..5fa5f0b4ecf7
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-5-fix-textrels-on-PIC-x86.patch
@@ -0,0 +1,100 @@
+From: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
+Subject: [PATCH] Fix assemby textrels on rdrand_asm.S on PIC x86
+
+This patch updates the fixes in the assembly in rdrand_asm.S in
+sys-apps/rng-tools-5 so it won't generate textrels on PIC systems.
+The main fixes are in the use of leal in SETPTR for such systems, the rest is
+the usual PIC support stuff.
+
+This should fix Gentoo bug #469962 and help fix #518210
+
+This patch is released under the GPLv2 or a higher version license as is the
+original file as long as the author and the tester are credited.
+
+Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=469962
+Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=518210
+Upstream-status: Not sent yet
+Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
+Reported-by: cilly <cilly@cilly.mine.nu>
+Reported-by: Manuel Rüger <mrueg@gentoo.org>
+Tested-by: Anthony Basile <blueness@gentoo.org>
+
+--- rng-tools/rdrand_asm.S
++++ rng-tools/rdrand_asm.S
+@@ -2,6 +2,7 @@
+  * Copyright (c) 2011-2014, Intel Corporation
+  * Authors: Fenghua Yu <fenghua.yu@intel.com>,
+  *          H. Peter Anvin <hpa@linux.intel.com>
++ * PIC code by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms and conditions of the GNU General Public License,
+@@ -174,7 +175,19 @@
+ 	jmp	4b
+ ENDPROC(x86_rdseed_or_rdrand_bytes)
+ 
++#if defined(__PIC__)
++#define INIT_PIC() \
++	pushl	%ebx ; \
++	call    __x86.get_pc_thunk.bx ; \
++	addl    $_GLOBAL_OFFSET_TABLE_, %ebx
++#define END_PIC() \
++	popl	%ebx
++#define SETPTR(var,ptr) leal (var)@GOTOFF(%ebx),ptr
++#else
++#define INIT_PIC()
++#define END_PIC()
+ #define SETPTR(var,ptr)	movl $(var),ptr
++#endif
+ #define PTR0	%eax
+ #define PTR1	%edx
+ #define PTR2	%ecx
+@@ -190,6 +203,7 @@
+ 	movl	8(%ebp), %eax
+ 	movl	12(%ebp), %edx
+ 	push	%esi
++	INIT_PIC()
+ #endif
+ 	movl	$512, CTR3	/* Number of rounds */
+ 	
+@@ -280,6 +294,7 @@
+ 	movdqa	%xmm7, (7*16)(PTR1)
+ 
+ #ifdef __i386__
++	END_PIC()
+ 	pop	%esi
+ 	pop	%ebp
+ #endif
+@@ -294,6 +309,7 @@
+ 	push	%ebp
+ 	mov	%esp, %ebp
+ 	movl	8(%ebp), %eax
++	INIT_PIC()
+ #endif
+ 
+ 	SETPTR(aes_round_keys, PTR1)
+@@ -323,6 +339,7 @@
+ 	call	1f
+ 
+ #ifdef __i386__
++	END_PIC()
+ 	pop	%ebp
+ #endif
+ 	ret
+@@ -343,6 +360,16 @@
+ 
+ ENDPROC(x86_aes_expand_key)
+ 
++#if defined(__i386__) && defined(__PIC__)
++	.section	.text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat
++	.globl	__x86.get_pc_thunk.bx
++	.hidden	__x86.get_pc_thunk.bx
++	.type	__x86.get_pc_thunk.bx, @function
++__x86.get_pc_thunk.bx:
++	movl	(%esp), %ebx
++	ret
++#endif
++
+ 	.bss
+ 	.balign 64
+ aes_round_keys:
diff --git a/sys-apps/rng-tools/files/rngd-confd-3 b/sys-apps/rng-tools/files/rngd-confd-3
deleted file mode 100644
index 0702ece0ae14..000000000000
--- a/sys-apps/rng-tools/files/rngd-confd-3
+++ /dev/null
@@ -1,27 +0,0 @@
-# /etc/conf.d/rngd
-
-# Please see "/usr/sbin/rngd --help" and "man rngd" for more information
-
-# If a single device is preferred, then specify it here, otherwise we will
-# search for suitable devices. TPM is specified via a later option, not this
-# one.
-#DEVICE=
-#TPM_DEVICE=
-
-# Random step (Number of bytes written to random-device at a time):
-STEP=64
-
-# Timeout (Interval written to random-device when the entropy pool is full):
-TIMEOUT=60
-
-# Should TPM be avoided?
-NO_TPM=0
-
-# Fill watermark
-# 0 <= n <= 4096
-WATERMARK=2048
-
-# Bug #292239: Remixing /dev/urandom back into /dev/random is considered a
-# security vulnerability in some cases where not enough entropy is present on
-# systems.
-DO_NOT_REMIX_URANDOM=0
diff --git a/sys-apps/rng-tools/files/rngd-confd-4 b/sys-apps/rng-tools/files/rngd-confd-4
deleted file mode 100644
index 182bc6095a75..000000000000
--- a/sys-apps/rng-tools/files/rngd-confd-4
+++ /dev/null
@@ -1,24 +0,0 @@
-# /etc/conf.d/rngd
-
-# Please see "/usr/sbin/rngd --help" and "man rngd" for more information
-
-# If a single device is preferred, then specify it here, otherwise we will
-# search for suitable devices. TPM is specified via a later option, not this
-# one.
-#DEVICE=
-#TPM_DEVICE=
-
-# Random step (Number of bytes written to random-device at a time):
-STEP=64
-
-# Should TPM be avoided?
-NO_TPM=0
-
-# Fill watermark
-# 0 <= n <= 4096
-WATERMARK=2048
-
-# Bug #292239: Remixing /dev/urandom back into /dev/random is considered a
-# security vulnerability in some cases where not enough entropy is present on
-# systems.
-DO_NOT_REMIX_URANDOM=0
diff --git a/sys-apps/rng-tools/files/rngd-initd-3 b/sys-apps/rng-tools/files/rngd-initd-3
deleted file mode 100644
index 51c8a15e5028..000000000000
--- a/sys-apps/rng-tools/files/rngd-initd-3
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-3,v 1.2 2013/05/22 05:16:17 vapier Exp $
-
-depend() {
-	need localmount
-	after urandom
-}
-
-BINARY=/usr/sbin/rngd
-# Do NOT add /dev/tpm to this.
-DEFAULT_DEVICE="/dev/hw_random* /dev/hwrandom* /dev/i810_rng /dev/hwrng*"
-DEFAULT_TPM_DEVICE="/dev/tpm*"
-[ $DO_NOT_REMIX_URANDOM -eq 0 ] && DEFAULT_DEVICE="${DEFAULT_DEVICE} /dev/urandom"
-
-find_device() {
-	# The echo is to cause globbing
-	for d in $*; do
-		[ -e "$d" ] && break
-	done
-	echo "$d"
-}
-
-find_rng_device() {
-	local d="$(find_device $(echo ${DEVICE-${DEFAULT_DEVICE}}))"
-	[ -z "${d}" ] && d=/dev/null
-	echo "$d"
-}
-
-find_tpm_device() {
-	local d="$(find_device $(echo ${TPM_DEVICE-${DEFAULT_TPM_DEVICE}}))"
-	[ -z "${d}" ] && d=/dev/null
-	echo "$d"
-}
-
-start() {
-	local d t
-	d="$(find_rng_device)"
-	[ "${NO_TPM}" == "1" ] || t="$(find_tpm_device)"
-	[ -z "${d}" ] && d=/dev/null
-	[ -z "${t}" ] && t=/dev/null
-	# TODO: find a better way to handle multiple feedback devices.
-	# Notice that we only warn if TPM is not available.
-	[ "$d" == "/dev/urandom" -a "$t" == "/dev/null" ] && ewarn "No hardware RNG found, using $d as feedback input"
-	# Now sanity check and start.
-	if [ "$d" != "/dev/null" -o "$t" != "/dev/null" ]; then
-		ebegin "Starting hardware RNG daemon"
-		start-stop-daemon --start --quiet --exec ${BINARY} -- -b -s ${STEP-64} -t ${TIMEOUT-60} --no-tpm=${NO_TPM-0} -W ${WATERMARK-2048} -r $d
-		eend $? "Failed to start hardware RNG daemon"
-	else
-		eerror "No hardware RNG or feedback source available."
-		return 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping hardware RNG daemon"
-	start-stop-daemon --stop --quiet --exec ${BINARY}
-	eend $? "Failed to stop hardware RNG daemon"
-}
diff --git a/sys-apps/rng-tools/files/rngd-initd-4 b/sys-apps/rng-tools/files/rngd-initd-4
deleted file mode 100644
index ced1a2f743fc..000000000000
--- a/sys-apps/rng-tools/files/rngd-initd-4
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4,v 1.2 2013/05/22 05:16:17 vapier Exp $
-
-depend() {
-	need localmount
-	after urandom
-}
-
-BINARY=/usr/sbin/rngd
-# Do NOT add /dev/tpm to this.
-DEFAULT_DEVICE="/dev/hw_random* /dev/hwrandom* /dev/i810_rng /dev/hwrng*"
-DEFAULT_TPM_DEVICE="/dev/tpm*"
-[ $DO_NOT_REMIX_URANDOM -eq 0 ] && DEFAULT_DEVICE="${DEFAULT_DEVICE} /dev/urandom"
-
-find_device() {
-	# The echo is to cause globbing
-	local d
-	for d in $* ; do
-		[ -e "${d}" ] && break
-	done
-	echo "${d:-/dev/null}"
-}
-
-find_rng_device() {
-	echo "$(find_device $(echo ${DEVICE:-${DEFAULT_DEVICE}}))"
-}
-
-find_tpm_device() {
-	echo "$(find_device $(echo ${TPM_DEVICE:-${DEFAULT_TPM_DEVICE}}))"
-}
-
-start() {
-	local d t
-	d="$(find_rng_device)"
-	[ "${NO_TPM}" = "1" ] || t="$(find_tpm_device)"
-
-	if [ "${d}" = "/dev/null" -a "${t}" = "/dev/null" ] ; then
-		eerror "No hardware RNG or feedback source available."
-		return 1
-	fi
-
-	# TODO: find a better way to handle multiple feedback devices.
-	# Notice that we only warn if TPM is not available.
-	if [ "${d}" = "/dev/urandom" -a "${t}" = "/dev/null" ] ; then
-		ewarn "No hardware RNG found, using ${d} as feedback input"
-	fi
-
-	ebegin "Starting hardware RNG daemon"
-	start-stop-daemon --start --quiet --exec ${BINARY} -- \
-		-b -s ${STEP:-64} --no-tpm=${NO_TPM:-0} -W ${WATERMARK:-2048} -r ${d}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping hardware RNG daemon"
-	start-stop-daemon --stop --quiet --exec ${BINARY}
-	eend $?
-}
diff --git a/sys-apps/rng-tools/rng-tools-2-r1.ebuild b/sys-apps/rng-tools/rng-tools-2-r1.ebuild
deleted file mode 100644
index 09b21268f2af..000000000000
--- a/sys-apps/rng-tools/rng-tools-2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-2-r1.ebuild,v 1.2 2014/08/10 20:25:06 slyfox Exp $
-
-inherit autotools
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="http://gkernel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	# we want this extra tool
-	cd "${S}"
-	echo 'bin_PROGRAMS = randstat' > contrib/Makefile.am
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog
-	doinitd "${FILESDIR}/2/rngd"
-	newconfd "${FILESDIR}/2/rngd-conf" rngd
-}
diff --git a/sys-apps/rng-tools/rng-tools-3-r1.ebuild b/sys-apps/rng-tools/rng-tools-3-r1.ebuild
deleted file mode 100644
index a73f1b13a4aa..000000000000
--- a/sys-apps/rng-tools/rng-tools-3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-3-r1.ebuild,v 1.2 2014/08/10 20:25:06 slyfox Exp $
-
-EAPI=2
-inherit eutils autotools
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="http://gkernel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
-	epatch "${FILESDIR}"/test-for-argp.patch
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog
-	newinitd "${FILESDIR}/rngd-initd-${PV}" rngd
-	newconfd "${FILESDIR}/rngd-confd-${PV}" rngd
-}
diff --git a/sys-apps/rng-tools/rng-tools-3.ebuild b/sys-apps/rng-tools/rng-tools-3.ebuild
deleted file mode 100644
index 7f7a1f0c2692..000000000000
--- a/sys-apps/rng-tools/rng-tools-3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-3.ebuild,v 1.2 2014/08/10 20:25:06 slyfox Exp $
-
-EAPI=2
-inherit autotools
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="http://gkernel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog
-	newinitd "${FILESDIR}/rngd-initd-${PV}" rngd
-	newconfd "${FILESDIR}/rngd-confd-${PV}" rngd
-}
diff --git a/sys-apps/rng-tools/rng-tools-4-r1.ebuild b/sys-apps/rng-tools/rng-tools-4-r1.ebuild
deleted file mode 100644
index 7315c4d4cdb5..000000000000
--- a/sys-apps/rng-tools/rng-tools-4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-4-r1.ebuild,v 1.1 2012/11/11 06:24:22 vapier Exp $
-
-EAPI="4"
-
-inherit eutils autotools toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="http://gkernel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
-	epatch "${FILESDIR}"/test-for-argp.patch
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in
-	tc-export AR
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-4 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4 rngd
-}
diff --git a/sys-apps/rng-tools/rng-tools-4-r5.ebuild b/sys-apps/rng-tools/rng-tools-4-r5.ebuild
deleted file mode 100644
index 2a1cf3b91954..000000000000
--- a/sys-apps/rng-tools/rng-tools-4-r5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-4-r5.ebuild,v 1.7 2013/12/16 14:44:30 swift Exp $
-
-EAPI="4"
-
-inherit eutils autotools toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="http://gkernel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc x86"
-IUSE="selinux"
-
-DEPEND="selinux? ( sec-policy/selinux-rngd )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
-	epatch "${FILESDIR}"/test-for-argp.patch
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in
-	tc-export AR
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-4.1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-}
diff --git a/sys-apps/rng-tools/rng-tools-4-r6.ebuild b/sys-apps/rng-tools/rng-tools-5.ebuild
index 834e37ee8647..b399ecf2c34b 100644
--- a/sys-apps/rng-tools/rng-tools-4-r6.ebuild
+++ b/sys-apps/rng-tools/rng-tools-5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-4-r6.ebuild,v 1.2 2013/12/16 14:44:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-5.ebuild,v 1.1 2014/11/18 19:54:10 mrueg Exp $
 
-EAPI="4"
+EAPI=5
 
-inherit eutils autotools toolchain-funcs
+inherit eutils autotools systemd toolchain-funcs
 
 DESCRIPTION="Daemon to use hardware random number generators"
 HOMEPAGE="http://gkernel.sourceforge.net/"
@@ -15,16 +15,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE="selinux"
 
-DEPEND="selinux? ( sec-policy/selinux-rngd )"
-RDEPEND="${DEPEND}"
+DEPEND="dev-libs/libgcrypt:0
+	dev-libs/libgpg-error"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )"
 
 src_prepare() {
 	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
-	epatch "${FILESDIR}"/test-for-argp.patch
-	epatch "${FILESDIR}"/fix-textrels-on-PIC-x86.patch
+	epatch "${FILESDIR}"/test-for-argp.patch\
+		"${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch
 	eautoreconf
 
-	sed -i '/^AR /d' Makefile.in
+	sed -i '/^AR /d' Makefile.in || die
 	tc-export AR
 }
 
@@ -32,4 +34,5 @@ src_install() {
 	default
 	newinitd "${FILESDIR}"/rngd-initd-4.1 rngd
 	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
 }