mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
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>
This commit is contained in:
committed by
Steve Sakoman
parent
92cb089717
commit
cada1f30e8
@@ -1,39 +0,0 @@
|
|||||||
From 38de4bccdb8a861ffdd447f12fdab19d6d852c02 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Chong Lu <Chong.Lu@windriver.com>
|
|
||||||
Date: Tue, 26 Jun 2018 17:34:15 +0800
|
|
||||||
Subject: [PATCH] vim: add knob whether elf.h are checked
|
|
||||||
|
|
||||||
Previously, it still was checked when there was no elf library in sysroots directory.
|
|
||||||
Add knob to decide whether elf.h are checked or not.
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
|
||||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|
||||||
---
|
|
||||||
src/configure.ac | 7 +++++++
|
|
||||||
1 file changed, 7 insertions(+)
|
|
||||||
|
|
||||||
Index: git/src/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- git.orig/src/configure.ac
|
|
||||||
+++ git/src/configure.ac
|
|
||||||
@@ -3264,11 +3264,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [in
|
|
||||||
AC_MSG_RESULT(no))
|
|
||||||
|
|
||||||
dnl Checks for header files.
|
|
||||||
+AC_MSG_CHECKING(whether or not to look for elf.h)
|
|
||||||
+AC_ARG_ENABLE(elf-check,
|
|
||||||
+ [ --enable-elf-check If elfutils, check for elf.h [default=no]],
|
|
||||||
+ , enable_elf_check="no")
|
|
||||||
+AC_MSG_RESULT($enable_elf_check)
|
|
||||||
+if test "x$enable_elf_check" != "xno"; then
|
|
||||||
AC_CHECK_HEADER(elf.h, HAS_ELF=1)
|
|
||||||
dnl AC_CHECK_HEADER(dwarf.h, SVR4=1)
|
|
||||||
if test "$HAS_ELF" = 1; then
|
|
||||||
AC_CHECK_LIB(elf, main)
|
|
||||||
fi
|
|
||||||
+fi
|
|
||||||
|
|
||||||
AC_HEADER_DIRENT
|
|
||||||
|
|
||||||
@@ -14,13 +14,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d1a651ab770b45d41c0f8cb5a8ca930e"
|
|||||||
|
|
||||||
SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
|
SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
|
||||||
file://disable_acl_header_check.patch \
|
file://disable_acl_header_check.patch \
|
||||||
file://vim-add-knob-whether-elf.h-are-checked.patch \
|
|
||||||
file://0001-src-Makefile-improve-reproducibility.patch \
|
file://0001-src-Makefile-improve-reproducibility.patch \
|
||||||
file://no-path-adjust.patch \
|
file://no-path-adjust.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
PV .= ".0114"
|
PV .= ".0682"
|
||||||
SRCREV = "fcaed6a70faf73bff3e5405ada556d726024f866"
|
SRCREV = "cb90ea9cba6f033fe141db0e466fb4117f28402b"
|
||||||
|
|
||||||
# Do not consider .z in x.y.z, as that is updated with every commit
|
# Do not consider .z in x.y.z, as that is updated with every commit
|
||||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0"
|
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user