diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
| commit | 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch) | |
| tree | 2878053f3e7faed19a1f82c733d3bd29df69991e /sys-apps/rng-tools | |
| parent | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff) | |
gentoo resync : 08.06.2019
Diffstat (limited to 'sys-apps/rng-tools')
| -rw-r--r-- | sys-apps/rng-tools/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/rng-tools/files/rngd-initd-6.7-r1 (renamed from sys-apps/rng-tools/files/rngd-initd-6.7) | 2 | ||||
| -rw-r--r-- | sys-apps/rng-tools/rng-tools-6.7-r1.ebuild (renamed from sys-apps/rng-tools/rng-tools-6.7.ebuild) | 10 |
3 files changed, 12 insertions, 4 deletions
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index 34a7e532fe43..93081a9f3042 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -6,7 +6,7 @@ AUX rngd-confd-4.1 562 BLAKE2B 8fe0147a1f9e67541c709f793ed1f34ed173204739973abbb AUX rngd-confd-6 2038 BLAKE2B 0f239923693d167a6a53609822d15a92e0c0e98d9c090c17ea3a73ad4a187528cd9a5d4bf071ec544592ef3ce801c2c364ccba193c22940411629b14a486cd69 SHA512 fe58599105fbcf8e1bf5f584aeefa54681dfa9fa2cd73cd682acd348f170ca825b692a1a8d153b438096c580a4b0cdab56a03b32b5f9ae8e73f06c3535c1ea46 AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694b6fd2d3283c51ccf42e1be403a2208be70bc09dbd946c0cb803bfb303ae3999e97b3c3baa1162aaf SHA512 f16c5bc417e7bae86311397b3bf51927cc2cfbb0b4ee14a835fff5b62f4d12ab194329942e21cae4eec56953e4271b1fc655dcfa0be4ccbff1df1f1defdc70d8 AUX rngd-initd-6-r1 1577 BLAKE2B be6d70877e840c8d95a029057e03f533219e7b45d87d493af80f9a88df72b3eb272e9565e238a05665ed50c2b417815aed96be82c739ba1ab8de26ee463d0a1d SHA512 5e133f0572920b48a56734bc86edece5f655c6dde11b669307e3c49591e2678fcf9135017aafbc3b37f2af8d6c9c5cf8e52217ee50ff68abc2a7bf2330576f37 -AUX rngd-initd-6.7 1687 BLAKE2B 0d597acedd2e37f2c2a455773aaf882c7e26af5ccb997f5d78391ada2f3c7fedf9ae00cbfe76188d20643d88f34db9ccea44576578010b5be6f5057f02360930 SHA512 22658113020cc1f0e73a2d30960e92211a3f939f87807992a88e5c226ac578da090d3509c3ff78eb3298d7ee40b0d0bba85c10956dc758049aa45d8be39dd5c8 +AUX rngd-initd-6.7-r1 1683 BLAKE2B 34bea128a94f2fc8479ebd8e8a398a01bb96dcbe8dd74876f8b8725f701862908448deca3768437d1cd98b138c9203106c199942910f63e7c95598d3e1b27818 SHA512 c1e3d94509d5cd3301836961598e221ef0db2e7310386f0467a4f3068eada8ad4010b063202b8a8c3d163d39799aea7d6a4dcb4d8ca569fe7b51f5c870100b6d AUX rngd-initd-r1-4.1 494 BLAKE2B 1f11526717fcc9b88125e89474e1f06fc11621435811f4997e9e6197f634794df681ef698ab08d3f7c610dfb47c156231a157cfda05c804a6293a27dc276322f SHA512 8bf9a0bd25bcc9c1cc4eacdf875077208ba0899c626a55e57f055cc93b62e23a427e0622859c5b4a31c3aebe550b180777528b43942a3efb2e2c0b4243c3c9c6 AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2 AUX test-for-argp.patch 1245 BLAKE2B eb60f4d921f395d713e0ab9f132e47ce8783a096600f050c45212bae6929dc9546ff5f7b5ddf92d66570d82041b1e31ca3d690abd1e17d1c0fc688629a462e06 SHA512 0fe4b37eb3d2e93ff9ce17aed8cfcaa29c7f04289ba692d10fd0f8ef6d9b1e5f64a5734a508aea548f13fd00217972a68bcbeaf6977e763087ad20c19d456ed6 @@ -15,5 +15,5 @@ DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27 DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d EBUILD rng-tools-5-r2.ebuild 1144 BLAKE2B 071f7d226fb3c5585be712206d4397c248501e1fb54122c01119444472b8888e7bc95cd21bfc7663bca9c0d40364361b012ef7dde824718918c6e8334436c74f SHA512 dfdbc4425a776b799c873948453091c4cfb674a190626b0d5035d872e31deb9255850f73f73e4e9f664c3e8d72ea316aff9dc0f8a0e70d5d676449aaf81e0339 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492 -EBUILD rng-tools-6.7.ebuild 1898 BLAKE2B d86004a5599ee6df5b092dcbbe49a81613a08dd549052d0d8f29af4f5c0ac545e36cd8da5ff9423deed540aa1cd9340064c0d2c2ce5f60941cb8c6c207b07e18 SHA512 afa4b56582c89c04bb813cfd7574d17c6eb63bbacd4118f6a973689b7c0fbeed97cc45dd5ebd56c3ed35552f3851b3025f168380d527de44693bc8d4b87a9f4f +EBUILD rng-tools-6.7-r1.ebuild 2123 BLAKE2B 7cb287d94fd1c92539155843f003a4fec3ada1617f27fb1977d3cfbabc7efba53c66f1e0d3421eeb72b96a8e942e61a03a41663f1ac495ef2f3ab716b84ee123 SHA512 dd7656d6a00c3c723d6efd5f24986060ef47a0333df13f30f8893b91509b72e382600b6f4960ad0a4261c060ee5f1ca8f2bbf96f98f65fa35ba90374682a6ab6 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64 diff --git a/sys-apps/rng-tools/files/rngd-initd-6.7 b/sys-apps/rng-tools/files/rngd-initd-6.7-r1 index e85581ba6cb4..4a284b4f505f 100644 --- a/sys-apps/rng-tools/files/rngd-initd-6.7 +++ b/sys-apps/rng-tools/files/rngd-initd-6.7-r1 @@ -10,7 +10,7 @@ depend() { command="/usr/sbin/rngd" description="Check and feed random data from hardware device to kernel entropy pool." -pidfile="/var/run/${RC_SVCNAME}.pid" +pidfile="/run/${RC_SVCNAME}.pid" command_args="" command_args_background="--pid-file ${pidfile} --background" start_stop_daemon_args="--wait 1000" diff --git a/sys-apps/rng-tools/rng-tools-6.7.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild index e674b8de1d30..c112d9e0d3f6 100644 --- a/sys-apps/rng-tools/rng-tools-6.7.ebuild +++ b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild @@ -45,6 +45,14 @@ PATCHES=( src_prepare() { echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die + + # rngd_pkcs11.c needs to be linked against -lcrypto #684228 + # See: https://github.com/nhorman/rng-tools/pull/61 + if use pkcs11; then + sed -e '/rngd_pkcs11.c$/ a rngd_LDADD\t+= -lcrypto' \ + -i Makefile.am || die + fi + default mv README.md README || die @@ -67,7 +75,7 @@ src_configure() { src_install() { default - newinitd "${FILESDIR}"/rngd-initd-6.7 rngd + newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd newconfd "${FILESDIR}"/rngd-confd-6.7 rngd systemd_dounit "${FILESDIR}"/rngd.service |