Hello community,
here is the log from the commit of package haveged for openSUSE:Factory checked
in at 2013-05-03 09:17:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haveged (Old)
and /work/SRC/openSUSE:Factory/.haveged.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haveged"
Changes:
--------
--- /work/SRC/openSUSE:Factory/haveged/haveged.changes 2013-03-26
16:13:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.haveged.new/haveged.changes 2013-05-03
09:17:03.000000000 +0200
@@ -1,0 +2,8 @@
+Thu May 2 18:25:33 UTC 2013 - crrodrig...@opensuse.org
+
+- haveged 1.7a
+* Correct VPATH issues and modify check target to support
+parallel builds and changes in automake 1.13 test harness.
+Updated sample spec file and other documentation changes.
+
+-------------------------------------------------------------------
Old:
----
haveged-1.7.tar.gz
New:
----
haveged-1.7a.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ haveged.spec ++++++
--- /var/tmp/diff_new_pack.GHrTlW/_old 2013-05-03 09:17:05.000000000 +0200
+++ /var/tmp/diff_new_pack.GHrTlW/_new 2013-05-03 09:17:05.000000000 +0200
@@ -17,7 +17,7 @@
Name: haveged
-Version: 1.7
+Version: 1.7a
Release: 0
Summary: Feed entropy into random pool
License: GPL-3.0
++++++ haveged-1.7.tar.gz -> haveged-1.7a.tar.gz ++++++
++++ 6095 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/ChangeLog new/haveged-1.7a/ChangeLog
--- old/haveged-1.7/ChangeLog 2013-01-15 15:43:37.000000000 +0100
+++ new/haveged-1.7a/ChangeLog 2013-02-13 21:01:09.000000000 +0100
@@ -1,9 +1,15 @@
+v1.7a (Feb 13, 2013)
+ * Fix parallel build (LDADD fix + VPATH fixes to test programs)
+ * Fix check target for automake v1.13 and previous (use check-local)
+ * Add option to suppress tuning code build
+ * Improve sample spec file for library
+
v1.7 (Jan 15, 2013)
- * Add havege_status_dump() as basis for haveged diagnositics
+ * Add havege_status_dump() as basis for haveged diagnostics
* Provide sample spec to build haveged and haveged-devel
* Add contrib/build to provide build support
* Modify build to use libtool
- * Retname base types to alias stdint.h types to allow 'fixes' if necessary
+ * Rename base types to alias stdint.h types to allow 'fixes' if necessary
* Rename all public functions to follow havege_* naming convention
* Sanitize havege.h to be include file for devel package
* Add destroy() to havege for library use.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/Makefile.am new/haveged-1.7a/Makefile.am
--- old/haveged-1.7/Makefile.am 2013-01-15 15:44:35.000000000 +0100
+++ new/haveged-1.7a/Makefile.am 2013-02-13 20:38:41.000000000 +0100
@@ -1,22 +1,18 @@
## Process this file with automake to produce Makefile.in
-# checks to perform is a autoconf substitution
-check_SCRIPTS = @HA_CHECK@
-
# Files to be included in distribution
-EXTRA_DIST = ent/test.sh ent/entitle.gif init.d/service.fedora
init.d/service.redhat \
- init.d/sysv.lsb init.d/sysv.redhat nist/test.sh nist/template9
\
+EXTRA_DIST = ent/entitle.gif init.d/service.fedora init.d/service.redhat \
+ init.d/sysv.lsb init.d/sysv.redhat nist/template9 \
contrib/diags/data_prep.c contrib/diags/bins.p
contrib/diags/inc.p \
contrib/diags/lognorm.r contrib/diags/lognorm.sh \
haveged.spec contrib/build/build.sh contrib/build/lib.spec
contrib/build/nolib.spec \
contrib/build/havege_sample.c contrib/build/fedora.spec
-# Scripts run as check target
-EXTRA_SCRIPTS = ent/test.sh nist/test.sh
+# programs used in check targets
+EXTRA_PROGRAMS = ent/entest nist/nist
# Build install script and tests as necessary
SUBDIRS = src init.d man ent nist
-# Perform all check_SCRIPTS
-TESTS = @HA_CHECK@
-
+# check entire package
+DISTCHECK_CONFIGURE_FLAGS = "--enable-nistest"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/NEWS new/haveged-1.7a/NEWS
--- old/haveged-1.7/NEWS 2013-01-15 15:43:46.000000000 +0100
+++ new/haveged-1.7a/NEWS 2013-02-14 16:18:46.000000000 +0100
@@ -1,3 +1,10 @@
+v1.7a (Feb 13, 2013)
+
+ Fix broken parallel builds - fix LDADD problem in build, VPATH problems in
check targets.
+ Move to check-local for check target to work with automake v1.13 but retain
backward
+ compatability. Modify build to make tuning component optional in build.
Improve sample
+ spec file and docs.
+
v1.7 (Jan 15, 2013)
The build has been restructured to provide a devel package. This introduces
a new libtool
@@ -5,7 +12,7 @@
as well as providing a bootstrap to recover from automake mismatches. The
script will also
build and run devel sample code for those interested in using the devel
package.
- Other build related changes include updating AC_PREQ to a more resonable,
2.59 and changing
+ Other build related changes include updating AC_PREQ to a more reasonable,
2.59 and changing
the build option for init scripts to default to --enable-init=none. The
format of the
haveged diagnostic display has changed to provided more information and the
output is now
displayed after output is generated in the non-daemon case.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/README new/haveged-1.7a/README
--- old/haveged-1.7/README 2013-01-15 15:43:09.000000000 +0100
+++ new/haveged-1.7a/README 2013-02-13 21:00:37.000000000 +0100
@@ -127,31 +127,25 @@
The following build options are available to "./configure":
-1. --enable-capture (diagnostic)
-2. --enable-clock_gettime (not normally needed)
-3. --enable-daemon (default for Linux)
-4. --enable-init (type)
-5. --enable-inject (diagnostic)
-6. --enable-nistest (recommended)
-7. --enable-olt (recommended default)
-8. --enable-threads (experimental)
+1. --enable-clock_gettime (default 'no' for recognized hosts)
+2. --enable-daemon (default 'yes' if Linux)
+3. --enable-diagnostic (default 'no')
+4. --enable-init (type, default 'no')
+5. --enable-nistest (default 'no' but recommended)
+6. --enable-olt (default 'yes')
+7. --enable-threads (experimental)
+8. --enable-tune (default 'yes')
Detailed option information is available by typing "./configure --help". For
options xxx that take "yes/no" arguments, --disable-xxx may be used as the
inverse of --enable-xxx.
-If --enable-capture or --enable-inject are 'yes', or --enable-daemon is 'yes',
-haveged will build without the daemon interfaces (i.e. only file system access
-will be available). The install target will install the executable in the user
-bin directory and no init method will be configured. If --enable-capture and
---enable-inject are both 'no', --enable-daemon defaults to 'yes' if the host
-operating system is Linux and 'no' otherwise.
-
If --enable-clock_gettime() is 'yes', the clock_gettime(CLOCK_MONOTONIC) system
call will be used as a timer source. This option defaults to 'yes' for generic
host builds and 'no' otherwise. This option may proved useful if access to time
hardware is privileged. Due to variability of clock_gettime() implementations,
-the adequacy of the clock_gettime() resolution cannot be known until run time.
+the adequacy of the clock_gettime() resolution cannot be known until run time.
+It is strongly advised to use run-time testing if this option is used.
If --enable-daemon is 'yes', ioctl access required to the random device and
read-write access to the /proc virtual file system is required. The daemon may
@@ -160,15 +154,25 @@
on 2.4 kernels due to difference in the random interface between those two
kernel versions. The change in the proc file system from pool size expressed in
bytes to pool size expressed in bits has been taken into account, other changes
-may be required.
+may be required. This option is 'no' when diagnostic modes are enabled. If
+the option is no the executable is installed in the user bin directory instead
+of the sbin directory.
+
+If --enable-diagnostic is 'yes', the capture and inject diagnostic interfaces
+are enabled. The capture or inject diagnostic may be enabled singly by setting
+the option to 'capture' or 'inject'. A setting for any value other than 'no'
+for this option forces --enable-daemon=no.
The --enable-init option is active only when --enable-daemon is 'yes'. This
value can specify a template to be used in the installation of an init method
-by the build's install target. The default value, 'none', disables the feature.
+by the build's install target. The default value, 'no', disables the feature.
Other values can be used to install a traditional systemv init script or
systemd unit definition. In the latter case, pkg-config is required by the
install target. See INSTALLATION for details.
+The --enable-nistest option enables more thorough testing for the check target.
+The build system provides to test mechanisms:
+
The --enable-olt option is provided to suppress the entire online test
facility.
This option is provided for systems with a very limited resource budget and the
ability to thoroughly test the RNG output by other means. The online test
system
@@ -183,8 +187,17 @@
multi-core haveged that would spread collection overhead more evenly over the
available cpu resources.
-The --enable-nistest option enables more thorough testing for the check target.
-The build system provides to test mechanisms:
+The --enable-tune option allows the on-line tuning facility to be suppressed.
+This is intended for systems with special needs and or a limited resource
budget.
+Setting the option to 'yes' enables both the cpuid and virtual file system
methods,
+a value of 'no' suppresses both methods. Individual tuning methods can be
selected
+by setting the option to either 'cpuid' or 'vfs'. Note that the 'cpuid' method
+is always conditional on host type and will not be present if the hardware
+architecture does not support the instruction.
+
+CHECKING haveged
+
+The build check target provides two test procedures for the build.
1. A "quick" check based upon and adaptation of the public domain ENT program.
The "entest" program uses the ENT sources to subject a sample to the
following:
@@ -208,16 +221,11 @@
The "quick" test is always part of the check target. The NIST suite is run only
when --enable-nistest is 'yes'.
-Both scripts function the same way, haveged is run to collect a sample file in
+Both checks function the same way, haveged is run to collect a sample file in
the test directory which is then analyzed by the test program. A pass-fail
return
is given in both cases, additional information is written to stdout. The input
samples and the nist.out report are deleted by the clean make target.
-The tests can also executed from a shell prompt at any time after "make check"
by
-executing ent/test.sh or nist/test.sh from the build directory. Command
arguments
-to the script are passed on to the haveged invocation, this allows the sample
-size to be adjusted via "-r" or cache sizes to be specified via "-d" and "-i".
-
Both test mechanisms are statistical and even a fully functional random number
generator will experience occasional failures. It is not uncommon to see one or
two failures in the NIST suite and the entest will occasionally fail with a
small
@@ -329,7 +337,7 @@
executable is installed in automake's sbin_PROGRAMS directory.
If the daemon interface is enabled, the enable-init setting provides a simple
-template system is to setup the init method. If enable--init is set to none
+template system is to setup the init method. If enable-init is set to none
no action is taken. Otherwise, the template must reside in the init.d build
directory and is selected by the setting. Template names "service.*" indicate
that a systemd style init, while template names "sysv.*" are used for sysv
@@ -352,7 +360,7 @@
EXTRAS
The contrib directory contains bits and pieces that are not integrated into the
-distribution. Currently this directory contains build related uitilies in
+distribution. Currently this directory contains build related utilities in
the build directory and an unorganized collection of some of the tools used
to analyze haveged in the diags directory.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/config.h.in new/haveged-1.7a/config.h.in
--- old/haveged-1.7/config.h.in 2013-01-15 15:30:21.000000000 +0100
+++ new/haveged-1.7a/config.h.in 2013-02-13 19:01:52.000000000 +0100
@@ -188,6 +188,12 @@
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
+/* Define to 1 for host tuning features */
+#undef TUNING_CPUID_ENABLE
+
+/* Define to 1 for host tuning features */
+#undef TUNING_VFS_ENABLE
+
/* Version number of package */
#undef VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/configure.ac new/haveged-1.7a/configure.ac
--- old/haveged-1.7/configure.ac 2013-01-15 15:14:11.000000000 +0100
+++ new/haveged-1.7a/configure.ac 2013-02-10 23:23:41.000000000 +0100
@@ -3,7 +3,7 @@
## Minimum Autoconf version
AC_PREREQ([2.59])
-AC_INIT([haveged],[1.7])
+AC_INIT([haveged],[1.7a])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE
@@ -21,36 +21,38 @@
AC_SUBST(HAVEGE_LT_VERSION)
##libtool_end##
-## Make capture diagnostic configurable
-AC_ARG_ENABLE(capture, AS_HELP_STRING([--enable-capture=[no/yes]],[Enable
capture diagnostic. [default=no]]),, enable_capture="no")
-if test "x$enable_capture" = "xyes"; then
- AC_DEFINE(RAW_OUT_ENABLE, 1, [Define to 1 for capture diagnostic])
-fi
+## Make clock_gettime configurable
+AC_ARG_ENABLE(clock_gettime,
AS_HELP_STRING([--enable-clock_gettime=[no/yes]],[Enable clock_gettime.
[default=no]]),, enable_clock_gettime="no")
## Make build w/o daemon interface configurable
AC_ARG_ENABLE(daemon, AS_HELP_STRING([--enable-daemon=[yes/no]],[Enable daemon
[default=yes if linux]]),, enable_daemon="x" )
-## Make inject diagnostic configurable
-AC_ARG_ENABLE(inject, AS_HELP_STRING([--enable-inject=[no/yes]],[Enable inject
diagnostic. [default=no]]),, enable_inject="no")
-if test "x$enable_inject" = "xyes"; then
+## Make diagnostic modes configurable
+AC_ARG_ENABLE(diagnostic,
AS_HELP_STRING([--enable-diagnostic=[no/capture/inject/yes]],[Enable diagnostic
modes. [default=no]]),, enable_diagnostic="no")
+if test "x$enable_diagnostic" = "xyes"; then
+ AC_DEFINE(RAW_OUT_ENABLE, 1, [Define to 1 for capture diagnostic])
+ AC_DEFINE(RAW_IN_ENABLE, 1, [Define to 1 for injection diagnostic])
+ enable_daemon="no";
+elif test "x$enable_diagnostic" == "xcapture"; then
+ AC_DEFINE(RAW_OUT_ENABLE, 1, [Define to 1 for capture diagnostic])
+ enable_daemon="no";
+elif test "x$enable_diagnostic" == "xinject"; then
AC_DEFINE(RAW_IN_ENABLE, 1, [Define to 1 for injection diagnostic])
+ enable_daemon="no";
fi
+## Make init configurable
+AC_ARG_ENABLE(init, AS_HELP_STRING([--enable-init=[type]],[Enable service.* or
sysv.* template [default=no]]),, enable_init="no" )
+
+## Make nist self-test configurable
+AC_ARG_ENABLE(nistest, AS_HELP_STRING([--enable-nistest=[no/yes]],[Run NIST
test suite [default=no]]),, enable_nistest="no")
+
## Make self test features configurable
AC_ARG_ENABLE(olt, AS_HELP_STRING([--enable-olt=[yes/no]],[Enable online tests
[default=yes]]),, enable_olt="yes" )
if test "x$enable_olt" = "xyes"; then
AC_DEFINE(ONLINE_TESTS_ENABLE, 1, [Define to 1 for online test features])
fi
-## Make init configurable
-AC_ARG_ENABLE(init, AS_HELP_STRING([--enable-init=[type]],[Enable systemd or
sysv template [default=sysv.redhat]]),, enable_init="none" )
-if test "x$enable_init" = "x"; then
- enable_init="none"
-fi
-
-## Make clock_gettime configurable
-AC_ARG_ENABLE(clock_gettime,
AS_HELP_STRING([--enable-clock_gettime=[no/yes]],[Enable clock_gettime.
[default=no]]),, enable_clock_gettime="no")
-
## Make multi-thread feature configurable
AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads=[no/yes]],[Enable
threads [default=no]]),, enable_threads="no")
if test "x$enable_threads" = "xyes"; then
@@ -60,14 +62,16 @@
AC_DEFINE(NUMBER_CORES, 1, [Define to single collection thread])
fi
-## Make nist self-test configurable
-AC_ARG_ENABLE(nistest, AS_HELP_STRING([--enable-nistest=[no/yes]],[Run NIST
test suite [default=no]]),, enable_nistest="no")
-if test "x$enable_nistest" = "xyes"; then
- HA_CHECK="ent/test.sh nist/test.sh"
-else
- HA_CHECK="ent/test.sh"
+## Make tuning features configurable
+AC_ARG_ENABLE(tune,
AS_HELP_STRING([--enable-tuning=[yes/cpuid/vfs/no]],[Enable tuning modes
[default=yes]]),, enable_tune="yes" )
+if test "x$enable_tune" = "xyes"; then
+ AC_DEFINE(TUNING_CPUID_ENABLE, 1, [Define to 1 for host tuning features])
+ AC_DEFINE(TUNING_VFS_ENABLE, 1, [Define to 1 for host tuning features])
+elif test "x$enable_tune" == "xcpuid"; then
+ AC_DEFINE(TUNING_CPUID_ENABLE, 1, [Define to 1 for host tuning features])
+elif test "x$enable_tune" == "xvfs"; then
+ AC_DEFINE(TUNING_VFS_ENABLE, 1, [Define to 1 for host tuning features])
fi
-AC_SUBST(HA_CHECK,$HA_CHECK)
## Checks for programs.
AC_PROG_CC([gcc])
@@ -104,11 +108,8 @@
AC_CANONICAL_HOST
## Determine if daemon interface to be included
-if test "x$enable_capture" == "xyes"; then
- daemon_type="none"
-elif test "x$enable_inject" == "xyes"; then
- daemon_type="none"
-elif test "x$enable_daemon" = "xyes"; then
+
+if test "x$enable_daemon" = "xyes"; then
daemon_type="yes"
elif test "x$enable_daemon" = "xno"; then
daemon_type="none"
@@ -194,13 +195,15 @@
fi
## AC_DEFINE_UNQUOTED(DAEMON_TYPE,"$daemon_type",[daemon type])
-## Fixup install
+## Fixup install and test options
AC_SUBST(HA_DISTRO,$enable_init):
AM_CONDITIONAL(ENABLE_BIN, test "$daemon_type" = "none")
AM_CONDITIONAL(ENABLE_SYSV, test "$init_type" = "sysv")
AM_CONDITIONAL(ENABLE_SYSTEMD, test "$init_type" = "systemd")
AM_CONDITIONAL(ENABLE_NOINIT, test "$init_type" = "none")
+AM_CONDITIONAL(ENABLE_ENT_TEST, test "yes" = "yes")
+AM_CONDITIONAL(ENABLE_NIST_TEST, test "$enable_nistest" = "yes")
## Set hardware dependent define for the build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/contrib/build/fedora.spec
new/haveged-1.7a/contrib/build/fedora.spec
--- old/haveged-1.7/contrib/build/fedora.spec 2013-01-15 14:53:05.000000000
+0100
+++ new/haveged-1.7a/contrib/build/fedora.spec 2013-02-13 17:31:48.000000000
+0100
@@ -1,6 +1,6 @@
Summary: A Linux entropy source using the HAVEGE algorithm
Name: haveged
-Version: 1.7h
+Version: 1.7a
Release: 0%{?dist}
License: GPLv3+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/contrib/build/lib.spec new/haveged-1.7a/contrib/build/lib.spec
--- old/haveged-1.7/contrib/build/lib.spec 2013-01-13 20:18:31.000000000
+0100
+++ new/haveged-1.7a/contrib/build/lib.spec 2013-02-14 17:59:18.000000000
+0100
@@ -4,15 +4,20 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
+%define have_systemd 0
+
Name: haveged
-Version: 1.7
-Release: 1
+Version: 1.7a
+Release: 0
License: GPLv3
Group: System Environment/Daemons
Summary: Feed entropy into random pool
URL: http://www.issihosts.com/haveged/
Source0: http://www.issihosts.com/haveged/haveged-%{version}.tar.gz
-BuildRoot: %{_builddir}/%{name}-root
+BuildRoot: %{_builddir}/%{name}-{%version}-build
+%if 0%{?have_systemd}
+BuildRequires: systemd
+%endif
%description
The haveged daemon feeds the linux entropy pool with random
@@ -21,7 +26,6 @@
%package devel
Summary: haveged development files
Group: Development/Libraries
-Provides: haveged-devel
%description devel
Headers and shared object symbolic links for the haveged library
@@ -33,27 +37,37 @@
%setup -q
%build
-./configure
+%configure \
+ --enable-daemon\
+ --enable-init=sysv.redhat
make
%check
make check
%install
-[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
+%{__install} -D -m0755 init.d/haveged %{buildroot}%{_sysconfdir}/init.d/%{name}
+%if 0%{?have_systemd}
+%{__install} -D -m0644 init.d/havege.service
%{buildroot}%{_unitdir}/%{name}.service
+%endif
+%{__rm} -f %{buildroot}%{_libdir}/libhavege.*a
%clean
-[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf $RPM_BUILD_ROOT
+%{?buildroot:%__rm -rf "%{buildroot}"}
%files
%defattr(-, root, root, -)
+%doc COPYING
%{_mandir}/man8/haveged.8*
%{_sbindir}/haveged
+%{_sysconfdir}/init.d/haveged
+%if 0%{?have_systemd}
%{_unitdir}/haveged.service
-%doc COPYING README ChangeLog AUTHORS
+%endif
%files devel
+%doc COPYING
%defattr(-, root, root, -)
%{_mandir}/man3/libhavege.3*
%dir %{_includedir}/%{name}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/contrib/build/nolib.spec
new/haveged-1.7a/contrib/build/nolib.spec
--- old/haveged-1.7/contrib/build/nolib.spec 2013-01-10 23:19:55.000000000
+0100
+++ new/haveged-1.7a/contrib/build/nolib.spec 2013-02-13 17:32:03.000000000
+0100
@@ -5,7 +5,7 @@
# package are under the same license as the package itself.
#
Name: haveged
-Version: 1.7
+Version: 1.7a
Release: 1
License: GPLv3
Group: System Environment/Daemons
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/ent/Makefile.am new/haveged-1.7a/ent/Makefile.am
--- old/haveged-1.7/ent/Makefile.am 2013-01-07 00:02:43.000000000 +0100
+++ new/haveged-1.7a/ent/Makefile.am 2013-02-13 20:03:23.000000000 +0100
@@ -1,6 +1,8 @@
## Process this file with automake to produce Makefile.in.
+if ENABLE_ENT_TEST
check_PROGRAMS = entest
+endif
AM_CFLAGS=-Wall
@@ -11,3 +13,10 @@
CLEANFILES = sample
MAINTAINERCLEANFILES = Makefile.in
+
+if ENABLE_ENT_TEST
+check-local:
+ ./entest -t ${srcdir}/entitle.gif
+ ../src/haveged -n 16384k -v 1 $*
+ ./entest -vf sample
+endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/ent/entest.c new/haveged-1.7a/ent/entest.c
--- old/haveged-1.7/ent/entest.c 2013-01-07 00:02:43.000000000 +0100
+++ new/haveged-1.7a/ent/entest.c 2013-02-13 20:03:32.000000000 +0100
@@ -168,7 +168,7 @@
verbose = FALSE;
char *filename="";
- while ((opt = getopt(argc, argv, "?c:e:f:m:p:s:tv")) != -1) {
+ while ((opt = getopt(argc, argv, "?c:e:f:m:p:s:t:v")) != -1) {
switch (toISOlower(opt)) {
case 'c':
params->chisqr = atof(optarg);
@@ -195,17 +195,18 @@
break;
case 't':
- filename = "entitle.gif";
+ filename = optarg;
+/* filename = "entitle.gif"; */
stest = TRUE;
break;
- case 'v':
- verbose = TRUE;
- break;
-
- default:
- help();
- return -1;
+ case 'v':
+ verbose = TRUE;
+ break;
+
+ default:
+ help();
+ return -1;
}
}
if (!strlen(filename)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/ent/test.sh new/haveged-1.7a/ent/test.sh
--- old/haveged-1.7/ent/test.sh 2013-01-07 00:02:43.000000000 +0100
+++ new/haveged-1.7a/ent/test.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd ent
-./entest -t
-../src/haveged -n 16384k -v 1 $*
-./entest -vf sample
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/haveged.spec new/haveged-1.7a/haveged.spec
--- old/haveged-1.7/haveged.spec 2013-01-13 20:18:01.000000000 +0100
+++ new/haveged-1.7a/haveged.spec 2013-02-14 16:43:37.000000000 +0100
@@ -4,15 +4,20 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
+%define have_systemd 0
+
Name: haveged
-Version: 1.7
-Release: 1
+Version: 1.7a
+Release: 0
License: GPLv3
Group: System Environment/Daemons
Summary: Feed entropy into random pool
URL: http://www.issihosts.com/haveged/
Source0: http://www.issihosts.com/haveged/haveged-%{version}.tar.gz
-BuildRoot: %{_builddir}/%{name}-root
+BuildRoot: %{_builddir}/%{name}-{%version}-build
+%if 0%{?have_systemd}
+BuildRequires: systemd
+%endif
%description
The haveged daemon feeds the linux entropy pool with random
@@ -21,7 +26,6 @@
%package devel
Summary: haveged development files
Group: Development/Libraries
-Provides: haveged-devel
%description devel
Headers and shared object symbolic links for the haveged library
@@ -33,27 +37,37 @@
%setup -q
%build
-./configure
+%configure \
+ --enable-daemon\
+ --enable-init=sysv.redhat
make
%check
make check
%install
-[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
+%{__install} -D -m0755 init.d/haveged %{buildroot}%{_sysconfdir}/init.d/%{name}
+%if 0%{?have_systemd}
+%{__install} -D -m0644 init.d/havege.service
%{buildroot}%{_unitdir}/%{name}.service
+%endif
+%{__rm} -f %{buildroot}%{_libdir}/libhavege.*a
%clean
-[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf $RPM_BUILD_ROOT
+%{?buildroot:%__rm -rf "%{buildroot}"}
%files
%defattr(-, root, root, -)
+%doc COPYING
%{_mandir}/man8/haveged.8*
%{_sbindir}/haveged
+%{_sysconfdir}/init.d/haveged
+%if 0%{?have_systemd}
%{_unitdir}/haveged.service
-%doc COPYING README ChangeLog AUTHORS
+%endif
%files devel
+%doc COPYING
%defattr(-, root, root, -)
%{_mandir}/man3/libhavege.3*
%dir %{_includedir}/%{name}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/init.d/Makefile.am new/haveged-1.7a/init.d/Makefile.am
--- old/haveged-1.7/init.d/Makefile.am 2013-01-07 00:41:55.000000000 +0100
+++ new/haveged-1.7a/init.d/Makefile.am 2013-02-14 17:30:46.000000000 +0100
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in.
-EXTRA_DIST = service.redhat sysv.lsb sysv.redhat
+EXTRA_DIST = service.fedora service.redhat sysv.lsb sysv.redhat
MAINTAINERCLEANFILES = Makefile.in
@@ -12,7 +12,7 @@
if ENABLE_SYSV
## legacy init script from template
-initdir = /etc/init.d
+initdir = $(sysconfdir)/init.d
init_SCRIPTS = haveged
haveged: $(src_tmpl) Makefile
@@ -20,12 +20,18 @@
endif
+if ENABLE_SYSTEMD
+
+install-exec-hook:
+ $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service;
+
+endif
+
install-data-hook:
if ENABLE_SYSTEMD
## new style init - requires pkg-config.
- $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; \
- install -p -m644 haveged.service `pkg-config
--variable=systemdsystemunitdir systemd`/haveged.service; \
- systemctl enable haveged.service;
+ install -p -m644 haveged.service `pkg-config
--variable=systemdsystemunitdir systemd`/haveged.service;
+## systemctl enable haveged.service;
endif
if ENABLE_NOINIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/nist/Makefile.am new/haveged-1.7a/nist/Makefile.am
--- old/haveged-1.7/nist/Makefile.am 2013-01-07 00:02:43.000000000 +0100
+++ new/haveged-1.7a/nist/Makefile.am 2013-02-13 20:29:12.000000000 +0100
@@ -1,6 +1,9 @@
## Process this file with automake to produce Makefile.in.
+
+if ENABLE_NIST_TEST
check_PROGRAMS = nist
+endif
AM_CFLAGS=-Wall
@@ -11,3 +14,9 @@
CLEANFILES = sample nist.out
MAINTAINERCLEANFILES = Makefile.in
+
+if ENABLE_NIST_TEST
+check-local:
+ ../src/haveged -n 16M $*
+ ./nist sample ${srcdir}
+endif
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/nist/nist.c new/haveged-1.7a/nist/nist.c
--- old/haveged-1.7/nist/nist.c 2013-01-13 17:33:49.000000000 +0100
+++ new/haveged-1.7a/nist/nist.c 2013-02-13 20:38:29.000000000 +0100
@@ -24,15 +24,18 @@
FILE *fp = stdin;
long result=0;
-if (argc!=2) {
- printf("Usage sts <file>\n");
+ if (argc<2 || argc>3) {
+ printf("Usage sts <file> [<template directory>]\n");
return 1;
}
-
-/* Template file must be in current working directory */
-
-(void)getcwd(basename,FILENAME_MAX);
-strcat(basename, "/");
+ /**
+ * get optional directory name
+ */
+ basename[0] = 0;
+ if (argc>2) {
+ strcat(basename, argv[2]);
+ strcat(basename, "/");
+ }
filename = argv[1];
if ((fp = fopen(filename, "rb")) == NULL) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/nist/test.sh new/haveged-1.7a/nist/test.sh
--- old/haveged-1.7/nist/test.sh 2013-01-07 00:02:43.000000000 +0100
+++ new/haveged-1.7a/nist/test.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd nist
-../src/haveged -n 16M $*
-./nist sample
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/src/Makefile.am new/haveged-1.7a/src/Makefile.am
--- old/haveged-1.7/src/Makefile.am 2013-01-11 20:23:55.000000000 +0100
+++ new/haveged-1.7a/src/Makefile.am 2013-02-10 17:58:27.000000000 +0100
@@ -27,7 +27,7 @@
haveged_SOURCES = haveged.c haveged.h
-haveged_LDADD = @HA_LDFLAGS@ $(top_builddir)/src/libhavege.la
+haveged_LDADD = @HA_LDFLAGS@ libhavege.la
##libtool_end##
MAINTAINERCLEANFILES = Makefile.in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/haveged-1.7/src/havegetune.c new/haveged-1.7a/src/havegetune.c
--- old/haveged-1.7/src/havegetune.c 2013-01-09 17:48:15.000000000 +0100
+++ new/haveged-1.7a/src/havegetune.c 2013-02-10 17:49:58.000000000 +0100
@@ -74,7 +74,6 @@
#define TUNE_DEBUG(...)
#endif
-#define VFS 1
/**
* Local prototypes
*/
@@ -91,9 +90,14 @@
static void cfg_cacheAdd(HOST_CFG *anchor, H_UINT src, H_UINT cpu,
H_UINT level, H_UINT type, H_UINT kb);
static void cfg_cpuAdd(HOST_CFG *anchor, H_UINT src, CPU_INST *INST);
+/**
+ * If cpuid not present, no need to generate the code
+ */
+#ifndef CPUID
+#undef TUNING_CPUID_ENABLE
+#endif
-
-#ifdef CPUID
+#ifdef TUNING_CPUID_ENABLE
/************************* CPUID support
***************************************/
/**
* Register names
@@ -122,7 +126,7 @@
#endif
/************************* CPUID support
***************************************/
/************************* VFS support
***************************************/
-#ifdef VFS
+#ifdef TUNING_VFS_ENABLE
#define VFS_LINESIZE 256
/**
@@ -430,12 +434,9 @@
}
#endif
+#ifdef TUNING_CPUID_ENABLE
/************************* CPUID support
***************************************/
/**
- * CPUID support
- */
-#ifdef CPUID
-/**
* Wrapper around the cpuid macro to assist in debugging
*/
static void cpuid( /* RETURN: none */
@@ -545,7 +546,7 @@
CPU_INST *w, /* IN-OUT: Workspace */
H_UINT *regs) /* IN-OUT: registers */
{
- /* L1 and Trace as per Intel application note 485, January 2011 */
+ /* L1 and Trace as per Intel application note 485, May 2012 */
static const H_UINT defs[] = {
0x06, 'I', 8 , /* 4-way set assoc, 32 byte line size */
0x08, 'I', 16 , /* 4-way set assoc, 32 byte line size */
@@ -632,7 +633,7 @@
#endif
/************************* CPUID support
***************************************/
/************************* VFS support
***************************************/
-#ifdef VFS
+#ifdef TUNING_VFS_ENABLE
/**
* Get configuration
*/
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
