rng-tools: version bump 5 -> 6.5

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 45 insertions, 8 deletions

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
new file mode 100644
index 000000000..9f03d86a0
--- /dev/null
+++ b/patches/rng-tools-6.5/0001-Buildsystem-fix-autotools-setup.patch
@@ -0,0 +1,25 @@
+From: Juergen Borleis <jbe@pengutronix.de>
+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 <jbe@pengutronix.de>
+---
+ 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 <nhorman@tuxdriver.com>])
+ 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/autogen.sh b/patches/rng-tools-6.5/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/rng-tools-6.5/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/rng-tools-6.5/series b/patches/rng-tools-6.5/series
new file mode 100644
index 000000000..48616bf45
--- /dev/null
+++ b/patches/rng-tools-6.5/series
@@ -0,0 +1,4 @@
+# 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 3c30406c1..07ccb4daf 100644
--- a/rules/rng-tools.in
+++ b/rules/rng-tools.in
@@ -3,6 +3,12 @@
 menuconfig RNG_TOOLS
 	tristate
 	prompt "rng-tools rngd                "
+	select LIBCURL
+	select LIBXML2
+	select OPENSSL
+	select LIBSYSFS
+	select LIBC_PTHREAD
+	select LIBGCRYPT
 	help
 	  random number generator daemon - seed kernel random from hwrng
 
@@ -12,10 +18,6 @@ menuconfig RNG_TOOLS
 
 	  By default, a hardware rng at /dev/hwrng is used as entropy source.
 
-	  This daemon is part of the rng-tools, which can be found at
-	      http://sourceforge.net/projects/gkernel/
-	      git://git.kernel.org/pub/scm/utils/kernel/rng-tools/rng-tools.git
-
 if RNG_TOOLS
 
 config RNG_TOOLS_STARTSCRIPT
diff --git a/rules/rng-tools.make b/rules/rng-tools.make
index 5f50225fc..3f7580a99 100644
--- a/rules/rng-tools.make
+++ b/rules/rng-tools.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2014 by Andreas Pretzsch <apr@cn-eng.de>
+#               2018 by Juergen Borleis <jbe@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -10,20 +11,24 @@
 
 PACKAGES-$(PTXCONF_RNG_TOOLS) += rng-tools
 
-RNG_TOOLS_VERSION	:= 5
-RNG_TOOLS_MD5		:= 6726cdc6fae1f5122463f24ae980dd68
+RNG_TOOLS_VERSION	:= 6.5
+RNG_TOOLS_MD5		:= c153517cc73f7f2a899bf59df06ed1ce
 RNG_TOOLS		:= rng-tools-$(RNG_TOOLS_VERSION)
 RNG_TOOLS_SUFFIX	:= tar.gz
-RNG_TOOLS_URL		:= $(call ptx/mirror, SF, gkernel/$(RNG_TOOLS).$(RNG_TOOLS_SUFFIX))
+RNG_TOOLS_URL		:= https://github.com/nhorman/rng-tools/archive/v$(RNG_TOOLS_VERSION).$(RNG_TOOLS_SUFFIX)
 RNG_TOOLS_SOURCE	:= $(SRCDIR)/$(RNG_TOOLS).$(RNG_TOOLS_SUFFIX)
 RNG_TOOLS_DIR		:= $(BUILDDIR)/$(RNG_TOOLS)
-RNG_TOOLS_LICENSE	:= GPL-2.0-only
+RNG_TOOLS_LICENSE	:= GPL-2.0-or-later
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
 RNG_TOOLS_CONF_TOOL	:= autoconf
+RNG_TOOLS_CONF_OPT	:= \
+	$(CROSS_AUTOCONF_USR) \
+	--with-libgcrypt \
+	--without-nistbeacon
 
 # ----------------------------------------------------------------------------
 # Target-Install