diff mbox series

[1/1] package/rng-tools: bump to version 6.16

Message ID 20230114161002.35480-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/rng-tools: bump to version 6.16 | expand

Commit Message

Fabrice Fontaine Jan. 14, 2023, 4:10 p.m. UTC 
- Drop patches (already in version)
- libcap is a mandatory dependency since
  https://github.com/nhorman/rng-tools/commit/50afdce9d3fed6244a0cf772d38f2d8475312bc5
- Add Qrypt support:
  https://github.com/nhorman/rng-tools/commit/7ab7f540da567467055f77016590744d828fc9eb

https://github.com/nhorman/rng-tools/releases/tag/v6.16

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...gure.ac-fix-build-without-sys-auxv.h.patch | 52 -------------------
 ...ropy-detection-to-look-for-the-setti.patch | 30 -----------
 ...ropy-library-to-timeout-fail-on-long.patch | 39 --------------
 package/rng-tools/Config.in                   | 14 +++++
 package/rng-tools/rng-tools.hash              |  2 +-
 package/rng-tools/rng-tools.mk                | 11 +++-
 6 files changed, 24 insertions(+), 124 deletions(-)
 delete mode 100644 package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch
 delete mode 100644 package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch
 delete mode 100644 package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch

Comments

Thomas Petazzoni Jan. 28, 2023, 11:07 p.m. UTC | #1 
On Sat, 14 Jan 2023 17:10:02 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

>  	# pthread_setaffinity_np
>  	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
>  	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
> +	select BR2_PACKAGE_LIBCAP

You forgot to propagate the depends on BR2_USE_MMU from
BR2_PACKAGE_LIBCAP, so I've done that when applying. Thanks a lot!

Best regards,

Thomas
Yann E. MORIN Jan. 30, 2023, 8:56 p.m. UTC | #2 
Fabrice, All,

On 2023-01-14 17:10 +0100, Fabrice Fontaine spake thusly:
> https://github.com/nhorman/rng-tools/releases/tag/v6.16
[--SNIP--]
> diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash
> index be2ee13969..4c86791267 100644
> --- a/package/rng-tools/rng-tools.hash
> +++ b/package/rng-tools/rng-tools.hash
> @@ -1,3 +1,3 @@
>  # Locally computed
> -sha256  bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a  rng-tools-6.15.tar.gz
> +sha256  17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894  rng-tools-6.16.tar.gz

This hash does not match here, and we've had a report on IRC that it
does not work either. In both cases, we get this hash instead:
    8e518d45be68f42d0873732a9ac3ecfe0f10c4a9bd5d5f44180a49be8ebda96f

Can you check on your side, how you ended up with 17666...90894?

Regards,
Yann E. MORIN.

>  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
> diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
> index f736193a23..3e565103e4 100644
> --- a/package/rng-tools/rng-tools.mk
> +++ b/package/rng-tools/rng-tools.mk
> @@ -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
> -- 
> 2.39.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Fabrice Fontaine Feb. 1, 2023, 5:35 p.m. UTC | #3 
Hi Yann,

Le lun. 30 janv. 2023 à 21:56, Yann E. MORIN <yann.morin.1998@free.fr> a
écrit :

> Fabrice, All,
>
> On 2023-01-14 17:10 +0100, Fabrice Fontaine spake thusly:
> > https://github.com/nhorman/rng-tools/releases/tag/v6.16
> [--SNIP--]
> > diff --git a/package/rng-tools/rng-tools.hash
> b/package/rng-tools/rng-tools.hash
> > index be2ee13969..4c86791267 100644
> > --- a/package/rng-tools/rng-tools.hash
> > +++ b/package/rng-tools/rng-tools.hash
> > @@ -1,3 +1,3 @@
> >  # Locally computed
> > -sha256
> bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a
> rng-tools-6.15.tar.gz
> > +sha256
> 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894
> rng-tools-6.16.tar.gz
>
> This hash does not match here, and we've had a report on IRC that it
> does not work either. In both cases, we get this hash instead:
>     8e518d45be68f42d0873732a9ac3ecfe0f10c4a9bd5d5f44180a49be8ebda96f
>
> Can you check on your side, how you ended up with 17666...90894?
>

I see that there is, only, one autobuilder failure.
However, I retested again on a fresh tarball and
17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 is the
correct sha256 for
https://github.com/nhorman/rng-tools/archive/v6.16/rng-tools-6.16.tar.gz.


> Regards,
> Yann E. MORIN.
>
> >  sha256
> 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
> > diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/
> rng-tools.mk
> > index f736193a23..3e565103e4 100644
> > --- a/package/rng-tools/rng-tools.mk
> > +++ b/package/rng-tools/rng-tools.mk
> > @@ -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
> > --
> > 2.39.0
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
>
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
> conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___
>      |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is
> no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v
>  conspiracy.  |
>
> '------------------------------^-------^------------------^--------------------'
>

Best Regards,

Fabrice
Peter Seiderer Feb. 1, 2023, 5:45 p.m. UTC | #4 
Hello *,

On Wed, 1 Feb 2023 18:35:17 +0100, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Hi Yann,
> 
> Le lun. 30 janv. 2023 à 21:56, Yann E. MORIN <yann.morin.1998@free.fr> a
> écrit :
> 
> > Fabrice, All,
> >
> > On 2023-01-14 17:10 +0100, Fabrice Fontaine spake thusly:  
> > > https://github.com/nhorman/rng-tools/releases/tag/v6.16  
> > [--SNIP--]  
> > > diff --git a/package/rng-tools/rng-tools.hash  
> > b/package/rng-tools/rng-tools.hash  
> > > index be2ee13969..4c86791267 100644
> > > --- a/package/rng-tools/rng-tools.hash
> > > +++ b/package/rng-tools/rng-tools.hash
> > > @@ -1,3 +1,3 @@
> > >  # Locally computed
> > > -sha256  
> > bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a
> > rng-tools-6.15.tar.gz  
> > > +sha256  
> > 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894
> > rng-tools-6.16.tar.gz
> >
> > This hash does not match here, and we've had a report on IRC that it
> > does not work either. In both cases, we get this hash instead:
> >     8e518d45be68f42d0873732a9ac3ecfe0f10c4a9bd5d5f44180a49be8ebda96f
> >
> > Can you check on your side, how you ended up with 17666...90894?
> >  
> 
> I see that there is, only, one autobuilder failure.
> However, I retested again on a fresh tarball and
> 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 is the
> correct sha256 for
> https://github.com/nhorman/rng-tools/archive/v6.16/rng-tools-6.16.tar.gz.

See https://github.blog/changelog/2023-01-30-git-archive-checksums-may-change/
for an possible explanation for the download hash diffs...

Regards,
Peter


> 
> 
> > Regards,
> > Yann E. MORIN.
> >  
> > >  sha256  
> > 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING  
> > > diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/  
> > rng-tools.mk  
> > > index f736193a23..3e565103e4 100644
> > > --- a/package/rng-tools/rng-tools.mk
> > > +++ b/package/rng-tools/rng-tools.mk
> > > @@ -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
> > > --
> > > 2.39.0
> > >
> > > _______________________________________________
> > > buildroot mailing list
> > > buildroot@buildroot.org
> > > https://lists.buildroot.org/mailman/listinfo/buildroot  
> >
> > --
> >
> > .-----------------.--------------------.------------------.--------------------.
> > |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
> > conspiracy: |
> > | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___
> >      |
> > | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is
> > no  |
> > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v
> >  conspiracy.  |
> >
> > '------------------------------^-------^------------------^--------------------'
> >  
> 
> Best Regards,
> 
> Fabrice
diff mbox series

Patch

diff --git a/package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch b/package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch
deleted file mode 100644
index 0c15ab6b7d..0000000000
--- a/package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch
+++ /dev/null
@@ -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,
diff --git a/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch b/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch
deleted file mode 100644
index 553842640d..0000000000
--- a/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch
+++ /dev/null
@@ -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)
diff --git a/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch b/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch
deleted file mode 100644
index 9d8dbe2d0b..0000000000
--- a/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch
+++ /dev/null
@@ -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])]
- )
diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in
index 0dd269c818..7b3192bcef 100644
--- a/package/rng-tools/Config.in
+++ b/package/rng-tools/Config.in
@@ -3,6 +3,7 @@  config BR2_PACKAGE_RNG_TOOLS
 	# pthread_setaffinity_np
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	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,6 +36,19 @@  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"
diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash
index be2ee13969..4c86791267 100644
--- a/package/rng-tools/rng-tools.hash
+++ b/package/rng-tools/rng-tools.hash
@@ -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
diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
index f736193a23..3e565103e4 100644
--- a/package/rng-tools/rng-tools.mk
+++ b/package/rng-tools/rng-tools.mk
@@ -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