mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

vim: upgrade 9.1.1198 -> 9.1.1652

Browse Source 
Handles CVE-2025-53905, CVE-2025-53906, CVE-2025-55157, CVE-2025-55158.

Changes between 9.1.1198 -> 9.1.1652
====================================
https://github.com/vim/vim/compare/v9.1.1198...v9.1.1652

Refresh patches.

Disable newly introduced wayland support (in patch version 1485).
To this belongs also adding recursion in delete command for dir auto
which was newly failing as there is wayland directory inside now.
If someone is interested, this can be probably enabled, but without
additional work it results in compilation error due to function
redefinition conflicts.

(From OE-Core rev: e87d427d928234ef0441f9ce1fe8631fbe471094)

(From OE-Core rev: 99e24ba524157ed70ad05b0b1a14fcca8df52246)

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Peter Marko
2025-08-25 21:31:05 +02:00
committed by Steve Sakoman
parent 390a774854
commit 4011ae9f22
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch
View File

@@ -16,11 +16,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
src/Makefile | 14 ++++---------- src/Makefile | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-) 1 file changed, 4 insertions(+), 10 deletions(-)
Index: git/src/Makefile diff --git a/src/Makefile b/src/Makefile
=================================================================== index 32c0d97d1..97c754673 100644
--- git.orig/src/Makefile --- a/src/Makefile
+++ git/src/Makefile +++ b/src/Makefile
@@ -3101,16 +3101,10 @@ auto/pathdef.c: Makefile auto/config.mk @@ -3138,16 +3138,10 @@ auto/pathdef.c: Makefile auto/config.mk
-@echo '#include "vim.h"' >> $@ -@echo '#include "vim.h"' >> $@
-@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@
-@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@

12
meta/recipes-support/vim/files/disable_acl_header_check.patch
View File

@@ -13,11 +13,11 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
src/configure.ac | 3 ++- src/configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
Index: git/src/configure.ac diff --git a/src/configure.ac b/src/configure.ac
=================================================================== index cdb818519..dafb7d6ce 100644
--- git.orig/src/configure.ac --- a/src/configure.ac
+++ git/src/configure.ac +++ b/src/configure.ac
@@ -3292,7 +3292,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h strin @@ -3400,7 +3400,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \
sys/systeminfo.h locale.h sys/stream.h termios.h \ sys/systeminfo.h locale.h sys/stream.h termios.h \
libc.h sys/statfs.h poll.h sys/poll.h pwd.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 \ utime.h sys/param.h sys/ptms.h libintl.h libgen.h \
@@ -26,7 +26,7 @@ Index: git/src/configure.ac
sys/access.h sys/sysinfo.h wchar.h wctype.h) sys/access.h sys/sysinfo.h wchar.h wctype.h)
dnl sys/ptem.h depends on sys/stream.h on Solaris dnl sys/ptem.h depends on sys/stream.h on Solaris
@@ -3974,6 +3974,7 @@ AC_ARG_ENABLE(acl, @@ -4137,6 +4137,7 @@ AC_ARG_ENABLE(acl,
, [enable_acl="yes"]) , [enable_acl="yes"])
if test "$enable_acl" = "yes"; then if test "$enable_acl" = "yes"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)

2
meta/recipes-support/vim/files/no-path-adjust.patch
View File

@@ -18,7 +18,7 @@ diff --git a/src/Makefile b/src/Makefile
index c9513a632..7a7cbdc43 100644 index c9513a632..7a7cbdc43 100644
--- a/src/Makefile --- a/src/Makefile
+++ b/src/Makefile +++ b/src/Makefile
@@ -2534,11 +2534,7 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \ @@ -2552,11 +2552,7 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
rm -rf $$cvs; \ rm -rf $$cvs; \
fi fi
-chmod $(FILEMOD) $(DEST_TOOLS)/* -chmod $(FILEMOD) $(DEST_TOOLS)/*

7
meta/recipes-support/vim/vim.inc
View File

@@ -18,8 +18,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
file://no-path-adjust.patch \ file://no-path-adjust.patch \
" "
PV .= ".1198" PV .= ".1652"
SRCREV = "f209dcd3defb95bae21b2740910e6aa7bb940531" SRCREV = "3e152c76adb9542af86760786d42a0beffe5354b"
# 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"
@@ -37,7 +37,7 @@ CLEANBROKEN = "1"
# vim configure.in contains functions which got 'dropped' by autotools.bbclass # vim configure.in contains functions which got 'dropped' by autotools.bbclass
do_configure () { do_configure () {
cd src cd src
rm -f auto/* rm -rf auto/*
touch auto/config.mk touch auto/config.mk
# git timestamps aren't reliable, so touch the shipped .po files so they aren't regenerated # git timestamps aren't reliable, so touch the shipped .po files so they aren't regenerated
touch -c po/cs.cp1250.po po/ja.euc-jp.po po/ja.sjis.po po/ko.po po/pl.UTF-8.po po/pl.cp1250.po po/ru.cp1251.po po/sk.cp1250.po po/uk.cp1251.po po/zh_CN.po po/zh_CN.cp936.po po/zh_TW.po touch -c po/cs.cp1250.po po/ja.euc-jp.po po/ja.sjis.po po/ko.po po/pl.UTF-8.po po/pl.cp1250.po po/ru.cp1251.po po/sk.cp1250.po po/uk.cp1251.po po/zh_CN.po po/zh_CN.cp936.po po/zh_TW.po
@@ -76,6 +76,7 @@ EXTRA_OECONF = " \
--disable-desktop-database-update \ --disable-desktop-database-update \
--with-tlib=ncurses \ --with-tlib=ncurses \
--with-modified-by='${MAINTAINER}' \ --with-modified-by='${MAINTAINER}' \
--with-wayland=no \
ac_cv_small_wchar_t=no \ ac_cv_small_wchar_t=no \
ac_cv_path_GLIB_COMPILE_RESOURCES=no \ ac_cv_path_GLIB_COMPILE_RESOURCES=no \
vim_cv_getcwd_broken=no \ vim_cv_getcwd_broken=no \