From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 May 2018 19:23:42 +0000 (+0100)
Subject: rngd: Update to version 6.2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90940aded5b7e233fadaae8bad8efbdfe383ce6c;p=people%2Fms%2Fipfire-2.x.git

rngd: Update to version 6.2

Fixes #11737

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

diff --git a/lfs/rng-tools b/lfs/rng-tools
index c8ea08d8a4..f9b79d108d 100644
--- a/lfs/rng-tools
+++ b/lfs/rng-tools
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5
+VER        = 6.2
 
 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 = 6726cdc6fae1f5122463f24ae980dd68
+$(DL_FILE)_MD5 = a596ecd89afc584afe48758923fe6195
 
 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) && ./autogen.sh
 	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
diff --git a/src/initscripts/system/rngd b/src/initscripts/system/rngd
index df4aa7da2f..e9a2db40ad 100644
--- a/src/initscripts/system/rngd
+++ b/src/initscripts/system/rngd
@@ -28,13 +28,7 @@ case "${1}" in
 		fi
 
 		boot_mesg "Starting Random Number Generator Daemon..."
-
-		if pidofproc /usr/sbin/rngd &>/dev/null; then
-			# Is already running.
-			echo_ok
-		else
-			loadproc /usr/sbin/rngd --no-tpm=1
-		fi
+		loadproc /usr/sbin/rngd --quiet
 		;;
 
 	stop)