From ee189b05ef5c5162fc983fb4154bf2330e42df0093a353f4daa886e77c74251e Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 16 Feb 2022 09:03:55 +0000
Subject: [PATCH] Accepting request 955185 from
 home:ohollmann:branches:security

Update to v1.9.17

OBS-URL: https://build.opensuse.org/request/show/955185
OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=144
---
 90-haveged.rules            |  3 +++
 haveged-1.9.14.tar.gz       |  3 ---
 haveged-1.9.17.tar.gz       |  3 +++
 haveged-dracut.module       |  1 +
 haveged-switch-root.service |  1 +
 haveged.changes             | 21 +++++++++++++++++++++
 haveged.spec                |  4 ++--
 7 files changed, 31 insertions(+), 5 deletions(-)
 delete mode 100644 haveged-1.9.14.tar.gz
 create mode 100644 haveged-1.9.17.tar.gz

diff --git a/90-haveged.rules b/90-haveged.rules
index a5df8a5..b0bf885 100644
--- a/90-haveged.rules
+++ b/90-haveged.rules
@@ -1,2 +1,5 @@
+# Start the haveged service as soon as the random device is available
+# to avoid starting other services while starved of entropy
+
 ACTION=="add", KERNEL=="random" , SUBSYSTEM=="mem", TAG+="systemd", ENV{SYSTEMD_WANTS}+="haveged.service"
 
diff --git a/haveged-1.9.14.tar.gz b/haveged-1.9.14.tar.gz
deleted file mode 100644
index 5f3ccc6..0000000
--- a/haveged-1.9.14.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:938cb494bcad7e4f24e61eb50fab4aa0acbc3240c80f3ad5c6cf7e6e922618c3
-size 496346
diff --git a/haveged-1.9.17.tar.gz b/haveged-1.9.17.tar.gz
new file mode 100644
index 0000000..42bbc45
--- /dev/null
+++ b/haveged-1.9.17.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02d9b7c801fbcf16bed43c27bf6ece570b79f4d94561f3eb30883fb5f89c526d
+size 495429
diff --git a/haveged-dracut.module b/haveged-dracut.module
index d2bdb78..5794a8f 100644
--- a/haveged-dracut.module
+++ b/haveged-dracut.module
@@ -1,4 +1,5 @@
 #!/bin/bash
+# /usr/lib/dracut/modules.d/98haveged/module-setup.sh
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
diff --git a/haveged-switch-root.service b/haveged-switch-root.service
index c86c9a3..979fd4b 100644
--- a/haveged-switch-root.service
+++ b/haveged-switch-root.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Tell haveged about new root
 DefaultDependencies=no
+ConditionKernelVersion=<5.6
 ConditionPathExists=/etc/initrd-release
 Before=initrd-switch-root.service
 JoinsNamespaceOf=haveged.service
diff --git a/haveged.changes b/haveged.changes
index 03ca514..91e1ab5 100644
--- a/haveged.changes
+++ b/haveged.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Feb 15 15:22:09 UTC 2022 - Otto Hollmann <otto.hollmann@suse.com>
+
+- Update to v1.9.17:
+  * Added new verbose mode [Jirka Hladky]
+  * haveged-once.service - use @SBIN_DIR@ instead of hard-coded path [Jirka Hladky]
+
+- Changes for version v1.9.16:
+  * Allow newuname syscall [Jirka Hladky]
+  * Fix: haveged cannot be run as an application if also running as a daemon [Günther Brunthaler]
+  * Add entropy unconditionally at the start and then every 60 seconds [Jirka Hladky]
+  * New parameter --once to refill entropy once and quit immediately [Jirka Hladky]
+  * Added haveged-once.service to provide entropy once (intended for initramfs) [Jirka Hladky]
+
+- Changes for version v1.9.15:
+  * Check for sys/auxv.h before using it. [Peter Seiderer]
+  * fix build on uclibc (origin/pr/58) [Pierre-Jean Texier]
+  * Improved make check tests [Jirka Hladky]
+  * Removed old init.d files. Configs are under contrib directory [Jirka Hladky]
+  * Support for Linux kernel LRNG patch set 
+
 -------------------------------------------------------------------
 Mon Nov 22 08:14:39 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 
diff --git a/haveged.spec b/haveged.spec
index ac1878c..d75d823 100644
--- a/haveged.spec
+++ b/haveged.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package haveged
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d }
 Name:           haveged
-Version:        1.9.14
+Version:        1.9.17
 Release:        0
 Summary:        Daemon for feeding entropy into the random pool
 License:        GPL-3.0-only