summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--contrib/Fedora/haveged.spec14
-rw-r--r--src/havege.h2
-rw-r--r--src/haveged.c4
5 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b8d226a..a4748f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+v1.9.18 (TBD)
+
v1.9.17 (Jan 08, 2022)
* Added new verbose mode [Jirka Hladky]
* haveged-once.service - use @SBIN_DIR@ instead of hard-coded path [Jirka Hladky]
diff --git a/configure.ac b/configure.ac
index 44befe5..9f89011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
## Minimum Autoconf version
AC_PREREQ([2.59])
-AC_INIT([haveged],[1.9.17])
+AC_INIT([haveged],[1.9.18])
AC_CONFIG_AUX_DIR(config)
AC_USE_SYSTEM_EXTENSIONS
AC_CONFIG_HEADER([config.h])
diff --git a/contrib/Fedora/haveged.spec b/contrib/Fedora/haveged.spec
index 1c36c34..f1d50ab 100644
--- a/contrib/Fedora/haveged.spec
+++ b/contrib/Fedora/haveged.spec
@@ -1,7 +1,7 @@
%define dracutlibdir lib/dracut
Summary: A Linux entropy source using the HAVEGE algorithm
Name: haveged
-Version: 1.9.15
+Version: 1.9.17
Release: 1%{?dist}
License: GPLv3+
URL: https://github.com/jirka-h/haveged
@@ -60,8 +60,11 @@ chmod 0644 COPYING README ChangeLog AUTHORS
#Install systemd service file
sed -e 's:@SBIN_DIR@:%{_sbindir}:g' -i contrib/Fedora/*service
+sed -i '/^ConditionKernelVersion/d' contrib/Fedora/*service
+
install -Dpm 0644 contrib/Fedora/haveged.service %{buildroot}%{_unitdir}/%{name}.service
install -Dpm 0644 contrib/Fedora/haveged-switch-root.service %{buildroot}%{_unitdir}/%{name}-switch-root.service
+install -Dpm 0644 contrib/Fedora/haveged-once.service %{buildroot}%{_unitdir}/%{name}-once.service
install -Dpm 0755 contrib/Fedora/haveged-dracut.module %{buildroot}/%{_prefix}/%{dracutlibdir}/modules.d/98%{name}/module-setup.sh
install -Dpm 0644 contrib/Fedora/90-haveged.rules %{buildroot}%{_udevrulesdir}/90-%{name}.rules
@@ -101,6 +104,15 @@ cp -p COPYING README ChangeLog AUTHORS contrib/build/havege_sample.c %{buildroot
%changelog
+* Sat Jan 08 2022 Jirka Hladky <hladky.jiri@gmail.com> - 1.9.17-1
+ - Update to 1.9.17
+
+* Mon Jan 03 2022 Jirka Hladky <hladky.jiri@gmail.com> - 1.9.16-2
+ - Fixed ExecStart in haveged-once.service
+
+* Sun Jan 02 2022 Jirka Hladky <hladky.jiri@gmail.com> - 1.9.16-1
+ - Update to 1.9.16
+
* Thu Sep 30 2021 Jirka Hladky <hladky.jiri@gmail.com> - 1.9.15-1
- Update to 1.9.15
diff --git a/src/havege.h b/src/havege.h
index 0d9828c..219368a 100644
--- a/src/havege.h
+++ b/src/havege.h
@@ -31,7 +31,7 @@ extern "C" {
* header/package version as a numeric major, minor, patch triple. See havege_version()
* below for usage.
*/
-#define HAVEGE_PREP_VERSION "1.9.17"
+#define HAVEGE_PREP_VERSION "1.9.18"
/**
* Basic types
*/
diff --git a/src/haveged.c b/src/haveged.c
index efa8be6..cb88d4a 100644
--- a/src/haveged.c
+++ b/src/haveged.c
@@ -647,8 +647,8 @@ static void run_daemon( /* RETURN: nothing */
error_exit("Stopping due to signal %d\n", params->exit_code - 128);
t[1] = time(NULL);
- if (t[1] - t[0] > 60) {
- /* add entropy on daemon start and then every 60 seconds unconditionally */
+ if (t[1] - t[0] > 600) {
+ /* add entropy on daemon start and then every 600 seconds unconditionally */
nbytes = poolSize / 2;
r = (nbytes+sizeof(H_UINT)-1)/sizeof(H_UINT);
fills = h->n_fills;