dpkg: update to 1.21.1, rm busybox compat patch

packages/dpkg/build.sh

@@ -2,11 +2,9 @@ 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.20.9
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_VERSION=1.21.1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=5ce242830f213b5620f08e6c4183adb1ef4dc9da28d31988a27c87c71fe534ce
-# with the extract.c.patch we remove the -p and --warning=no-timestamp tar options so we can use busybox tar
+TERMUX_PKG_SHA256=1eb9fd5228b3199284ea5134904bb45b7a5bc12fb044b8e4964d89d2e5bbb563
 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,21 +1,21 @@
-diff -u -r ../dpkg-1.18.15/configure ./configure
---- ../dpkg-1.18.15/configure	2016-11-15 21:28:05.000000000 -0500
-+++ ./configure	2016-11-26 10:44:53.214082696 -0500
-@@ -25749,7 +25749,7 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dpkg cpu type" >&5
- $as_echo_n "checking dpkg cpu type... " >&6; }
+diff -u -r ../dpkg-1.21.1/configure ./configure
+--- ../dpkg-1.21.1/configure
++++ ./configure
+@@ -29537,7 +29537,7 @@ fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dpkg cpu type" >&5
+ printf %s "checking dpkg cpu type... " >&6; }
  
--      cpu_type=$(PERL=$PERL $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/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 :
+   if test "x$cpu_type" = "x"
+ then :
+@@ -29586,7 +29586,7 @@ printf "%s\n" "#define ARCHITECTURE_OS \"${os_type}\"" >>confdefs.h
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dpkg architecture name" >&5
+ printf %s "checking dpkg architecture name... " >&6; }
  
-@@ -25800,7 +25800,7 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dpkg architecture name" >&5
- $as_echo_n "checking dpkg architecture name... " >&6; }
- 
--      dpkg_arch=$(PERL=$PERL $srcdir/run-script scripts/dpkg-architecture.pl -t$host -qDEB_HOST_ARCH 2>/dev/null)
+-      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=TERMUX_ARCH
  
-   if test "x$dpkg_arch" = "x"; then :
- 
+   if test "x$dpkg_arch" = "x"
+ then :

packages/dpkg/extract.c.patch

@@ -1,26 +0,0 @@
-Remove tar options not supported by busybox tar.
-
-diff -u -r ../dpkg-1.17.10/dpkg-deb/extract.c ./dpkg-deb/extract.c
---- ../dpkg-1.17.10/dpkg-deb/extract.c	2014-06-04 02:02:54.000000000 +0200
-+++ ./dpkg-deb/extract.c	2014-07-01 16:40:02.785848137 +0200
-@@ -327,14 +327,20 @@
-       else
-         internerr("unknown or missing tar action '%d'", taroption);
- 
-+#ifndef __ANDROID__
-+      /* busybox tar does not support this */
-       if (taroption & DPKG_TAR_PERMS)
-         command_add_arg(&cmd, "-p");
-+#endif
-       if (taroption & DPKG_TAR_NOMTIME)
-         command_add_arg(&cmd, "-m");
- 
-       command_add_arg(&cmd, "-f");
-       command_add_arg(&cmd, "-");
-+#ifndef __ANDROID__
-+      /* busybox tar does not support this */
-       command_add_arg(&cmd, "--warning=no-timestamp");
-+#endif
- 
-       m_dup2(p2[0],0);
-       close(p2[0]);