Accepting request 63100 from security

Accepted submit request 63100 from user msmeissn

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

haveged-0.9_git201011252143.tar.xz

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

haveged-0.9_git201101042303.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25511cb02fe210008df7f54b581a218d064d3ed3b067d712cb561fc104a9c8f9
+size 86197

haveged.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Mar  1 10:03:17 CET 2011 - meissner@suse.de
+
+- avoid unnecessary services. bnc#675841
+  also the start should be mediated by YaST or kiwi depending
+  on presence of a virtualization environment, not by the package
+  itself.
+
+-------------------------------------------------------------------
+Tue Jan  4 23:14:52 UTC 2011 - cristian.rodriguez@opensuse.org
+
+- Update to version 0.9_git201101042303
+  * fix wrong usage of strdupa
+- fix build in older distros that have no XZ
+
+-------------------------------------------------------------------
+Tue Jan  4 17:18:34 UTC 2011 - cristian.rodriguez@opensuse.org
+
+- Fix build in older distros
+- run spec cleaner 
+
 -------------------------------------------------------------------
 Tue Dec  7 21:26:31 UTC 2010 - coolo@novell.com
 

haveged.spec

@@ -15,24 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           haveged
-Version:        0.9_git201011252143
+Version:        0.9_git201101042303
 Release:        1
 License:        GPLv3
-Group:          System/Daemons
 Summary:        Feed entropy into random pool
 Url:            http://www.issihosts.com/haveged/
+Group:          System/Daemons
 # Our sources https://github.com/crrodriguez/haveged
-Source0:        http://www.issihosts.com/haveged/haveged-%{version}.tar.xz
+Source0:        http://www.issihosts.com/haveged/haveged-%{version}.tar.bz2
 Source1:        haveged.init
 Source2:        haveged.service
+BuildRequires:  libcap-ng-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires(pre):	%insserv_prereq sysvinit(syslog)
+Requires(pre):	%insserv_prereq 
+%if 0%{suse_version} >= 1140
+Requires(pre):  sysvinit(syslog)
+%endif
 Requires(post):	 grep util-linux
 Enhances:       openssl gpg2 php5 apache2 openvpn smtp_daemon
-BuildRequires:  libcap-ng-devel lzma
+%{!?_initddir: %global _initddir /etc/init.d} 
 
 %description
 The haveged daemon feeds the linux entropy pool with random
@@ -53,34 +55,19 @@ make %{?_smp_mflags}
 make %{?_smp_mflags} check
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install 
+%makeinstall
-%{__install} -m0755 %{S:1} %{buildroot}/etc/init.d/haveged
+%{__install} -m0755 %{S:1} %{buildroot}%{_initddir}/haveged
 %{__mkdir_p} %{buildroot}%{_sbindir}
 %{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
 %{__mkdir_p} %{buildroot}/lib/systemd/system
 %{__install} -m0755 %{S:2} %{buildroot}/lib/systemd/system/haveged.service
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
-## brace for impact...
+# do not enable on condition here, let YAST, kiwi or the user do it.
-%if 0%{?sles_version}
-	if [ -x /usr/bin/lscpu ]; then
-		if /usr/bin/lscpu | grep -q "Virtualization type" ; then
-		## Is a VM 
-			%{fillup_and_insserv -fy %{name}}
-		else
-		## it isnt.
 %{fillup_and_insserv -f %{name}}
-		fi
-	else 
-	##there is no lscpu! shouldnt happend...
-		%{fillup_and_insserv -f %{name}}
-	fi
-%else
-	%{fillup_and_insserv -fy %{name}}
-%endif
 
 %postun
 %restart_on_update %{name}
@@ -93,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_sbindir}/rc%{name}
 /sbin/haveged
-%config /etc/init.d/haveged 
+%config %{_initddir}/haveged
 %{_mandir}/man8/haveged.8.gz
 %dir /lib/systemd
 %dir /lib/systemd/system