diff --git a/backport-Fix-haveged-cannot-be-run-as-an-application-if-also-running-as-a-daemon.patch b/backport-Fix-haveged-cannot-be-run-as-an-application-if-also-running-as-a-daemon.patch deleted file mode 100644 index d9d2e33..0000000 --- a/backport-Fix-haveged-cannot-be-run-as-an-application-if-also-running-as-a-daemon.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a4b69d65a8dfc5a9f52ff8505c7f58dcf8b9234f Mon Sep 17 00:00:00 2001 -From: Jirka Hladky -Date: Wed, 3 Nov 2021 14:38:11 +0100 -Subject: [PATCH] Fix: haveged cannot be run as an application if also running - as a daemon - ---- - man/haveged.8 | 5 ++++- - src/haveged.c | 2 +- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/man/haveged.8 b/man/haveged.8 -index edbc611..f88dc76 100644 ---- a/man/haveged.8 -+++ b/man/haveged.8 -@@ -188,7 +188,7 @@ If running as a daemon, access to the following files is required - .I /proc/sys/kernel/osrelease - .P - .I /proc/sys/kernel/random/poolsize --.P -+.P - .I /proc/sys/kernel/random/write_wakeup_threshold - .RE - -@@ -313,6 +313,9 @@ haveged -n 16T -o tba8cbw -f - | pv > /dev/null - .TP - Generate large amounts of data (16TB). Disable continuous tests for the maximum throughput but run the online tests at the startup to make sure that generator for properly initialized: - haveged -n 16T -o tba8c -f - | pv > /dev/null -+.TP -+Create a password equivalent to a key strength of 256 bit -+haveged -f - -n 32 2>/dev/null | base64 | tr -d = - - .SH SEE ALSO - .TP -diff --git a/src/haveged.c b/src/haveged.c -index 059bb28..59e62f5 100644 ---- a/src/haveged.c -+++ b/src/haveged.c -@@ -435,7 +435,7 @@ int main(int argc, char **argv) - close(socket_fd); - return ret; - } -- else { -+ else if (!(params->setup & RUN_AS_APP)){ - socket_fd = cmd_listen(params); - if (socket_fd >= 0) - fprintf(stderr, "%s: command socket is listening at fd %d\n", params->daemon, socket_fd); --- -1.8.3.1 - diff --git a/haveged-1.9.15.tar.gz b/haveged-1.9.15.tar.gz deleted file mode 100644 index 5fca6c4..0000000 Binary files a/haveged-1.9.15.tar.gz and /dev/null differ diff --git a/haveged-1.9.18.tar.gz b/haveged-1.9.18.tar.gz new file mode 100644 index 0000000..653f1ae Binary files /dev/null and b/haveged-1.9.18.tar.gz differ diff --git a/haveged.service b/haveged.service index a80a979..9dfa3bc 100644 --- a/haveged.service +++ b/haveged.service @@ -1,3 +1,6 @@ +[Unit] +Description=Entropy Daemon based on the HAVEGE algorithm + [Service] ExecStart=/usr/sbin/haveged -w 1024 -v 1 --Foreground Type=simple diff --git a/haveged.spec b/haveged.spec index edd8d69..b19c25c 100644 --- a/haveged.spec +++ b/haveged.spec @@ -2,7 +2,7 @@ # and made some modifications. The exactly file path is ./contrib/build/fedora.spec. Summary: A Linux entropy source using the HAVEGE algorithm Name: haveged -Version: 1.9.15 +Version: 1.9.18 Release: 1 License: GPLv3+ URL: https://github.com/jirka-h/haveged @@ -10,7 +10,6 @@ Source0: https://github.com/jirka-h/%{name}/archive/v%{version}/%{name}-% Source1: haveged.service Patch0: fix-the-core-file-problem.patch -Patch1: backport-Fix-haveged-cannot-be-run-as-an-application-if-also-running-as-a-daemon.patch Requires(post): systemd Requires(preun): systemd @@ -103,6 +102,9 @@ rm -rf %{buildroot} %{_mandir}/man3/libhavege.3* %changelog +* Mon Jul 4 2022 panxiaohe - 1.9.18-1 +- update to 1.9.18 + * Fri Dec 24 2021 yixiangzhike - 1.9.15-1 - update to 1.9.15