Removes CVE-2025-66476 from CVE metrics. It's fixed in 9.1.1947, but only affects Vim for Windows.
Rebased patches and resolved conflicts. Signed-off-by: Hitendra Prajapati <[email protected]> --- .../vim/files/0001-src-Makefile-improve-reproducibility.patch | 4 ++-- meta/recipes-support/vim/files/disable_acl_header_check.patch | 4 ++-- meta/recipes-support/vim/files/no-path-adjust.patch | 2 +- meta/recipes-support/vim/vim.inc | 4 ++-- meta/recipes-support/vim/vim_9.1.bb | 2 -- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch index 0741745adc..ae78059296 100644 --- a/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch +++ b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch @@ -20,7 +20,7 @@ diff --git a/src/Makefile b/src/Makefile index 32c0d97d1..97c754673 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -3138,16 +3138,10 @@ auto/pathdef.c: Makefile auto/config.mk +@@ -3143,16 +3143,10 @@ auto/pathdef.c: Makefile auto/config.mk -@echo '#include "vim.h"' >> $@ -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ @@ -29,7 +29,7 @@ index 32c0d97d1..97c754673 100644 - -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@ - -@if test -n "$(COMPILEDBY)"; then \ - echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \ -- else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi +- else (logname 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi - -@echo '";' >> $@ - -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@ - -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi diff --git a/meta/recipes-support/vim/files/disable_acl_header_check.patch b/meta/recipes-support/vim/files/disable_acl_header_check.patch index 2a5487e685..b34f91c9b6 100644 --- a/meta/recipes-support/vim/files/disable_acl_header_check.patch +++ b/meta/recipes-support/vim/files/disable_acl_header_check.patch @@ -17,7 +17,7 @@ diff --git a/src/configure.ac b/src/configure.ac index cdb818519..dafb7d6ce 100644 --- a/src/configure.ac +++ b/src/configure.ac -@@ -3400,7 +3400,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \ +@@ -3440,7 +3440,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \ sys/systeminfo.h locale.h sys/stream.h termios.h \ libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ utime.h sys/param.h sys/ptms.h libintl.h libgen.h \ @@ -26,7 +26,7 @@ index cdb818519..dafb7d6ce 100644 sys/access.h sys/sysinfo.h wchar.h wctype.h) dnl sys/ptem.h depends on sys/stream.h on Solaris -@@ -4137,6 +4137,7 @@ AC_ARG_ENABLE(acl, +@@ -4182,6 +4182,7 @@ AC_ARG_ENABLE(acl, , [enable_acl="yes"]) if test "$enable_acl" = "yes"; then AC_MSG_RESULT(no) diff --git a/meta/recipes-support/vim/files/no-path-adjust.patch b/meta/recipes-support/vim/files/no-path-adjust.patch index 1b380393d8..a4efce491e 100644 --- a/meta/recipes-support/vim/files/no-path-adjust.patch +++ b/meta/recipes-support/vim/files/no-path-adjust.patch @@ -18,7 +18,7 @@ diff --git a/src/Makefile b/src/Makefile index c9513a632..7a7cbdc43 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -2552,11 +2552,7 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \ +@@ -2531,11 +2531,7 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \ rm -rf $$cvs; \ fi -chmod $(FILEMOD) $(DEST_TOOLS)/* diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 289f31be70..0ce6aa71a4 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -18,8 +18,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1683" -SRCREV = "b922b30cfe4c044c83bac3cc908084ed20a83598" +PV .= ".2128" +SRCREV = "392b428d1239e963020b73682cd03f17ffb538b3" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" diff --git a/meta/recipes-support/vim/vim_9.1.bb b/meta/recipes-support/vim/vim_9.1.bb index c492342ffb..fee9f055e9 100644 --- a/meta/recipes-support/vim/vim_9.1.bb +++ b/meta/recipes-support/vim/vim_9.1.bb @@ -21,5 +21,3 @@ ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd" # in many places for _FORTIFY_SOURCE=2. Security flags become part of CC. # lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=1',d)}" - -CVE_STATUS[CVE-2025-66476] = "not-applicable-platform: Issue only applies on Windows" -- 2.50.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#233297): https://lists.openembedded.org/g/openembedded-core/message/233297 Mute This Topic: https://lists.openembedded.org/mt/118360202/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
