Skip to content

Commit

Permalink
haveged: update to 1.9.18
Browse files Browse the repository at this point in the history
  • Loading branch information
RMerl committed May 18, 2022
1 parent c2e74cb commit acc7b1a
Show file tree
Hide file tree
Showing 44 changed files with 1,096 additions and 1,159 deletions.
19 changes: 18 additions & 1 deletion release/src/router/haveged/ChangeLog
@@ -1,7 +1,24 @@
v1.9.15 (TBD)
v1.9.18 (Apr 09, 2022) [Jirka Hladky]
* Round bits up and target full pool size [Jason A. Donenfeld]
* Specify right kernel commit in README [Jason A. Donenfeld]

v1.9.17 (Jan 08, 2022)
* Added new verbose mode [Jirka Hladky]
* haveged-once.service - use @SBIN_DIR@ instead of hard-coded path [Jirka Hladky]

v1.9.16 (Jan 02, 2022)
* Allow newuname syscall [Jirka Hladky]
* Fix: haveged cannot be run as an application if also running as a daemon [Günther Brunthaler]
* Add entropy unconditionally at the start and then every 60 seconds [Jirka Hladky]
* New parameter --once to refill entropy once and quit immediately [Jirka Hladky]
* Added haveged-once.service to provide entropy once (intended for initramfs) [Jirka Hladky]

v1.9.15 (Sep 30, 2021)
* Check for sys/auxv.h before using it. [Peter Seiderer]
* fix build on uclibc (origin/pr/58) [Pierre-Jean Texier]
* Improved make check tests [Jirka Hladky]
* Removed old init.d files. Configs are under contrib directory [Jirka Hladky]
* Support for Linux kernel LRNG patch set

v1.9.14 (Jan 01, 2021)
* made enttest configurable
Expand Down
5 changes: 2 additions & 3 deletions release/src/router/haveged/Makefile.am
@@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in

# Files to be included in distribution
EXTRA_DIST = ent/entitle.gif init.d/service.fedora init.d/service.redhat \
init.d/sysv.lsb init.d/sysv.redhat nist/template9 \
EXTRA_DIST = ent/entitle.gif 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 \
Expand All @@ -12,7 +11,7 @@ EXTRA_DIST = ent/entitle.gif init.d/service.fedora init.d/service.redhat \
EXTRA_PROGRAMS = ent/entest nist/nist

# Build install script and tests as necessary
SUBDIRS = src init.d man ent nist
SUBDIRS = src man ent nist

# check entire package
DISTCHECK_CONFIGURE_FLAGS = "--enable-nistest"
47 changes: 26 additions & 21 deletions release/src/router/haveged/Makefile.in
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -168,8 +168,8 @@ am__recursive_targets = \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
Expand Down Expand Up @@ -265,9 +265,7 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
HAVEGE_LT_VERSION = @HAVEGE_LT_VERSION@
HA_DISTRO = @HA_DISTRO@
HA_LDFLAGS = @HA_LDFLAGS@
HA_UNITD = @HA_UNITD@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Expand Down Expand Up @@ -347,6 +345,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
Expand All @@ -357,16 +356,15 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@

# Files to be included in distribution
EXTRA_DIST = ent/entitle.gif init.d/service.fedora init.d/service.redhat \
init.d/sysv.lsb init.d/sysv.redhat nist/template9 \
EXTRA_DIST = ent/entitle.gif 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


# Build install script and tests as necessary
SUBDIRS = src init.d man ent nist
SUBDIRS = src man ent nist

# check entire package
DISTCHECK_CONFIGURE_FLAGS = "--enable-nistest"
Expand Down Expand Up @@ -657,6 +655,10 @@ dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)

dist-zstd: distdir
tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
$(am__post_remove_distdir)

dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
Expand Down Expand Up @@ -699,6 +701,8 @@ distcheck: dist
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
Expand Down Expand Up @@ -879,18 +883,19 @@ uninstall-am:
am--refresh check check-am clean clean-cscope clean-generic \
clean-libtool cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
dist-xz dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
dist-xz dist-zip dist-zstd distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am

.PRECIOUS: Makefile

Expand Down
2 changes: 2 additions & 0 deletions release/src/router/haveged/NEWS
@@ -1,3 +1,5 @@
Please see ChangeLog for the latest NEWS.

v1.9.8 (Sep 30, 2019)
* Various bug fixes - please see ChangeLog for the detailed list of changes

Expand Down
57 changes: 7 additions & 50 deletions release/src/router/haveged/README
Expand Up @@ -136,12 +136,10 @@ The following build options are available to "./configure":
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-initdir (default '' unless enable--init="service.*")
6. --enable-nistest (default 'no' but recommended)
7. --enable-olt (default 'yes')
8. --enable-threads (experimental)
9. --enable-tune (default 'yes')
4. --enable-nistest (default 'no' but recommended)
5. --enable-olt (default 'yes')
6. --enable-threads (experimental)
7. --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
Expand Down Expand Up @@ -170,15 +168,6 @@ 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. See DIAGNOSTICS below for details.

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, 'no', disables the feature.
Other values can be used to install a traditional systemv init script or
systemd unit definition. See INSTALLATION for details.

The --enable-initdir is active only when --enable-init='service.*', i.e. a
systemd install. See INSTALLATION for details.

The --enable-nistest option enables more thorough testing for the check target.
See CHECKING for details.

Expand Down Expand Up @@ -256,7 +245,7 @@ the haveged collection area to exercise all buffer logic.

Users are encouraged to run their own external tests. The --number==0 option is
a convenient means to pipe haveged output into external suites such as Dieharder,
the TESTU01 batteries, or PractRand.
the TESTU01 batteries, or PractRand.


RUNNING haveged
Expand Down Expand Up @@ -333,7 +322,7 @@ where

build option flags represent the ./configure options as:
C=clock_gettime, D=diagnostic I=tune with cpuid, M=multi-core, T=online tests, V=tune with vfs

tuning sources are:
D=default value, P=instance parameter, C=cpuid present,
H=hyperthreading, A=AMD cpuid, A5=AMD fn5, A6=AMD fn6, A8=AMD fn8
Expand Down Expand Up @@ -369,7 +358,7 @@ where
<action> is either 'retry' or 'fail'
<bytes> is number of bytes processed in procedure before failure
<fill> is the number of times the buffer was filled

The exec summary is logged upon error or signal terminations. Other log output is
controlled by --verbose:

Expand Down Expand Up @@ -423,38 +412,6 @@ automake's bin_PROGRAMS directory and provides a man(8) page. A man(3) page
is provided for the libtool build. If the daemon interface is enabled, the
executable is installed in automake's sbin_PROGRAMS directory.

If the daemon interface is enabled, the --enable-init setting provides a simple
template system 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
style init scripts.

Sample sysv style templates are provided for linux standard base, sysv.lsb,
and redhat systems, sysv.redhat , such as centos which have not moved to
systemd style inits.

For systemd style installs, --enable-initdir specifies the systemd unit
directory. If the setting is not specified (or is ''), the default value is
obtained from hosts pkg-config query for systemdsystemunitdir. Sample systemd
templates are provided for forking, service.forking, and non-forking,
service.fedora, configurations. The non-forking configuration is recommended to
avoid the overhead of PID file and minimize start-up cost.

Examples:

./configure --enable-init=service.redhat
./configure --enable-init=sysv.lsb

Custom init scripts can be added as necessary by adding templates to the
init.d directory.

A sample file, haveged.spec, is provided in the build root as a guide for
those who want to build a rpm. As with init scripts, the sample may need
customization before use. Other SPEC file examples can be found in the
contrib directory (see EXTRAS for details).


EXTRAS

The contrib directory contains bits and pieces that are not integrated into the
Expand Down

0 comments on commit acc7b1a

Please sign in to comment.