* [PATCH] rng-tools: Update to version 6.14
@ 2021-12-01 12:29 Adolf Belka
2021-12-01 15:15 ` Michael Tremer
0 siblings, 1 reply; 2+ messages in thread
From: Adolf Belka @ 2021-12-01 12:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4482 bytes --]
- 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 <adolf.belka(a)ipfire.org>
---
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 <michael.tremer(a)ipfire.org>
-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 <michael.tremer(a)ipfire.org>
-
-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
-
--
2.34.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] rng-tools: Update to version 6.14
2021-12-01 12:29 [PATCH] rng-tools: Update to version 6.14 Adolf Belka
@ 2021-12-01 15:15 ` Michael Tremer
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tremer @ 2021-12-01 15:15 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5112 bytes --]
Hello,
> On 1 Dec 2021, at 12:29, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>
> - 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
This is slightly jumping the gun because 2021 hasn’t ended, yet :)
However, since this will not be part of Core Update 162 and 163 will probably be released in the new year, this should be fine.
> - 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.
That is also fine for me. We probably don’t want any entropy sources like this.
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
> - 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 <adolf.belka(a)ipfire.org>
> ---
> 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 <michael.tremer(a)ipfire.org>
> -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 <michael.tremer(a)ipfire.org>
> -
> -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
> -
> --
> 2.34.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-01 15:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-01 12:29 [PATCH] rng-tools: Update to version 6.14 Adolf Belka
2021-12-01 15:15 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox