Merging upstream version 1.22.10.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 34 insertions, 31 deletions

diff --git a/configure b/configure
index e11c7dd..3f44711 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for dpkg 1.22.9.
+# Generated by GNU Autoconf 2.71 for dpkg 1.22.10.
 #
 # Report bugs to <debian-dpkg@lists.debian.org>.
 #
@@ -681,8 +681,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dpkg'
 PACKAGE_TARNAME='dpkg'
-PACKAGE_VERSION='1.22.9'
-PACKAGE_STRING='dpkg 1.22.9'
+PACKAGE_VERSION='1.22.10'
+PACKAGE_STRING='dpkg 1.22.10'
 PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
 PACKAGE_URL='https://wiki.debian.org/Teams/Dpkg'
 
@@ -1613,7 +1613,7 @@ if test "$ac_init_help" = "long"; then
   # 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 dpkg 1.22.9 to adapt to many kinds of systems.
+\`configure' configures dpkg 1.22.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1684,7 +1684,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dpkg 1.22.9:";;
+     short | recursive ) echo "Configuration of dpkg 1.22.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1887,7 +1887,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dpkg configure 1.22.9
+dpkg configure 1.22.10
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2703,7 +2703,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dpkg $as_me 1.22.9, which was
+It was created by dpkg $as_me 1.22.10, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3701,7 +3701,7 @@ fi
 
 PACKAGE_COPYRIGHT_HOLDER='Dpkg Developers'
 
-PACKAGE_VCS_ID=82ab77437894fc3201e7e111677e83027c02294a
+PACKAGE_VCS_ID=ef5536cfe24e4c41c6fdc56e4530161fade3887c
 
 PACKAGE_VCS_TYPE=git
 
@@ -5523,7 +5523,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dpkg'
- VERSION='1.22.9'
+ VERSION='1.22.10'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -18704,8 +18704,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports C99 features" >&5
-printf %s "checking whether $CC supports C99 features... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports C99" >&5
+printf %s "checking whether $CC supports C99... " >&6; }
 if test ${dpkg_cv_c99+y}
 then :
   printf %s "(cached) " >&6
@@ -18758,6 +18758,10 @@ main (void)
 	/* Magic __func__ variable. */
 	printf("%s", __func__);
 
+#if __STDC_VERSION__ < 199901L
+#error "Requires C99"
+#endif
+
   ;
   return 0;
 }
@@ -18777,8 +18781,8 @@ printf "%s\n" "$dpkg_cv_c99" >&6; }
   if test "x$dpkg_cv_c99" != "xyes"
 then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept C99 features" >&5
-printf %s "checking for $CC option to accept C99 features... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept C99" >&5
+printf %s "checking for $CC option to accept C99... " >&6; }
 if test ${dpkg_cv_c99_arg+y}
 then :
   printf %s "(cached) " >&6
@@ -18836,6 +18840,10 @@ main (void)
 	/* Magic __func__ variable. */
 	printf("%s", __func__);
 
+#if __STDC_VERSION__ < 199901L
+#error "Requires C99"
+#endif
+
   ;
   return 0;
 }
@@ -18866,21 +18874,15 @@ printf "%s\n" "$dpkg_cv_c99_arg" >&6; }
 then :
 
       CC="$CC $dpkg_cv_c99_arg"
-      dpkg_cv_c99=1
+      dpkg_cv_c99=yes
 
 fi
 
 fi
-  if test "x$dpkg_cv_c99" = "xyes"
+  if test "x$dpkg_cv_c99" != "xyes"
 then :
 
-
-printf "%s\n" "#define HAVE_C99 1" >>confdefs.h
-
-
-else $as_nop
-
-    as_fn_error $? "unsupported required C99 extensions" "$LINENO" 5
+    as_fn_error $? "unsupported required C99" "$LINENO" 5
 
 fi
 
@@ -22757,6 +22759,10 @@ main (void)
 	// Null pointer keyword.
 	void *ptr = nullptr;
 
+#if __cplusplus < 201103L
+#error "Requires C++11"
+#endif
+
   ;
   return 0;
 }
@@ -22812,6 +22818,10 @@ main (void)
 	// Null pointer keyword.
 	void *ptr = nullptr;
 
+#if __cplusplus < 201103L
+#error "Requires C++11"
+#endif
+
   ;
   return 0;
 }
@@ -22852,15 +22862,8 @@ then :
 fi
 
 fi
-  if test "x$dpkg_cv_cxx11" = "xyes"
-then :
 
 
-printf "%s\n" "#define HAVE_CXX11 1" >>confdefs.h
-
-
-fi
-
 
   for ac_prog in gpatch patch
 do
@@ -34314,7 +34317,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dpkg $as_me 1.22.9, which was
+This file was extended by dpkg $as_me 1.22.10, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -34383,7 +34386,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-dpkg config.status 1.22.9
+dpkg config.status 1.22.10
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"