From 55bed213cffe7449b3e7a1f50f9bf0d4a0535ef1 Mon Sep 17 00:00:00 2001 From: Ralph Siemsen Date: Fri, 8 Apr 2022 22:16:44 -0400 Subject: 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 Signed-off-by: Richard Purdie --- .../gzip/gzip-1.11/wrong-path-fix.patch | 36 ------------------- .../gzip/gzip-1.12/wrong-path-fix.patch | 36 +++++++++++++++++++ meta/recipes-extended/gzip/gzip_1.11.bb | 41 ---------------------- meta/recipes-extended/gzip/gzip_1.12.bb | 41 ++++++++++++++++++++++ 4 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch create mode 100644 meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch delete mode 100644 meta/recipes-extended/gzip/gzip_1.11.bb create mode 100644 meta/recipes-extended/gzip/gzip_1.12.bb (limited to 'meta/recipes-extended/gzip') diff --git a/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch deleted file mode 100644 index 7c37bc8d2d..0000000000 --- a/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -fix MakeMaker issues with using wrong SHELL/GREP - -A set of substitution is being processed to all target scripts with sed by -replacing some key words with the detected values at configure time, this -is exactly not compliant with cross compling, and will cause missing path -errors at run time like: -"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" - -Fixed by removing unneeded substitution and using real runtime paths -instead. - -Signed-off-by: Ming Liu - -Upstream-Status: Pending - ---- - Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index d4ecc3f..e4657d2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -82,8 +82,7 @@ SUFFIXES = .in - .in: - $(AM_V_GEN)rm -f $@-t $@ \ - && 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 \ --- -2.7.4 - diff --git a/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch new file mode 100644 index 0000000000..7f9e249de8 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch @@ -0,0 +1,36 @@ +fix MakeMaker issues with using wrong SHELL/GREP + +A set of substitution is being processed to all target scripts with sed by +replacing some key words with the detected values at configure time, this +is exactly not compliant with cross compling, and will cause missing path +errors at run time like: +"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" + +Fixed by removing unneeded substitution and using real runtime paths +instead. + +Signed-off-by: Ming Liu + +Upstream-Status: Pending + +--- + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4f51b61..80a5ddf 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -93,8 +93,7 @@ SUFFIXES = .in + .in: + $(AM_V_GEN)rm -f $@-t $@ \ + && sed \ +- -e 's|/bin/sh|$(SHELL)|g' \ +- -e 's|[@]GREP@|$(GREP)|g' \ ++ -e 's|[@]GREP@|$(base_bindir)/grep|g' \ + -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.11.bb deleted file mode 100644 index 321c9c31a4..0000000000 --- a/meta/recipes-extended/gzip/gzip_1.11.bb +++ /dev/null @@ -1,41 +0,0 @@ -require gzip.inc - -# change to GPL-3.0-or-later in 2007/07. Previous GPL-2.0-or-later version is -# 1.3.12 -LICENSE = "GPL-3.0-or-later" - -SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ - file://run-ptest \ - " -SRC_URI:append:class-target = " file://wrong-path-fix.patch" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" - -PROVIDES:append:class-native = " gzip-replacement-native" - -RDEPENDS:${PN}-ptest += "make perl grep diffutils" - -BBCLASSEXTEND = "native nativesdk" - -inherit ptest - -do_install_ptest() { - mkdir -p ${D}${PTEST_PATH}/src/build-aux - cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/src/build-aux/ - mkdir -p ${D}${PTEST_PATH}/src/tests - cp -r ${S}/tests/* ${D}${PTEST_PATH}/src/tests - sed -e 's/^abs_srcdir = ..*/abs_srcdir = \.\./' \ - -e 's/^top_srcdir = ..*/top_srcdir = \.\./' \ - -e 's/^GREP = ..*/GREP = grep/' \ - -e 's/^AWK = ..*/AWK = awk/' \ - -e 's/^srcdir = ..*/srcdir = \./' \ - -e 's/^Makefile: ..*/Makefile: /' \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile -} - -SRC_URI[sha256sum] = "3e8a0e0c45bad3009341dce17d71536c4c655d9313039021ce7554a26cd50ed9" diff --git a/meta/recipes-extended/gzip/gzip_1.12.bb b/meta/recipes-extended/gzip/gzip_1.12.bb new file mode 100644 index 0000000000..14de50b230 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip_1.12.bb @@ -0,0 +1,41 @@ +require gzip.inc + +# change to GPL-3.0-or-later in 2007/07. Previous GPL-2.0-or-later version is +# 1.3.12 +LICENSE = "GPL-3.0-or-later" + +SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ + file://run-ptest \ + " +SRC_URI:append:class-target = " file://wrong-path-fix.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" + +PROVIDES:append:class-native = " gzip-replacement-native" + +RDEPENDS:${PN}-ptest += "make perl grep diffutils" + +BBCLASSEXTEND = "native nativesdk" + +inherit ptest + +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/src/build-aux + cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/src/build-aux/ + mkdir -p ${D}${PTEST_PATH}/src/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/src/tests + sed -e 's/^abs_srcdir = ..*/abs_srcdir = \.\./' \ + -e 's/^top_srcdir = ..*/top_srcdir = \.\./' \ + -e 's/^GREP = ..*/GREP = grep/' \ + -e 's/^AWK = ..*/AWK = awk/' \ + -e 's/^srcdir = ..*/srcdir = \./' \ + -e 's/^Makefile: ..*/Makefile: /' \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile +} + +SRC_URI[sha256sum] = "5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085" -- cgit v1.2.3-54-g00ecf