diff options
author | Ralph Siemsen <ralph.siemsen@linaro.org> | 2022-04-08 22:16:44 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-10 08:31:17 +0100 |
commit | 55bed213cffe7449b3e7a1f50f9bf0d4a0535ef1 (patch) | |
tree | b16c6e3cfe8c8f6033ba9d66ae22b9deba7b1c4c /meta/recipes-extended/gzip/gzip-1.12 | |
parent | 30eb28dd02920f166d2deaf5114a8e810c42b948 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-extended/gzip/gzip-1.12')
-rw-r--r-- | meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch | 36 |
1 files changed, 36 insertions, 0 deletions
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 @@ | |||
1 | fix MakeMaker issues with using wrong SHELL/GREP | ||
2 | |||
3 | A set of substitution is being processed to all target scripts with sed by | ||
4 | replacing some key words with the detected values at configure time, this | ||
5 | is exactly not compliant with cross compling, and will cause missing path | ||
6 | errors at run time like: | ||
7 | "/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" | ||
8 | |||
9 | Fixed by removing unneeded substitution and using real runtime paths | ||
10 | instead. | ||
11 | |||
12 | Signed-off-by: Ming Liu <ming.liu@windriver.com> | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | --- | ||
17 | Makefile.am | 3 +-- | ||
18 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/Makefile.am b/Makefile.am | ||
21 | index 4f51b61..80a5ddf 100644 | ||
22 | --- a/Makefile.am | ||
23 | +++ b/Makefile.am | ||
24 | @@ -93,8 +93,7 @@ SUFFIXES = .in | ||
25 | .in: | ||
26 | $(AM_V_GEN)rm -f $@-t $@ \ | ||
27 | && sed \ | ||
28 | - -e 's|/bin/sh|$(SHELL)|g' \ | ||
29 | - -e 's|[@]GREP@|$(GREP)|g' \ | ||
30 | + -e 's|[@]GREP@|$(base_bindir)/grep|g' \ | ||
31 | -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \ | ||
32 | -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \ | ||
33 | -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \ | ||
34 | -- | ||
35 | 2.7.4 | ||
36 | |||