tar: update to 1.33
This commit is contained in:
parent
7e4cc7bdbe
commit
c4dc90c657
|
@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/tar/
|
||||||
TERMUX_PKG_DESCRIPTION="GNU tar for manipulating tar archives"
|
TERMUX_PKG_DESCRIPTION="GNU tar for manipulating tar archives"
|
||||||
TERMUX_PKG_LICENSE="GPL-3.0"
|
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||||
TERMUX_PKG_MAINTAINER="@termux"
|
TERMUX_PKG_MAINTAINER="@termux"
|
||||||
TERMUX_PKG_VERSION=1.32
|
TERMUX_PKG_VERSION=1.33
|
||||||
TERMUX_PKG_REVISION=6
|
|
||||||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/tar/tar-${TERMUX_PKG_VERSION}.tar.xz
|
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/tar/tar-${TERMUX_PKG_VERSION}.tar.xz
|
||||||
TERMUX_PKG_SHA256=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8
|
TERMUX_PKG_SHA256=66a8344b1dc83a411d311bd1547e0176e56cc311f28ee94a30f84dafb3d9067e
|
||||||
TERMUX_PKG_DEPENDS="libandroid-glob, libiconv"
|
TERMUX_PKG_DEPENDS="libandroid-glob, libiconv"
|
||||||
TERMUX_PKG_ESSENTIAL=true
|
TERMUX_PKG_ESSENTIAL=true
|
||||||
|
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff -u -r ../tar-1.31/gnu/stdio-impl.h ./gnu/stdio-impl.h
|
|
||||||
--- ../tar-1.31/gnu/stdio-impl.h 2019-01-02 18:16:01.000000000 +0000
|
|
||||||
+++ ./gnu/stdio-impl.h 2019-01-03 00:26:16.683764235 +0000
|
|
||||||
@@ -60,7 +60,7 @@
|
|
||||||
# define _flags pub._flags
|
|
||||||
# define _r pub._r
|
|
||||||
# define _w pub._w
|
|
||||||
-# elif defined __ANDROID__ /* Android */
|
|
||||||
+# elif defined __ANDROID_BUT_THIS_IS_BROKEN__ /* Android */
|
|
||||||
/* Up to this commit from 2015-10-12
|
|
||||||
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
|
|
||||||
the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff -uNr tar-1.32/gnu/vasnprintf.c tar-1.32.mod/gnu/vasnprintf.c
|
|
||||||
--- tar-1.32/gnu/vasnprintf.c 2019-01-02 20:16:02.000000000 +0200
|
|
||||||
+++ tar-1.32.mod/gnu/vasnprintf.c 2019-11-29 15:26:53.996809645 +0200
|
|
||||||
@@ -4874,7 +4874,7 @@
|
|
||||||
# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
|
|
||||||
&& !defined __UCLIBC__) \
|
|
||||||
|| (defined __APPLE__ && defined __MACH__) \
|
|
||||||
- || (defined _WIN32 && ! defined __CYGWIN__))
|
|
||||||
+ || (defined _WIN32 && ! defined __CYGWIN__) || defined(__ANDROID__))
|
|
||||||
fbp[1] = '%';
|
|
||||||
fbp[2] = 'n';
|
|
||||||
fbp[3] = '\0';
|
|
|
@ -21,15 +21,15 @@ diff -uNr tar-1.31/gnu/tempname.c tar-1.31.mod/gnu/tempname.c
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
__set_errno (ENOENT);
|
__set_errno (ENOENT);
|
||||||
diff -uNr tar-1.31/src/xheader.c tar-1.31.mod/src/xheader.c
|
diff -uNr tar-1.33/src/xheader.c tar-1.33.mod/src/xheader.c
|
||||||
--- tar-1.31/src/xheader.c 2019-01-02 20:07:48.000000000 +0200
|
--- tar-1.33/src/xheader.c 2021-01-06 15:52:09.000000000 +0000
|
||||||
+++ tar-1.31.mod/src/xheader.c 2019-03-01 18:31:18.538927987 +0200
|
+++ tar-1.33.mod/src/xheader.c 2021-02-07 21:18:57.425078913 +0000
|
||||||
@@ -387,7 +387,7 @@
|
@@ -404,7 +404,7 @@
|
||||||
size_t len;
|
const char *global_header_template = HEADER_TEMPLATE (pax_global_header);
|
||||||
const char *tmp = getenv ("TMPDIR");
|
const char *tmp = getenv ("TMPDIR");
|
||||||
if (!tmp)
|
if (!tmp)
|
||||||
- tmp = "/tmp";
|
- tmp = "/tmp";
|
||||||
+ tmp = "@TERMUX_PREFIX@/tmp";
|
+ tmp = "@TERMUX_PREFIX@/tmp";
|
||||||
len = strlen (tmp) + sizeof (GLOBAL_HEADER_TEMPLATE); /* Includes nul */
|
len = strlen (tmp) + strlen (global_header_template) + 1;
|
||||||
globexthdr_name = xmalloc (len);
|
globexthdr_name = xmalloc (len);
|
||||||
strcpy(globexthdr_name, tmp);
|
strcpy(globexthdr_name, tmp);
|
||||||
|
|
Loading…
Reference in New Issue