From 05ebefe869c5b547f1f49e3bdcaa2d349a984d53 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 26 Nov 2016 10:47:55 -0500
Subject: [PATCH] dpkg: Update from 1.18.0 to 1.18.15

Also switch from ftp.debian.org to mirrors.kernel.org.
---
 packages/dpkg/build.sh        |  5 +++--
 packages/dpkg/configure.patch | 30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh
index 2214e648..b4971a16 100755
--- a/packages/dpkg/build.sh
+++ b/packages/dpkg/build.sh
@@ -1,7 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg
 TERMUX_PKG_DESCRIPTION="Debian package management system"
-TERMUX_PKG_VERSION=1.18.10
-TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_VERSION=1.18.15
+TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=aee936653b9c39403160c0a331ee7934563fbfa4e1f5adbc14a289c803cda371
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-dselect --disable-shared --disable-start-stop-daemon --disable-largefile --disable-update-alternatives --host=${TERMUX_ARCH}-linux --without-selinux dpkg_cv_c99_snprintf=yes ac_cv_lib_selinux_setexecfilecon=no HAVE_SETEXECFILECON_FALSE=#"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --without-libbz2"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/perl5 share/perl5 lib/dpkg/parsechangelog bin/dpkg-architecture bin/dpkg-buildflags bin/dpkg-buildpackage bin/dpkg-checkbuilddeps bin/dpkg-distaddfile bin/dpkg-genchanges bin/dpkg-gencontrol bin/dpkg-gensymbols bin/dpkg-maintscript-helper bin/dpkg-mergechangelogs bin/dpkg-name bin/dpkg-parsechangelog bin/dpkg-scanpackages bin/dpkg-scansources bin/dpkg-shlibdeps bin/dpkg-source bin/dpkg-statoverride bin/dpkg-vendor share/man/man1/dpkg-architecture.1 share/man/man1/dpkg-buildflags.1 share/man/man1/dpkg-buildpackage.1 share/man/man1/dpkg-checkbuilddeps.1 share/man/man1/dpkg-distaddfile.1 share/man/man1/dpkg-genchanges.1 share/man/man1/dpkg-gencontrol.1 share/man/man1/dpkg-gensymbols.1 share/man/man1/dpkg-maintscript-helper.1 share/man/man1/dpkg-mergechangelogs.1 share/man/man1/dpkg-name.1 share/man/man1/dpkg-parsechangelog.1 share/man/man1/dpkg-scanpackages.1 share/man/man1/dpkg-scansources.1 share/man/man1/dpkg-shlibdeps.1 share/man/man1/dpkg-source.1 share/man/man1/dpkg-vendor.1 share/man/man8/dpkg-statoverride.8 share/man/man3"
diff --git a/packages/dpkg/configure.patch b/packages/dpkg/configure.patch
index 0ff14275..823100e2 100644
--- a/packages/dpkg/configure.patch
+++ b/packages/dpkg/configure.patch
@@ -1,21 +1,21 @@
-diff -u -r ../dpkg-1.18.7/configure ./configure
---- ../dpkg-1.18.7/configure	2016-05-08 22:09:16.000000000 -0400
-+++ ./configure	2016-05-24 16:52:40.683774088 -0400
-@@ -24862,7 +24862,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dpkg cpu type" >&5
+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; }
  
--cpu_type=$(PERL=$PERL $srcdir/run-script scripts/dpkg-architecture.pl -t$host -qDEB_HOST_ARCH_CPU 2>/dev/null)
-+cpu_type=TERMUX_ARCH
+-      cpu_type=$(PERL=$PERL $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
- 	cpu_type=$host_cpu
-@@ -24904,7 +24904,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dpkg architecture name" >&5
+   if test "x$cpu_type" = "x"; then :
+ 
+@@ -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=TERMUX_ARCH
+-      dpkg_arch=$(PERL=$PERL $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
- 	as_fn_error $? "cannot determine host dpkg architecture" "$LINENO" 5
-- 
2.11.0