[ptxdist] [PATCH 04/13] haveged: version bump 1.9.8 -> 1.9.13

[Robert Schwebel <r.schwebel@pengutronix.de>]

The patch was a backport from upstream and has been applied meanwhile.

The license was extended by one line, with a new copyright holder and
year, but no change of content.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 ...-fix-compilation-with-enable-threads.patch | 33 -------------------
 patches/haveged-1.9.8/series                  |  1 -
 rules/haveged.make                            |  6 ++--
 3 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch
 delete mode 100644 patches/haveged-1.9.8/series

diff --git a/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch b/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch
deleted file mode 100644
index 38895a97c..000000000
--- a/patches/haveged-1.9.8/0001-cb1f06-fix-compilation-with-enable-threads.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 14 Nov 2019 16:15:00 +0100
-Subject: [PATCH] build: Fix compilation with --enable-threads
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Previously failed with:
-
-havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this function); did you mean ‘BUILD_THREADS’?
-  190 |    *bp++ = BUILD_THREAD;
-      |            ^~~~~~~~~~~~
-      |            BUILD_THREADS
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/havegetune.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/havegetune.c b/src/havegetune.c
-index de39c53..6f14476 100644
---- a/src/havegetune.c
-+++ b/src/havegetune.c
-@@ -187,7 +187,7 @@ void havege_tune(          /* RETURN: none               */
-    *bp++ = BUILD_CPUID;
- #endif
- #if NUMBER_CORES>1
--   *bp++ = BUILD_THREAD;
-+   *bp++ = BUILD_THREADS;
- #endif
- #ifdef ONLINE_TESTS_ENABLE
-    *bp++ = BUILD_OLT;
diff --git a/patches/haveged-1.9.8/series b/patches/haveged-1.9.8/series
deleted file mode 100644
index cb49a0968..000000000
--- a/patches/haveged-1.9.8/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-cb1f06-fix-compilation-with-enable-threads.patch
diff --git a/rules/haveged.make b/rules/haveged.make
index 155c142d4..7c015c714 100644
--- a/rules/haveged.make
+++ b/rules/haveged.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HAVEGED) += haveged
 #
 # Paths and names
 #
-HAVEGED_VERSION	:= 1.9.8
-HAVEGED_MD5	:= fba3c88e416ad99ed69849b61fdcaad0
+HAVEGED_VERSION	:= 1.9.13
+HAVEGED_MD5	:= 5391978794208b6cca6f53d7a6211c04
 HAVEGED		:= haveged-$(HAVEGED_VERSION)
 HAVEGED_SUFFIX	:= tar.gz
 HAVEGED_URL	:= \
@@ -25,7 +25,7 @@ HAVEGED_DIR	:= $(BUILDDIR)/$(HAVEGED)
 HAVEGED_LICENSE	:= GPL-3.0-or-later
 HAVEGED_LICENSE_FILES   := \
 	file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-	file://src/haveged.c;startline=1;endline=19;md5=772ad7f0aa1fd2230cffdf7be784b15f
+	file://src/haveged.c;startline=1;endline=20;md5=0b45b25b79d4a3b7d800cc2c951429b2
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.27.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de