From patchwork Wed Dec 1 12:29:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4872 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J3z0h3Pncz3wg9 for ; Wed, 1 Dec 2021 12:29:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J3z0h0XvyznR; Wed, 1 Dec 2021 12:29:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J3z0h03Rrz2yf4; Wed, 1 Dec 2021 12:29:08 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J3z0f1GVDz2yf4 for ; Wed, 1 Dec 2021 12:29:06 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J3z0d4CKVznR; Wed, 1 Dec 2021 12:29:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638361745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2NSiwE+S5+UbD97XbfAH/s+bDyQtgteAF3vaPfEEtXE=; b=S/+C2+GkL2KQNhm9j1xBQVRSzd3GYnfG/UPR+WeGtA+V0etTzv0YLLd1nWHdispL5pUN6W RbyKaHpsY6F5VeBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638361745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2NSiwE+S5+UbD97XbfAH/s+bDyQtgteAF3vaPfEEtXE=; b=QKPzPMvfxHVsPH+WMxSaCHcMgmJa50obQ6ZDcNqCZ5sn6JcqcWnxKzQpbcQApRIJNhHNSp hLkcA9goP52KFQAIE/G8OCR75KWK+afHmCpxhMNRS2Oi9/RCxzpOtMA+df2b/WN8ORnHSU 8lxaHcVJe+bLOnTH4Zlf3b1e3K/JVDAJDp10kcdzJkfKmAk+W/FCBX5i6JovdBWny/HNus nPn1ywqQnRs24JM8g4jkRvibofhGiC84jc4m9SbkSXLF4qj5SlDhm9mi4qybUhDI6CXBZt ic/edpmRGgxAU3/f+mhnuDDx/3B3IIWO7prvNNhpOg/GV8F+ytTEwdlAXNLJog== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] rng-tools: Update to version 6.14 Date: Wed, 1 Dec 2021 13:29:03 +0100 Message-Id: <20211201122903.3436682-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from 6.12 to 6.14 - Update of rootfile not required - patch for building rng-tools also for i586 removed as 32 bit will no longer be EOL at end of 2021 - Building 6.14 caused an error for not finding librtlsdr. The same check is in the makefile in 6.12 but it does not get checked. I could not find why the check was being carried out in 6.14 - it was not due to the removal of the patch. In the end I added the --disable-rtlsdr option to configure and this allowed the build to occur without the check for the prescence of librtlsdr being carried out. - Changelog rng-tools 6.14 Bug Fixes: Fixed a null pointer deref in nistbeacon entropy source fixed some confguration tests clarified some rngd behavior in the man page update init code to do proper logging various covscan fixes fixed a memory leak in jitter entropy source fixed possible NULL deref in rdrand source various fixed in openssl mangling code added randstat binary to build minor modernizations to configure.ac rng-tools 6.13 Features: Support rndr instruction on arm Support jitter software timer on coarse time systems Bug Fixes: Merged all openssl use into a single helper library Improved console output readability Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- lfs/rng-tools | 10 +++--- ...g-tools-6-Enable-RDRAND-for-i586-too.patch | 35 ------------------- 2 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch diff --git a/lfs/rng-tools b/lfs/rng-tools index 4b9915f40..31706015f 100644 --- a/lfs/rng-tools +++ b/lfs/rng-tools @@ -24,7 +24,7 @@ include Config -VER = 6.12 +VER = 6.14 THISAPP = rng-tools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 17f2815263b6ce6a353625b1fe615346 +$(DL_FILE)_MD5 = 917d21dd2b06816b0484e220dfb5ba4b install : $(TARGET) @@ -70,9 +70,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch cd $(DIR_APP) && ./autogen.sh - cd $(DIR_APP) && ./configure --prefix=/usr --without-pkcs11 + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --without-pkcs11 \ + --without-rtlsdr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install @rm -rf $(DIR_APP) diff --git a/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch b/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch deleted file mode 100644 index 7d45bd0b8..000000000 --- a/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1f023b49959aa58246e6bb7091ba7710116f6915 Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Sun, 9 Sep 2018 17:29:15 +0100 -Subject: [PATCH] Enable RDRAND for i586, too - -IPFire is being compiled for i586 omitting some instructions -for i686. However, RDRAND is available on some systems and -can of course be used. - -Signed-off-by: Michael Tremer - -Pull request sent: https://github.com/nhorman/rng-tools/pull/31 - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index faba7cc9857e..716175328ff6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -53,8 +53,8 @@ AC_CHECK_TOOLS([AR], [ar gar], :) - - AX_PTHREAD - --AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686]) --AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[]) -+AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686 -o $target_cpu = i586]) -+AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686 -o $target_cpu = i586], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[]) - - AM_CONDITIONAL([DARN], [test $target_cpu = powerpc64le]) - AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[]) --- -2.17.1 -