From c13daf9d276943828c5d337f8f19ee8510442590 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 21 Jul 2019 16:39:04 +0300
Subject: [PATCH] apk-tools: update to 2.10.4

---
 packages/apk-tools/build.sh              |  5 ++---
 packages/apk-tools/libfetch-http.c.patch | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 packages/apk-tools/libfetch-http.c.patch

diff --git a/packages/apk-tools/build.sh b/packages/apk-tools/build.sh
index d8dd932af..5ef2f5175 100644
--- a/packages/apk-tools/build.sh
+++ b/packages/apk-tools/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://wiki.alpinelinux.org/wiki/Alpine_Linux_package_management
 TERMUX_PKG_DESCRIPTION="Alpine Linux package management tools"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=2.10.3
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=f91861ed981d0a2912d5d860a33795ec40d16021ab03f6561a3849b9c0bcf77e
+TERMUX_PKG_VERSION=2.10.4
 TERMUX_PKG_SRCURL=https://github.com/alpinelinux/apk-tools/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=c08aa725a0437a6a83c5364a1a3a468e4aef5d1d09523369074779021397281c
 TERMUX_PKG_DEPENDS="openssl, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_MAKE_ARGS="LUAAPK="
diff --git a/packages/apk-tools/libfetch-http.c.patch b/packages/apk-tools/libfetch-http.c.patch
new file mode 100644
index 000000000..b0c65a83e
--- /dev/null
+++ b/packages/apk-tools/libfetch-http.c.patch
@@ -0,0 +1,20 @@
+diff -uNr apk-tools-2.10.4/libfetch/http.c apk-tools-2.10.4.mod/libfetch/http.c
+--- apk-tools-2.10.4/libfetch/http.c	2019-06-05 15:34:16.000000000 +0300
++++ apk-tools-2.10.4.mod/libfetch/http.c	2019-07-21 16:38:08.300760202 +0300
+@@ -496,14 +496,11 @@
+ static int
+ http_parse_mtime(const char *p, time_t *mtime)
+ {
+-	char *locale, *r;
++	char *r;
+ 	struct tm tm;
+ 
+-	locale = strdupa(setlocale(LC_TIME, NULL));
+-	setlocale(LC_TIME, "C");
+ 	r = strptime(p, "%a, %d %b %Y %H:%M:%S GMT", &tm);
+-	/* XXX should add support for date-2 and date-3 */
+-	setlocale(LC_TIME, locale);
++
+ 	if (r == NULL)
+ 		return (-1);
+ 	*mtime = timegm(&tm);