diff options
Diffstat (limited to 'source/a/tar')
-rw-r--r-- | source/a/tar/CVE-2022-48303.patch | 31 | ||||
-rwxr-xr-x | source/a/tar/tar.SlackBuild | 5 |
2 files changed, 1 insertions, 35 deletions
diff --git a/source/a/tar/CVE-2022-48303.patch b/source/a/tar/CVE-2022-48303.patch deleted file mode 100644 index b248fb089..000000000 --- a/source/a/tar/CVE-2022-48303.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1d530107a24d71e798727d7f0afa0833473d1074 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matej=20Mu=C5=BEila?= <mmuzila@gmail.com> -Date: Wed, 11 Jan 2023 08:55:58 +0100 -Subject: [PATCH] Fix savannah bug #62387 - -* src/list.c (from_header): Check for the end of field after leading byte - (0x80 or 0xff) of base-256 encoded header value ---- - src/list.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/list.c b/src/list.c -index 9fafc425..bf41b581 100644 ---- a/src/list.c -+++ b/src/list.c -@@ -895,6 +895,12 @@ from_header (char const *where0, size_t digs, char const *type, - << (CHAR_BIT * sizeof (uintmax_t) - - LG_256 - (LG_256 - 2))); - value = (*where++ & ((1 << (LG_256 - 2)) - 1)) - signbit; -+ if (where == lim) -+ { -+ if (type && !silent) -+ ERROR ((0, 0, _("Archive base-256 value is invalid"))); -+ return -1; -+ } - for (;;) - { - value = (value << LG_256) + (unsigned char) *where++; --- -2.38.1 - diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild index 20dcd4956..b01d00eda 100755 --- a/source/a/tar/tar.SlackBuild +++ b/source/a/tar/tar.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tar VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -78,9 +78,6 @@ find . \ # The "A lone zero block at %s" messages also cause problems: zcat $CWD/tar.nolonezero.diff.gz | patch -p1 --verbose || exit 1 -# Patch for CVE-2022-48303: -zcat $CWD/CVE-2022-48303.patch.gz | patch -p1 --verbose || exit 1 - FORCE_UNSAFE_CONFIGURE=1 \ CFLAGS="$SLKCFLAGS" \ ./configure \ |