From 6fe68d1d4630c372ca4259da6fba03ce6c74aa8b44e1e96cdb81a6246a4edbb4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 8 Dec 2010 13:56:39 +0000 Subject: [PATCH 1/6] Updating link to change in openSUSE:Factory/haveged revision 9.0 OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=597b03ea3dbe2aae814f63cafb3995e6 --- haveged.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haveged.spec b/haveged.spec index e4d4955..f952ae4 100644 --- a/haveged.spec +++ b/haveged.spec @@ -1,5 +1,5 @@ # -# spec file for package haveged (Version 0.9_git201011232331) +# spec file for package haveged (Version 0.9_git201011252143) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # From 0e4b68e65a19a70729d6bc665e16e609fad26e3c8f97a77088ac0d6ee2f32903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 4 Jan 2011 17:19:21 +0000 Subject: [PATCH 2/6] - Fix build in older distros - run spec cleaner OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=33 --- haveged.changes | 6 ++++++ haveged.spec | 26 +++++++++++++++----------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/haveged.changes b/haveged.changes index d1ff992..2e4ea3d 100644 --- a/haveged.changes +++ b/haveged.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/haveged.spec b/haveged.spec index f952ae4..c572206 100644 --- a/haveged.spec +++ b/haveged.spec @@ -21,18 +21,22 @@ Name: haveged Version: 0.9_git201011252143 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 Source1: haveged.init Source2: haveged.service +BuildRequires: libcap-ng-devel +BuildRequires: xz 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 +Enhances: openssl gpg2 php5 apache2 openvpn smtp_daemon %description The haveged daemon feeds the linux entropy pool with random @@ -47,34 +51,34 @@ For more informations see http://www.issihosts.com/haveged/ autoreconf -fiv export LDFLAGS="-Wl,-z,relro,-z,now" %configure --with-libcap-ng=yes --sbindir=/sbin --enable-nistest=yes -make %{?_smp_mflags} +make %{?_smp_mflags} %check make %{?_smp_mflags} check %install -make DESTDIR=$RPM_BUILD_ROOT install -%{__install} -m0755 %{S:1} %{buildroot}/etc/init.d/haveged +%makeinstall +%{__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... %if 0%{?sles_version} if [ -x /usr/bin/lscpu ]; then if /usr/bin/lscpu | grep -q "Virtualization type" ; then - ## Is a VM + ## Is a VM %{fillup_and_insserv -fy %{name}} else ## it isnt. %{fillup_and_insserv -f %{name}} fi - else + else ##there is no lscpu! shouldnt happend... %{fillup_and_insserv -f %{name}} fi @@ -93,7 +97,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 From aa3b52151bdd3b26b0d8d9aed483469e56bb7d6ba2fa1d2df03b3bfd34993cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 4 Jan 2011 23:16:00 +0000 Subject: [PATCH 3/6] - Update to version 0.9_git201101042303 * fix wrong usage of strdupa - fix build in older distros that have no XZ OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=34 --- haveged-0.9_git201011252143.tar.xz | 3 --- haveged-0.9_git201101042303.tar.bz2 | 3 +++ haveged.changes | 7 +++++++ haveged.spec | 5 ++--- 4 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 haveged-0.9_git201011252143.tar.xz create mode 100644 haveged-0.9_git201101042303.tar.bz2 diff --git a/haveged-0.9_git201011252143.tar.xz b/haveged-0.9_git201011252143.tar.xz deleted file mode 100644 index 02630ee..0000000 --- a/haveged-0.9_git201011252143.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0ad7af83b49e4e480c745afb32daead66bc29cfb6070ec6e64103c29496a7b8 -size 78184 diff --git a/haveged-0.9_git201101042303.tar.bz2 b/haveged-0.9_git201101042303.tar.bz2 new file mode 100644 index 0000000..520da23 --- /dev/null +++ b/haveged-0.9_git201101042303.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25511cb02fe210008df7f54b581a218d064d3ed3b067d712cb561fc104a9c8f9 +size 86197 diff --git a/haveged.changes b/haveged.changes index 2e4ea3d..7f5c6b0 100644 --- a/haveged.changes +++ b/haveged.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/haveged.spec b/haveged.spec index c572206..465da6b 100644 --- a/haveged.spec +++ b/haveged.spec @@ -18,18 +18,17 @@ Name: haveged -Version: 0.9_git201011252143 +Version: 0.9_git201101042303 Release: 1 License: GPLv3 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 -BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %insserv_prereq %if 0%{suse_version} >= 1140 From f643935d1d7114cc8b171c757208543cbe69d4aff459c7c72e68e2e7bbffe539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 4 Jan 2011 23:37:59 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=35 --- haveged.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/haveged.spec b/haveged.spec index 465da6b..031fee5 100644 --- a/haveged.spec +++ b/haveged.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: haveged Version: 0.9_git201101042303 Release: 1 @@ -36,6 +34,7 @@ Requires(pre): sysvinit(syslog) %endif Requires(post): grep util-linux Enhances: openssl gpg2 php5 apache2 openvpn smtp_daemon +%{!?_initddir: %global _initddir /etc/init.d} %description The haveged daemon feeds the linux entropy pool with random From 3972be290a8a4e04a58be553b5d3f15906b481f3e1d3a62b668192090bd7f990 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 1 Mar 2011 09:17:42 +0000 Subject: [PATCH 5/6] Accepting request 63083 from home:msmeissn:branches:security ok OBS-URL: https://build.opensuse.org/request/show/63083 OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=36 --- haveged.changes | 6 ++++++ haveged.spec | 22 +++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/haveged.changes b/haveged.changes index 7f5c6b0..e3cfe46 100644 --- a/haveged.changes +++ b/haveged.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 1 10:03:17 CET 2011 - meissner@suse.de + +- also use the SLES code for openSUSE, to avoid unnecessary + services. bnc#675841 + ------------------------------------------------------------------- Tue Jan 4 23:14:52 UTC 2011 - cristian.rodriguez@opensuse.org diff --git a/haveged.spec b/haveged.spec index 031fee5..c5e12c2 100644 --- a/haveged.spec +++ b/haveged.spec @@ -67,22 +67,18 @@ rm -rf %{buildroot} %post ## brace for impact... -%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 +if [ -x /usr/bin/lscpu ]; then + if /usr/bin/lscpu | grep -q "Virtualization type" ; then + ## Is a VM + %{fillup_and_insserv -fy %{name}} else - ##there is no lscpu! shouldnt happend... + ## it isnt. %{fillup_and_insserv -f %{name}} fi -%else - %{fillup_and_insserv -fy %{name}} -%endif +else +##there is no lscpu! shouldnt happend... + %{fillup_and_insserv -f %{name}} +fi %postun %restart_on_update %{name} From a711f70755f5b53434c3c3346e38d5cff3b1e1855f982ed8bf2f6aa3cdf3d4b1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 1 Mar 2011 09:31:24 +0000 Subject: [PATCH 6/6] - 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. OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=37 --- haveged.changes | 6 ++++-- haveged.spec | 15 ++------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/haveged.changes b/haveged.changes index e3cfe46..31f5ed5 100644 --- a/haveged.changes +++ b/haveged.changes @@ -1,8 +1,10 @@ ------------------------------------------------------------------- Tue Mar 1 10:03:17 CET 2011 - meissner@suse.de -- also use the SLES code for openSUSE, to avoid unnecessary - services. bnc#675841 +- 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 diff --git a/haveged.spec b/haveged.spec index c5e12c2..4c0e0cd 100644 --- a/haveged.spec +++ b/haveged.spec @@ -66,19 +66,8 @@ make %{?_smp_mflags} check rm -rf %{buildroot} %post -## brace for impact... -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 +# do not enable on condition here, let YAST, kiwi or the user do it. +%{fillup_and_insserv -f %{name}} %postun %restart_on_update %{name}