Hello community, here is the log from the commit of package health-checker for openSUSE:Factory checked in at 2020-05-14 23:25:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/health-checker (Old) and /work/SRC/openSUSE:Factory/.health-checker.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "health-checker" Thu May 14 23:25:24 2020 rev:14 rq:803274 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/health-checker/health-checker.changes 2020-02-03 11:26:58.954138150 +0100 +++ /work/SRC/openSUSE:Factory/.health-checker.new.2738/health-checker.changes 2020-05-14 23:25:28.205069442 +0200 @@ -1,0 +2,25 @@ +Tue May 12 15:49:31 UTC 2020 - Ignaz Forster <[email protected]> + +- Update to version 1.3.4 + * Really fix plugindir replacement in configure.ac script + +------------------------------------------------------------------- +Fri May 8 15:51:03 UTC 2020 - Ignaz Forster <[email protected]> + +- Update to version 1.3.3 + * Fix plugindir replacement in configure.ac script + * Use Python 3 for building documentation + +------------------------------------------------------------------- +Wed May 6 14:26:27 UTC 2020 - Ignaz Forster <[email protected]> + +- Use pkgconfig macro instead of package dependencies + +------------------------------------------------------------------- +Wed May 6 10:00:20 UTC 2020 - Ignaz Forster <[email protected]> + +- Update to version 1.3.2 + * Use pkgconf to determine installation directories instead of + guessing + +------------------------------------------------------------------- Old: ---- health-checker-1.3.1.tar.xz New: ---- health-checker-1.3.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ health-checker.spec ++++++ --- /var/tmp/diff_new_pack.aSnGYf/_old 2020-05-14 23:25:29.205071624 +0200 +++ /var/tmp/diff_new_pack.aSnGYf/_new 2020-05-14 23:25:29.205071624 +0200 @@ -17,7 +17,7 @@ Name: health-checker -Version: 1.3.1 +Version: 1.3.4 Release: 0 Summary: Service for verifying that important services are running License: GPL-2.0-only @@ -26,6 +26,8 @@ Source: health-checker-%{version}.tar.xz BuildRequires: fdupes BuildRequires: suse-module-tools +BuildRequires: pkgconfig(dracut) +BuildRequires: pkgconfig(systemd) Requires: health-checker-plugins = 1.0 BuildArch: noarch ++++++ health-checker-1.3.1.tar.xz -> health-checker-1.3.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/Makefile.in new/health-checker-1.3.4/Makefile.in --- old/health-checker-1.3.1/Makefile.in 2020-01-30 14:24:03.000000000 +0100 +++ new/health-checker-1.3.4/Makefile.in 2020-05-12 17:38:55.000000000 +0200 @@ -207,7 +207,6 @@ AWK = @AWK@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ -DRACUTDIR = @DRACUTDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -230,12 +229,12 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLUGINDIR = @PLUGINDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMDDIR = @SYSTEMDDIR@ -TMPFILESDIR = @TMPFILESDIR@ VERSION = @VERSION@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ @@ -254,6 +253,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ +dracutmodulesdir = @dracutmodulesdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -276,6 +276,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/NEWS new/health-checker-1.3.4/NEWS --- old/health-checker-1.3.1/NEWS 2020-01-30 14:22:46.000000000 +0100 +++ new/health-checker-1.3.4/NEWS 2020-05-12 17:37:01.000000000 +0200 @@ -2,6 +2,16 @@ Copyright (C) 2017-2020 Thorsten Kukuk et al. +Version 1.3.4 +* Really fix plugindir replacement in configure.ac script + +Version 1.3.3 +* Fix plugindir replacement in configure.ac script +* Use Python 3 for building documentation + +Version 1.3.2 +* Use pkgconf to determine installation directories + Version 1.3.1 * Support multiple menuentries in GRUB configuration [gh#kubic-project/health-checker#5] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/aclocal.m4 new/health-checker-1.3.4/aclocal.m4 --- old/health-checker-1.3.1/aclocal.m4 2020-01-30 14:24:02.000000000 +0100 +++ new/health-checker-1.3.4/aclocal.m4 2020-05-12 17:38:54.000000000 +0200 @@ -20,6 +20,350 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 11 (pkg-config-0.29.1) + +dnl Copyright © 2004 Scott James Remnant <[email protected]>. +dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.1]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR + +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + # Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/configure new/health-checker-1.3.4/configure --- old/health-checker-1.3.1/configure 2020-01-30 14:24:02.000000000 +0100 +++ new/health-checker-1.3.4/configure 2020-05-12 17:38:55.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for health-checker 1.3.1. +# Generated by GNU Autoconf 2.69 for health-checker 1.3.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,12 +576,11 @@ # Identity of this package. PACKAGE_NAME='health-checker' PACKAGE_TARNAME='health-checker' -PACKAGE_VERSION='1.3.1' -PACKAGE_STRING='health-checker 1.3.1' +PACKAGE_VERSION='1.3.4' +PACKAGE_STRING='health-checker 1.3.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' -ac_unique_file="sbin/health-checker.in" ac_default_prefix=/usr ac_subst_vars='LTLIBOBJS LIBOBJS @@ -592,10 +591,11 @@ XMLLINT XSLTPROC LN_S -DRACUTDIR -PLUGINDIR -SYSTEMDDIR -TMPFILESDIR +dracutmodulesdir +systemdsystemunitdir +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V @@ -669,7 +669,12 @@ ' ac_precious_vars='build_alias host_alias -target_alias' +target_alias +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +systemdsystemunitdir +dracutmodulesdir' # Initialize some variables set by options. @@ -1210,7 +1215,7 @@ # 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 health-checker 1.3.1 to adapt to many kinds of systems. +\`configure' configures health-checker 1.3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1276,7 +1281,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of health-checker 1.3.1:";; + short | recursive ) echo "Configuration of health-checker 1.3.4:";; esac cat <<\_ACEOF @@ -1293,6 +1298,20 @@ --with-xml-catalog=CATALOG path to xml catalog to use +Some influential environment variables: + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + systemdsystemunitdir + value of systemdsystemunitdir for systemd, overriding pkg-config + dracutmodulesdir + value of dracutmodulesdir for dracut, overriding pkg-config + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + Report bugs to the package provider. _ACEOF ac_status=$? @@ -1356,7 +1375,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -health-checker configure 1.3.1 +health-checker configure 1.3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1373,7 +1392,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by health-checker $as_me 1.3.1, which was +It was created by health-checker $as_me 1.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2236,7 +2255,7 @@ # Define the identity of the package. PACKAGE='health-checker' - VERSION='1.3.1' + VERSION='1.3.4' cat >>confdefs.h <<_ACEOF @@ -2335,19 +2354,173 @@ -test "${prefix}" = "NONE" && prefix="/usr" -test "${exec_prefix}" = "NONE" && exec_prefix="/usr" -test ${libexecdir} = '${exec_prefix}/libexec' && libexecdir="${exec_prefix}/lib" -TMPFILESDIR=${libexecdir}/tmpfiles.d -SYSTEMDDIR=${libexecdir}/systemd/system -PLUGINDIR=${libexecdir}/health-checker -DRACUTDIR=${libexecdir}/dracut +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + +if test -n "$systemdsystemunitdir"; then + pkg_cv_systemdsystemunitdir="$systemdsystemunitdir" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_systemdsystemunitdir=`$PKG_CONFIG --variable="systemdsystemunitdir" "systemd" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +systemdsystemunitdir=$pkg_cv_systemdsystemunitdir + +if test "x$systemdsystemunitdir" = x""; then : + as_fn_error $? "Could not determine value for 'systemdsystemunitdir' - is the 'systemd.pc' file installed?" "$LINENO" 5 +fi + +if test -n "$dracutmodulesdir"; then + pkg_cv_dracutmodulesdir="$dracutmodulesdir" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dracut\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dracut") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_dracutmodulesdir=`$PKG_CONFIG --variable="dracutmodulesdir" "dracut" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +dracutmodulesdir=$pkg_cv_dracutmodulesdir + +if test "x$dracutmodulesdir" = x""; then : + as_fn_error $? "Could not determine value for 'dracutmodulesdir' - is the 'dracut.pc' file installed?" "$LINENO" 5 +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s @@ -2564,7 +2737,7 @@ fi -ac_config_files="$ac_config_files Makefile sbin/Makefile man/Makefile systemd/Makefile plugins/Makefile dracut/Makefile grub/Makefile sbin/health-checker" +ac_config_files="$ac_config_files Makefile sbin/Makefile man/Makefile systemd/Makefile plugins/Makefile dracut/Makefile grub/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3121,7 +3294,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by health-checker $as_me 1.3.1, which was +This file was extended by health-checker $as_me 1.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3174,7 +3347,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -health-checker config.status 1.3.1 +health-checker config.status 1.3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -3294,7 +3467,6 @@ "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; "dracut/Makefile") CONFIG_FILES="$CONFIG_FILES dracut/Makefile" ;; "grub/Makefile") CONFIG_FILES="$CONFIG_FILES grub/Makefile" ;; - "sbin/health-checker") CONFIG_FILES="$CONFIG_FILES sbin/health-checker" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/configure.ac new/health-checker-1.3.4/configure.ac --- old/health-checker-1.3.1/configure.ac 2020-01-30 14:23:47.000000000 +0100 +++ new/health-checker-1.3.4/configure.ac 2020-05-12 17:38:49.000000000 +0200 @@ -1,23 +1,15 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(health-checker, 1.3.1) +AC_INIT(health-checker, 1.3.4) AM_INIT_AUTOMAKE -AC_CONFIG_SRCDIR([sbin/health-checker.in]) AC_PREFIX_DEFAULT(/usr) AC_SUBST(PACKAGE) AC_SUBST(VERSION) -test "${prefix}" = "NONE" && prefix="/usr" -test "${exec_prefix}" = "NONE" && exec_prefix="/usr" -test ${libexecdir} = '${exec_prefix}/libexec' && libexecdir="${exec_prefix}/lib" -TMPFILESDIR=${libexecdir}/tmpfiles.d -SYSTEMDDIR=${libexecdir}/systemd/system -PLUGINDIR=${libexecdir}/health-checker -DRACUTDIR=${libexecdir}/dracut -AC_SUBST(TMPFILESDIR) -AC_SUBST(SYSTEMDDIR) -AC_SUBST(PLUGINDIR) -AC_SUBST(DRACUTDIR) +PKG_CHECK_VAR([systemdsystemunitdir], [systemd], [systemdsystemunitdir], [], + [AC_MSG_ERROR([Could not determine value for 'systemdsystemunitdir' - is the 'systemd.pc' file installed?])]) +PKG_CHECK_VAR([dracutmodulesdir], [dracut], [dracutmodulesdir], [], + [AC_MSG_ERROR([Could not determine value for 'dracutmodulesdir' - is the 'dracut.pc' file installed?])]) AC_PROG_INSTALL AC_PROG_LN_S @@ -39,5 +31,4 @@ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno) AC_OUTPUT([Makefile sbin/Makefile man/Makefile systemd/Makefile \ - plugins/Makefile dracut/Makefile grub/Makefile \ - sbin/health-checker]) + plugins/Makefile dracut/Makefile grub/Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/dracut/Makefile.am new/health-checker-1.3.4/dracut/Makefile.am --- old/health-checker-1.3.1/dracut/Makefile.am 2018-01-31 15:06:28.000000000 +0100 +++ new/health-checker-1.3.4/dracut/Makefile.am 2020-05-04 17:20:40.000000000 +0200 @@ -2,7 +2,7 @@ # Copyright (c) 2017 Thorsten Kukuk <[email protected]> # -modulesdir = @DRACUTDIR@/modules.d/50health-checker +modulesdir = $(dracutmodulesdir)/50health-checker modules_SCRIPTS = health-checker-emergency.sh module-setup.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/dracut/Makefile.in new/health-checker-1.3.4/dracut/Makefile.in --- old/health-checker-1.3.1/dracut/Makefile.in 2020-01-30 14:24:03.000000000 +0100 +++ new/health-checker-1.3.4/dracut/Makefile.in 2020-05-12 17:38:55.000000000 +0200 @@ -160,7 +160,6 @@ AWK = @AWK@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ -DRACUTDIR = @DRACUTDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -183,12 +182,12 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLUGINDIR = @PLUGINDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMDDIR = @SYSTEMDDIR@ -TMPFILESDIR = @TMPFILESDIR@ VERSION = @VERSION@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ @@ -207,6 +206,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ +dracutmodulesdir = @dracutmodulesdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -229,11 +229,12 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -modulesdir = @DRACUTDIR@/modules.d/50health-checker +modulesdir = $(dracutmodulesdir)/50health-checker modules_SCRIPTS = health-checker-emergency.sh module-setup.sh EXTRA_DIST = $(SCRIPTS) all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/grub/Makefile.am new/health-checker-1.3.4/grub/Makefile.am --- old/health-checker-1.3.1/grub/Makefile.am 2018-03-09 13:14:52.000000000 +0100 +++ new/health-checker-1.3.4/grub/Makefile.am 2020-05-04 15:11:24.000000000 +0200 @@ -2,7 +2,7 @@ # Copyright (c) 2018 Ignaz Forster <[email protected]> # -modulesdir = @sysconfdir@/grub.d +modulesdir = $(sysconfdir)/grub.d modules_SCRIPTS = 05_health_check 83_health_check_marker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/grub/Makefile.in new/health-checker-1.3.4/grub/Makefile.in --- old/health-checker-1.3.1/grub/Makefile.in 2020-01-30 14:24:03.000000000 +0100 +++ new/health-checker-1.3.4/grub/Makefile.in 2020-05-12 17:38:55.000000000 +0200 @@ -160,7 +160,6 @@ AWK = @AWK@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ -DRACUTDIR = @DRACUTDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -183,12 +182,12 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLUGINDIR = @PLUGINDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMDDIR = @SYSTEMDDIR@ -TMPFILESDIR = @TMPFILESDIR@ VERSION = @VERSION@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ @@ -207,6 +206,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ +dracutmodulesdir = @dracutmodulesdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -229,11 +229,12 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -modulesdir = @sysconfdir@/grub.d +modulesdir = $(sysconfdir)/grub.d modules_SCRIPTS = 05_health_check 83_health_check_marker EXTRA_DIST = $(SCRIPTS) all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/man/Makefile.am new/health-checker-1.3.4/man/Makefile.am --- old/health-checker-1.3.1/man/Makefile.am 2018-01-31 15:06:28.000000000 +0100 +++ new/health-checker-1.3.4/man/Makefile.am 2020-05-08 15:07:36.000000000 +0200 @@ -33,7 +33,7 @@ endef health-checker.index.xml: make-man-index.py $(XMLS) - python $(srcdir)/make-man-index.py $(srcdir)/$@ $(XMLS) + python3 $(srcdir)/make-man-index.py $(srcdir)/$@ $(XMLS) health-checker.index.html: health-checker.index.xml custom-html.xsl $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) $(XSLTPROC_FLAGS_HTML) $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/man/Makefile.in new/health-checker-1.3.4/man/Makefile.in --- old/health-checker-1.3.1/man/Makefile.in 2020-01-30 14:24:03.000000000 +0100 +++ new/health-checker-1.3.4/man/Makefile.in 2020-05-12 17:38:55.000000000 +0200 @@ -165,7 +165,6 @@ AWK = @AWK@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ -DRACUTDIR = @DRACUTDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -188,12 +187,12 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLUGINDIR = @PLUGINDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMDDIR = @SYSTEMDDIR@ -TMPFILESDIR = @TMPFILESDIR@ VERSION = @VERSION@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ @@ -212,6 +211,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ +dracutmodulesdir = @dracutmodulesdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -234,6 +234,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -500,7 +501,7 @@ @ENABLE_REGENERATE_MAN_TRUE@endef @[email protected]: make-man-index.py $(XMLS) -@ENABLE_REGENERATE_MAN_TRUE@ python $(srcdir)/make-man-index.py $(srcdir)/$@ $(XMLS) +@ENABLE_REGENERATE_MAN_TRUE@ python3 $(srcdir)/make-man-index.py $(srcdir)/$@ $(XMLS) @[email protected]: health-checker.index.xml custom-html.xsl @ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) $(XSLTPROC_FLAGS_HTML) $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/man/health-checker.8 new/health-checker-1.3.4/man/health-checker.8 --- old/health-checker-1.3.1/man/health-checker.8 2019-12-05 17:52:48.000000000 +0100 +++ new/health-checker-1.3.4/man/health-checker.8 2020-05-12 17:20:08.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: health-checker .\" Author: Thorsten Kukuk <[email protected]> .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 12/05/2019 +.\" Date: 05/12/2020 .\" Manual: health-checker .\" Source: health-checker .\" Language: English .\" -.TH "HEALTH\-CHECKER" "8" "12/05/2019" "health-checker" "health-checker" +.TH "HEALTH\-CHECKER" "8" "05/12/2020" "health-checker" "health-checker" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/man/health-checker.8.html new/health-checker-1.3.4/man/health-checker.8.html --- old/health-checker-1.3.1/man/health-checker.8.html 2019-12-05 17:52:48.000000000 +0100 +++ new/health-checker-1.3.4/man/health-checker.8.html 2020-05-12 17:20:30.000000000 +0200 @@ -15,7 +15,7 @@ h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { visibility: visible; } - </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.2.3</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up + </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.3.3</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up correctly after an update and reboot.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> --version </p></div><p><code class="filename">health-checker.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>health-checker</em></span> checks during boot, if the system is coming up correct. In error case, the action depends on what did happen before. If this is the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/man/health-checker.index.html new/health-checker-1.3.4/man/health-checker.index.html --- old/health-checker-1.3.1/man/health-checker.index.html 2019-12-05 17:54:24.000000000 +0100 +++ new/health-checker-1.3.4/man/health-checker.index.html 2020-05-12 17:20:30.000000000 +0200 @@ -15,4 +15,4 @@ h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { visibility: visible; } - </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.2.3</span><hr><div class="refentry"><a name="health-checker.index"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>health-checker.index — List all manpages from the health-checker project</p></div><div class="refsect1"><a name="id-1.4"></a><h2 id="H">H<a class="headerlink" title="Permalink to this headline" href="#H">¶</a></h2><p><a href="health-checker.8.html"><span class="citerefentry"><span class="refentrytitle">health-checker</span>(8)</span></a> -- Checks that all important services of a system did come up correctly after an update and reboot.<br><a href="health-checker.service.8.html"><span class="citerefentry"><span class="refentrytitle">health-checker.service</span>(8)</span></a> -- Checks that all important services of a system did come up correctly after an update and reboot.<br></p></div><div class="refsect1"><a name="id-1.5"></a><p><a name="counts"></a>This index contains 2 entries, referring to 1 individual manual pages.</p></div></div></body></html> + </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.3.3</span><hr><div class="refentry"><a name="health-checker.index"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>health-checker.index — List all manpages from the health-checker project</p></div><div class="refsect1"><a name="id-1.4"></a><h2 id="H">H<a class="headerlink" title="Permalink to this headline" href="#H">¶</a></h2><p><a href="health-checker.8.html"><span class="citerefentry"><span class="refentrytitle">health-checker</span>(8)</span></a> — Checks that all important services of a system did come up correctly after an update and reboot.<br><a href="health-checker.service.8.html"><span class="citerefentry"><span class="refentrytitle">health-checker.service</span>(8)</span></a> — Checks that all important services of a system did come up correctly after an update and reboot.<br></p></div><div class="refsect1"><a name="id-1.5"></a><p><a name="counts"></a>This index contains 2 entries, referring to 1 individual manual pages.</p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/man/health-checker.index.xml new/health-checker-1.3.4/man/health-checker.index.xml --- old/health-checker-1.3.1/man/health-checker.index.xml 2019-12-05 17:54:23.000000000 +0100 +++ new/health-checker-1.3.4/man/health-checker.index.xml 2020-05-12 17:20:30.000000000 +0200 @@ -14,6 +14,6 @@ <refname>health-checker.index</refname> <refpurpose>List all manpages from the health-checker project</refpurpose> </refnamediv> -<refsect1><title>H</title><para><citerefentry><refentrytitle>health-checker</refentrytitle><manvolnum>8</manvolnum></citerefentry> -- Checks that all important services of a system did come up correctly after an update and reboot.<sbr/><citerefentry><refentrytitle>health-checker.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> -- Checks that all important services of a system did come up correctly after an update and reboot.<sbr/></para></refsect1><refsect1> +<refsect1><title>H</title><para><citerefentry><refentrytitle>health-checker</refentrytitle><manvolnum>8</manvolnum></citerefentry> — Checks that all important services of a system did come up correctly after an update and reboot.<sbr/><citerefentry><refentrytitle>health-checker.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> — Checks that all important services of a system did come up correctly after an update and reboot.<sbr/></para></refsect1><refsect1> <para id="counts">This index contains 2 entries, referring to 1 individual manual pages.</para> </refsect1></refentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/man/health-checker.service.8.html new/health-checker-1.3.4/man/health-checker.service.8.html --- old/health-checker-1.3.1/man/health-checker.service.8.html 2019-12-05 17:52:48.000000000 +0100 +++ new/health-checker-1.3.4/man/health-checker.service.8.html 2020-05-12 17:20:30.000000000 +0200 @@ -15,7 +15,7 @@ h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { visibility: visible; } - </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.2.3</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up + </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.3.3</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up correctly after an update and reboot.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> --version </p></div><p><code class="filename">health-checker.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>health-checker</em></span> checks during boot, if the system is coming up correct. In error case, the action depends on what did happen before. If this is the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/plugins/Makefile.am new/health-checker-1.3.4/plugins/Makefile.am --- old/health-checker-1.3.1/plugins/Makefile.am 2019-03-29 00:01:36.000000000 +0100 +++ new/health-checker-1.3.4/plugins/Makefile.am 2020-05-04 15:13:35.000000000 +0200 @@ -2,7 +2,7 @@ # Copyright (c) 2017 Thorsten Kukuk <[email protected]> # -plugindir = @PLUGINDIR@ +plugindir = ${libexecdir}/health-checker plugin_SCRIPTS = health-check-tester.sh etcd.sh etc-overlayfs.sh \ rebootmgr.sh btrfs-subvolumes-mounted.sh crio.sh kubelet.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/plugins/Makefile.in new/health-checker-1.3.4/plugins/Makefile.in --- old/health-checker-1.3.1/plugins/Makefile.in 2020-01-30 14:24:03.000000000 +0100 +++ new/health-checker-1.3.4/plugins/Makefile.in 2020-05-12 17:38:55.000000000 +0200 @@ -160,7 +160,6 @@ AWK = @AWK@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ -DRACUTDIR = @DRACUTDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -183,12 +182,12 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLUGINDIR = @PLUGINDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMDDIR = @SYSTEMDDIR@ -TMPFILESDIR = @TMPFILESDIR@ VERSION = @VERSION@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ @@ -207,6 +206,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ +dracutmodulesdir = @dracutmodulesdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -229,11 +229,12 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -plugindir = @PLUGINDIR@ +plugindir = ${libexecdir}/health-checker plugin_SCRIPTS = health-check-tester.sh etcd.sh etc-overlayfs.sh \ rebootmgr.sh btrfs-subvolumes-mounted.sh crio.sh kubelet.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/sbin/Makefile.am new/health-checker-1.3.4/sbin/Makefile.am --- old/health-checker-1.3.1/sbin/Makefile.am 2018-01-31 15:06:28.000000000 +0100 +++ new/health-checker-1.3.4/sbin/Makefile.am 2020-05-08 15:07:36.000000000 +0200 @@ -3,5 +3,11 @@ # sbin_SCRIPTS = health-checker - +CLEANFILES = $(sbin_SCRIPTS) EXTRA_DIST = health-checker.in + +plugindir = ${libexecdir}/health-checker + +health-checker: health-checker.in + sed 's|@PLUGINDIR@|${plugindir}|g' health-checker.in > health-checker + chmod +x health-checker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/sbin/Makefile.in new/health-checker-1.3.4/sbin/Makefile.in --- old/health-checker-1.3.1/sbin/Makefile.in 2020-01-30 14:24:03.000000000 +0100 +++ new/health-checker-1.3.4/sbin/Makefile.in 2020-05-12 17:38:55.000000000 +0200 @@ -98,7 +98,7 @@ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = health-checker +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -149,7 +149,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/health-checker.in +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -160,7 +160,6 @@ AWK = @AWK@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ -DRACUTDIR = @DRACUTDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -183,12 +182,12 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLUGINDIR = @PLUGINDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMDDIR = @SYSTEMDDIR@ -TMPFILESDIR = @TMPFILESDIR@ VERSION = @VERSION@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ @@ -207,6 +206,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ +dracutmodulesdir = @dracutmodulesdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -229,12 +229,15 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ sbin_SCRIPTS = health-checker +CLEANFILES = $(sbin_SCRIPTS) EXTRA_DIST = health-checker.in +plugindir = ${libexecdir}/health-checker all: all-am .SUFFIXES: @@ -267,8 +270,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -health-checker: $(top_builddir)/config.status $(srcdir)/health-checker.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-sbinSCRIPTS: $(sbin_SCRIPTS) @$(NORMAL_INSTALL) @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \ @@ -373,6 +374,7 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -464,6 +466,10 @@ .PRECIOUS: Makefile +health-checker: health-checker.in + sed 's|@PLUGINDIR@|${plugindir}|g' health-checker.in > health-checker + chmod +x health-checker + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/systemd/Makefile.am new/health-checker-1.3.4/systemd/Makefile.am --- old/health-checker-1.3.1/systemd/Makefile.am 2018-01-31 15:06:28.000000000 +0100 +++ new/health-checker-1.3.4/systemd/Makefile.am 2020-05-04 21:54:59.000000000 +0200 @@ -2,7 +2,7 @@ # Copyright (c) 2016 Thorsten Kukuk <[email protected]> # -systemddir = @SYSTEMDDIR@ +systemddir = $(systemdsystemunitdir) systemd_DATA = health-checker.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.3.1/systemd/Makefile.in new/health-checker-1.3.4/systemd/Makefile.in --- old/health-checker-1.3.1/systemd/Makefile.in 2020-01-30 14:24:03.000000000 +0100 +++ new/health-checker-1.3.4/systemd/Makefile.in 2020-05-12 17:38:55.000000000 +0200 @@ -160,7 +160,6 @@ AWK = @AWK@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ -DRACUTDIR = @DRACUTDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -183,12 +182,12 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLUGINDIR = @PLUGINDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMDDIR = @SYSTEMDDIR@ -TMPFILESDIR = @TMPFILESDIR@ VERSION = @VERSION@ XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ @@ -207,6 +206,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ +dracutmodulesdir = @dracutmodulesdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -229,11 +229,12 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -systemddir = @SYSTEMDDIR@ +systemddir = $(systemdsystemunitdir) systemd_DATA = health-checker.service EXTRA_DIST = $(DATA) all: all-am
