From 3b9d2e3df5963a6ad44687ef7671a7fa4daf682c16e62a84ac4ac1cc0a046471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Wed, 14 Dec 2011 23:48:37 +0000
Subject: [PATCH] Accepting request 96691 from home:elvigia:branches:security

- Update to version 1.3.0a, PPC fixes.
- Cleanup systemd unit and drop capabiltities there.

OBS-URL: https://build.opensuse.org/request/show/96691
OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=54
---
 haveged-1.3.tar.gz  | 3 ---
 haveged-1.3a.tar.gz | 3 +++
 haveged.changes     | 6 ++++++
 haveged.service     | 2 +-
 haveged.spec        | 7 +++++--
 5 files changed, 15 insertions(+), 6 deletions(-)
 delete mode 100644 haveged-1.3.tar.gz
 create mode 100644 haveged-1.3a.tar.gz

diff --git a/haveged-1.3.tar.gz b/haveged-1.3.tar.gz
deleted file mode 100644
index 10f4e64..0000000
--- a/haveged-1.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c37f73250f76fc61da6936d0f5bff2ec4239282a879eda4a8fa56c380ee6436
-size 211852
diff --git a/haveged-1.3a.tar.gz b/haveged-1.3a.tar.gz
new file mode 100644
index 0000000..adb90b8
--- /dev/null
+++ b/haveged-1.3a.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0430cbeffd0dea31dbe300f7b88c532a2d046e336c7d0ce5e1ef84858179595b
+size 212072
diff --git a/haveged.changes b/haveged.changes
index f77254b..a3281f3 100644
--- a/haveged.changes
+++ b/haveged.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec 14 23:42:57 UTC 2011 - crrodriguez@opensuse.org
+
+- Update to version 1.3.0a, PPC fixes.
+- Cleanup systemd unit and drop capabiltities there.
+
 -------------------------------------------------------------------
 Fri Dec  2 07:26:32 UTC 2011 - coolo@suse.com
 
diff --git a/haveged.service b/haveged.service
index 2e66135..c3bc2d3 100644
--- a/haveged.service
+++ b/haveged.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Haveged Entropy Gathering Daemon
-After= local-fs.target syslog.target
 
 [Service]
 Type=simple
 ExecStart=/sbin/haveged -F 1 -w 1024 -v 0
+CapabilityBoundingSet=CAP_SYS_ADMIN
 
 [Install]
 WantedBy=multi-user.target
diff --git a/haveged.spec b/haveged.spec
index 75df85d..29739f1 100644
--- a/haveged.spec
+++ b/haveged.spec
@@ -15,6 +15,9 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+%define extra_ver a
+
 Name:           haveged
 Version:        1.3
 Release:        0
@@ -22,7 +25,7 @@ License:        GPL-3.0
 Summary:        Feed entropy into random pool
 Url:            http://www.issihosts.com/haveged/
 Group:          System/Daemons
-Source0:        http://www.issihosts.com/haveged/%{name}-%{version}.tar.gz
+Source0:        http://www.issihosts.com/haveged/%{name}-%{version}%{extra_ver}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.service
 Patch1:         %{name}-ppc64.patch
@@ -57,7 +60,7 @@ For more informations see http://www.issihosts.com/haveged/
 %build
 autoreconf -fiv
 export LDFLAGS="-Wl,-z,relro,-z,now"
-%configure --with-libcap-ng=yes --sbindir=/sbin --enable-nistest=yes --enable-daemon=yes
+%configure --sbindir=/sbin --enable-nistest=yes --enable-daemon=yes
 make %{?_smp_mflags}
 
 %check