From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 9 Sep 2018 16:42:17 +0000 (+0100)
Subject: rng-tools: Update to 6.4
X-Git-Tag: v2.21-core124~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd0a0384f07b399e9cb4cf46b4c5722b809ffe6a;p=ipfire-2.x.git

rng-tools: Update to 6.4

Also add a patch that keeps RDRAND enabled on i586

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Fixes: #11853
---

diff --git a/lfs/rng-tools b/lfs/rng-tools
index c7a358e564..dc87a3406e 100644
--- a/lfs/rng-tools
+++ b/lfs/rng-tools
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.3.1
+VER        = 6.4
 
 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 = fe2d38e39ff02d0c7b3585407d51dc64
+$(DL_FILE)_MD5 = 52a8243858503f94eecd4ae0983a9818
 
 install : $(TARGET)
 
@@ -70,6 +70,7 @@ $(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
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
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
new file mode 100644
index 0000000000..7d45bd0b85
--- /dev/null
+++ b/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch
@@ -0,0 +1,35 @@
+From 1f023b49959aa58246e6bb7091ba7710116f6915 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@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@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
+