From b6fa5cdf74502a65af44636201641efc615bed27 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 16 Jul 2025 03:02:33 +0800 Subject: [PATCH] 9.1.1546 --- backport-CVE-2025-29768.patch | 44 ---------------------- v9.1.1166.tar.gz => v9.1.1546.tar.gz | 4 +- vim-8.0-copy-paste.patch | 26 ++++++------- vim-Add-sw64-architecture-debcontrol.patch | 10 +++-- vim.spec | 11 +++--- 5 files changed, 27 insertions(+), 68 deletions(-) delete mode 100644 backport-CVE-2025-29768.patch rename v9.1.1166.tar.gz => v9.1.1546.tar.gz (32%) diff --git a/backport-CVE-2025-29768.patch b/backport-CVE-2025-29768.patch deleted file mode 100644 index 2270a35..0000000 --- a/backport-CVE-2025-29768.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f209dcd3defb95bae21b2740910e6aa7bb940531 Mon Sep 17 00:00:00 2001 -From: Christian Brabandt -Date: Wed, 12 Mar 2025 22:04:01 +0100 -Subject: [PATCH] patch 9.1.1198: [security]: potential data loss with zip.vim - -Problem: [security]: potential data loss with zip.vim and special - crafted zip files (RyotaK) -Solution: use glob '[-]' to protect filenames starting with '-' - -Github Advisory: -https://github.com/vim/vim/security/advisories/GHSA-693p-m996-3rmf - -Signed-off-by: Christian Brabandt ---- - runtime/autoload/zip.vim | 6 ++++++ - 1 files changed, 6 insertions(+) - -diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim -index 4a53fc5f2..dae4ddeb9 100644 ---- a/runtime/autoload/zip.vim -+++ b/runtime/autoload/zip.vim -@@ -14,6 +14,7 @@ - " 2024 Aug 05 by Vim Project: clean-up and make it work with shellslash on Windows - " 2024 Aug 18 by Vim Project: correctly handle special globbing chars - " 2024 Aug 21 by Vim Project: simplify condition to detect MS-Windows -+" 2025 Mar 11 by Vim Project: handle filenames with leading '-' correctly - " License: Vim License (see vim's :help license) - " Copyright: Copyright (C) 2005-2019 Charles E. Campbell {{{1 - " Permission is hereby granted to use and distribute this code, -@@ -343,6 +344,11 @@ fun! zip#Extract() - return - endif - let target = fname->substitute('\[', '[[]', 'g') -+ " unzip 6.0 does not support -- to denote end-of-arguments -+ " unzip 6.1 (2010) apparently supports, it, but hasn't been released -+ " so the workaround is to use glob '[-]' so that it won't be considered an argument -+ " else, it would be possible to use 'unzip -o '-d/tmp' to extract the whole archive -+ let target = target->substitute('^-', '[&]', '') - if &shell =~ 'cmd' && has("win32") - let target = target - \ ->substitute('[?*]', '[&]', 'g') --- -2.33.0 - diff --git a/v9.1.1166.tar.gz b/v9.1.1546.tar.gz similarity index 32% rename from v9.1.1166.tar.gz rename to v9.1.1546.tar.gz index 86ab753..2a3c282 100644 --- a/v9.1.1166.tar.gz +++ b/v9.1.1546.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18543682cffe511407ef6a61af6df842d60232fad58c7c02544ae5860107e6be -size 18510701 +oid sha256:a7e088b7d4cbbf2850d852883e971b51de1c6b790ff118f8bd417c4ea3009a48 +size 18677802 diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index 8249ae3..44ff817 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,8 +1,8 @@ diff --git a/runtime/defaults.vim b/runtime/defaults.vim -index f1d5cd1..b08de8e 100644 +index af6d583..4f53fc6 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim -@@ -74,18 +74,6 @@ sunmap Q +@@ -70,18 +70,6 @@ sunmap Q " Revert with ":iunmap ". inoremap u @@ -22,11 +22,11 @@ index f1d5cd1..b08de8e 100644 if 1 diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim -index ed0c6c1..90c8c40 100644 +index 1fe0ae8..a03442a 100644 --- a/src/testdir/test_balloon.vim +++ b/src/testdir/test_balloon.vim -@@ -9,6 +9,7 @@ source screendump.vim - CheckScreendump +@@ -7,6 +7,7 @@ CheckFeature balloon_eval_term + source util/screendump.vim let s:common_script =<< trim [CODE] + set mouse=a @@ -34,10 +34,10 @@ index ed0c6c1..90c8c40 100644 set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100 let s:trailing = '<' " check that script context is set diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim -index d930133..0c74032 100644 +index 2ae0165..4db5125 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim -@@ -945,6 +945,7 @@ func Test_mouse_popup_position() +@@ -957,6 +957,7 @@ func Test_mouse_popup_position() let script =<< trim END set mousemodel=popup_setpos source $VIMRUNTIME/menu.vim @@ -46,10 +46,10 @@ index d930133..0c74032 100644 func Trigger(col) call test_setmouse(1, a:col) diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim -index b91689e..c6b70d1 100644 +index 21d6819..93a43f2 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim -@@ -553,6 +553,7 @@ func Test_popup_drag() +@@ -556,6 +556,7 @@ func Test_popup_drag() " create a popup that covers the command line let lines =<< trim END call setline(1, range(1, 20)) @@ -57,7 +57,7 @@ index b91689e..c6b70d1 100644 split vsplit $wincmd w -@@ -621,6 +622,7 @@ func Test_popup_drag_minwidth() +@@ -623,6 +624,7 @@ func Test_popup_drag_minwidth() " create a popup that does not fit let lines =<< trim END @@ -65,7 +65,7 @@ index b91689e..c6b70d1 100644 call range(40) \ ->map({_,i -> string(i)}) \ ->popup_create({ -@@ -669,6 +671,7 @@ func Test_popup_drag_termwin() +@@ -670,6 +672,7 @@ func Test_popup_drag_termwin() let lines =<< trim END set foldmethod=marker call setline(1, range(100)) @@ -81,7 +81,7 @@ index b91689e..c6b70d1 100644 " With border, can click on X let winid = popup_create('foobar', #{ \ close: 'button', -@@ -1557,6 +1561,7 @@ func Test_popup_beval() +@@ -1559,6 +1563,7 @@ func Test_popup_beval() let lines =<< trim END call setline(1, range(1, 20)) call setline(5, 'here is some text to hover over') @@ -89,7 +89,7 @@ index b91689e..c6b70d1 100644 set balloonevalterm set balloonexpr=BalloonExpr() set balloondelay=100 -@@ -2262,6 +2267,7 @@ func Test_popup_scrollbar() +@@ -2269,6 +2274,7 @@ func Test_popup_scrollbar() let lines =<< trim END call setline(1, range(1, 20)) diff --git a/vim-Add-sw64-architecture-debcontrol.patch b/vim-Add-sw64-architecture-debcontrol.patch index 1d44a5a..97517f6 100644 --- a/vim-Add-sw64-architecture-debcontrol.patch +++ b/vim-Add-sw64-architecture-debcontrol.patch @@ -1,6 +1,8 @@ ---- vim-9.1.1043/runtime/syntax/debcontrol.vim.orig 2025-01-21 20:04:23.175132700 +0800 -+++ vim-9.1.1043/runtime/syntax/debcontrol.vim 2025-01-21 20:04:37.779219600 +0800 -@@ -31,7 +31,7 @@ +diff --git a/runtime/syntax/shared/debarchitectures.vim b/runtime/syntax/shared/debarchitectures.vim +index 8005fe8..d1a9a2c 100644 +--- a/runtime/syntax/shared/debarchitectures.vim ++++ b/runtime/syntax/shared/debarchitectures.vim +@@ -11,7 +11,7 @@ let s:archs = [ \ 'alpha', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa' \, 'i386', 'ia64', 'loong64', 'lpia', 'm32r', 'm68k', 'mipsel', 'mips64el', 'mips' \, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 'riscv64', 's390x', 's390', 'sh3eb' @@ -8,4 +10,4 @@ + \, 'sh3', 'sh4eb', 'sh4', 'sh', 'sparc64', 'sparc', 'sw_64', 'x32' \ ] let s:pairs = [ - \ 'hurd-i386', 'kfreebsd-i386', 'kfreebsd-amd64', 'knetbsd-i386' + \ 'hurd-i386', 'hurd-amd64', 'kfreebsd-i386', 'kfreebsd-amd64', 'knetbsd-i386' diff --git a/vim.spec b/vim.spec index bddeb62..069d0bf 100644 --- a/vim.spec +++ b/vim.spec @@ -4,13 +4,13 @@ %{!?_with_netbeans__:%define _with_netbeans__ 1} %define baseversion 9.1 -%define patchlevel 1166 +%define patchlevel 1546 %define vimdir vim91 Name: vim Epoch: 2 Version: %{baseversion}.%{patchlevel} -Release: 3 +Release: 1 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim AND LGPL-2.1-or-later AND MIT AND GPL-1.0-only AND (GPL-2.0-only OR Vim) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-or-later AND GPL-3.0-or-later AND OPUBL-1.0 AND Apache-2.0 WITH Swift-exception URL: https://www.vim.org @@ -25,8 +25,6 @@ Patch0003: vim-python3-tests.patch Patch0005: bugfix-rm-modify-info-version.patch Patch0006: vim-Add-sw64-architecture-debcontrol.patch -Patch6000: backport-CVE-2025-29768.patch - BuildRequires: autoconf python3-devel ncurses-devel gettext perl-devel perl-generators gcc BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) libacl-devel gpm-devel file BuildRequires: pkgconfig(libsodium) @@ -346,7 +344,6 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests." %{_datadir}/%{name}/%{vimdir}/import/dist/{vimhelp.vim,vimhighlight.vim} %{_bindir}/xxd %lang(af) %{_datadir}/%{name}/%{vimdir}/lang/af -%lang(am) %{_datadir}/%{name}/%{vimdir}/lang/am %lang(ca) %{_datadir}/%{name}/%{vimdir}/lang/ca %lang(cs) %{_datadir}/%{name}/%{vimdir}/lang/cs %lang(cs.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/cs.cp1250 @@ -359,6 +356,7 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests." %lang(fr) %{_datadir}/%{name}/%{vimdir}/lang/fr %lang(ga) %{_datadir}/%{name}/%{vimdir}/lang/ga %lang(hu) %{_datadir}/%{name}/%{vimdir}/lang/hu +%lang(hy) %{_datadir}/%{name}/%{vimdir}/lang/hy %lang(it) %{_datadir}/%{name}/%{vimdir}/lang/it %lang(ja) %{_datadir}/%{name}/%{vimdir}/lang/ja %lang(ja.euc-jp) %{_datadir}/%{name}/%{vimdir}/lang/ja.euc-jp @@ -428,6 +426,9 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests." %{_mandir}/man1/evim.* %changelog +* Wed Jul 16 2025 Funda Wang - 2:9.1.1546-1 +- update to 9.1 patchlevel 1546 + * Fri Apr 25 2025 wangjiang - 2:9.1.1166-3 - enable check and fix some tests failed -- Gitee