summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Siemsen <ralph.siemsen@linaro.org>2022-04-08 22:16:44 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-10 08:31:17 +0100
commit55bed213cffe7449b3e7a1f50f9bf0d4a0535ef1 (patch)
treeb16c6e3cfe8c8f6033ba9d66ae22b9deba7b1c4c
parent30eb28dd02920f166d2deaf5114a8e810c42b948 (diff)
downloadpoky-55bed213cffe7449b3e7a1f50f9bf0d4a0535ef1.tar.gz
gzip: upgrade 1.11 -> 1.12
This includes a fix for CVE-2022-1271. The existing "wrong path" patch needed to be refreshed, because the context changed due to the following upstream change: https://git.savannah.gnu.org/cgit/gzip.git/commit/?id=31193bbd13cd2807d8ccaa2ba5b072303d5425e7 (From OE-Core rev: ada1a900b022f0330a9812e4f4c0248961de1048) Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch (renamed from meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch)14
-rw-r--r--meta/recipes-extended/gzip/gzip_1.12.bb (renamed from meta/recipes-extended/gzip/gzip_1.11.bb)2
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch
index 7c37bc8d2d..7f9e249de8 100644
--- a/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch
@@ -18,19 +18,19 @@ Upstream-Status: Pending
18 1 file changed, 1 insertion(+), 2 deletions(-) 18 1 file changed, 1 insertion(+), 2 deletions(-)
19 19
20diff --git a/Makefile.am b/Makefile.am 20diff --git a/Makefile.am b/Makefile.am
21index d4ecc3f..e4657d2 100644 21index 4f51b61..80a5ddf 100644
22--- a/Makefile.am 22--- a/Makefile.am
23+++ b/Makefile.am 23+++ b/Makefile.am
24@@ -82,8 +82,7 @@ SUFFIXES = .in 24@@ -93,8 +93,7 @@ SUFFIXES = .in
25 .in: 25 .in:
26 $(AM_V_GEN)rm -f $@-t $@ \ 26 $(AM_V_GEN)rm -f $@-t $@ \
27 && sed \ 27 && sed \
28- -e 's|/bin/sh|$(SHELL)|g' \ 28- -e 's|/bin/sh|$(SHELL)|g' \
29- -e 's|[@]GREP@|$(GREP)|g' \ 29- -e 's|[@]GREP@|$(GREP)|g' \
30+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \ 30+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \
31 -e 's|[@]VERSION@|$(VERSION)|g' \ 31 -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \
32 $(srcdir)/$@.in >$@-t \ 32 -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \
33 && chmod a=rx $@-t \ 33 -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \
34-- 34--
352.7.4 352.7.4
36 36
diff --git a/meta/recipes-extended/gzip/gzip_1.11.bb b/meta/recipes-extended/gzip/gzip_1.12.bb
index 321c9c31a4..14de50b230 100644
--- a/meta/recipes-extended/gzip/gzip_1.11.bb
+++ b/meta/recipes-extended/gzip/gzip_1.12.bb
@@ -38,4 +38,4 @@ do_install_ptest() {
38 ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile 38 ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile
39} 39}
40 40
41SRC_URI[sha256sum] = "3e8a0e0c45bad3009341dce17d71536c4c655d9313039021ce7554a26cd50ed9" 41SRC_URI[sha256sum] = "5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085"