Accepting request 130723 from security

- Update to 1.5
  * Add online tests based on AIS-31 
  * Add -p option to specify the pid location.
  * Fix -F option to not take argument - i.e. now a switch
  * Factor diagnostic methods for capture and inject for better performance
  * Fix install target, move to bin and eliminate script if not daemon, now use sysv and systemd templates 
- use -F with no arguments in haveged.service 
- work-around nist check on i586 by decreasing the size of static array in a test

- Update to version 1.4
  * Add s390 architecture. Thanks to Dan Horak and Jiri Hladky
  * Add generic architecture with clock_gettime() timer.
  * Rewrite collection loop to support multiple instances and new diagnostics
  * Rewrite tuning mechanism to add virtual file system mining and correct cpuid bugs
  * Add prototype multi-thread collection option
  * Reduce collection buffer size to .5MB
  * Improve/correct build and install
  * Add new invocation options to support new features.
- init script additions $remote_fs added

- build with -fpie

OBS-URL: https://build.opensuse.org/request/show/130723
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haveged?expand=0&rev=24

haveged-1.3a.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0430cbeffd0dea31dbe300f7b88c532a2d046e336c7d0ce5e1ef84858179595b
-size 212072

haveged-1.5.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6950672e88376f5de7976d0ac9e479c6a3ecdb8d2d214887347eb24f367d5d8e
+size 243336

haveged-otherarch.patch

@@ -1,47 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -81,6 +81,14 @@
-     HA_CPPFLAGS="-DHAVE_ISA_IA64"
-  ;;
- 
-+ s390-*)
-+    HA_CPPFLAGS="-DHAVE_ISA_S390"
-+ ;;
-+
-+ s390x-*)
-+    HA_CPPFLAGS="-DHAVE_ISA_S390X"
-+ ;;
-+
-  powerpc*|pcc-*|powerpc64|ppc64)
-     HA_CPPFLAGS="-DHAVE_ISA_PPC"
-  ;;
---- src/havegecollect.h
-+++ src/havegecollect.h
-@@ -124,12 +124,25 @@
- 
- #ifdef HAVE_ISA_IA64
- #define ARCH "ia64"
--#define CPUID(op,reg) ASM("mov %0=cpuid[%1]"\
-+/* commented out, does not compile, ro 2011-11-01
-+hash define CPUID(op,reg) ASM("mov %0=cpuid[%1]"\
-    : "=r" (value)\
-    : "r" (reg))
-+hash define HASCPUID(x) x=1
-+ */
- #define HARDCLOCK(x) ASM("mov %0=ar.itc" : "=r"(x))
--#define HASCPUID(x) x=1
- #endif
-+
-+#ifdef HAVE_ISA_S390
-+#define ARCH "s390"
-+#define HARDCLOCK(x) { unsigned long long cycles ; __asm__("stck 0(%0)" : : "a" (&(cycles)) : "memory", "cc"); x = cycles; }
-+#endif
-+
-+#ifdef HAVE_ISA_S390X
-+#define ARCH "s390x"
-+#define HARDCLOCK(x) { unsigned long long cycles ; __asm__("stck 0(%0)" : : "a" (&(cycles)) : "memory", "cc"); x = cycles; }
-+#endif
-+
- #endif
- /**
-  *  Use the "&&" extension to calculate the LOOP_PT

haveged-ppc64.patch

@@ -1,11 +0,0 @@
---- configure.ac.orig	2011-06-06 13:32:49.000000000 +0200
-+++ configure.ac	2011-06-06 13:33:02.000000000 +0200
-@@ -33,7 +33,7 @@
-     HA_CPPFLAGS="-DHAVE_ISA_IA64"
-  ;;
- 
-- powerpc-*|pcc-*|powerpc64|ppc64)
-+ powerpc*|pcc-*|powerpc64|ppc64)
-     HA_CPPFLAGS="-DHAVE_ISA_PPC"
-  ;;
- 

haveged.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Mon Aug 13 13:15:15 UTC 2012 - mvyskocil@suse.cz
+
+- Update to 1.5
+  * Add online tests based on AIS-31 
+  * Add -p option to specify the pid location.
+  * Fix -F option to not take argument - i.e. now a switch
+  * Factor diagnostic methods for capture and inject for better performance
+  * Fix install target, move to bin and eliminate script if not daemon, now use sysv and systemd templates 
+- use -F with no arguments in haveged.service 
+- work-around nist check on i586 by decreasing the size of static array in a test
+
+-------------------------------------------------------------------
+Fri May 15 22:46:03 UTC 2012 - aboe@opensuse.org
+
+- Update to version 1.4
+  * Add s390 architecture. Thanks to Dan Horak and Jiri Hladky
+  * Add generic architecture with clock_gettime() timer.
+  * Rewrite collection loop to support multiple instances and new diagnostics
+  * Rewrite tuning mechanism to add virtual file system mining and correct cpuid bugs
+  * Add prototype multi-thread collection option
+  * Reduce collection buffer size to .5MB
+  * Improve/correct build and install
+  * Add new invocation options to support new features.
+
+- init script additions $remote_fs added
+
+-------------------------------------------------------------------
+Thu Feb  9 21:20:37 UTC 2012 - crrodriguez@opensuse.org
+
+- build with -fpie 
+
 -------------------------------------------------------------------
 Sat Dec 31 05:09:38 UTC 2011 - crrodriguez@opensuse.org
 

haveged.init

@@ -2,8 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          haveged
-# Required-Start:    $syslog $local_fs
+# Required-Start:    $syslog $local_fs $remote_fs
-# Required-Stop:     $syslog $local_fs
+# Required-Stop:     $syslog $local_fs $remote_fs
 # Default-Start:     2 3 5
 # Default-Stop:
 # Short-Description: Daemon to feed entropy into /dev/urandom

haveged.service

@@ -3,7 +3,7 @@ Description=Haveged Entropy Gathering Daemon
 
 [Service]
 Type=simple
-ExecStart=/usr/sbin/haveged -F 1 -w 1024 -v 0
+ExecStart=/usr/sbin/haveged -w 1024 -v 0 -F
 CapabilityBoundingSet=CAP_SYS_ADMIN
 
 [Install]

haveged.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package haveged
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,16 @@
 #
 
 
-%define extra_ver a
-
 Name:           haveged
-Version:        1.3
+Version:        1.5
 Release:        0
-License:        GPL-3.0
 Summary:        Feed entropy into random pool
-Url:            http://www.issihosts.com/haveged/
+License:        GPL-3.0
 Group:          System/Daemons
-Source0:        http://www.issihosts.com/haveged/%{name}-%{version}%{extra_ver}.tar.gz
+Url:            http://www.issihosts.com/haveged/
+Source0:        http://www.issihosts.com/haveged/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.service
-Patch1:         %{name}-ppc64.patch
-Patch2:         %{name}-otherarch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    %{arm}
 BuildRequires:  automake
@@ -54,16 +50,22 @@ For more informations see http://www.issihosts.com/haveged/
 
 %prep
 %setup -q
-%patch1
-%patch2
 
 %build
 autoreconf -fiv
-export LDFLAGS="-Wl,-z,relro,-z,now"
+export CFLAGS="%optflags -fpie"
+export LDFLAGS="-Wl,-z,relro,-z,now -pie"
 %configure --enable-nistest=yes --enable-daemon=yes
 make %{?_smp_mflags}
 
 %check
+#XXX: nist test is killed by SIGKILL with static int random_pool1[_32MB] on
+#     32bit. Let change it to _08MB to avoid the test beeing killed, even if I
+#     am not sure allocate of 128M is prohibited
+%ifarch %{ix86}
+sed -i 's/\[_32MB\]/[_08MB]/' nist/nist.c
+%endif
+
 make %{?_smp_mflags} check
 
 %install