- Disable randomly failing ENT test bnc#876674

- Added patches:
  * haveged-conditional-enttest.patch

OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=94
This commit is contained in:
Tomáš Chvátal
2014-05-12 11:01:39 +00:00
committed by Git OBS Bridge
parent 90baee8324
commit 9bded32d00
3 changed files with 36 additions and 0 deletions

View File

@@ -0,0 +1,24 @@
diff -urN haveged-1.9.1/configure.ac haveged-1.9.1.new/configure.ac
--- haveged-1.9.1/configure.ac 2014-02-11 16:06:58.000000000 +0100
+++ haveged-1.9.1.new/configure.ac 2014-05-12 12:57:40.111268914 +0200
@@ -60,6 +60,11 @@
AS_HELP_STRING([--enable-nistest=[no/yes]],[Run NIST test suite [default=no]]),
, enable_nistest="no")
+## Make ent self-test configurable
+AC_ARG_ENABLE(enttest,
+ AS_HELP_STRING([--enable-enttest=[no/yes]],[Run ENT test suite [default=yes]]),
+ , enable_enttest="yes")
+
## Make self test features configurable
AC_ARG_ENABLE(olt,
AS_HELP_STRING([--enable-olt=[yes/no]],[Enable online tests [default=yes]]),
@@ -225,7 +230,7 @@
AM_CONDITIONAL(ENABLE_SYSTEMD, test "$init_type" = "systemd")
AM_CONDITIONAL(ENABLE_SYSTEMD_LOOKUP, test "$enable_initdir" = "?")
AM_CONDITIONAL(ENABLE_NOINIT, test "$init_type" = "none")
-AM_CONDITIONAL(ENABLE_ENT_TEST, test "yes" = "yes")
+AM_CONDITIONAL(ENABLE_ENT_TEST, test "$enable_enttest" = "yes")
AM_CONDITIONAL(ENABLE_NIST_TEST, test "$enable_nistest" = "yes")
## Set hardware dependent define for the build

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 12 10:55:20 UTC 2014 - tchvatal@suse.com
- Disable randomly failing ENT test bnc#876674
- Added patches:
* haveged-conditional-enttest.patch
-------------------------------------------------------------------
Mon May 12 10:49:09 UTC 2014 - tchvatal@suse.com

View File

@@ -27,6 +27,8 @@ Source0: http://www.issihosts.com/haveged/%{name}-%{version}.tar.gz
Source2: %{name}.service
Source3: 90-haveged.rules
Patch0: ppc64le.patch
# PATCH-FIX-UPSTREAM: ent tests randomly fail so make them conditional tchvatal@suse.cz bnc#876674
Patch1: haveged-conditional-enttest.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -71,13 +73,16 @@ algorithm and supporting features.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
autoreconf -fvi
export CFLAGS="%{optflags} -fpie"
export LDFLAGS="-Wl,-z,relro,-z,now -pie"
# ENT randomly fails so disable the test
%configure \
--disable-static \
--disable-enttest \
--enable-nistest \
--enable-daemon \
--enable-clock_gettime