Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nbd for openSUSE:Factory checked in at 2021-02-04 20:24:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nbd (Old) and /work/SRC/openSUSE:Factory/.nbd.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nbd" Thu Feb 4 20:24:29 2021 rev:55 rq:869213 version:3.21 Changes: -------- --- /work/SRC/openSUSE:Factory/nbd/nbd.changes 2020-10-03 18:56:43.721563776 +0200 +++ /work/SRC/openSUSE:Factory/.nbd.new.28504/nbd.changes 2021-02-04 20:25:04.610917855 +0100 @@ -1,0 +2,11 @@ +Thu Feb 4 11:16:57 UTC 2021 - Dirk M??ller <[email protected]> + +- update to 3.21: + - Fix --disable-manpages build + - Fix a bug in whitespace handling regarding authorization files + - Support client-side marking of devices as read-only + - Support preinitialized NBD connection (i.e., skip the negotiation). + - Fix the systemd unit file for nbd-client so it works with netlink (the + more common situation nowadays) + +------------------------------------------------------------------- Old: ---- nbd-3.20.tar.xz New: ---- nbd-3.21.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nbd.spec ++++++ --- /var/tmp/diff_new_pack.tZrj1x/_old 2021-02-04 20:25:05.278918872 +0100 +++ /var/tmp/diff_new_pack.tZrj1x/_new 2021-02-04 20:25:05.282918878 +0100 @@ -1,7 +1,7 @@ # # spec file for package nbd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: nbd -Version: 3.20 +Version: 3.21 Release: 0 Summary: Network Block Device Server and Client Utilities License: GPL-2.0-or-later ++++++ nbd-3.20.tar.xz -> nbd-3.21.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/Makefile.in new/nbd-3.21/Makefile.in --- old/nbd-3.20/Makefile.in 2019-09-15 14:04:42.000000000 +0200 +++ new/nbd-3.21/Makefile.in 2021-01-17 13:22:24.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 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, @@ -249,8 +249,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. @@ -313,6 +313,8 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best DIST_TARGETS = dist-xz dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -1015,6 +1017,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 @@ -1057,6 +1063,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) @@ -1072,7 +1080,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -1261,19 +1269,20 @@ clean-noinstLTLIBRARIES clean-sbinPROGRAMS cscope \ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-sbinPROGRAMS + dist-zstd distcheck distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-sbinPROGRAMS install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-sbinPROGRAMS .PRECIOUS: Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/README.md new/nbd-3.21/README.md --- old/nbd-3.20/README.md 2019-02-12 05:52:29.000000000 +0100 +++ new/nbd-3.21/README.md 2021-01-17 13:19:39.000000000 +0100 @@ -91,22 +91,8 @@ `nbd-server` runs as; otherwise, you won't get a PID file, though the server will keep running). -There are packages (or similar) available for the following operating -systems: - -- Debian (and derivatives, like Ubuntu): `nbd-client` and `nbd-server`, - since Debian woody. -- Gentoo: the `nbd` ebuild in the `sys-block` category, available in - Portage since 2002. -- FreeBSD: `net/nbd-server`, available in the ports tree since 2003. - FreeBSD doesn't have kernel support for NBD, so obviously the client - isn't built there. -- SuSE: `nbd`, in SuSE 10.0 -- Fedora: `nbd`, since Fedora 7 -- uClibc's `buildroot` script also seems to have support for NBD. - -If you're packaging NBD for a different operating system that isn't in -the above list, I'd like to know about it. +There are packages (or similar) available for most current operating +systems; see the "Packaging status" badge below for details. For questions, please use the [[email protected]](mailto:[email protected]) mailinglist. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/aclocal.m4 new/nbd-3.21/aclocal.m4 --- old/nbd-3.20/aclocal.m4 2019-09-15 14:04:41.000000000 +0200 +++ new/nbd-3.21/aclocal.m4 2021-01-17 13:22:22.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- 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, @@ -20,9 +20,9 @@ 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'.])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright ?? 2004 Scott James Remnant <[email protected]>. dnl Copyright ?? 2012-2015 Dan Nicholson <[email protected]> dnl @@ -63,7 +63,7 @@ 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]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) 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 @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + 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 + 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 @@ -195,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + 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 @@ -296,7 +296,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# 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, @@ -311,7 +311,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.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -327,14 +327,14 @@ # 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.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -386,7 +386,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, @@ -417,7 +417,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, @@ -608,7 +608,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, @@ -647,7 +647,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 @@ -674,7 +676,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, @@ -871,7 +873,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, @@ -892,7 +894,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, @@ -914,7 +916,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# 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, @@ -949,7 +951,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, @@ -992,7 +994,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, @@ -1013,12 +1015,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -1031,7 +1028,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, @@ -1060,7 +1057,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, @@ -1107,7 +1104,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, @@ -1126,7 +1123,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, @@ -1207,7 +1204,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, @@ -1267,7 +1264,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, @@ -1295,7 +1292,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, @@ -1314,7 +1311,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/nbd-3.20/compile new/nbd-3.21/compile --- old/nbd-3.20/compile 2018-12-16 18:05:47.000000000 +0100 +++ new/nbd-3.21/compile 2021-01-17 13:22:24.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/configure new/nbd-3.21/configure --- old/nbd-3.20/configure 2019-09-15 14:04:43.000000000 +0200 +++ new/nbd-3.21/configure 2021-01-17 13:22:22.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for nbd 3.20. +# Generated by GNU Autoconf 2.69 for nbd 3.21. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='nbd' PACKAGE_TARNAME='nbd' -PACKAGE_VERSION='3.20' -PACKAGE_STRING='nbd 3.20' +PACKAGE_VERSION='3.21' +PACKAGE_STRING='nbd 3.21' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://nbd.sourceforge.net/' @@ -1364,7 +1364,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 nbd 3.20 to adapt to many kinds of systems. +\`configure' configures nbd 3.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1435,7 +1435,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nbd 3.20:";; + short | recursive ) echo "Configuration of nbd 3.21:";; esac cat <<\_ACEOF @@ -1575,7 +1575,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nbd configure 3.20 +nbd configure 3.21 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2284,7 +2284,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nbd $as_me 3.20, which was +It was created by nbd $as_me 3.21, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2838,12 +2838,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -3148,7 +3143,7 @@ # Define the identity of the package. PACKAGE='nbd' - VERSION='3.20' + VERSION='3.21' cat >>confdefs.h <<_ACEOF @@ -6015,7 +6010,7 @@ fi : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} @@ -7736,8 +7731,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 + echo "$AR cr libconftest.a conftest.o" >&5 + $AR cr libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -8866,6 +8861,12 @@ lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -13812,8 +13813,8 @@ if test "x$with_gnutls" != "xno"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GnuTLS" >&5 -$as_echo_n "checking for GnuTLS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 2.12.0" >&5 +$as_echo_n "checking for gnutls >= 2.12.0... " >&6; } if test -n "$GnuTLS_CFLAGS"; then pkg_cv_GnuTLS_CFLAGS="$GnuTLS_CFLAGS" @@ -13853,7 +13854,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -13878,7 +13879,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test "x$with_gnutls" = "xyes"; then as_fn_error $? "--with-gnutls given but cannot find gnutls" "$LINENO" 5 @@ -14426,8 +14427,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -$as_echo_n "checking for GLIB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.26.0 gthread-2.0 >= 2.26.0" >&5 +$as_echo_n "checking for glib-2.0 >= 2.26.0 gthread-2.0 >= 2.26.0... " >&6; } if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" @@ -14467,7 +14468,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14485,7 +14486,7 @@ as_fn_error $? "Missing glib" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "Missing glib" "$LINENO" 5 else @@ -14571,8 +14572,8 @@ if test "x$with_libnl" != "xno"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL3" >&5 -$as_echo_n "checking for LIBNL3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl-genl-3.0 >= 3.1" >&5 +$as_echo_n "checking for libnl-genl-3.0 >= 3.1... " >&6; } if test -n "$LIBNL3_CFLAGS"; then pkg_cv_LIBNL3_CFLAGS="$LIBNL3_CFLAGS" @@ -14612,7 +14613,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14637,7 +14638,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test "x$with_libnl" = "xyes"; then as_fn_error $? "--with-libnl given but cannot find libnl" "$LINENO" 5 @@ -14671,7 +14672,7 @@ enableval=$enable_manpages; fi - if test "x$enablemanpages" != "xno"; then + if test "x$enable_manpages" != "xno"; then MANPAGES_TRUE= MANPAGES_FALSE='#' else @@ -15322,7 +15323,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nbd $as_me 3.20, which was +This file was extended by nbd $as_me 3.21, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15393,7 +15394,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nbd config.status 3.20 +nbd config.status 3.21 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -16535,7 +16536,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/nbd-3.20/configure.ac new/nbd-3.21/configure.ac --- old/nbd-3.20/configure.ac 2019-09-15 14:04:36.000000000 +0200 +++ new/nbd-3.21/configure.ac 2021-01-17 13:19:39.000000000 +0100 @@ -338,7 +338,7 @@ AC_ARG_ENABLE([manpages], AS_HELP_STRING([--disable-manpages], [Do not install man pages])) -AM_CONDITIONAL(MANPAGES, test "x$enablemanpages" != "xno") +AM_CONDITIONAL(MANPAGES, test "x$enable_manpages" != "xno") AS_IF([test "x$enable_manpages" != "xno"], [ AC_SUBST([MAN_CONFIG_FILES],["\ man/nbd-client.8.sh \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/depcomp new/nbd-3.21/depcomp --- old/nbd-3.20/depcomp 2018-12-16 18:05:47.000000000 +0100 +++ new/nbd-3.21/depcomp 2021-01-17 13:22:24.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/doc/Makefile.in new/nbd-3.21/doc/Makefile.in --- old/nbd-3.20/doc/Makefile.in 2019-09-15 14:04:42.000000000 +0200 +++ new/nbd-3.21/doc/Makefile.in 2021-01-17 13:22:24.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 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/nbd-3.20/doc/proto.md new/nbd-3.21/doc/proto.md --- old/nbd-3.20/doc/proto.md 2019-09-15 13:35:52.000000000 +0200 +++ new/nbd-3.21/doc/proto.md 2021-01-17 13:19:39.000000000 +0100 @@ -815,9 +815,12 @@ the client MUST ensure that *offset* and *length* are integer multiples of any advertised minimum block size, and SHOULD use integer multiples of any advertised preferred block size where possible. For -those requests, the client MUST NOT use a *length* larger than any -advertised maximum block size or which, when added to *offset*, would -exceed the export size. The server SHOULD report an `NBD_EINVAL` error if +those requests, the client MUST NOT use a *length* which, when added to +*offset*, would exceed the export size. Also for NBD_CMD_READ, +NBD_CMD_WRITE, NBD_CMD_CACHE and NBD_CMD_WRITE_ZEROES (except for +when NBD_CMD_FLAG_FAST_ZERO is set), the client MUST NOT use a *length* +larger than any advertised maximum block size. +The server SHOULD report an `NBD_EINVAL` error if the client's request is not aligned to advertised minimum block size boundaries, or is larger than the advertised maximum block size. Notwithstanding any maximum block size advertised, either the server @@ -1582,7 +1585,8 @@ * `NBD_REP_ERR_PLATFORM` (2^31 + 4) The option sent by the client is not supported on the platform on - which the server is running. Not currently used. + which the server is running, or requires compile-time options that + were disabled, e.g., upon trying to use TLS. * `NBD_REP_ERR_TLS_REQD` (2^31 + 5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/gznbd/Makefile.in new/nbd-3.21/gznbd/Makefile.in --- old/nbd-3.20/gznbd/Makefile.in 2019-09-15 14:04:42.000000000 +0200 +++ new/nbd-3.21/gznbd/Makefile.in 2021-01-17 13:22:24.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 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/nbd-3.20/install-sh new/nbd-3.21/install-sh --- old/nbd-3.20/install-sh 2018-12-16 18:05:47.000000000 +0100 +++ new/nbd-3.21/install-sh 2021-01-17 13:22:24.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to [email protected]. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -451,7 +456,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -477,6 +493,13 @@ then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -491,9 +514,9 @@ # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/ltmain.sh new/nbd-3.21/ltmain.sh --- old/nbd-3.20/ltmain.sh 2018-12-16 18:05:40.000000000 +0100 +++ new/nbd-3.21/ltmain.sh 2021-01-17 13:22:18.000000000 +0100 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-6" +VERSION="2.4.6 Debian-2.4.6-14" package_revision=2.4.6 @@ -64,7 +64,7 @@ # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-10-04.22; # UTC +scriptversion=2015-01-20.17; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 @@ -387,7 +387,7 @@ # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -1091,57 +1091,6 @@ } -# func_quote ARG -# -------------- -# Aesthetically quote one ARG, store the result into $func_quote_result. Note -# that we keep attention to performance here (so far O(N) complexity as long as -# func_append is O(1)). -func_quote () -{ - $debug_cmd - - func_quote_result=$1 - - case $func_quote_result in - *[\\\`\"\$]*) - case $func_quote_result in - *[\[\*\?]*) - func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"` - return 0 - ;; - esac - - func_quote_old_IFS=$IFS - for _G_char in '\' '`' '"' '$' - do - # STATE($1) PREV($2) SEPARATOR($3) - set start "" "" - func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy - IFS=$_G_char - for _G_part in $func_quote_result - do - case $1 in - quote) - func_append func_quote_result "$3$2" - set quote "$_G_part" "\\$_G_char" - ;; - start) - set first "" "" - func_quote_result= - ;; - first) - set quote "$_G_part" "" - ;; - esac - done - IFS=$func_quote_old_IFS - done - ;; - *) ;; - esac -} - - # func_quote_for_eval ARG... # -------------------------- # Aesthetically quote ARGs to be evaled later. @@ -1158,8 +1107,12 @@ func_quote_for_eval_unquoted_result= func_quote_for_eval_result= while test 0 -lt $#; do - func_quote "$1" - _G_unquoted_arg=$func_quote_result + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac if test -n "$func_quote_for_eval_unquoted_result"; then func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" else @@ -2188,7 +2141,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-6 + version: $progname $scriptversion Debian-2.4.6-14 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -5397,8 +5350,7 @@ if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - func_quote "$ECHO" - qECHO=$func_quote_result + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -7415,10 +7367,13 @@ # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang # -fsanitize=* Clang/GCC memory and address sanitizer + # -fuse-ld=* Linker select flags for GCC + # -static-* direct GCC to link specific libraries statically + # -fcilkplus Cilk Plus language extension features for C/C++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*) + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" @@ -10655,8 +10610,8 @@ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi done - func_quote "(cd `pwd`; $relink_command)" - relink_command=$func_quote_result + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -10902,8 +10857,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - func_quote "$relink_command" - relink_command=$func_quote_result + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test yes = "$hardcode_automatic"; then relink_command= fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/man/Makefile.in new/nbd-3.21/man/Makefile.in --- old/nbd-3.20/man/Makefile.in 2019-09-15 14:04:42.000000000 +0200 +++ new/nbd-3.21/man/Makefile.in 2021-01-17 13:22:24.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 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/nbd-3.20/man/nbd-client.8.in.sgml new/nbd-3.21/man/nbd-client.8.in.sgml --- old/nbd-3.20/man/nbd-client.8.in.sgml 2019-02-12 05:52:29.000000000 +0100 +++ new/nbd-3.21/man/nbd-client.8.in.sgml 2021-01-17 13:19:39.000000000 +0100 @@ -65,7 +65,10 @@ <arg>-nofork</arg> <arg>-nonetlink</arg> <arg>-systemd-mark</arg> + <arg>-readonly</arg> + <arg>-preinit</arg> <arg>-block-size <replaceable>block size</replaceable></arg> + <arg>-size <replaceable>bytes</replaceable></arg> <arg>-timeout <replaceable>seconds</replaceable></arg> <arg>-name <replaceable>name</replaceable></arg> <arg>-certfile <replaceable>certfile</replaceable></arg> @@ -84,7 +87,10 @@ <arg>-nofork</arg> <arg>-nonetlink</arg> <arg>-systemd-mark</arg> + <arg>-readonly</arg> + <arg>-preinit</arg> <arg>-block-size <replaceable>block size</replaceable></arg> + <arg>-size <replaceable>bytes</replaceable></arg> <arg>-timeout <replaceable>seconds</replaceable></arg> <arg>-name <replaceable>name</replaceable></arg> </cmdsynopsis> @@ -265,6 +271,37 @@ </listitem> </varlistentry> <varlistentry> + <term><option>-preinit</option></term> + <term><option>-P</option></term> + <listitem> + <para>When this option is specified, &dhpackage; will skip + the usual negotiation with the server, and hand the socket + to the kernel immediately after connecting. Only use this + when connecting to specialized NBD servers specifically + designed for it. This requires specifying the size of the + device via the -B option, and does not support TLS.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>-readonly</option></term> + <term><option>-R</option></term> + <listitem> + <para>When this option is specified, &dhpackage; will tell the + kernel to treat the device as read-only, even if the server + would allow writes.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>-size <replaceable>bytes</replaceable></option></term> + <term><option>-B <replaceable>bytes</replaceable></option></term> + <listitem> + <para>Force the device size to the specified number of bytes, + rather than using the value from server negotiation. Must + be a multiple of the block size. If using preinit (-P) to + skip negotiation, this option is required.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>-sdp</option></term> <term><option>-S</option></term> <listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/man/nbd-client.8.sh.in new/nbd-3.21/man/nbd-client.8.sh.in --- old/nbd-3.20/man/nbd-client.8.sh.in 2019-02-12 06:53:31.000000000 +0100 +++ new/nbd-3.21/man/nbd-client.8.sh.in 2021-01-17 13:22:41.000000000 +0100 @@ -16,10 +16,10 @@ nbd-client \- connect to a server running nbd-server(1), to use its exported block device .SH SYNOPSIS -\fBnbd-client\fR \fB\fIhost\fB\fR [ \fB\fIport\fB\fR ] \fB\fInbd-device\fB\fR [ \fB-connections \fInum\fB\fR ] [ \fB-sdp\fR ] [ \fB-swap\fR ] [ \fB-persist\fR ] [ \fB-nofork\fR ] [ \fB-nonetlink\fR ] [ \fB-systemd-mark\fR ] [ \fB-block-size \fIblock size\fB\fR ] [ \fB-timeout \fIseconds\fB\fR ] [ \fB-name \fIname\fB\fR ] [ \fB-certfile \fIcertfile\fB\fR ] [ \fB-keyfile \fIkeyfile\fB\fR ] [ \fB-cacertfile \fIcacertfile\fB\fR ] [ \fB-tlshostname \fIhostname\fB\fR ] +\fBnbd-client\fR \fB\fIhost\fB\fR [ \fB\fIport\fB\fR ] \fB\fInbd-device\fB\fR [ \fB-connections \fInum\fB\fR ] [ \fB-sdp\fR ] [ \fB-swap\fR ] [ \fB-persist\fR ] [ \fB-nofork\fR ] [ \fB-nonetlink\fR ] [ \fB-systemd-mark\fR ] [ \fB-readonly\fR ] [ \fB-preinit\fR ] [ \fB-block-size \fIblock size\fB\fR ] [ \fB-size \fIbytes\fB\fR ] [ \fB-timeout \fIseconds\fB\fR ] [ \fB-name \fIname\fB\fR ] [ \fB-certfile \fIcertfile\fB\fR ] [ \fB-keyfile \fIkeyfile\fB\fR ] [ \fB-cacertfile \fIcacertfile\fB\fR ] [ \fB-tlshostname \fIhostname\fB\fR ] -\fBnbd-client\fR \fB-unix \fIpath\fB\fR \fB\fInbd-device\fB\fR [ \fB-connections \fInum\fB\fR ] [ \fB-sdp\fR ] [ \fB-swap\fR ] [ \fB-persist\fR ] [ \fB-nofork\fR ] [ \fB-nonetlink\fR ] [ \fB-systemd-mark\fR ] [ \fB-block-size \fIblock size\fB\fR ] [ \fB-timeout \fIseconds\fB\fR ] [ \fB-name \fIname\fB\fR ] +\fBnbd-client\fR \fB-unix \fIpath\fB\fR \fB\fInbd-device\fB\fR [ \fB-connections \fInum\fB\fR ] [ \fB-sdp\fR ] [ \fB-swap\fR ] [ \fB-persist\fR ] [ \fB-nofork\fR ] [ \fB-nonetlink\fR ] [ \fB-systemd-mark\fR ] [ \fB-readonly\fR ] [ \fB-preinit\fR ] [ \fB-block-size \fIblock size\fB\fR ] [ \fB-size \fIbytes\fB\fR ] [ \fB-timeout \fIseconds\fB\fR ] [ \fB-name \fIname\fB\fR ] \fBnbd-client\fR \fB\fInbd-device\fB\fR @@ -165,6 +165,31 @@ connection ever drops unexpectedly due to a lost server or something similar. .TP +\fB-preinit\fR +.TP +\fB-P\fR +When this option is specified, nbd-client will skip +the usual negotiation with the server, and hand the socket +to the kernel immediately after connecting. Only use this +when connecting to specialized NBD servers specifically +designed for it. This requires specifying the size of the +device via the -B option, and does not support TLS. +.TP +\fB-readonly\fR +.TP +\fB-R\fR +When this option is specified, nbd-client will tell the +kernel to treat the device as read-only, even if the server +would allow writes. +.TP +\fB-size \fIbytes\fB\fR +.TP +\fB-B \fIbytes\fB\fR +Force the device size to the specified number of bytes, +rather than using the value from server negotiation. Must +be a multiple of the block size. If using preinit (-P) to +skip negotiation, this option is required. +.TP \fB-sdp\fR .TP \fB-S\fR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/missing new/nbd-3.21/missing --- old/nbd-3.20/missing 2018-12-16 18:05:47.000000000 +0100 +++ new/nbd-3.21/missing 2021-01-17 13:22:24.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/nbd-client.c new/nbd-3.21/nbd-client.c --- old/nbd-3.20/nbd-client.c 2019-09-15 13:35:52.000000000 +0200 +++ new/nbd-3.21/nbd-client.c 2021-01-17 13:19:39.000000000 +0100 @@ -896,9 +896,9 @@ fprintf(stderr, "%s version %s\n", PROG_NAME, PACKAGE_VERSION); } #if HAVE_NETLINK - fprintf(stderr, "Usage: nbd-client -name|-N name host [port] nbd_device\n\t[-block-size|-b block size] [-timeout|-t timeout] [-swap|-s] [-sdp|-S]\n\t[-persist|-p] [-nofork|-n] [-systemd-mark|-m] [-nonetlink|-L]\n"); + fprintf(stderr, "Usage: nbd-client -name|-N name host [port] nbd_device\n\t[-block-size|-b block size] [-timeout|-t timeout] [-swap|-s] [-sdp|-S]\n\t[-persist|-p] [-nofork|-n] [-systemd-mark|-m] [-nonetlink|-L]\n\t[-readonly|-R] [-size|-B bytes] [-preinit|-P]\n"); #else - fprintf(stderr, "Usage: nbd-client -name|-N name host [port] nbd_device\n\t[-block-size|-b block size] [-timeout|-t timeout] [-swap|-s] [-sdp|-S]\n\t[-persist|-p] [-nofork|-n] [-systemd-mark|-m]\n"); + fprintf(stderr, "Usage: nbd-client -name|-N name host [port] nbd_device\n\t[-block-size|-b block size] [-timeout|-t timeout] [-swap|-s] [-sdp|-S]\n\t[-persist|-p] [-nofork|-n] [-systemd-mark|-m]\n\t[-readonly|-R] [-size|-B bytes] [-preinit|-P]\n"); #endif fprintf(stderr, "Or : nbd-client -u (with same arguments as above)\n"); fprintf(stderr, "Or : nbd-client nbdX\n"); @@ -930,12 +930,13 @@ if (ioctl(nbd, NBD_CLEAR_SOCK)<0) err("Ioctl failed: %m\n"); printf("done\n"); + close(nbd); } #if HAVE_NETLINK -static const char *short_opts = "-A:b:c:C:d:gH:hK:LlnN:pSst:uVx"; +static const char *short_opts = "-A:B:b:c:C:d:gH:hK:LlnN:PpRSst:uVx"; #else -static const char *short_opts = "-A:b:c:C:d:gH:hK:lnN:pSst:uVx"; +static const char *short_opts = "-A:B:b:c:C:d:gH:hK:lnN:PpRSst:uVx"; #endif int main(int argc, char *argv[]) { @@ -950,8 +951,11 @@ int sdp=0; int G_GNUC_UNUSED nofork=0; // if -dNOFORK pid_t main_pid; - u64 size64; + u64 size64 = 0; + u64 force_size64 = 0; uint16_t flags = 0; + bool force_read_only = false; + bool preinit = false; int c; int nonspecial=0; int b_unix=0; @@ -973,6 +977,7 @@ struct option long_options[] = { { "cacertfile", required_argument, NULL, 'A' }, { "block-size", required_argument, NULL, 'b' }, + { "size", required_argument, NULL, 'B' }, { "check", required_argument, NULL, 'c' }, { "connections", required_argument, NULL, 'C'}, { "disconnect", required_argument, NULL, 'd' }, @@ -989,6 +994,8 @@ { "nofork", no_argument, NULL, 'n' }, { "name", required_argument, NULL, 'N' }, { "persist", no_argument, NULL, 'p' }, + { "preinit", no_argument, NULL, 'P' }, + { "readonly", no_argument, NULL, 'R' }, { "sdp", no_argument, NULL, 'S' }, { "swap", no_argument, NULL, 's' }, { "timeout", required_argument, NULL, 't' }, @@ -1057,6 +1064,13 @@ exit(EXIT_FAILURE); } break; + case 'B': + force_size64=(u64)strtoull(optarg, NULL, 0); + if(force_size64 == 0) { + fprintf(stderr, "E: Invalid size\n"); + exit(EXIT_FAILURE); + } + break; case 'c': return check_conn(optarg, 1); case 'C': @@ -1094,6 +1108,12 @@ case 'p': cont=1; break; + case 'P': + preinit = true; + break; + case 'R': + force_read_only = true; + break; case 's': swap=1; break; @@ -1175,12 +1195,28 @@ tls = true; } + if (preinit) { + if (tls) { + fprintf(stderr, "E: preinit connection cannot be used with TLS\n"); + exit(EXIT_FAILURE); + } + if (!force_size64) { + fprintf(stderr, "E: preinit connection requires specifying size\n"); + exit(EXIT_FAILURE); + } + } + if (!tlshostname && hostname) tlshostname = strdup(hostname); if (netlink) nofork = 1; + if((force_size64 % blocksize) != 0) { + fprintf(stderr, "E: size (" PRIu64 " bytes) is not a multiple of blocksize (%d)!\n", force_size64, blocksize); + exit(EXIT_FAILURE); + } + if(strlen(name)==0 && !(opts & NBDC_DO_LIST)) { printf("Warning: the oldstyle protocol is no longer supported.\nThis method now uses the newstyle protocol with a default export\n"); } @@ -1205,7 +1241,12 @@ if (sock < 0) exit(EXIT_FAILURE); - negotiate(&sock, &size64, &flags, name, needed_flags, cflags, opts, certfile, keyfile, cacertfile, tlshostname, tls, can_opt_go); + if (!preinit) + negotiate(&sock, &size64, &flags, name, needed_flags, cflags, opts, certfile, keyfile, cacertfile, tlshostname, tls, can_opt_go); + if (force_read_only) + flags |= NBD_FLAG_READ_ONLY; + if (force_size64) + size64 = force_size64; if (netlink) { sockfds[i] = sock; continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/nbdsrv.c new/nbd-3.21/nbdsrv.c --- old/nbd-3.20/nbdsrv.c 2019-05-25 22:38:33.000000000 +0200 +++ new/nbd-3.21/nbdsrv.c 2021-01-17 13:19:39.000000000 +0100 @@ -127,6 +127,7 @@ while (fgets(line,LINELEN,f)!=NULL) { char* pos; + char* endpos; /* Drop comments */ if((pos = strchr(line, '#'))) { *pos = '\0'; @@ -140,7 +141,12 @@ if(!(*pos)) { continue; } - if(address_matches(line, (struct sockaddr*)&opts->clientaddr, NULL)) { + /* Trim trailing whitespace */ + endpos = pos; + while ((*endpos) && !isspace(*endpos)) + endpos++; + *endpos = '\0'; + if(address_matches(pos, (struct sockaddr*)&opts->clientaddr, NULL)) { fclose(f); return 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/support/libtool.m4 new/nbd-3.21/support/libtool.m4 --- old/nbd-3.20/support/libtool.m4 2018-12-16 18:05:40.000000000 +0100 +++ new/nbd-3.21/support/libtool.m4 2021-01-17 13:22:19.000000000 +0100 @@ -1041,8 +1041,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1492,7 +1492,7 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) @@ -4704,6 +4704,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/systemd/Makefile.in new/nbd-3.21/systemd/Makefile.in --- old/nbd-3.20/systemd/Makefile.in 2019-09-15 14:04:42.000000000 +0200 +++ new/nbd-3.21/systemd/Makefile.in 2021-01-17 13:22:24.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 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/nbd-3.20/systemd/[email protected] new/nbd-3.21/systemd/[email protected] --- old/nbd-3.20/systemd/[email protected] 2018-08-18 16:30:00.000000000 +0200 +++ new/nbd-3.21/systemd/[email protected] 2021-01-17 13:19:39.000000000 +0100 @@ -14,8 +14,10 @@ Conflicts=shutdown.target DefaultDependencies=no [Service] -Type=forking +Type=oneshot +RemainAfterExit=yes ExecStart=@sbindir@/nbd-client %i +ExecStop=@sbindir@/nbd-client -d /dev/%i [Install] RequiredBy=dev-%i.device RequiredBy=dev-%ip1.device diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.20/tests/Makefile.in new/nbd-3.21/tests/Makefile.in --- old/nbd-3.20/tests/Makefile.in 2019-09-15 14:04:42.000000000 +0200 +++ new/nbd-3.21/tests/Makefile.in 2021-01-17 13:22:24.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 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/nbd-3.20/tests/code/Makefile.in new/nbd-3.21/tests/code/Makefile.in --- old/nbd-3.20/tests/code/Makefile.in 2019-09-15 14:04:42.000000000 +0200 +++ new/nbd-3.21/tests/code/Makefile.in 2021-01-17 13:22:24.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 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/nbd-3.20/tests/run/Makefile.in new/nbd-3.21/tests/run/Makefile.in --- old/nbd-3.20/tests/run/Makefile.in 2019-09-15 14:04:42.000000000 +0200 +++ new/nbd-3.21/tests/run/Makefile.in 2021-01-17 13:22:24.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 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,
