package/rng-tools: bump to version 6.16
- Drop patches (already in version) - libcap is a mandatory dependency since50afdce9d3- Add Qrypt support:7ab7f540dahttps://github.com/nhorman/rng-tools/releases/tag/v6.16 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
Thomas Petazzoni
parent
f46e197374
commit
a97ab5d2fa
@ -1,52 +0,0 @@
|
||||
From 6ea89861c300a732d1bbcffd085d92f5c4c9228e Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 15 Aug 2022 11:57:21 +0200
|
||||
Subject: [PATCH] configure.ac: fix build without sys/auxv.h
|
||||
|
||||
Fix the following build failure on aarch64 without sys/auxv.h (e.g. on
|
||||
uclibc) raised since version 6.13 and
|
||||
https://github.com/nhorman/rng-tools/commit/9070a04adfcd21ec3839ee8ff190e7130ccd5c9b:
|
||||
|
||||
rngd_rndr.c:34:10: fatal error: sys/auxv.h: No such file or directory
|
||||
34 | #include <sys/auxv.h>
|
||||
| ^~~~~~~~~~~~
|
||||
|
||||
The same issue could be raised on powerpc64le since version 6.11 and
|
||||
https://github.com/nhorman/rng-tools/commit/ade348cdb90c25b44b203fd4e9c33ec4bccff323
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/41d5ab9e67eb0d8af8d789fc94d4366f130a7fb2
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/nhorman/rng-tools/commit/6ea89861c300a732d1bbcffd085d92f5c4c9228e]
|
||||
---
|
||||
configure.ac | 11 +++++++----
|
||||
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0af64e7..411c7b8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -76,14 +76,17 @@ AC_PROG_GCC_TRADITIONAL
|
||||
|
||||
AX_PTHREAD
|
||||
|
||||
+dnl Checks for header files.
|
||||
+AC_CHECK_HEADERS(sys/auxv.h)
|
||||
+
|
||||
AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || test $host_cpu = i686])
|
||||
AS_IF([test $host_cpu = x86_64 || test $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
|
||||
|
||||
-AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le])
|
||||
-AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
|
||||
+AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le -a "$ac_cv_header_sys_auxv_h" = "yes"])
|
||||
+AS_IF([test $host_cpu = powerpc64le -a "$ac_cv_header_sys_auxv_h" = "yes"], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
|
||||
|
||||
-AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64])
|
||||
-AS_IF([test $host_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
|
||||
+AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64 -a "$ac_cv_header_sys_auxv_h" = "yes"])
|
||||
+AS_IF([test $host_cpu = aarch64 -a "$ac_cv_header_sys_auxv_h" = "yes"], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
|
||||
AM_CONDITIONAL([JITTER], [false])
|
||||
|
||||
AC_ARG_ENABLE(jitterentropy,
|
||||
@ -1,30 +0,0 @@
|
||||
From e2698477e8abf623c18ab28d33cc894ec882a706 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Horman <neil.horman@privafy.com>
|
||||
Date: Fri, 18 Mar 2022 18:59:52 -0400
|
||||
Subject: [PATCH] Adjust jitterentropy detection to look for the settick
|
||||
function
|
||||
|
||||
Theres no great way to detect if jitterentropy has the internal timer
|
||||
feature enabled so we have to look for a function that is only defined
|
||||
when it is enabled
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[downloaded from upstream commit
|
||||
https://github.com/nhorman/rng-tools/commit/e2698477e8abf623c18ab28d33cc894ec882a706]
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e16e1a0..0f5a38e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -94,7 +94,7 @@ AS_IF(
|
||||
AC_SEARCH_LIBS(jent_version,jitterentropy,
|
||||
[AM_CONDITIONAL([JITTER], [true])
|
||||
AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])
|
||||
- AC_CHECK_LIB(jitterentropy, jent_entropy_switch_notime_impl,
|
||||
+ AC_CHECK_LIB(jitterentropy, jent_notime_settick,
|
||||
[AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])],
|
||||
[],-lpthread)],
|
||||
AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread)
|
||||
@ -1,39 +0,0 @@
|
||||
From c29424f10a0dcbd18ac25607fa1c81c18a960e81 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Horman <nhorman@tuxdriver.com>
|
||||
Date: Mon, 16 May 2022 13:38:54 -0400
|
||||
Subject: [PATCH] Adjust jitterentropy library to timeout/fail on long delay
|
||||
|
||||
[Bernd: removed description of unrelated part of the patch]
|
||||
|
||||
Also while we're at it, I might have a build solution for the presence
|
||||
of internal timers. When jitterentropy is built without internal
|
||||
timers, jent_notime_init is defined publically, but when it is built
|
||||
with timers, its declared as a static symbol, preenting resolution, so
|
||||
we can test to see if the function exists. If it does we _don't_ have
|
||||
notime support. The logic is a bit backwards, but i think it works
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[downloaded configure.ac patch from upstream commit
|
||||
https://github.com/nhorman/rng-tools/commit/57be6d4c90e78ea9ad036a3a6e9b09822ed4d219]
|
||||
---
|
||||
configure.ac | 6 ++---
|
||||
rngd_jitter.c | 62 ++++++++++++++++++++++++++++++++++++++-------------
|
||||
2 files changed, 49 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 52f2bb5..0af64e7 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -101,9 +101,9 @@ AS_IF(
|
||||
AC_SEARCH_LIBS(jent_version,jitterentropy,
|
||||
[AM_CONDITIONAL([JITTER], [true])
|
||||
AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])
|
||||
- AC_CHECK_LIB(jitterentropy, jent_notime_settick,
|
||||
- [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])],
|
||||
- [],-lpthread)],
|
||||
+ AC_CHECK_LIB(jitterentropy, jent_notime_init,
|
||||
+ [],
|
||||
+ [AC_DEFINE([HAVE_JITTER_NOTIME],1, [Enable JITTER_NOTIME])],-lpthread)],
|
||||
AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread)
|
||||
], [AC_MSG_NOTICE([Disabling JITTER entropy source])]
|
||||
)
|
||||
@ -2,7 +2,9 @@ config BR2_PACKAGE_RNG_TOOLS
|
||||
bool "rng-tools"
|
||||
# pthread_setaffinity_np
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_USE_MMU # libcap
|
||||
select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
|
||||
select BR2_PACKAGE_LIBCAP
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
help
|
||||
Daemon to use hardware random number generators.
|
||||
@ -35,7 +37,21 @@ config BR2_PACKAGE_RNG_TOOLS_NISTBEACON
|
||||
never be used for cryptographic purposes, or any use case in
|
||||
which random data should be known only by a single entity.
|
||||
|
||||
config BR2_PACKAGE_RNG_TOOLS_QRYPT
|
||||
bool "Qrypt Entropy Beacon support"
|
||||
select BR2_PACKAGE_JANSSON
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
help
|
||||
Enable Qrypt NIST-Beacon like entropy support.
|
||||
|
||||
Entropy gathered from Qrypt server based entropy beacons. Like
|
||||
NIST, it should likely not be used directly in cryptographic
|
||||
operation, as the entropy may be intercepted over a network,
|
||||
but can provide copius amounts of entropy for non-crypto
|
||||
purposes.
|
||||
|
||||
endif
|
||||
|
||||
comment "rng-tools needs a toolchain w/ NPTL"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz
|
||||
sha256 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 rng-tools-6.16.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
RNG_TOOLS_VERSION = 6.15
|
||||
RNG_TOOLS_VERSION = 6.16
|
||||
RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION))
|
||||
RNG_TOOLS_LICENSE = GPL-2.0
|
||||
RNG_TOOLS_LICENSE_FILES = COPYING
|
||||
RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project
|
||||
RNG_TOOLS_SELINUX_MODULES = rngd
|
||||
|
||||
RNG_TOOLS_DEPENDENCIES = host-pkgconf openssl
|
||||
RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl
|
||||
# From git
|
||||
RNG_TOOLS_AUTORECONF = YES
|
||||
|
||||
@ -45,6 +45,13 @@ else
|
||||
RNG_TOOLS_CONF_OPTS += --without-nistbeacon
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_RNG_TOOLS_QRYPT),y)
|
||||
RNG_TOOLS_DEPENDENCIES += jansson libcurl
|
||||
RNG_TOOLS_CONF_OPTS += --with-qrypt
|
||||
else
|
||||
RNG_TOOLS_CONF_OPTS += --without-qrypt
|
||||
endif
|
||||
|
||||
define RNG_TOOLS_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 755 package/rng-tools/S21rngd \
|
||||
$(TARGET_DIR)/etc/init.d/S21rngd
|
||||
|
||||
Loading…
Reference in New Issue
Block a user