apk-tools: update to 2.10.4

This commit is contained in:
Leonid Pliushch 2019-07-21 16:39:04 +03:00
parent 4e91b02380
commit c13daf9d27
2 changed files with 22 additions and 3 deletions

View File

@ -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="

View File

@ -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);