diff options
author | Siddharth Doshi <sdoshi@mvista.com> | 2024-08-20 14:51:42 +0530 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-09-04 05:57:57 -0700 |
commit | cada1f30e8b71f2bb810fb057e2830a0ae43b1e6 (patch) | |
tree | 25435999bac51197b3bf90f886a9b014109be56e | |
parent | 92cb089717faa1055b7d503e2f83ea0793ac77ff (diff) | |
download | poky-cada1f30e8b71f2bb810fb057e2830a0ae43b1e6.tar.gz |
vim: Upgrade 9.1.0114 -> 9.1.0682
This includes CVE-fix for CVE-2024-41957, CVE-2024-41965 and CVE-2024-43374
Changes between 9.1.0114 -> 9.1.0682
====================================
https://github.com/vim/vim/compare/v9.1.0114...v9.1.0682
Note:
====
Removed patch "vim-add-knob-whether-elf.h-are-checked.patch" as libelf checks are removed from configure.ac as per
commit https://github.com/vim/vim/commit/1acc67ac4412aa9a75d1c58ebf93f2b29585a960
(From OE-Core rev: 3312a57ce631ea6235055b3d4b4ac31d06c8a2ae)
Signed-off-by: Siddharth Doshi <sdoshi@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6d2938e53cad5d9bf2e78a5403e9f9fab1db77b4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch | 39 | ||||
-rw-r--r-- | meta/recipes-support/vim/vim.inc | 5 |
2 files changed, 2 insertions, 42 deletions
diff --git a/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch deleted file mode 100644 index 5284ba45b6..0000000000 --- a/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 38de4bccdb8a861ffdd447f12fdab19d6d852c02 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chong Lu <Chong.Lu@windriver.com> | ||
3 | Date: Tue, 26 Jun 2018 17:34:15 +0800 | ||
4 | Subject: [PATCH] vim: add knob whether elf.h are checked | ||
5 | |||
6 | Previously, it still was checked when there was no elf library in sysroots directory. | ||
7 | Add knob to decide whether elf.h are checked or not. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
12 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
13 | --- | ||
14 | src/configure.ac | 7 +++++++ | ||
15 | 1 file changed, 7 insertions(+) | ||
16 | |||
17 | Index: git/src/configure.ac | ||
18 | =================================================================== | ||
19 | --- git.orig/src/configure.ac | ||
20 | +++ git/src/configure.ac | ||
21 | @@ -3264,11 +3264,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [in | ||
22 | AC_MSG_RESULT(no)) | ||
23 | |||
24 | dnl Checks for header files. | ||
25 | +AC_MSG_CHECKING(whether or not to look for elf.h) | ||
26 | +AC_ARG_ENABLE(elf-check, | ||
27 | + [ --enable-elf-check If elfutils, check for elf.h [default=no]], | ||
28 | + , enable_elf_check="no") | ||
29 | +AC_MSG_RESULT($enable_elf_check) | ||
30 | +if test "x$enable_elf_check" != "xno"; then | ||
31 | AC_CHECK_HEADER(elf.h, HAS_ELF=1) | ||
32 | dnl AC_CHECK_HEADER(dwarf.h, SVR4=1) | ||
33 | if test "$HAS_ELF" = 1; then | ||
34 | AC_CHECK_LIB(elf, main) | ||
35 | fi | ||
36 | +fi | ||
37 | |||
38 | AC_HEADER_DIRENT | ||
39 | |||
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 071deed338..f8ba37156a 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc | |||
@@ -14,13 +14,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d1a651ab770b45d41c0f8cb5a8ca930e" | |||
14 | 14 | ||
15 | SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ | 15 | SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ |
16 | file://disable_acl_header_check.patch \ | 16 | file://disable_acl_header_check.patch \ |
17 | file://vim-add-knob-whether-elf.h-are-checked.patch \ | ||
18 | file://0001-src-Makefile-improve-reproducibility.patch \ | 17 | file://0001-src-Makefile-improve-reproducibility.patch \ |
19 | file://no-path-adjust.patch \ | 18 | file://no-path-adjust.patch \ |
20 | " | 19 | " |
21 | 20 | ||
22 | PV .= ".0114" | 21 | PV .= ".0682" |
23 | SRCREV = "fcaed6a70faf73bff3e5405ada556d726024f866" | 22 | SRCREV = "cb90ea9cba6f033fe141db0e466fb4117f28402b" |
24 | 23 | ||
25 | # Do not consider .z in x.y.z, as that is updated with every commit | 24 | # Do not consider .z in x.y.z, as that is updated with every commit |
26 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" | 25 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" |