diff --git a/meta/recipes-extended/gzip/gzip-1.14/CVE-2026-41991.patch b/meta/recipes-extended/gzip/gzip-1.15/CVE-2026-41991.patch similarity index 50% rename from meta/recipes-extended/gzip/gzip-1.14/CVE-2026-41991.patch rename to meta/recipes-extended/gzip/gzip-1.15/CVE-2026-41991.patch index b1a3644020..e72c3d355b 100644 --- a/meta/recipes-extended/gzip/gzip-1.14/CVE-2026-41991.patch +++ b/meta/recipes-extended/gzip/gzip-1.15/CVE-2026-41991.patch @@ -1,4 +1,4 @@ -From 661918c7c0d5acf52508107d6bcdeb72a526ce52 Mon Sep 17 00:00:00 2001 +From 286734a7f791dfb1694bf7d2d61dfae8c8105cc7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 16 Apr 2026 12:11:44 -0700 Subject: [PATCH] gzexe: use -C if lacking mktemp @@ -16,16 +16,14 @@ CVE: CVE-2026-41991 Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/gzip.git/commit/?id=4e6f8b24ab823146ab8776f0b7fe486ab34d4269] Signed-off-by: Jaipaul Cheernam --- - NEWS | 13 +++++++++---- - gzexe.in | 1 + - zdiff.in | 7 +++---- - 3 files changed, 13 insertions(+), 8 deletions(-) + NEWS | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS -index 881b6b6..3a05d7e 100644 +index 75836f2..7881350 100644 --- a/NEWS +++ b/NEWS -@@ -4,10 +4,6 @@ GNU gzip NEWS -*- outline -*- +@@ -68,10 +68,6 @@ GNU gzip NEWS -*- outline -*- ** Bug fixes @@ -36,7 +34,7 @@ index 881b6b6..3a05d7e 100644 'gzip -d' no longer omits the last partial output buffer when the input ends unexpectedly on an IBM Z platform. [bug introduced in gzip-1.11] -@@ -18,6 +14,15 @@ GNU gzip NEWS -*- outline -*- +@@ -82,6 +78,15 @@ GNU gzip NEWS -*- outline -*- 'gzip -S' now rejects suffixes containing '/'. [bug present since the beginning] @@ -52,35 +50,3 @@ index 881b6b6..3a05d7e 100644 ** Changes in behavior The GZIP environment variable is now silently ignored except for the -diff --git a/gzexe.in b/gzexe.in -index 1267d6e..09a2571 100644 ---- a/gzexe.in -+++ b/gzexe.in -@@ -127,6 +127,7 @@ for i do - tmp=`mktemp "${dir}gzexeXXXXXXXXX"` - else - tmp=${dir}gzexe$$ -+ (umask 77; set -C; > "$tmp") - fi && { cp -p "$file" "$tmp" 2>/dev/null || cp "$file" "$tmp"; } || { - res=$? - printf >&2 '%s\n' "$0: cannot copy $file" -diff --git a/zdiff.in b/zdiff.in -index a8689a0..c04a8c0 100644 ---- a/zdiff.in -+++ b/zdiff.in -@@ -156,12 +156,11 @@ case $file2 in - *) TMPDIR=/tmp/;; - esac - if command -v mktemp >/dev/null 2>&1; then -- tmp=`mktemp "${TMPDIR}zdiffXXXXXXXXX"` || -- exit 2 -+ tmp=`mktemp "${TMPDIR}zdiffXXXXXXXXX"` - else -- set -C - tmp=${TMPDIR}zdiff$$ -- fi -+ (umask 77; set -C; > "$tmp") -+ fi && - 'gzip' -cdfq -- "$file2" > "$tmp" || exit 2 - gzip_status=$( - exec 4>&1 diff --git a/meta/recipes-extended/gzip/gzip-1.14/CVE-2026-41992.patch b/meta/recipes-extended/gzip/gzip-1.15/CVE-2026-41992.patch similarity index 65% rename from meta/recipes-extended/gzip/gzip-1.14/CVE-2026-41992.patch rename to meta/recipes-extended/gzip/gzip-1.15/CVE-2026-41992.patch index f55c89978d..00378dd179 100644 --- a/meta/recipes-extended/gzip/gzip-1.14/CVE-2026-41992.patch +++ b/meta/recipes-extended/gzip/gzip-1.15/CVE-2026-41992.patch @@ -1,7 +1,8 @@ -From 63dbf6b3b9e6e781df1a6a64e609b10e23969681 Mon Sep 17 00:00:00 2001 +From 3a355dd8d9bc7ec9640447e5542acaefecf3fec5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 15 Apr 2026 12:00:17 -0700 -Subject: =?UTF-8?q?gzip:=20don=E2=80=99t=20mishandle=20.lzh=20after=20.Z?= +Subject: [PATCH] =?UTF-8?q?gzip:=20don=E2=80=99t=20mishandle=20.lzh=20afte?= + =?UTF-8?q?r=20.Z?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,15 +15,14 @@ Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/gzip.git/commi Signed-off-by: Jaipaul Cheernam --- NEWS | 4 ++++ - THANKS | 1 + unlzh.c | 6 ++++++ - 3 files changed, 11 insertions(+) + 2 files changed, 10 insertions(+) diff --git a/NEWS b/NEWS -index 6388227..8fb8918 100644 +index a8657a8..75836f2 100644 --- a/NEWS +++ b/NEWS -@@ -4,6 +4,10 @@ GNU gzip NEWS -*- outline -*- +@@ -68,6 +68,10 @@ GNU gzip NEWS -*- outline -*- ** Bug fixes @@ -33,20 +33,8 @@ index 6388227..8fb8918 100644 'gzip -d' no longer omits the last partial output buffer when the input ends unexpectedly on an IBM Z platform. [bug introduced in gzip-1.11] -diff --git a/THANKS b/THANKS -index 4e545d9..a7d25e4 100644 ---- a/THANKS -+++ b/THANKS -@@ -186,6 +186,7 @@ Jamie Lokier u90jl@ecs.oxford.ac.uk - Richard Lloyd R.K.Lloyd@csc.liv.ac.uk - David J. MacKenzie djm@eng.umd.edu - John R MacMillan john@chance.gts.org -+Michał Majchrowicz mmajchrowicz@afine.com - Ron Male male@eso.mc.xerox.com - Jakub Martisko jamartis@redhat.com - Don R. Maszle maze@bea.lbl.gov diff --git a/unlzh.c b/unlzh.c -index 3320196..a6cf109 100644 +index 7fde9c6..2e31c27 100644 --- a/unlzh.c +++ b/unlzh.c @@ -232,6 +232,12 @@ read_c_len () diff --git a/meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.15/wrong-path-fix.patch similarity index 92% rename from meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch rename to meta/recipes-extended/gzip/gzip-1.15/wrong-path-fix.patch index 4d5e7a8e02..cff379d133 100644 --- a/meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch +++ b/meta/recipes-extended/gzip/gzip-1.15/wrong-path-fix.patch @@ -1,4 +1,4 @@ -From eda9b1d08c517acbdc5b26c24c94a3985f29c749 Mon Sep 17 00:00:00 2001 +From 885f15530d7e5442d5399b5216fcfc988eb2d721 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Fri, 21 Nov 2014 04:50:57 -0500 Subject: [PATCH] fix MakeMaker issues with using wrong SHELL/GREP @@ -20,7 +20,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 23e0d3e..3455878 100644 +index 6491c8b..596fd9a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,8 +95,7 @@ SUFFIXES = .in diff --git a/meta/recipes-extended/gzip/gzip_1.14.bb b/meta/recipes-extended/gzip/gzip_1.15.bb similarity index 94% rename from meta/recipes-extended/gzip/gzip_1.14.bb rename to meta/recipes-extended/gzip/gzip_1.15.bb index d6bd36f89f..d1340c36bd 100644 --- a/meta/recipes-extended/gzip/gzip_1.14.bb +++ b/meta/recipes-extended/gzip/gzip_1.15.bb @@ -42,4 +42,4 @@ do_install_ptest() { ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile } -SRC_URI[sha256sum] = "613d6ea44f1248d7370c7ccdeee0dd0017a09e6c39de894b3c6f03f981191c6b" +SRC_URI[sha256sum] = "545886cf57fa88a65e967fbf705903d7fcb2567c82c7342493e82e8d7b1a210b"