From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 20 Oct 2021 11:43: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 1md886-0007Ak-QD for lore@lore.pengutronix.de; Wed, 20 Oct 2021 11:43: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 1md886-0003BG-9f; Wed, 20 Oct 2021 11:43:26 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1md84c-0007WL-Gi; Wed, 20 Oct 2021 11:39:50 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1md84b-0005Vp-VE; Wed, 20 Oct 2021 11:39:49 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1md84b-00GVmy-SO; Wed, 20 Oct 2021 11:39:49 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 20 Oct 2021 11:39:49 +0200 Message-Id: <20211020093949.3935333-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210813094446.13958-1-rhi@pengutronix.de> References: <20210813094446.13958-1-rhi@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] 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 Thanks, applied as 38fe011f7e28189764b108fb76d4cb9f4a49fb2a. Michael [sent from post-receive hook] On Wed, 20 Oct 2021 11:39:49 +0200, Roland Hieber wrote: > 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, and also removed the libsysfs dependency. The patch was > applied upstream, but ./configure still needs to be generated. > > Signed-off-by: Roland Hieber > Message-Id: <20210813094446.13958-1-rhi@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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..e8e5b776cf97 100644 > --- a/rules/rng-tools.in > +++ b/rules/rng-tools.in > @@ -3,9 +3,8 @@ > menuconfig RNG_TOOLS > tristate > 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 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de