Merging upstream version 1.22.5.

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

2 files changed, 212 insertions, 28 deletions

diff --git a/configure b/configure
index a1f02d1..271deeb 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.4.
+# Generated by GNU Autoconf 2.71 for dpkg 1.22.5.
 #
 # 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.4'
-PACKAGE_STRING='dpkg 1.22.4'
+PACKAGE_VERSION='1.22.5'
+PACKAGE_STRING='dpkg 1.22.5'
 PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
 PACKAGE_URL='https://wiki.debian.org/Teams/Dpkg'
 
@@ -801,13 +801,20 @@ DPKG_DEFAULT_SHELL
 DPKG_SHELL
 DEB_DEFAULT_COMPRESSOR
 zshcompletionsdir
+bashcompletionsdir
+polkitactionsdir
+aclocaldir
+pkgconfigdir
 logdir
 backupsdir
 admindir
+methodsdir
+docspecdir
 pkgconfdir
 devlibdir
 BUILD_DEVEL_DOCS
 PACKAGE_RELEASE_DATE
+perllibdir
 PERL_LIBDIR
 PERL_MIN_VERSION
 PERL
@@ -821,8 +828,6 @@ HAVE_LINKER_VERSION_SCRIPT_FALSE
 HAVE_LINKER_VERSION_SCRIPT_TRUE
 HAVE_LINKER_AS_NEEDED_FALSE
 HAVE_LINKER_AS_NEEDED_TRUE
-BUILD_SHARED_FALSE
-BUILD_SHARED_TRUE
 LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
@@ -987,12 +992,19 @@ enable_libtool_lock
 enable_dselect
 enable_start_stop_daemon
 enable_update_alternatives
+with_perllibdir
 enable_devel_docs
 with_devlibdir
 with_pkgconfdir
+with_docspecdir
+with_methodsdir
 with_admindir
 with_backupsdir
 with_logdir
+with_pkgconfigdir
+with_aclocaldir
+with_polkitactionsdir
+with_bashcompletionsdir
 with_zshcompletionsdir
 with_deb_compressor
 enable_coverage
@@ -1598,7 +1610,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.4 to adapt to many kinds of systems.
+\`configure' configures dpkg 1.22.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1669,7 +1681,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dpkg 1.22.4:";;
+     short | recursive ) echo "Configuration of dpkg 1.22.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1729,12 +1741,26 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
+  --with-perllibdir=DIR   perl modules directory
   --with-devlibdir=DIR    dpkg development library directory [LIBDIR]
   --with-pkgconfdir=DIR   dpkg configuration directory [SYSCONFDIR/dpkg]
+  --with-docspecdir=DIR   dpkg specifications directory [DOCDIR/spec]
+  --with-methodsdir=DIR   dpkg download methods directory
+                          [LIBEXECDIR/dpkg/methods]
   --with-admindir=DIR     dpkg database directory [LOCALSTATEDIR/lib/dpkg]
   --with-backupsdir=DIR   dpkg database backups directory
                           [LOCALSTATEDIR/backups]
   --with-logdir=DIR       system logging directory [LOCALSTATEDIR/log]
+  --with-pkgconfigdir=DIR pkg-config .pc fragments directory
+                          [DEVLIBDIR/pkgconfig]
+  --with-aclocaldir=DIR   aclocal m4 fragments files directory
+                          [DATADIR/aclocal]
+  --with-polkitactionsdir=DIR
+                          polkit .policy actions directory
+                          [DATADIR/polkit-1/actions]
+  --with-bashcompletionsdir=DIR
+                          bash completions directory
+                          [DATADIR/bash-completion/completions]
   --with-zshcompletionsdir=DIR
                           zsh vendor completions directory
                           [DATADIR/zsh/vendor-completions]
@@ -1858,7 +1884,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dpkg configure 1.22.4
+dpkg configure 1.22.5
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2674,7 +2700,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.4, which was
+It was created by dpkg $as_me 1.22.5, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -5492,7 +5518,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dpkg'
- VERSION='1.22.4'
+ VERSION='1.22.5'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -17054,14 +17080,6 @@ then :
     as_fn_error $? "building libdpkg as a shared library is not supported" "$LINENO" 5
 
 fi
-   if test "$enable_shared" = "yes"; then
-  BUILD_SHARED_TRUE=
-  BUILD_SHARED_FALSE='#'
-else
-  BUILD_SHARED_TRUE='#'
-  BUILD_SHARED_FALSE=
-fi
-
 
 
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker flag" >&5
@@ -17346,6 +17364,24 @@ then :
 
 fi
 
+  perllibdir="${PERL_LIBDIR}"
+
+# Check whether --with-perllibdir was given.
+if test ${with_perllibdir+y}
+then :
+  withval=$with_perllibdir;
+    case $with_perllibdir in #(
+  "") :
+    as_fn_error $? "invalid perllibdir specified" "$LINENO" 5 ;; #(
+  *) :
+    perllibdir="$with_perllibdir" ;;
+esac
+
+fi
+
+
+
+
 
 
   TIMESTAMP=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/build-aux/run-script" scripts/dpkg-parsechangelog.pl -l"$srcdir/debian/changelog" -STimestamp)
@@ -17396,7 +17432,7 @@ fi
 
 
 
-  pkgconfdir="${sysconfdir}/${PACKAGE_NAME}"
+  pkgconfdir="${sysconfdir}/${PACKAGE_TARNAME}"
 
 # Check whether --with-pkgconfdir was given.
 if test ${with_pkgconfdir+y}
@@ -17414,7 +17450,43 @@ fi
 
 
 
-  admindir="${localstatedir}/lib/${PACKAGE_NAME}"
+  docspecdir="${docdir}/spec"
+
+# Check whether --with-docspecdir was given.
+if test ${with_docspecdir+y}
+then :
+  withval=$with_docspecdir;
+    case $with_docspecdir in #(
+  "") :
+    as_fn_error $? "invalid docspecdir specified" "$LINENO" 5 ;; #(
+  *) :
+    docspecdir="$with_docspecdir" ;;
+esac
+
+fi
+
+
+
+
+  methodsdir="${libexecdir}/${PACKAGE_TARNAME}/methods"
+
+# Check whether --with-methodsdir was given.
+if test ${with_methodsdir+y}
+then :
+  withval=$with_methodsdir;
+    case $with_methodsdir in #(
+  "") :
+    as_fn_error $? "invalid methodsdir specified" "$LINENO" 5 ;; #(
+  *) :
+    methodsdir="$with_methodsdir" ;;
+esac
+
+fi
+
+
+
+
+  admindir="${localstatedir}/lib/${PACKAGE_TARNAME}"
 
 # Check whether --with-admindir was given.
 if test ${with_admindir+y}
@@ -17468,6 +17540,78 @@ fi
 
 
 
+  pkgconfigdir="${devlibdir}/pkgconfig"
+
+# Check whether --with-pkgconfigdir was given.
+if test ${with_pkgconfigdir+y}
+then :
+  withval=$with_pkgconfigdir;
+    case $with_pkgconfigdir in #(
+  "") :
+    as_fn_error $? "invalid pkgconfigdir specified" "$LINENO" 5 ;; #(
+  *) :
+    pkgconfigdir="$with_pkgconfigdir" ;;
+esac
+
+fi
+
+
+
+
+  aclocaldir="${datadir}/aclocal"
+
+# Check whether --with-aclocaldir was given.
+if test ${with_aclocaldir+y}
+then :
+  withval=$with_aclocaldir;
+    case $with_aclocaldir in #(
+  "") :
+    as_fn_error $? "invalid aclocaldir specified" "$LINENO" 5 ;; #(
+  *) :
+    aclocaldir="$with_aclocaldir" ;;
+esac
+
+fi
+
+
+
+
+  polkitactionsdir="${datadir}/polkit-1/actions"
+
+# Check whether --with-polkitactionsdir was given.
+if test ${with_polkitactionsdir+y}
+then :
+  withval=$with_polkitactionsdir;
+    case $with_polkitactionsdir in #(
+  "") :
+    as_fn_error $? "invalid polkitactionsdir specified" "$LINENO" 5 ;; #(
+  *) :
+    polkitactionsdir="$with_polkitactionsdir" ;;
+esac
+
+fi
+
+
+
+
+  bashcompletionsdir="${datadir}/bash-completion/completions"
+
+# Check whether --with-bashcompletionsdir was given.
+if test ${with_bashcompletionsdir+y}
+then :
+  withval=$with_bashcompletionsdir;
+    case $with_bashcompletionsdir in #(
+  "") :
+    as_fn_error $? "invalid bashcompletionsdir specified" "$LINENO" 5 ;; #(
+  *) :
+    bashcompletionsdir="$with_bashcompletionsdir" ;;
+esac
+
+fi
+
+
+
+
   zshcompletionsdir="${datadir}/zsh/vendor-completions"
 
 # Check whether --with-zshcompletionsdir was given.
@@ -23196,6 +23340,24 @@ then :
 
 fi
 
+  perllibdir="${PERL_LIBDIR}"
+
+# Check whether --with-perllibdir was given.
+if test ${with_perllibdir+y}
+then :
+  withval=$with_perllibdir;
+    case $with_perllibdir in #(
+  "") :
+    as_fn_error $? "invalid perllibdir specified" "$LINENO" 5 ;; #(
+  *) :
+    perllibdir="$with_perllibdir" ;;
+esac
+
+fi
+
+
+
+
 
 
   for ac_prog in pod2man
@@ -33804,10 +33966,6 @@ else
   am__EXEEXT_FALSE=
 fi
 
-if test -z "${BUILD_SHARED_TRUE}" && test -z "${BUILD_SHARED_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_SHARED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_LINKER_AS_NEEDED_TRUE}" && test -z "${HAVE_LINKER_AS_NEEDED_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LINKER_AS_NEEDED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -34291,7 +34449,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.4, which was
+This file was extended by dpkg $as_me 1.22.5, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -34360,7 +34518,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.4
+dpkg config.status 1.22.5
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
@@ -36525,9 +36683,16 @@ Configuration:
   Paths:
     devlibdir . . . . . . . . . . : $devlibdir
     pkgconfdir  . . . . . . . . . : $pkgconfdir
+    docspecdir  . . . . . . . . . : $docspecdir
+    methodsdir  . . . . . . . . . : $methodsdir
     admindir  . . . . . . . . . . : $admindir
     backupsdir  . . . . . . . . . : $backupsdir
     logdir  . . . . . . . . . . . : $logdir
+    pkg-config dir  . . . . . . . : $pkgconfigdir
+    aclocal dir   . . . . . . . . : $aclocaldir
+    polkit actions dir  . . . . . : $polkitactionsdir
+    bash completions dir  . . . . : $bashcompletionsdir
+    zsh completions dir . . . . . : $zshcompletionsdir
     perl interpreter  . . . . . . : $PERL
     perl libdir . . . . . . . . . : $PERL_LIBDIR
 
diff --git a/configure.ac b/configure.ac
index 568c712..b084ade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,14 +60,26 @@ DPKG_BUILD_DEVEL_DOCS
 # Allow alternate directories
 DPKG_WITH_DIR([devlibdir], [${libdir}],
   [dpkg development library directory [LIBDIR]])
-DPKG_WITH_DIR([pkgconfdir], [${sysconfdir}/${PACKAGE_NAME}],
+DPKG_WITH_DIR([pkgconfdir], [${sysconfdir}/${PACKAGE_TARNAME}],
   [dpkg configuration directory [SYSCONFDIR/dpkg]])
-DPKG_WITH_DIR([admindir], [${localstatedir}/lib/${PACKAGE_NAME}],
+DPKG_WITH_DIR([docspecdir], [${docdir}/spec],
+  [dpkg specifications directory [DOCDIR/spec]])
+DPKG_WITH_DIR([methodsdir], [${libexecdir}/${PACKAGE_TARNAME}/methods],
+  [dpkg download methods directory [LIBEXECDIR/dpkg/methods]])
+DPKG_WITH_DIR([admindir], [${localstatedir}/lib/${PACKAGE_TARNAME}],
   [dpkg database directory [LOCALSTATEDIR/lib/dpkg]])
 DPKG_WITH_DIR([backupsdir], [${localstatedir}/backups],
   [dpkg database backups directory [LOCALSTATEDIR/backups]])
 DPKG_WITH_DIR([logdir], [${localstatedir}/log],
   [system logging directory [LOCALSTATEDIR/log]])
+DPKG_WITH_DIR([pkgconfigdir], [${devlibdir}/pkgconfig],
+  [pkg-config .pc fragments directory [DEVLIBDIR/pkgconfig]])
+DPKG_WITH_DIR([aclocaldir], [${datadir}/aclocal],
+  [aclocal m4 fragments files directory [DATADIR/aclocal]])
+DPKG_WITH_DIR([polkitactionsdir], [${datadir}/polkit-1/actions],
+  [polkit .policy actions directory [DATADIR/polkit-1/actions]])
+DPKG_WITH_DIR([bashcompletionsdir], [${datadir}/bash-completion/completions],
+  [bash completions directory [DATADIR/bash-completion/completions]])
 DPKG_WITH_DIR([zshcompletionsdir], [${datadir}/zsh/vendor-completions],
   [zsh vendor completions directory [DATADIR/zsh/vendor-completions]])
 
@@ -298,9 +310,16 @@ Configuration:
   Paths:
     devlibdir . . . . . . . . . . : $devlibdir
     pkgconfdir  . . . . . . . . . : $pkgconfdir
+    docspecdir  . . . . . . . . . : $docspecdir
+    methodsdir  . . . . . . . . . : $methodsdir
     admindir  . . . . . . . . . . : $admindir
     backupsdir  . . . . . . . . . : $backupsdir
     logdir  . . . . . . . . . . . : $logdir
+    pkg-config dir  . . . . . . . : $pkgconfigdir
+    aclocal dir   . . . . . . . . : $aclocaldir
+    polkit actions dir  . . . . . : $polkitactionsdir
+    bash completions dir  . . . . : $bashcompletionsdir
+    zsh completions dir . . . . . : $zshcompletionsdir
     perl interpreter  . . . . . . : $PERL
     perl libdir . . . . . . . . . : $PERL_LIBDIR