Preparing v1.9.14 release

4 files changed, 26 insertions, 14 deletions

diff --git a/configure b/configure
index c6aab5d..8c9c235 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for haveged 1.9.13.
+# Generated by GNU Autoconf 2.69 for haveged 1.9.14.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='haveged'
 PACKAGE_TARNAME='haveged'
-PACKAGE_VERSION='1.9.13'
-PACKAGE_STRING='haveged 1.9.13'
+PACKAGE_VERSION='1.9.14'
+PACKAGE_STRING='haveged 1.9.14'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -772,6 +772,7 @@ enable_diagnostic
 enable_init
 enable_initdir
 enable_nistest
+enable_enttest
 enable_olt
 enable_threads
 enable_tune
@@ -1326,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures haveged 1.9.13 to adapt to many kinds of systems.
+\`configure' configures haveged 1.9.14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1396,7 +1397,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of haveged 1.9.13:";;
+     short | recursive ) echo "Configuration of haveged 1.9.14:";;
    esac
   cat <<\_ACEOF
 
@@ -1420,6 +1421,7 @@ Optional Features:
   --enable-initdir=DIR    Directory for systemd service files
                           [default=pkg-config var if init==service.*]
   --enable-nistest=no/yes Run NIST test suite [default=no]
+  --enable-enttest=no/yes Run ENT test suite [default=yes]
   --enable-olt=yes/no     Enable online tests [default=yes]
   --enable-threads=no/yes Enable threads [default=no]
   --enable-tune=yes/cpuid/vfs/no
@@ -1515,7 +1517,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-haveged configure 1.9.13
+haveged configure 1.9.14
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1934,7 +1936,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by haveged $as_me 1.9.13, which was
+It was created by haveged $as_me 1.9.14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4106,7 +4108,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='haveged'
- VERSION='1.9.13'
+ VERSION='1.9.14'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12030,6 +12032,15 @@ else
 fi
 
 
+## Make ent self-test configurable
+# Check whether --enable-enttest was given.
+if test "${enable_enttest+set}" = set; then :
+  enableval=$enable_enttest;
+else
+  enable_enttest="yes"
+fi
+
+
 ## Make self test features configurable
 # Check whether --enable-olt was given.
 if test "${enable_olt+set}" = set; then :
@@ -13406,7 +13417,7 @@ else
   ENABLE_NOINIT_FALSE=
 fi
 
- if test "yes" = "yes"; then
+ if test "$enable_enttest" = "yes"; then
   ENABLE_ENT_TEST_TRUE=
   ENABLE_ENT_TEST_FALSE='#'
 else
@@ -13979,7 +13990,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by haveged $as_me 1.9.13, which was
+This file was extended by haveged $as_me 1.9.14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14045,7 +14056,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-haveged config.status 1.9.13
+haveged config.status 1.9.14
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/contrib/build/fedora.spec b/contrib/build/fedora.spec
index b324a4a..c3ef381 100644
--- a/contrib/build/fedora.spec
+++ b/contrib/build/fedora.spec
@@ -42,7 +42,7 @@ Headers and shared object symbolic links for the HAVEGE algorithm
 
 %build
 #autoreconf -fiv
-%configure
+%configure --disable-enttest --enable-nistest
 #SMP build is not working
 #make %{?_smp_mflags}
 make
@@ -60,6 +60,7 @@ chmod 0644 COPYING README ChangeLog AUTHORS
 #Install systemd service file
 sed -e 's:@SBIN_DIR@:%{_sbindir}:g' -i init.d/service.fedora
 install -Dpm 0644 init.d/service.fedora %{buildroot}%{_unitdir}/%{name}.service
+install -Dpm 0755 contrib/SUSE/haveged-dracut.module %{buildroot}/lib/dracut/modules.d/98%{name}/module-setup.sh
 
 # We don't ship .la files.
 rm -rf %{buildroot}%{_libdir}/libhavege.*a
diff --git a/src/Makefile.in b/src/Makefile.in
index 6f05fc7..559af60 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -326,7 +326,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -Wall -I..
+AM_CFLAGS = -Wall -Wextra -Wpedantic -I..
 
 ####nolibtool_start##
 ####nolibtool_end##
diff --git a/src/havegecmd.c b/src/havegecmd.c
index 2bad675..9ced105 100644
--- a/src/havegecmd.c
+++ b/src/havegecmd.c
@@ -371,7 +371,7 @@ ssize_t safein(                    /* RETURN: read bytes                    */
    if (ret < 0 || avail <=0)
       goto out;
 
-   if (len > avail)
+   if (len > (unsigned int) avail)
       len = avail; 
 
    do {