Accepting request 577874 from home:avindra

- update to 1.9.2
  * Cross compile fixes
  * Limit watermark max to less than pool size to avoid 100% cpu
    condition
  * Add service.suse init script
- drop fix-enforced-clock-gettime.patch (fixed upstream)
- cleanup with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/577874
OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=112
This commit is contained in:
Marcus Meissner 2018-02-19 07:16:16 +00:00 committed by Git OBS Bridge
parent ab2704a644
commit c97be11e29
5 changed files with 32 additions and 39 deletions

View File

@ -1,11 +0,0 @@
--- configure.ac
+++ configure.ac
@@ -173,7 +173,7 @@
;;
*)
- if test "x$enable_clock_gettime" = "xx"; then
+ if test "x$enable_clock_gettime" = "xx" -o "x$enable_clock_gettime" = "xyes"; then
enable_clock_gettime="yes"
else
AC_MSG_ERROR([no timer source for host :"$host".])

View File

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

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

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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Feb 18 20:27:41 UTC 2018 - avindra@opensuse.org
- update to 1.9.2
* Cross compile fixes
* Limit watermark max to less than pool size to avoid 100% cpu
condition
* Add service.suse init script
- drop fix-enforced-clock-gettime.patch (fixed upstream)
- cleanup with spec-cleaner
-------------------------------------------------------------------
Sun Jun 19 13:16:01 UTC 2016 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package haveged
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX 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,8 +16,9 @@
#
%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d }
Name: haveged
Version: 1.9.1
Version: 1.9.2
Release: 0
Summary: Feed entropy into random pool
License: GPL-3.0
@ -30,15 +31,16 @@ Source4: haveged-dracut.module
Patch0: ppc64le.patch
# PATCH-FIX-UPSTREAM: ent tests randomly fail so make them conditional tchvatal@suse.cz bnc#876674
Patch1: haveged-conditional-enttest.patch
# PATCH-FIX-OPENSUSE: ignore clock-gettime enablement on generic architectures
Patch2: fix-enforced-clock-gettime.patch
# PATCH-FIX-UPSTREAM: don't write to syslog at startup to avoid deadlocks psimons@suse.com bnc#959237
Patch3: haveged-no-syslog.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
Requires(post): coreutils
Requires(postun): coreutils
Enhances: apache2
Enhances: gpg2
Enhances: openssl
@ -46,11 +48,7 @@ Enhances: openvpn
Enhances: php5
Enhances: smtp_daemon
Enhances: systemd
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d }
Requires(post): coreutils
Requires(postun): coreutils
%description
The haveged daemon feeds the linux entropy pool with random
@ -82,7 +80,6 @@ algorithm and supporting features.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2
%patch3 -p1
%build
@ -102,21 +99,21 @@ make %{?_smp_mflags}
#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
%ifarch %{ix86}
sed -i 's/\[_32MB\]/[_08MB]/' nist/nist.c
%endif
make %{?_smp_mflags} check
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%make_install
install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
install -D -m0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/90-haveged.rules
install -D -m0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/90-%{name}.rules
rm -f %{buildroot}%{_libdir}/libhavege.*a
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
install -d -m0755 %{buildroot}/usr/lib/dracut/modules.d/98haveged
install -m0755 %{SOURCE4} %{buildroot}/usr/lib/dracut/modules.d/98haveged/module-setup.sh
install -d -m0755 %{buildroot}%{_prefix}/lib/dracut/modules.d/98%{name}
install -m0755 %{SOURCE4} %{buildroot}%{_prefix}/lib/dracut/modules.d/98%{name}/module-setup.sh
%post
%{?udev_rules_update:%udev_rules_update}
@ -137,33 +134,29 @@ install -m0755 %{SOURCE4} %{buildroot}/usr/lib/dracut/modules.d/98haveged/module
%service_del_preun %{name}.service
%post -n libhavege1 -p /sbin/ldconfig
%postun -n libhavege1 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING
%{_sbindir}/rc%{name}
%{_sbindir}/%{name}
%doc %{_mandir}/man8/%{name}.8*
%{_mandir}/man8/%{name}.8%{ext_man}
%{_unitdir}/%{name}.service
%{_udevrulesdir}/90-haveged.rules
%dir /usr/lib/dracut
%dir /usr/lib/dracut/modules.d
%dir /usr/lib/dracut/modules.d/98haveged
/usr/lib/dracut/modules.d/98haveged/module-setup.sh
%{_udevrulesdir}/90-%{name}.rules
%dir %{_prefix}/lib/dracut
%dir %{_prefix}/lib/dracut/modules.d
%dir %{_prefix}/lib/dracut/modules.d/98%{name}
%{_prefix}/lib/dracut/modules.d/98%{name}/module-setup.sh
%files devel
%defattr(-,root,root)
%doc COPYING
%{_mandir}/man3/libhavege.3*
%{_mandir}/man3/libhavege.3%{ext_man}
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/havege.h
%doc contrib/build/havege_sample.c
%{_libdir}/*.so
%files -n libhavege1
%defattr(-,root,root)
%doc COPYING
%{_libdir}/*.so.*