From 8fc0694db0e034f4101a205a19ceb96008ee73fdfbfdc0af24e1cd6211699a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Sat, 31 Dec 2011 14:51:57 +0000
Subject: [PATCH] Accepting request 98462 from home:elvigia:branches:security

- Put the haveged binary back in /usr/sbin not in /sbin

OBS-URL: https://build.opensuse.org/request/show/98462
OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=56
---
 haveged.changes | 5 +++++
 haveged.init    | 4 ++--
 haveged.service | 2 +-
 haveged.spec    | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/haveged.changes b/haveged.changes
index a3281f3..d71aab2 100644
--- a/haveged.changes
+++ b/haveged.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Dec 31 05:09:38 UTC 2011 - crrodriguez@opensuse.org
+
+- Put the haveged binary back in /usr/sbin not in /sbin
+
 -------------------------------------------------------------------
 Wed Dec 14 23:42:57 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/haveged.init b/haveged.init
index 8989e5c..7123abe 100644
--- a/haveged.init
+++ b/haveged.init
@@ -11,8 +11,8 @@
 #                    to generate random numbers that are fed into the random pool.
 ### END INIT INFO
 
-HAVEGED_BIN=/sbin/haveged
-HAVEGED_PARAMS="-w 1024 -v 1"
+HAVEGED_BIN=/usr/sbin/haveged
+HAVEGED_PARAMS="-w 1024 -v 0"
 
 # Shell functions sourced from /etc/rc.status:
 #      rc_check         check and set local and overall rc status
diff --git a/haveged.service b/haveged.service
index c3bc2d3..1159f36 100644
--- a/haveged.service
+++ b/haveged.service
@@ -3,7 +3,7 @@ Description=Haveged Entropy Gathering Daemon
 
 [Service]
 Type=simple
-ExecStart=/sbin/haveged -F 1 -w 1024 -v 0
+ExecStart=/usr/sbin/haveged -F 1 -w 1024 -v 0
 CapabilityBoundingSet=CAP_SYS_ADMIN
 
 [Install]
diff --git a/haveged.spec b/haveged.spec
index 29739f1..e910b8d 100644
--- a/haveged.spec
+++ b/haveged.spec
@@ -60,7 +60,7 @@ For more informations see http://www.issihosts.com/haveged/
 %build
 autoreconf -fiv
 export LDFLAGS="-Wl,-z,relro,-z,now"
-%configure --sbindir=/sbin --enable-nistest=yes --enable-daemon=yes
+%configure --enable-nistest=yes --enable-daemon=yes
 make %{?_smp_mflags}
 
 %check
@@ -107,7 +107,7 @@ make %{?_smp_mflags} check
 %files
 %defattr(-,root,root)
 %{_sbindir}/rc%{name}
-/sbin/%{name}
+%{_sbindir}/%{name}
 %config %{_initddir}/%{name}
 %{_mandir}/man8/%{name}.8.gz
 %if 0%{?have_systemd}