From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Aug 2021 15:19:26 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mEAcI-0001h3-Pd for lore@lore.pengutronix.de; Thu, 12 Aug 2021 15:19:26 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mEAcI-0007WC-IL; Thu, 12 Aug 2021 15:19:26 +0200 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mEAa8-0007JN-Ie; Thu, 12 Aug 2021 15:17:12 +0200 Received: from rhi by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1mEAa8-0001S2-Am; Thu, 12 Aug 2021 15:17:12 +0200 From: Roland Hieber To: ptxdist@pengutronix.de Date: Thu, 12 Aug 2021 15:17:11 +0200 Message-Id: <20210812131711.5528-2-rhi@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210812131711.5528-1-rhi@pengutronix.de> References: <20210812131711.5528-1-rhi@pengutronix.de> MIME-Version: 1.0 Mail-Followup-To: Roland Hieber , ptxdist@pengutronix.de Subject: [ptxdist] [PATCH 2/2] rng-tools: version bump v6.5 -> v6.14 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false The old version of rng-tools didn't use libgcrypt, but linked to it nevertheless; however it moved from libgcrypt to openssl anyway in the new version. The patch was applied upstream, but ./configure still needs to be generated. Signed-off-by: Roland Hieber --- .../autogen.sh | 0 ...0001-Buildsystem-fix-autotools-setup.patch | 25 ------------------- patches/rng-tools-6.5/series | 4 --- rules/rng-tools.in | 2 +- rules/rng-tools.make | 11 +++++--- 5 files changed, 8 insertions(+), 34 deletions(-) rename patches/{rng-tools-6.5 => rng-tools-6.14}/autogen.sh (100%) delete mode 100644 patches/rng-tools-6.5/0001-Buildsystem-fix-autotools-setup.patch delete mode 100644 patches/rng-tools-6.5/series diff --git a/patches/rng-tools-6.5/autogen.sh b/patches/rng-tools-6.14/autogen.sh similarity index 100% rename from patches/rng-tools-6.5/autogen.sh rename to patches/rng-tools-6.14/autogen.sh diff --git a/patches/rng-tools-6.5/0001-Buildsystem-fix-autotools-setup.patch b/patches/rng-tools-6.5/0001-Buildsystem-fix-autotools-setup.patch deleted file mode 100644 index 9f03d86a0b14..000000000000 --- a/patches/rng-tools-6.5/0001-Buildsystem-fix-autotools-setup.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Juergen Borleis -Date: Mon, 15 Oct 2018 12:51:16 +0200 -Subject: [PATCH] Buildsystem: fix autotools setup - -Using 'gnu' forces the existence of various files, which are not present -in this repository ('README' for example). - -Signed-off-by: Juergen Borleis ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b1544d9aefcb..6eaed1071869 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,7 @@ AC_INIT(rng-tools, 6.5, [Neil Horman ]) - AC_PREREQ(2.52) - AC_CONFIG_SRCDIR([rngd.c]) - AC_CANONICAL_TARGET --AM_INIT_AUTOMAKE([gnu]) -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADERS([rng-tools-config.h]) - AC_CONFIG_MACRO_DIRS([m4]) - diff --git a/patches/rng-tools-6.5/series b/patches/rng-tools-6.5/series deleted file mode 100644 index 48616bf4538d..000000000000 --- a/patches/rng-tools-6.5/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Buildsystem-fix-autotools-setup.patch -# 05372db98be6dd445f49fca3ec398a6f - git-ptx-patches magic diff --git a/rules/rng-tools.in b/rules/rng-tools.in index 24bcd048f268..eed76200987a 100644 --- a/rules/rng-tools.in +++ b/rules/rng-tools.in @@ -5,7 +5,7 @@ menuconfig RNG_TOOLS prompt "rng-tools rngd " select LIBSYSFS select LIBC_PTHREAD - select LIBGCRYPT + select OPENSSL help random number generator daemon - seed kernel random from hwrng diff --git a/rules/rng-tools.make b/rules/rng-tools.make index 93d1b522588b..8436fb15931f 100644 --- a/rules/rng-tools.make +++ b/rules/rng-tools.make @@ -9,8 +9,8 @@ PACKAGES-$(PTXCONF_RNG_TOOLS) += rng-tools -RNG_TOOLS_VERSION := 6.5 -RNG_TOOLS_MD5 := c153517cc73f7f2a899bf59df06ed1ce +RNG_TOOLS_VERSION := 6.14 +RNG_TOOLS_MD5 := 917d21dd2b06816b0484e220dfb5ba4b RNG_TOOLS := rng-tools-$(RNG_TOOLS_VERSION) RNG_TOOLS_SUFFIX := tar.gz RNG_TOOLS_URL := https://github.com/nhorman/rng-tools/archive/v$(RNG_TOOLS_VERSION).$(RNG_TOOLS_SUFFIX) @@ -29,8 +29,11 @@ RNG_TOOLS_LICENSE_FILES := \ RNG_TOOLS_CONF_TOOL := autoconf RNG_TOOLS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --with-libgcrypt \ - --without-nistbeacon + --disable-jitterentropy \ + --without-nistbeacon \ + --without-pkcs11 \ + --without-rtlsdr \ + --without-libargp # ---------------------------------------------------------------------------- # Target-Install -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de