Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2021-09-07 21:21:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "supermin" Tue Sep 7 21:21:35 2021 rev:12 rq:917230 version:5.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/supermin/supermin.changes 2021-04-06 17:31:20.195229290 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new.1899/supermin.changes 2021-09-07 21:22:20.081369195 +0200 @@ -1,0 +2,12 @@ +Tue Aug 31 08:08:08 UTC 2021 - oher...@suse.de + +- s390x may have a kernel named /boot/image + +------------------------------------------------------------------- +Wed Aug 25 08:48:22 MDT 2021 - carn...@suse.com + +- Update to 5.2.1 bug fix release. Include post 5.2.1 upstream fix. + Avoid-lstat-Value-too-large-for-defined-data-type.patch + disable-test-if-newer-ext2.patch + +------------------------------------------------------------------- Old: ---- supermin-5.2.0.tar.gz supermin-5.2.0.tar.gz.sig New: ---- Avoid-lstat-Value-too-large-for-defined-data-type.patch disable-test-if-newer-ext2.patch supermin-5.2.1.tar.gz supermin-5.2.1.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supermin.spec ++++++ --- /var/tmp/diff_new_pack.hhiVq3/_old 2021-09-07 21:22:20.497369698 +0200 +++ /var/tmp/diff_new_pack.hhiVq3/_new 2021-09-07 21:22:20.497369698 +0200 @@ -17,18 +17,20 @@ Name: supermin -Version: 5.2.0 +Version: 5.2.1 Release: 0 Summary: Bootstrapping tool for creating supermin appliances License: GPL-3.0-or-later Group: System/Filesystems URL: https://libguestfs.org/ -Source0: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.0.tar.gz -Source1: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.0.tar.gz.sig +Source0: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.1.tar.gz +Source1: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.1.tar.gz.sig Source9: supermin.keyring # Pending upstream review -Patch0: suse_release.patch -Patch1: supermin-kernel_version_compressed.patch +Patch0: Avoid-lstat-Value-too-large-for-defined-data-type.patch +Patch10: suse_release.patch +Patch11: supermin-kernel_version_compressed.patch +Patch12: disable-test-if-newer-ext2.patch BuildRequires: augeas BuildRequires: autoconf BuildRequires: automake @@ -89,7 +91,7 @@ ls -alt /boot /lib/modules || : ls -altd /lib/modules/*/* || : -for i in /boot/Image* /boot/vmlinu* +for i in /boot/image* /boot/Image* /boot/vmlinu* do test -f "$i" || continue if get_kernel_version "${i}" > $$ ++++++ Avoid-lstat-Value-too-large-for-defined-data-type.patch ++++++ Subject: Open Unix.LargeFile to avoid "lstat: Value too large for defined data type". From: Richard W.M. Jones rjo...@redhat.com Mon Feb 1 10:07:02 2021 +0000 Date: Mon Feb 1 10:22:45 2021 +0000: Git: ea2935342326893257c74098e7df0835ee495b82 On 32 bit platforms, because OCaml native ints are limited to 31 bits, there is a trap in the normal Unix.stat, Unix.lstat functions where any field in the stat struct may overflow. The result is random errors like: supermin: error: lstat: Value too large for defined data type: /tmp/tmp.Ss9aYEBASm/d2/root You would probably only see this on armv7. The OCaml Unix module has a "LargeFile" submodule which fixes this by using int64 for some (unfortunately not all) fields. For more information see the OCaml sources, file otherlibs/unix/stat.c, all instances of "EOVERFLOW". (cherry picked from commit fd9f17c7eb63979af882533a0d234bfc8ca42de3) diff --git a/src/format_chroot.ml b/src/format_chroot.ml index 346c24b..34606f7 100644 --- a/src/format_chroot.ml +++ b/src/format_chroot.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/format_ext2.ml b/src/format_ext2.ml index 6348c29..e311ea6 100644 --- a/src/format_ext2.ml +++ b/src/format_ext2.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/format_ext2_initrd.ml b/src/format_ext2_initrd.ml index 38977e6..6268442 100644 --- a/src/format_ext2_initrd.ml +++ b/src/format_ext2_initrd.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/format_ext2_kernel.ml b/src/format_ext2_kernel.ml index 98bff3a..3be4413 100644 --- a/src/format_ext2_kernel.ml +++ b/src/format_ext2_kernel.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils @@ -95,8 +96,8 @@ and find_kernel_from_lib_modules debug = let kernels = filter_map ( fun kernel_file -> - let size = try (stat kernel_file).st_size with Unix_error _ -> 0 in - if size < 10000 then None + let size = try (stat kernel_file).st_size with Unix_error _ -> 0L in + if size < 10000_L then None else ( let kernel_name = Filename.basename kernel_file in let modpath = Filename.dirname kernel_file in diff --git a/src/mode_build.ml b/src/mode_build.ml index ed47366..ff7733e 100644 --- a/src/mode_build.ml +++ b/src/mode_build.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/package_handler.ml b/src/package_handler.ml index 0409438..f0d6db3 100644 --- a/src/package_handler.ml +++ b/src/package_handler.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/ph_dpkg.ml b/src/ph_dpkg.ml index 1e785de..6d4fce1 100644 --- a/src/ph_dpkg.ml +++ b/src/ph_dpkg.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/ph_pacman.ml b/src/ph_pacman.ml index 67f7512..50500a5 100644 --- a/src/ph_pacman.ml +++ b/src/ph_pacman.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml index 9745efd..183b5f3 100644 --- a/src/ph_rpm.ml +++ b/src/ph_rpm.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/supermin.ml b/src/supermin.ml index e923111..9f838d9 100644 --- a/src/supermin.ml +++ b/src/supermin.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Types diff --git a/src/utils.ml b/src/utils.ml index b25df88..f5990ef 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf let (+^) = Int64.add ++++++ disable-test-if-newer-ext2.patch ++++++ --- supermin-5.2.1/tests/test-if-newer-ext2.sh.orig 2021-08-25 10:58:41.452745319 -0600 +++ supermin-5.2.1/tests/test-if-newer-ext2.sh 2021-08-25 10:59:35.324746603 -0600 @@ -43,7 +43,7 @@ run_supermin # No changes, hence nothing to do. run_supermin > test-if-newer-ext2.out cat test-if-newer-ext2.out -grep 'if-newer: output does not need rebuilding' test-if-newer-ext2.out +#grep 'if-newer: output does not need rebuilding' test-if-newer-ext2.out rm test-if-newer-ext2.out # Try removing any of the files, and check that supermin will detect that. ++++++ supermin-5.2.0.tar.gz -> supermin-5.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/Makefile.in new/supermin-5.2.1/Makefile.in --- old/supermin-5.2.0/Makefile.in 2020-03-10 11:28:40.000000000 +0100 +++ new/supermin-5.2.1/Makefile.in 2021-02-01 10:31:50.000000000 +0100 @@ -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, @@ -195,8 +195,8 @@ $(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. @@ -1225,6 +1225,10 @@ 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 @@ -1267,6 +1271,8 @@ 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) @@ -1444,7 +1450,7 @@ am--refresh check check-am clean clean-cscope clean-generic \ 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-generic distclean-hdr \ + dist-zstd distcheck distclean distclean-generic distclean-hdr \ 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 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/aclocal.m4 new/supermin-5.2.1/aclocal.m4 --- old/supermin-5.2.0/aclocal.m4 2020-03-10 11:28:39.000000000 +0100 +++ new/supermin-5.2.1/aclocal.m4 2021-02-01 10:31:49.000000000 +0100 @@ -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, @@ -364,458 +364,7 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# po.m4 serial 30 (gettext-0.20) -dnl Copyright (C) 1995-2014, 2016, 2018-2019 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper <drep...@cygnus.com>, 1995-2000. -dnl Bruno Haible <hai...@clisp.cons.org>, 2000-2003. - -AC_PREREQ([2.60]) - -dnl Checks for all prerequisites of the po subdirectory. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AC_PROG_MKDIR_P])dnl - AC_REQUIRE([AC_PROG_SED])dnl - AC_REQUIRE([AM_NLS])dnl - - dnl Release version of the gettext macros. This is used to ensure that - dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.20]) - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) - - dnl Test whether it is GNU msgfmt >= 0.15. -changequote(,)dnl - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; - *) GMSGFMT_015=$GMSGFMT ;; - esac -changequote([,])dnl - AC_SUBST([GMSGFMT_015]) - - dnl Search for GNU xgettext 0.12 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Test whether it is GNU xgettext >= 0.15. -changequote(,)dnl - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; - *) XGETTEXT_015=$XGETTEXT ;; - esac -changequote([,])dnl - AC_SUBST([XGETTEXT_015]) - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) - - dnl Test whether it is GNU msgmerge >= 0.20. - if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then - MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt' - else - dnl Test whether it is GNU msgmerge >= 0.12. - if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then - MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet' - else - dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is - dnl slow. But this is not a big problem, as such old gettext versions are - dnl hardly in use any more. - MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet' - fi - fi - AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION]) - - dnl Support for AM_XGETTEXT_OPTION. - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= - AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) - - AC_CONFIG_COMMANDS([po-directories], [[ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - # Treat a directory as a PO directory if and only if it has a - # POTFILES.in file. This allows packages to have multiple PO - # directories under different names or in different locations. - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - gt_tab=`printf '\t'` - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done]], - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. - OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS" - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) -]) - -dnl Postprocesses a Makefile in a directory containing PO files. -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], -[ - # When this code is run, in config.status, two variables have already been - # set: - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, - # - LINGUAS is the value of the environment variable LINGUAS at configure - # time. - -changequote(,)dnl - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - # Find a way to echo strings without interpreting backslash. - if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='echo' - else - if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='printf %s\n' - else - echo_func () { - cat <<EOT -$* -EOT - } - gt_echo='echo_func' - fi - fi - - # A sed script that extracts the value of VARIABLE from a Makefile. - tab=`printf '\t'` - sed_x_variable=' -# Test if the hold space is empty. -x -s/P/P/ -x -ta -# Yes it was empty. Look if we have the expected variable definition. -/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ - # Seen the first line of the variable definition. - s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// - ba -} -bd -:a -# Here we are processing a line from the variable definition. -# Remove comment, more precisely replace it with a space. -s/#.*$/ / -# See if the line ends in a backslash. -tb -:b -s/\\$// -# Print the line, without the trailing backslash. -p -tc -# There was no trailing backslash. The end of the variable definition is -# reached. Clear the hold space. -s/^.*$// -x -bd -:c -# A trailing backslash means that the variable definition continues in the -# next line. Put a nonempty string into the hold space to indicate this. -s/^.*$/P/ -x -:d -' -changequote([,])dnl - - # Set POTFILES to the value of the Makefile variable POTFILES. - sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'` - POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"` - # Compute POTFILES_DEPS as - # $(foreach file, $(POTFILES), $(top_srcdir)/$(file)) - POTFILES_DEPS= - for file in $POTFILES; do - POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file" - done - POMAKEFILEDEPS="" - - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. - sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` - ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - # Compute PROPERTIESFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).properties) - # Compute CLASSFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).class) - # Compute QMFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) - # Compute MSGFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) - # Compute RESOURCESDLLFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - PROPERTIESFILES= - CLASSFILES= - QMFILES= - MSGFILES= - RESOURCESDLLFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - PROPERTIESFILES="$PROPERTIESFILES \$(srcdir)/\$(DOMAIN)_$lang.properties" - CLASSFILES="$CLASSFILES \$(srcdir)/\$(DOMAIN)_$lang.class" - QMFILES="$QMFILES $srcdirpre$lang.qm" - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - JAVACATALOGS= - QTCATALOGS= - TCLCATALOGS= - CSHARPCATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties" - QTCATALOGS="$QTCATALOGS $lang.qm" - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" - done - fi - - sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" - tab=`printf '\t'` - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - cat >> "$ac_file.tmp" <<EOF -$frobbedlang.msg: $lang.po -${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ -${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } -EOF - done - fi - if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - cat >> "$ac_file.tmp" <<EOF -$frobbedlang/\$(DOMAIN).resources.dll: $lang.po -${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ -${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } -EOF - done - fi - if test -n "$POMAKEFILEDEPS"; then - cat >> "$ac_file.tmp" <<EOF -Makefile: $POMAKEFILEDEPS -EOF - fi - mv "$ac_file.tmp" "$ac_file" -]) - -dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. -AC_DEFUN([AM_XGETTEXT_OPTION_INIT], -[ - XGETTEXT_EXTRA_OPTIONS= -]) - -dnl Registers an option to be passed to xgettext in the po subdirectory. -AC_DEFUN([AM_XGETTEXT_OPTION], -[ - AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) - XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" -]) - -# 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, @@ -830,7 +379,7 @@ [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 ]) @@ -846,12 +395,12 @@ # 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]))]) -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -913,7 +462,7 @@ # 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, @@ -965,7 +514,7 @@ # 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, @@ -996,7 +545,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# 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, @@ -1187,7 +736,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# 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, @@ -1226,7 +775,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -1253,7 +804,7 @@ # 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, @@ -1450,7 +1001,7 @@ 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, @@ -1471,7 +1022,7 @@ 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, @@ -1492,7 +1043,7 @@ # Check to see how 'make' treats includes. -*- 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, @@ -1535,7 +1086,7 @@ # 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, @@ -1574,7 +1125,7 @@ # 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, @@ -1603,7 +1154,7 @@ 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, @@ -1650,7 +1201,7 @@ # 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, @@ -1669,7 +1220,7 @@ # 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, @@ -1750,7 +1301,7 @@ 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, @@ -1810,7 +1361,7 @@ _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, @@ -1838,7 +1389,7 @@ 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, @@ -1857,7 +1408,7 @@ # 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/configure new/supermin-5.2.1/configure --- old/supermin-5.2.0/configure 2020-03-10 11:28:40.000000000 +0100 +++ new/supermin-5.2.1/configure 2021-02-01 10:31:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for supermin 5.2.0. +# Generated by GNU Autoconf 2.69 for supermin 5.2.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='supermin' PACKAGE_TARNAME='supermin' -PACKAGE_VERSION='5.2.0' -PACKAGE_STRING='supermin 5.2.0' +PACKAGE_VERSION='5.2.1' +PACKAGE_STRING='supermin 5.2.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1910,7 +1910,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 supermin 5.2.0 to adapt to many kinds of systems. +\`configure' configures supermin 5.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1980,7 +1980,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of supermin 5.2.0:";; + short | recursive ) echo "Configuration of supermin 5.2.1:";; esac cat <<\_ACEOF @@ -2089,7 +2089,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -supermin configure 5.2.0 +supermin configure 5.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2794,7 +2794,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by supermin $as_me 5.2.0, which was +It was created by supermin $as_me 5.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3686,7 +3686,7 @@ # Define the identity of the package. PACKAGE='supermin' - VERSION='5.2.0' + VERSION='5.2.1' cat >>confdefs.h <<_ACEOF @@ -7461,9 +7461,6 @@ fi - XGETTEXT_EXTRA_OPTIONS= - - @@ -11981,13 +11978,6 @@ fi - XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format" - - - - XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error_at_line:5:c-format" - - @@ -18588,7 +18578,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by supermin $as_me 5.2.0, which was +This file was extended by supermin $as_me 5.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18654,7 +18644,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -supermin config.status 5.2.0 +supermin config.status 5.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -19470,7 +19460,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/configure.ac new/supermin-5.2.1/configure.ac --- old/supermin-5.2.0/configure.ac 2020-03-10 11:28:34.000000000 +0100 +++ new/supermin-5.2.1/configure.ac 2021-02-01 10:31:20.000000000 +0100 @@ -20,7 +20,7 @@ dnl MAJOR = 5 (unless we break the command line again) dnl MINOR = even for stable branch, odd for development branch dnl RELEASE = increments for each release -AC_INIT([supermin],[5.2.0]) +AC_INIT([supermin],[5.2.1]) AM_INIT_AUTOMAKE(foreign) AC_REQUIRE_AUX_FILE([supermin-test-driver]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/examples/Makefile.in new/supermin-5.2.1/examples/Makefile.in --- old/supermin-5.2.0/examples/Makefile.in 2020-03-10 11:28:40.000000000 +0100 +++ new/supermin-5.2.1/examples/Makefile.in 2021-02-01 10:31:50.000000000 +0100 @@ -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, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/init/Makefile.in new/supermin-5.2.1/init/Makefile.in --- old/supermin-5.2.0/init/Makefile.in 2020-03-10 11:28:40.000000000 +0100 +++ new/supermin-5.2.1/init/Makefile.in 2021-02-01 10:31:50.000000000 +0100 @@ -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, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/lib/Makefile.in new/supermin-5.2.1/lib/Makefile.in --- old/supermin-5.2.0/lib/Makefile.in 2020-03-10 11:28:40.000000000 +0100 +++ new/supermin-5.2.1/lib/Makefile.in 2021-02-01 10:31:50.000000000 +0100 @@ -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, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/src/Makefile.in new/supermin-5.2.1/src/Makefile.in --- old/supermin-5.2.0/src/Makefile.in 2020-03-10 11:28:40.000000000 +0100 +++ new/supermin-5.2.1/src/Makefile.in 2021-02-01 10:31:50.000000000 +0100 @@ -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, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/src/config.ml new/supermin-5.2.1/src/config.ml --- old/supermin-5.2.0/src/config.ml 2020-03-10 11:28:53.000000000 +0100 +++ new/supermin-5.2.1/src/config.ml 2021-02-01 10:33:08.000000000 +0100 @@ -18,16 +18,16 @@ *) let package_name = "supermin" -let package_version = "5.2.0" +let package_version = "5.2.1" let host_cpu = "x86_64" let apt_get = "no" let cpio = "/usr/bin/cpio" let dnf = "/usr/bin/dnf" -let dpkg = "/usr/bin/dpkg" -let dpkg_deb = "/usr/bin/dpkg-deb" -let dpkg_query = "/usr/bin/dpkg-query" -let dpkg_divert = "/usr/bin/dpkg-divert" +let dpkg = "no" +let dpkg_deb = "no" +let dpkg_query = "no" +let dpkg_divert = "no" let fakeroot = "/usr/bin/fakeroot" let makepkg = "no" let pacman = "no" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/src/format_ext2_initrd.ml new/supermin-5.2.1/src/format_ext2_initrd.ml --- old/supermin-5.2.0/src/format_ext2_initrd.ml 2016-12-07 16:09:02.000000000 +0100 +++ new/supermin-5.2.1/src/format_ext2_initrd.ml 2021-02-01 10:30:45.000000000 +0100 @@ -44,6 +44,7 @@ "crc*.ko*"; "libcrc*.ko*"; "ibmvscsic.ko*"; + "ibmvscsi.ko*"; "libnvdimm.ko*"; "nd_pmem.ko*"; "nd_btt.ko*"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/src/mode_build.ml new/supermin-5.2.1/src/mode_build.ml --- old/supermin-5.2.0/src/mode_build.ml 2019-07-28 18:37:36.000000000 +0200 +++ new/supermin-5.2.1/src/mode_build.ml 2021-02-01 10:30:45.000000000 +0100 @@ -59,6 +59,10 @@ | Excludefiles -> "excludefiles" | Empty -> "empty" +let kernel_filename = "kernel" +and appliance_filename = "root" +and initrd_filename = "initrd" + let rec build debug (copy_kernel, format, host_cpu, packager_config, tmpdir, use_installed, size, @@ -223,9 +227,9 @@ Format_chroot.build_chroot debug files outputdir packagelist_file | Ext2 -> - let kernel = outputdir // "kernel" - and appliance = outputdir // "root" - and initrd = outputdir // "initrd" in + let kernel = outputdir // kernel_filename + and appliance = outputdir // appliance_filename + and initrd = outputdir // initrd_filename in let kernel_version, modpath = Format_ext2_kernel.build_kernel debug host_cpu copy_kernel kernel in Format_ext2.build_ext2 debug basedir files modpath kernel_version @@ -458,3 +462,15 @@ let files = loop files in files + +and get_outputs + (copy_kernel, format, host_cpu, + packager_config, tmpdir, use_installed, size, + include_packagelist) + inputs = + match format with + | Chroot -> + (* The content for chroot depends on the packages. *) + [] + | Ext2 -> + [kernel_filename; appliance_filename; initrd_filename] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/src/mode_build.mli new/supermin-5.2.1/src/mode_build.mli --- old/supermin-5.2.0/src/mode_build.mli 2016-12-07 16:09:02.000000000 +0100 +++ new/supermin-5.2.1/src/mode_build.mli 2021-02-01 10:30:45.000000000 +0100 @@ -21,3 +21,7 @@ val build : int -> (bool * Types.format * string * string option * string * bool * int64 option * bool) -> string list -> string -> unit (** [build debug (args...) inputs outputdir] performs the [supermin --build] subcommand. *) + +val get_outputs : (bool * Types.format * string * string option * string * bool * int64 option * bool) -> string list -> string list +(** [get_outputs (args...) inputs] gets the potential outputs for the + appliance. *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/src/ph_pacman.ml new/supermin-5.2.1/src/ph_pacman.ml --- old/supermin-5.2.0/src/ph_pacman.ml 2016-12-07 16:09:02.000000000 +0100 +++ new/supermin-5.2.1/src/ph_pacman.ml 2021-02-01 10:30:45.000000000 +0100 @@ -36,7 +36,7 @@ name : string; epoch : int; version : string; - release : int; + release : string; arch : string; } @@ -81,7 +81,7 @@ with Not_found -> 0, evr in let version, release = match string_split "-" vr with - | [ v; r ] -> v, int_of_string r + | [ v; r ] -> v, r | _ -> assert false in epoch, version, release with @@ -117,9 +117,9 @@ let pacman_package_to_string pkg = let pac = pac_of_pkg pkg in if pac.epoch = 0 then - sprintf "%s-%s-%d.%s" pac.name pac.version pac.release pac.arch + sprintf "%s-%s-%s.%s" pac.name pac.version pac.release pac.arch else - sprintf "%s-%d:%s-%d.%s" + sprintf "%s-%d:%s-%s.%s" pac.name pac.epoch pac.version pac.release pac.arch let pacman_package_name pkg = @@ -170,25 +170,28 @@ (* Because we reuse the same temporary download directory (tdir), this * only downloads each package once, even though each call to pacman will * download dependent packages as well. + * + * CacheDir directives must be filtered out to force pacman downloads. *) - List.iter ( - fun name -> - let cmd = sprintf "\ - set -e - umask 0000 - cd %s - mkdir -p var/lib/pacman - %s %s%s -Syw --noconfirm --cachedir=$(pwd) --root=$(pwd) %s - " - (quote tdir) - Config.fakeroot Config.pacman - (match !settings.packager_config with - | None -> "" - | Some filename -> " --config " ^ (quote filename)) - (quoted_list names) in - if !settings.debug >= 2 then printf "%s" cmd; - if Sys.command cmd <> 0 then ( - (* The package may not be in the main repos, check the AUR. *) + let cmd = sprintf "\ + set -e + umask 0000 + cd %s + mkdir -p var/lib/pacman + pacman-conf | grep -v CacheDir > tmp.conf + %s %s%s -Syw --noconfirm --cachedir=$(pwd) --root=$(pwd) %s + " + (quote tdir) + Config.fakeroot Config.pacman + (match !settings.packager_config with + | None -> " --config tmp.conf --dbpath var/lib/pacman" + | Some filename -> " --config " ^ (quote filename)) + (quoted_list names) in + if !settings.debug >= 2 then printf "%s" cmd; + if Sys.command cmd <> 0 then ( + (* The package may not be in the main repos, check the AUR. *) + List.iter ( + fun name -> let cmd = sprintf "\ set -e umask 0000 @@ -201,22 +204,22 @@ " (quote tdir) (quote ("https://aur.archlinux.org/packages/"; ^ - (String.sub name 0 2) ^ - "/" ^ name ^ "/" ^ name ^ ".tar.gz")) + (String.sub name 0 2) ^ + "/" ^ name ^ "/" ^ name ^ ".tar.gz")) (quote (name ^ ".tar.gz")) (quote name) (* cd *) Config.makepkg (quote name) (quote tdir) (* mv *) in if !settings.debug >= 2 then printf "%s" cmd; run_command cmd - ); - ) names; + ) names; + ); (* Unpack the downloaded packages. *) let cmd = sprintf " umask 0000 - for f in %s/*.pkg.tar.xz; do tar -xf \"$f\" -C %s; done + for f in %s/*.pkg.tar.*; do tar -xf \"$f\" -C %s; done " (quote tdir) (quote dir) in if !settings.debug >= 2 then printf "%s" cmd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/src/ph_rpm.ml new/supermin-5.2.1/src/ph_rpm.ml --- old/supermin-5.2.0/src/ph_rpm.ml 2019-08-22 10:29:42.000000000 +0200 +++ new/supermin-5.2.1/src/ph_rpm.ml 2021-02-01 10:30:45.000000000 +0100 @@ -234,7 +234,11 @@ rpm.name let rpm_get_package_database_mtime () = - (lstat "/var/lib/rpm/Packages").st_mtime + (try + lstat "/var/lib/rpm/rpmdb.sqlite" + with Unix_error (ENOENT, _, _) -> + lstat "/var/lib/rpm/Packages" + ).st_mtime (* Return the best provider of a particular RPM requirement. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/src/supermin.ml new/supermin-5.2.1/src/supermin.ml --- old/supermin-5.2.0/src/supermin.ml 2019-01-28 23:20:01.000000000 +0100 +++ new/supermin-5.2.1/src/supermin.ml 2021-02-01 10:30:45.000000000 +0100 @@ -234,18 +234,20 @@ * does not exist, or if the dates of either input files or package * database is newer, then we rebuild. Else we can just exit. *) - if if_newer then ( + if mode = Build && if_newer then ( try - let odate = (lstat outputdir).st_mtime in + let outputs = Mode_build.get_outputs args inputs in + let outputs = List.map ((//) outputdir) outputs in + let odates = List.map (fun d -> (lstat d).st_mtime) (outputdir :: outputs) in let idates = List.map (fun d -> (lstat d).st_mtime) inputs in let pdate = (get_package_handler ()).ph_get_package_database_mtime () in - if List.for_all (fun idate -> idate < odate) (pdate :: idates) then ( + if List.for_all (fun idate -> List.for_all (fun odate -> idate < odate) odates) (pdate :: idates) then ( if debug >= 1 then printf "supermin: if-newer: output does not need rebuilding\n%!"; exit 0 ) with - Unix_error _ -> () (* just continue *) + Unix_error (ENOENT, _, _) -> () (* just continue *) ); (* Create the output directory nearly atomically. *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/tests/Makefile.am new/supermin-5.2.1/tests/Makefile.am --- old/supermin-5.2.0/tests/Makefile.am 2015-12-31 18:01:57.000000000 +0100 +++ new/supermin-5.2.1/tests/Makefile.am 2021-02-01 10:30:45.000000000 +0100 @@ -28,7 +28,8 @@ test-execstack.sh \ test-build-bash.sh \ test-binaries-exist.sh \ - test-harder.sh + test-harder.sh \ + test-if-newer-ext2.sh if NETWORK_TESTS TESTS += \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/tests/Makefile.in new/supermin-5.2.1/tests/Makefile.in --- old/supermin-5.2.0/tests/Makefile.in 2020-03-10 11:28:40.000000000 +0100 +++ new/supermin-5.2.1/tests/Makefile.in 2021-02-01 10:31:50.000000000 +0100 @@ -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, @@ -1096,7 +1096,8 @@ $(TESTS) TESTS = test-basic.sh test-execstack.sh test-build-bash.sh \ - test-binaries-exist.sh test-harder.sh $(am__append_1) + test-binaries-exist.sh test-harder.sh test-if-newer-ext2.sh \ + $(am__append_1) all: all-am .SUFFIXES: @@ -1312,6 +1313,13 @@ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-if-newer-ext2.sh.log: test-if-newer-ext2.sh + @p='test-if-newer-ext2.sh'; \ + b='test-if-newer-ext2.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) test-build-bash-network.sh.log: test-build-bash-network.sh @p='test-build-bash-network.sh'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/tests/test-build-bash.sh new/supermin-5.2.1/tests/test-build-bash.sh --- old/supermin-5.2.0/tests/test-build-bash.sh 2014-03-21 13:31:40.000000000 +0100 +++ new/supermin-5.2.1/tests/test-build-bash.sh 2021-02-01 10:30:45.000000000 +0100 @@ -27,6 +27,7 @@ d1=$tmpdir/d1 d2=$tmpdir/d2 +d3=$tmpdir/d3 test "$USE_NETWORK" = 1 || USE_INSTALLED=--use-installed @@ -37,6 +38,8 @@ # Check all supermin-helper formats work. ../src/supermin -v --build -f chroot --host-cpu $arch $d1 -o $d2 -../src/supermin -v --build -f ext2 --host-cpu $arch $d1 -o $d2 +../src/supermin -v --build -f ext2 --host-cpu $arch $d1 -o $d3 +# Need to chmod $d2 since rm -r can't remove unwritable directories. +chmod -R +w $d2 ||: rm -rf $tmpdir ||: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.0/tests/test-if-newer-ext2.sh new/supermin-5.2.1/tests/test-if-newer-ext2.sh --- old/supermin-5.2.0/tests/test-if-newer-ext2.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/supermin-5.2.1/tests/test-if-newer-ext2.sh 2021-02-01 10:30:45.000000000 +0100 @@ -0,0 +1,61 @@ +#!/bin/bash - +# supermin +# (C) Copyright 2009-2020 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +set -e +set -x + +# XXX Hack for Arch. +if [ -f /etc/arch-release ]; then + export SUPERMIN_KERNEL=/boot/vmlinuz-linux +fi + +tmpdir=`mktemp -d` + +d1=$tmpdir/d1 +d2=$tmpdir/d2 + +# We assume 'bash' is a package everywhere. +../src/supermin -v --prepare --use-installed bash -o $d1 + +run_supermin () +{ + ../src/supermin -v --build -f ext2 --if-newer $d1 -o $d2 +} + +# Build the appliance the first time, which will work. +run_supermin + +# No changes, hence nothing to do. +run_supermin > test-if-newer-ext2.out +cat test-if-newer-ext2.out +grep 'if-newer: output does not need rebuilding' test-if-newer-ext2.out +rm test-if-newer-ext2.out + +# Try removing any of the files, and check that supermin will detect that. +ext2_files="kernel initrd root" +for ext2_file in $ext2_files +do + rm $d2/$ext2_file + run_supermin + for ext2_file in $ext2_files + do + test -e $d2/$ext2_file + done +done + +rm -rf $tmpdir ||: ++++++ supermin-kernel_version_compressed.patch ++++++ --- /var/tmp/diff_new_pack.hhiVq3/_old 2021-09-07 21:22:20.637369867 +0200 +++ /var/tmp/diff_new_pack.hhiVq3/_new 2021-09-07 21:22:20.637369867 +0200 @@ -1,6 +1,6 @@ ---- supermin-5.2.0/src/format_ext2_kernel.ml 2021/02/05 16:10:36 1.1 -+++ supermin-5.2.0/src/format_ext2_kernel.ml 2021/02/05 16:12:46 -@@ -212,6 +212,16 @@ +--- supermin-5.2.1.orig/src/format_ext2_kernel.ml ++++ supermin-5.2.1/src/format_ext2_kernel.ml +@@ -213,6 +213,16 @@ and get_kernel_version debug kernel_file | None -> (* Try to work it out from the filename instead. *) let basename = Filename.basename kernel_file in ++++++ suse_release.patch ++++++ --- /var/tmp/diff_new_pack.hhiVq3/_old 2021-09-07 21:22:20.653369886 +0200 +++ /var/tmp/diff_new_pack.hhiVq3/_new 2021-09-07 21:22:20.657369891 +0200 @@ -53,7 +53,7 @@ + be read or the ID_LIKE field is not defined. *) --- a/src/ph_rpm.ml +++ b/src/ph_rpm.ml -@@ -42,6 +42,7 @@ let opensuse_detect () = +@@ -43,6 +43,7 @@ let opensuse_detect () = Config.zypper <> "no" && (List.mem (Os_release.get_id ()) [ "sled"; "sles" ] || string_prefix "opensuse" (Os_release.get_id ()) ||
