From e5855e10054fff399c4081e30d35c1d9e62a17b2 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Mon, 24 Jul 2023 11:20:50 +0200 Subject: [PATCH] tar: update to 1.35. --- srcpkgs/tar/patches/cve-2022-48303.patch | 31 ------------------------ srcpkgs/tar/template | 9 ++++--- 2 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/tar/patches/cve-2022-48303.patch diff --git a/srcpkgs/tar/patches/cve-2022-48303.patch b/srcpkgs/tar/patches/cve-2022-48303.patch deleted file mode 100644 index 8ce9af97ac39f..0000000000000 --- a/srcpkgs/tar/patches/cve-2022-48303.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Sat, 11 Feb 2023 11:57:39 +0200 -Subject: Fix boundary checking in base-256 decoder - -* src/list.c (from_header): Base-256 encoding is at least 2 bytes -long. ---- - src/list.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - https://savannah.gnu.org/bugs/?62387 - -diff --git a/src/list.c b/src/list.c -index 9fafc42..86bcfdd 100644 ---- a/src/list.c -+++ b/src/list.c -@@ -881,8 +881,9 @@ from_header (char const *where0, size_t digs, char const *type, - where++; - } - } -- else if (*where == '\200' /* positive base-256 */ -- || *where == '\377' /* negative base-256 */) -+ else if (where <= lim - 2 -+ && (*where == '\200' /* positive base-256 */ -+ || *where == '\377' /* negative base-256 */)) - { - /* Parse base-256 output. A nonnegative number N is - represented as (256**DIGS)/2 + N; a negative number -N is --- -cgit v1.1 - diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template index 0896a89afe2cd..97d43f70d3f0c 100644 --- a/srcpkgs/tar/template +++ b/srcpkgs/tar/template @@ -1,7 +1,7 @@ # Template file for 'tar' pkgname=tar -version=1.34 -revision=3 +version=1.35 +revision=1 build_style=gnu-configure configure_args="gl_cv_struct_dirent_d_ino=yes" makedepends="acl-devel" @@ -10,11 +10,14 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/tar/" distfiles="${GNU_SITE}/tar/${pkgname}-${version}.tar.xz" -checksum=63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28 +checksum=4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16 pre_configure() { # chroot-style=ethereal export FORCE_UNSAFE_CONFIGURE=1 # avoid regenerating doc on install touch -r doc/stamp-vti configure + if [ "$XBPS_TARGET_MACHINE" = "armv6l-musl" ]; then + configure_args+=" --disable-year2038" + fi }