diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | Makefile.in | 46 | ||||
| -rw-r--r-- | README | 57 | ||||
| -rw-r--r-- | README.md | 61 | ||||
| -rw-r--r-- | aclocal.m4 | 38 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | config/compile | 6 | ||||
| -rwxr-xr-x | config/install-sh | 13 | ||||
| -rwxr-xr-x | config/missing | 2 | ||||
| -rwxr-xr-x | configure | 107 | ||||
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | ent/Makefile.in | 6 | ||||
| -rw-r--r-- | man/Makefile.in | 6 | ||||
| -rw-r--r-- | nist/Makefile.in | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 6 |
15 files changed, 87 insertions, 309 deletions
diff --git a/Makefile.am b/Makefile.am index 3332110..95e42f9 100644 --- a/Makefile.am +++ b/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 \ @@ -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" diff --git a/Makefile.in b/Makefile.in index 77c1b82..3d74f16 100644 --- a/Makefile.in +++ b/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, @@ -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. @@ -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@ @@ -357,8 +355,7 @@ 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 \ @@ -366,7 +363,7 @@ EXTRA_DIST = ent/entitle.gif init.d/service.fedora init.d/service.redhat \ # 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" @@ -657,6 +654,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 @@ -699,6 +700,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) @@ -879,18 +882,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 @@ -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 @@ -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. @@ -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 @@ -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 @@ -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: @@ -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 @@ -154,12 +154,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 @@ -188,15 +186,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. @@ -255,9 +244,9 @@ The build check target provides two test procedures for the build. NIST to review the detailed results. AIS31 provides recommendations for the NIST test suite as 'additional tests'. See testing documentation at http://www.issihosts.com/haveged/ais31.html for further information. - + The "quick" test is always part of the check target. The NIST suite is run only -when --enable-nistest is 'yes'. +when --enable-nistest is 'yes'. 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 @@ -274,7 +263,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 @@ -351,7 +340,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 @@ -387,7 +376,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: @@ -441,38 +430,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 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9052,7 +9052,7 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9067,7 +9067,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9083,14 +9083,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9142,7 +9142,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9175,7 +9175,7 @@ fi])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9372,7 +9372,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9393,7 +9393,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9414,7 +9414,7 @@ AC_SUBST([am__leading_dot])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9453,7 +9453,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9482,7 +9482,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9529,7 +9529,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9548,7 +9548,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9629,7 +9629,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9689,7 +9689,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9717,7 +9717,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9736,7 +9736,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/config.h.in b/config.h.in index 08e36e1..5c46bca 100644 --- a/config.h.in +++ b/config.h.in @@ -192,9 +192,6 @@ /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR -/* Define to 1 to suppress daemon interface */ -#undef NO_DAEMON - /* Define to single collection thread */ #undef NUMBER_CORES diff --git a/config/compile b/config/compile index 99e5052..23fcba0 100755 --- a/config/compile +++ b/config/compile @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff --git a/config/install-sh b/config/install-sh index 8175c64..20d8b2e 100755 --- a/config/install-sh +++ b/config/install-sh @@ -451,7 +451,18 @@ do trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # diff --git a/config/missing b/config/missing index 625aeb1..8d0eaad 100755 --- a/config/missing +++ b/config/missing @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -638,18 +638,8 @@ ENABLE_NIST_TEST_FALSE ENABLE_NIST_TEST_TRUE ENABLE_ENT_TEST_FALSE ENABLE_ENT_TEST_TRUE -ENABLE_NOINIT_FALSE -ENABLE_NOINIT_TRUE -ENABLE_SYSTEMD_LOOKUP_FALSE -ENABLE_SYSTEMD_LOOKUP_TRUE -ENABLE_SYSTEMD_FALSE -ENABLE_SYSTEMD_TRUE -ENABLE_SYSV_FALSE -ENABLE_SYSV_TRUE ENABLE_BIN_FALSE ENABLE_BIN_TRUE -HA_UNITD -HA_DISTRO HAVEGE_LT_VERSION LT_SYS_LIBRARY_PATH OTOOL64 @@ -769,8 +759,6 @@ enable_libtool_lock enable_clock_gettime enable_daemon enable_diagnostic -enable_init -enable_initdir enable_nistest enable_enttest enable_olt @@ -1417,9 +1405,6 @@ Optional Features: --enable-daemon=yes/no Enable daemon [default=yes if linux] --enable-diagnostic=no/capture/inject/yes Enable diagnostic mode [default=no] - --enable-init=type Enable service.* or sysv.* template [default=no] - --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] @@ -12007,22 +11992,6 @@ $as_echo "#define RAW_IN_ENABLE 1" >>confdefs.h enable_daemon="no"; fi -## Make init configurable -# Check whether --enable-init was given. -if test "${enable_init+set}" = set; then : - enableval=$enable_init; -else - enable_init="no" -fi - -# Check whether --enable-initdir was given. -if test "${enable_initdir+set}" = set; then : - enableval=$enable_initdir; -else - enable_initdir="?" -fi - - ## Make nist self-test configurable # Check whether --enable-nistest was given. if test "${enable_nistest+set}" = set; then : @@ -13374,33 +13343,8 @@ $as_echo "#define ENABLE_CLOCK_GETTIME 1" >>confdefs.h fi -## Determine init type - -if test "$daemon_type" = "none"; then - -$as_echo "#define NO_DAEMON 1" >>confdefs.h - - init_type="none" -else - case "$enable_init" in - service.*) - init_type="systemd" - ;; - sysv.*) - init_type="sysv" - ;; - *) - init_type="none" - ;; -esac -fi - ## Fixup install and test options -HA_DISTRO=$enable_init - -HA_UNITD=$enable_initdir - if test "$daemon_type" = "none"; then ENABLE_BIN_TRUE= ENABLE_BIN_FALSE='#' @@ -13409,38 +13353,6 @@ else ENABLE_BIN_FALSE= fi - if test "$init_type" = "sysv"; then - ENABLE_SYSV_TRUE= - ENABLE_SYSV_FALSE='#' -else - ENABLE_SYSV_TRUE='#' - ENABLE_SYSV_FALSE= -fi - - if test "$init_type" = "systemd"; then - ENABLE_SYSTEMD_TRUE= - ENABLE_SYSTEMD_FALSE='#' -else - ENABLE_SYSTEMD_TRUE='#' - ENABLE_SYSTEMD_FALSE= -fi - - if test "$enable_initdir" = "?"; then - ENABLE_SYSTEMD_LOOKUP_TRUE= - ENABLE_SYSTEMD_LOOKUP_FALSE='#' -else - ENABLE_SYSTEMD_LOOKUP_TRUE='#' - ENABLE_SYSTEMD_LOOKUP_FALSE= -fi - - if test "$init_type" = "none"; then - ENABLE_NOINIT_TRUE= - ENABLE_NOINIT_FALSE='#' -else - ENABLE_NOINIT_TRUE='#' - ENABLE_NOINIT_FALSE= -fi - if test "$enable_enttest" = "yes"; then ENABLE_ENT_TEST_TRUE= ENABLE_ENT_TEST_FALSE='#' @@ -13462,7 +13374,7 @@ fi -ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile init.d/Makefile ent/Makefile nist/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile ent/Makefile nist/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -13593,22 +13505,6 @@ if test -z "${ENABLE_BIN_TRUE}" && test -z "${ENABLE_BIN_FALSE}"; then as_fn_error $? "conditional \"ENABLE_BIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_SYSV_TRUE}" && test -z "${ENABLE_SYSV_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_SYSV\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${ENABLE_SYSTEMD_TRUE}" && test -z "${ENABLE_SYSTEMD_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_SYSTEMD\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${ENABLE_SYSTEMD_LOOKUP_TRUE}" && test -z "${ENABLE_SYSTEMD_LOOKUP_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_SYSTEMD_LOOKUP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${ENABLE_NOINIT_TRUE}" && test -z "${ENABLE_NOINIT_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_NOINIT\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${ENABLE_ENT_TEST_TRUE}" && test -z "${ENABLE_ENT_TEST_FALSE}"; then as_fn_error $? "conditional \"ENABLE_ENT_TEST\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -14496,7 +14392,6 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; - "init.d/Makefile") CONFIG_FILES="$CONFIG_FILES init.d/Makefile" ;; "ent/Makefile") CONFIG_FILES="$CONFIG_FILES ent/Makefile" ;; "nist/Makefile") CONFIG_FILES="$CONFIG_FILES nist/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5d7a35a..8e85684 100644 --- a/configure.ac +++ b/configure.ac @@ -49,14 +49,6 @@ elif test "x$enable_diagnostic" = "xinject"; then 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" ) -AC_ARG_ENABLE(initdir, - AS_HELP_STRING([--enable-initdir=DIR], [Directory for systemd service files [default=pkg-config var if init==service.*]]), - , enable_initdir="?") - ## Make nist self-test configurable AC_ARG_ENABLE(nistest, AS_HELP_STRING([--enable-nistest=[no/yes]],[Run NIST test suite [default=no]]), @@ -220,34 +212,9 @@ if test "x$enable_clock_gettime" = "xyes"; then fi -## Determine init type - -if test "$daemon_type" = "none"; then - AC_DEFINE(NO_DAEMON, 1, [Define to 1 to suppress daemon interface]) - init_type="none" -else - case "$enable_init" in - service.*) - init_type="systemd" - ;; - sysv.*) - init_type="sysv" - ;; - *) - init_type="none" - ;; -esac -fi - ## Fixup install and test options -AC_SUBST(HA_DISTRO,$enable_init) -AC_SUBST(HA_UNITD,$enable_initdir) 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_SYSTEMD_LOOKUP, test "$enable_initdir" = "?") -AM_CONDITIONAL(ENABLE_NOINIT, test "$init_type" = "none") AM_CONDITIONAL(ENABLE_ENT_TEST, test "$enable_enttest" = "yes") AM_CONDITIONAL(ENABLE_NIST_TEST, test "$enable_nistest" = "yes") @@ -258,7 +225,6 @@ AC_SUBST(HA_LDFLAGS) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile - init.d/Makefile ent/Makefile nist/Makefile]) AC_OUTPUT diff --git a/ent/Makefile.in b/ent/Makefile.in index f3df960..84f5330 100644 --- a/ent/Makefile.in +++ b/ent/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, @@ -192,9 +192,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@ diff --git a/man/Makefile.in b/man/Makefile.in index a17153e..8f4a6c2 100644 --- a/man/Makefile.in +++ b/man/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, @@ -178,9 +178,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@ diff --git a/nist/Makefile.in b/nist/Makefile.in index 82999a1..27976ec 100644 --- a/nist/Makefile.in +++ b/nist/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, @@ -192,9 +192,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@ diff --git a/src/Makefile.in b/src/Makefile.in index 559af60..615d972 100644 --- a/src/Makefile.in +++ b/src/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, @@ -236,9 +236,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@ |