commit: 846e3534c81b11e9acad30f82451734cc9ab0521 Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> AuthorDate: Wed Sep 26 17:48:35 2018 +0000 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> CommitDate: Wed Sep 26 17:50:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846e3534
sys-apps/rng-tools: bump to v6.5 Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 sys-apps/rng-tools/Manifest | 1 + ...6.5-jitterentropy-automagic-detection-fix.patch | 60 +++++++++++++++++++ sys-apps/rng-tools/rng-tools-6.5.ebuild | 69 ++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index 8146fd915f2..a95823f89e7 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -4,4 +4,5 @@ DIST rng-tools-6.2.tar.gz 30421 BLAKE2B 646628095cbc611aee4113198e0874b5f0672cd7 DIST rng-tools-6.3.1.tar.gz 31797 BLAKE2B 00d75d8436b4b49798bca8fb76e43a98feac8805b47a57d2315c22e72ed3dff30c6305b206168531c85c0576dc1d9864585eb3d4c2af833e9bec8dc5a478e19b SHA512 cb85674e6448e8152f92b4a82e944a9258dcc9ce68349404c0000c09378ac5f6fb298c50ed2d9a1b18d76c5f35b0a4884d5efd0f4dd434ec0952107e0738b937 DIST rng-tools-6.3.tar.gz 31474 BLAKE2B 4d3924b3ca85d31d1999ceb45908cf64e8d2978d2e0aa638d9bbd3054a11a41251f9db54db35583c8fc080fd0667387cd63792c15486048d1f52300217e02fa9 SHA512 c00ac28c059ba689f114480958fe993e2199a1428137b151779a0331b9cc5a667f08770aa7b28d98c801166a509e8bd40d6b92f5c29b6ff73eb50a1cb0f2dd13 DIST rng-tools-6.4.tar.gz 41248 BLAKE2B 16000e0779cf7aa25936a95661a0c40d4f0f12ed91fa36160924782d22a1057838bfb466f60614f91ef6c5576e0a29b6c1028bb72d5f5403c9a61d8f5ec16edd SHA512 12da9819b6e9a9ea688e82d1689642a690f6c9d78ad5fcf159a71b37a49f79120c8f62d4e1b8e81a496eac46a28137c5c87973499b31e1881a7866de99a168f0 +DIST rng-tools-6.5.tar.gz 51484 BLAKE2B 92700cbe1b48244effeae4f058507c27f8c9714f9bb5435ee7c6c08e260ce57891084208ea62391ab68b6551a3d95997c91d88020e9541564488abcf2041e479 SHA512 ae356ae18cb8584a594519038789d17e0f1b3d30122c058f86f3919a9c5ebfe0c48f8d7bfa6154b37d4f92d89c8b8a4a91007de0d1262ce5b86af19248c57bd0 DIST rng-tools-6.tar.gz 26024 BLAKE2B a523328fcce56997e2847940cdc096abd5a539135f857f0a4cd3d782a1659f4d2978870149caac47b839c80788df6a3d891adcd39371d5968149dd29bc46bc62 SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 diff --git a/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch new file mode 100644 index 00000000000..b03960180ed --- /dev/null +++ b/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch @@ -0,0 +1,60 @@ +From 76cfc06afb69019dcf0bbd9938f6378168e37411 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <[email protected]> +Date: Wed, 26 Sep 2018 13:32:39 -0400 +Subject: [PATCH] configure.ac: control jitterentropy support using + --with-jitter + +Replace automagic detection of jitterentropy DSO with an AC_ARG_WITH +macro so that rngd can be compiled without jitter support even when +the jitterentropy library is available on the system. +--- + configure.ac | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b1544d9..1e58184 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,6 +40,13 @@ AC_ARG_WITH([nistbeacon], + [with_nistbeacon=check] + ) + ++AC_ARG_WITH([jitter], ++ AS_HELP_STRING([--without-jitter], ++ [Disable jitter entropy library support. ]), ++ [], ++ [with_jitter=check] ++) ++ + dnl Make sure anyone changing configure.ac/Makefile.am has a clue + AM_MAINTAINER_MODE + AM_PROG_AS +@@ -61,13 +68,18 @@ AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])] + + AM_CONDITIONAL([JITTER], [false]) + AM_CONDITIONAL([JITTER_DSO], [false]) +-AS_IF([test -f jitterentropy-library/Makefile], +- [AM_CONDITIONAL([JITTER], [true]) +- AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])], +- [AC_SEARCH_LIBS(jent_version,jitterentropy, +- [AM_CONDITIONAL([JITTER_DSO], [true]) +- AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])], +- [AC_MSG_NOTICE([Disabling JITTER entropy source])])]) ++AS_IF( ++ [ test "x$with_jitter" != "xno" ], ++ [ ++ AS_IF([test -f jitterentropy-library/Makefile], ++ [AM_CONDITIONAL([JITTER], [true]) ++ AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])], ++ [AC_SEARCH_LIBS(jent_version,jitterentropy, ++ [AM_CONDITIONAL([JITTER_DSO], [true]) ++ AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])], ++ [AC_MSG_NOTICE([Disabling JITTER entropy source])])]) ++ ] ++) + + #AM_CONDITIONAL([JITTER], [test -f jitterentropy-library/Makefile]) + #AS_IF([test -f jitterentropy-library/Makefile], [AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],[AC_MSG_NOTICE([Disabling JITTER entropy source])]) +-- +2.19.0 + diff --git a/sys-apps/rng-tools/rng-tools-6.5.ebuild b/sys-apps/rng-tools/rng-tools-6.5.ebuild new file mode 100644 index 00000000000..23bb96b4215 --- /dev/null +++ b/sys-apps/rng-tools/rng-tools-6.5.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools systemd toolchain-funcs + +DESCRIPTION="Daemon to use hardware random number generators" +HOMEPAGE="https://github.com/nhorman/rng-tools"; +SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86" +IUSE="jitterentropy nistbeacon selinux" + +DEPEND="dev-libs/libgcrypt:0 + dev-libs/libgpg-error + sys-fs/sysfsutils + jitterentropy? ( + app-crypt/jitterentropy:= + ) + nistbeacon? ( + net-misc/curl[ssl] + dev-libs/libxml2:2= + dev-libs/openssl:0= + ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-rngd )" +DEPEND="${DEPEND} + nistbeacon? ( + virtual/pkgconfig + ) +" + +PATCHES=( + "${FILESDIR}"/test-for-argp.patch + "${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962 + "${FILESDIR}"/${PN}-6.5-jitterentropy-automagic-detection-fix.patch +) + +src_prepare() { + echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die + default + + mv README.md README || die + + eautoreconf + + sed -i '/^AR /d' Makefile.in || die + tc-export AR +} + +src_configure() { + local myeconfargs=( + $(use_with nistbeacon) + $(use_with jitterentropy jitter) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + newinitd "${FILESDIR}"/rngd-initd-6 rngd + newconfd "${FILESDIR}"/rngd-confd-4.1 rngd + systemd_dounit "${FILESDIR}"/rngd.service +}
