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

Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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
similarity index 79%
rename from meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch
rename to meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch
index 7c37bc8d2d9269aaf86c70164aa0ad86c65cae12..7f9e249de8a4c5b80ae3f52054909d8178288ea3 100644 (file)
--- 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
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index d4ecc3f..e4657d2 100644
+index 4f51b61..80a5ddf 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -82,8 +82,7 @@ SUFFIXES = .in
+@@ -93,8 +93,7 @@ SUFFIXES = .in
  .in:
        $(AM_V_GEN)rm -f $@-t $@ \
-           && sed \
+         && sed \
 -              -e 's|/bin/sh|$(SHELL)|g' \
 -              -e 's|[@]GREP@|$(GREP)|g' \
 +              -e 's|[@]GREP@|$(base_bindir)/grep|g' \
-               -e 's|[@]VERSION@|$(VERSION)|g' \
-               $(srcdir)/$@.in >$@-t \
-         && chmod a=rx $@-t \
--- 
+               -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \
+               -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \
+               -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \
+--
 2.7.4
 

diff --git a/meta/recipes-extended/gzip/gzip_1.11.bb b/meta/recipes-extended/gzip/gzip_1.12.bb
similarity index 94%
rename from meta/recipes-extended/gzip/gzip_1.11.bb
rename to meta/recipes-extended/gzip/gzip_1.12.bb
index 321c9c31a4830ab682d7484f16054e17db7ede2a..14de50b230594fc532b5a66da27b8fe9ac6001d9 100644 (file)
--- 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() {
             ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile
 }
 
-SRC_URI[sha256sum] = "3e8a0e0c45bad3009341dce17d71536c4c655d9313039021ce7554a26cd50ed9"
+SRC_URI[sha256sum] = "5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085"