Accepting request 72809 from security

rerun with correctly formated spec file (forwarded request 72771 from adrianSuSE)

OBS-URL: https://build.opensuse.org/request/show/72809
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haveged?expand=0&rev=14
This commit is contained in:
Sascha Peilicke 2011-06-07 08:52:59 +00:00 committed by Git OBS Bridge
commit ce5ef90703
5 changed files with 38 additions and 4 deletions

View File

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

3
haveged-1.1.tar.gz Normal file
View File

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

11
haveged-ppc64.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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"
;;

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jun 6 11:45:47 UTC 2011 - k0da@opensuse.org
- fix ppc64 build
-------------------------------------------------------------------
Mon Jun 6 10:11:20 UTC 2011 - adrian@suse.de
- fix URL to source tar ball
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 7 20:06:23 UTC 2011 - crrodriguez@opensuse.org Sat May 7 20:06:23 UTC 2011 - crrodriguez@opensuse.org

View File

@ -24,9 +24,10 @@ License: GPLv3
Summary: Feed entropy into random pool Summary: Feed entropy into random pool
Url: http://www.issihosts.com/haveged/ Url: http://www.issihosts.com/haveged/
Group: System/Daemons Group: System/Daemons
Source0: http://www.issihosts.com/haveged/haveged-%{version}.tar.bz2 Source0: http://www.issihosts.com/haveged/haveged-%{version}.tar.gz
Source1: haveged.init Source1: haveged.init
Source2: haveged.service Source2: haveged.service
Patch1: haveged-ppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): %insserv_prereq Requires(pre): %insserv_prereq
%if 0%{suse_version} >= 1140 %if 0%{suse_version} >= 1140
@ -36,6 +37,7 @@ Requires(post): grep util-linux
Enhances: openssl gpg2 php5 apache2 openvpn smtp_daemon Enhances: openssl gpg2 php5 apache2 openvpn smtp_daemon
%{!?_initddir: %global _initddir /etc/init.d} %{!?_initddir: %global _initddir /etc/init.d}
%description %description
The haveged daemon feeds the linux entropy pool with random The haveged daemon feeds the linux entropy pool with random
numbers generated from hidden processor state. numbers generated from hidden processor state.
@ -44,6 +46,8 @@ For more informations see http://www.issihosts.com/haveged/
%prep %prep
%setup -q %setup -q
%patch1
%build %build
autoreconf -fiv autoreconf -fiv
@ -51,9 +55,11 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
%configure --with-libcap-ng=yes --sbindir=/sbin --enable-nistest=yes %configure --with-libcap-ng=yes --sbindir=/sbin --enable-nistest=yes
make %{?_smp_mflags} make %{?_smp_mflags}
%check %check
make %{?_smp_mflags} check make %{?_smp_mflags} check
%install %install
%makeinstall %makeinstall
%{__install} -m0755 %{S:1} %{buildroot}%{_initddir}/haveged %{__install} -m0755 %{S:1} %{buildroot}%{_initddir}/haveged
@ -62,20 +68,25 @@ make %{?_smp_mflags} check
%{__mkdir_p} %{buildroot}/lib/systemd/system %{__mkdir_p} %{buildroot}/lib/systemd/system
%{__install} -m0755 %{S:2} %{buildroot}/lib/systemd/system/haveged.service %{__install} -m0755 %{S:2} %{buildroot}/lib/systemd/system/haveged.service
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
%post %post
# do not enable on condition here, let YAST, kiwi or the user do it. # do not enable on condition here, let YAST, kiwi or the user do it.
%{fillup_and_insserv -f %{name}} %{fillup_and_insserv -f %{name}}
%postun %postun
%restart_on_update %{name} %restart_on_update %{name}
%{insserv_cleanup} %{insserv_cleanup}
%preun %preun
%stop_on_removal %{name} %stop_on_removal %{name}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
@ -86,4 +97,6 @@ rm -rf %{buildroot}
%dir /lib/systemd/system %dir /lib/systemd/system
/lib/systemd/system/haveged.service /lib/systemd/system/haveged.service
%changelog %changelog