dpkg: update to 1.21.7

packages/dpkg/build.sh

@@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg
 TERMUX_PKG_DESCRIPTION="Debian package management system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.21.1
+TERMUX_PKG_VERSION=1.21.7
 TERMUX_PKG_REVISION=1
-#TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SRCURL=https://ftp-osl.osuosl.org/pub/gentoo/distfiles/dpkg_${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=1eb9fd5228b3199284ea5134904bb45b7a5bc12fb044b8e4964d89d2e5bbb563
+TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=bd9b66bd92ff9b851ce1d79eed4bf710427d8d39a33c91f1b5da8e3dde524c39
 TERMUX_PKG_DEPENDS="bzip2, coreutils, diffutils, gzip, less, libbz2, liblzma, tar, xz-utils, zlib"
 TERMUX_PKG_BREAKS="dpkg-dev"
 TERMUX_PKG_REPLACES="dpkg-dev"

packages/dpkg/configure.patch

@@ -1,20 +1,20 @@
-diff -u -r ../dpkg-1.21.1/configure ./configure
---- ../dpkg-1.21.1/configure
-+++ ./configure
-@@ -29537,7 +29537,7 @@ fi
+diff -u -r ../dpkg-1.21.7/configure ./configure
+--- ../dpkg-1.21.7/configure	2022-04-30 20:54:49.352689537 -0300
++++ ./configure	2022-04-30 20:56:52.770022395 -0300
+@@ -29818,7 +29818,7 @@
    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dpkg cpu type" >&5
  printf %s "checking dpkg cpu type... " >&6; }
  
--      cpu_type=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/run-script" scripts/dpkg-architecture.pl -t$host -qDEB_HOST_ARCH_CPU 2>/dev/null)
+-      cpu_type=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/build-aux/run-script" scripts/dpkg-architecture.pl -t$host -qDEB_HOST_ARCH_CPU 2>/dev/null)
 +      cpu_type=TERMUX_ARCH
  
    if test "x$cpu_type" = "x"
  then :
-@@ -29586,7 +29586,7 @@ printf "%s\n" "#define ARCHITECTURE_OS \"${os_type}\"" >>confdefs.h
+@@ -29867,7 +29867,7 @@
    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dpkg architecture name" >&5
  printf %s "checking dpkg architecture name... " >&6; }
  
--      dpkg_arch=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/run-script" scripts/dpkg-architecture.pl -t$host -qDEB_HOST_ARCH 2>/dev/null)
+-      dpkg_arch=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/build-aux/run-script" scripts/dpkg-architecture.pl -t$host -qDEB_HOST_ARCH 2>/dev/null)
 +      dpkg_arch=TERMUX_ARCH
  
    if test "x$dpkg_arch" = "x"

packages/dpkg/src-archives.c.patch

@@ -1,6 +1,6 @@
 diff -u -r ../dpkg-1.19.2/src/archives.c ./src/archives.c
 --- ../dpkg-1.19.2/src/archives.c	2018-10-08 09:43:48.000000000 +0000
-+++ ./src/archives.c	2018-11-11 02:17:28.534503365 +0000
++++ ./src/main/archives.c	2018-11-11 02:17:28.534503365 +0000
 @@ -389,9 +389,11 @@
              namenode->statoverride->uid,
              namenode->statoverride->gid,

packages/dpkg/src-configure.c.patch

@@ -1,6 +1,6 @@
 diff -u -r ../dpkg-1.18.15/src/configure.c ./src/configure.c
 --- ../dpkg-1.18.15/src/configure.c	2016-11-11 22:18:40.000000000 -0500
-+++ ./src/configure.c	2016-12-03 16:32:43.719508056 -0500
++++ ./src/main/configure.c	2016-12-03 16:32:43.719508056 -0500
 @@ -497,8 +497,10 @@
  			        pkg_name(pkg, pnaw_nonambig), cdr2.buf,
  			        strerror(errno));

packages/dpkg/src-help.c.patch

@@ -1,6 +1,6 @@
 diff -u -r ../dpkg-1.19.2/src/help.c ./src/help.c
 --- ../dpkg-1.19.2/src/help.c	2018-10-07 22:07:52.000000000 +0000
-+++ ./src/help.c	2018-11-11 02:13:05.133548711 +0000
++++ ./src/main/help.c	2018-11-11 02:13:05.133548711 +0000
 @@ -127,8 +127,10 @@
      "update_dyld_shared_cache",
  #elif defined(__GLIBC__) || defined(__UCLIBC__) || \

packages/dpkg/src-statoverride-main.c.patch

@@ -1,7 +1,7 @@
-diff -u -r ../dpkg-1.18.2/src/statcmd.c ./src/statcmd.c
---- ../dpkg-1.18.2/src/statcmd.c	2015-07-12 22:38:47.000000000 -0400
-+++ ./src/statcmd.c	2015-08-25 18:07:59.388890175 -0400
-@@ -161,8 +161,10 @@
+diff -u -r ./src/statoverride/main.c ./main.c
+--- ./src/statoverride/main.c	2022-05-01 09:51:32.298164682 -0300
++++ ./main.c	2022-05-01 09:56:12.247431464 -0300
+@@ -185,8 +185,10 @@
  static void
  statdb_node_apply(const char *filename, struct file_stat *filestat)
  {