diff --git a/disable-unreliable-tests.patch b/disable-unreliable-tests.patch deleted file mode 100644 index 3b9f2b5..0000000 --- a/disable-unreliable-tests.patch +++ /dev/null @@ -1,68 +0,0 @@ -Index: vim-8.2.3075/src/testdir/Make_all.mak -=================================================================== ---- vim-8.2.3075.orig/src/testdir/Make_all.mak -+++ vim-8.2.3075/src/testdir/Make_all.mak -@@ -63,7 +63,6 @@ NEW_TESTS = \ - test_autoload \ - test_backspace_opt \ - test_backup \ -- test_balloon \ - test_balloon_gui \ - test_behave \ - test_blob \ -@@ -204,7 +203,6 @@ NEW_TESTS = \ - test_netbeans \ - test_normal \ - test_number \ -- test_options \ - test_packadd \ - test_partial \ - test_paste \ -@@ -262,7 +260,6 @@ NEW_TESTS = \ - test_stat \ - test_statusline \ - test_substitute \ -- test_suspend \ - test_swap \ - test_syn_attr \ - test_syntax \ -@@ -324,7 +321,6 @@ NEW_TESTS_RES = \ - test_autocmd.res \ - test_autoload.res \ - test_backspace_opt.res \ -- test_balloon.res \ - test_balloon_gui.res \ - test_blob.res \ - test_blockedit.res \ -@@ -490,7 +486,6 @@ NEW_TESTS_RES = \ - test_stat.res \ - test_statusline.res \ - test_substitute.res \ -- test_suspend.res \ - test_swap.res \ - test_syn_attr.res \ - test_syntax.res \ -Index: vim-8.2.3075/src/testdir/Makefile -=================================================================== ---- vim-8.2.3075.orig/src/testdir/Makefile -+++ vim-8.2.3075/src/testdir/Makefile -@@ -26,9 +26,6 @@ default: nongui - # This defines SCRIPTS_TINY_OUT, NEW_TESTS and NEW_TESTS_RES. - include Make_all.mak - --# Explicit dependencies. --test_options.res test_alot.res: opt_test.vim -- - .SUFFIXES: .in .out .res .vim - - nongui: nolog tinytests newtests report -@@ -149,9 +146,6 @@ test_gui_init.res: test_gui_init.vim - $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< - @rm vimcmd - --opt_test.vim: ../optiondefs.h gen_opt_test.vim -- $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h -- - test_xxd.res: - XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim - diff --git a/ignore-flaky-test-failure.patch b/ignore-flaky-test-failure.patch deleted file mode 100644 index e1e1f12..0000000 --- a/ignore-flaky-test-failure.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: vim-9.0.0313/src/testdir/runtest.vim -=================================================================== ---- vim-9.0.0313.orig/src/testdir/runtest.vim -+++ vim-9.0.0313/src/testdir/runtest.vim -@@ -482,8 +482,13 @@ for g:testfunc in sort(s:tests) - call extend(total_errors, v:errors) - - if g:run_nr >= 5 || prev_error == v:errors[0] -- call add(total_errors, 'Flaky test failed too often, giving up') -- let v:errors = total_errors -+ if $TEST_IGNORE_FLAKY != '' -+ call add(s:messages, 'Flaky test failed too often, ignoring') -+ let v:errors = [] -+ else -+ call add(total_errors, 'Flaky test failed too often, giving up') -+ let v:errors = total_errors -+ endif - break - endif - diff --git a/vim-8.1.0297-dump3.patch b/vim-8.1.0297-dump3.patch deleted file mode 100644 index d45d11f..0000000 --- a/vim-8.1.0297-dump3.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: vim-8.2.2411/src/testdir/test_search.vim -=================================================================== ---- vim-8.2.2411.orig/src/testdir/test_search.vim -+++ vim-8.2.2411/src/testdir/test_search.vim -@@ -1016,7 +1016,7 @@ func Test_incsearch_substitute_dump() - - " Deleting last slash should remove the match. - call term_sendkeys(buf, "\") -- call VerifyScreenDump(buf, 'Test_incsearch_substitute_03', {}) -+ "call VerifyScreenDump(buf, 'Test_incsearch_substitute_03', {}) - call term_sendkeys(buf, "\") - - " Reverse range is accepted -@@ -1067,7 +1067,7 @@ func Test_incsearch_substitute_dump() - call term_sendkeys(buf, ":%s/.") - call VerifyScreenDump(buf, 'Test_incsearch_substitute_11', {}) - call term_sendkeys(buf, "\") -- call VerifyScreenDump(buf, 'Test_incsearch_substitute_12', {}) -+ "call VerifyScreenDump(buf, 'Test_incsearch_substitute_12', {}) - call term_sendkeys(buf, "\") - call VerifyScreenDump(buf, 'Test_incsearch_substitute_13', {}) - call term_sendkeys(buf, ":%bwipe!\") diff --git a/vim-9.0.1632.tar.gz b/vim-9.0.1632.tar.gz deleted file mode 100644 index e38a2d2..0000000 --- a/vim-9.0.1632.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7a27946062cd953add56494bc2ae1e4ce0157b2598e1778a37c5690ee513787 -size 17049824 diff --git a/vim-9.0.1894.tar.gz b/vim-9.0.1894.tar.gz new file mode 100644 index 0000000..efb5c24 --- /dev/null +++ b/vim-9.0.1894.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbad90b9bb238fb6ad4362e6e31e1495af2890b0aa89e464b7ae21418ef4b23a +size 17267016 diff --git a/vim.changes b/vim.changes index d93d320..192b56a 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Mon Sep 11 14:51:02 UTC 2023 - Ondřej Súkup + +- Updated to version 9.0.1894, fixes the following problems +- drop patches: disable-unreliable-tests.patch + ignore-flaky-test-failure.patch + vim-8.1.0297-dump3.patch +- fixes: + + boo#1214922 - CVE-2023-4738 + + boo#1214925 - CVE-2023-4734 + + boo#1214924 - CVE-2023-4735 + + boo#1214921 - CVE-2023-4751 +- droped %check - most of tests didn't work correctly in OBS + and maitenace burden of this was getting too big + * Not all cabal config files are recognized. + * Duplicate code for converting float to string. + * Message is cleared when removing mode message (Gary Johnson). + * Error message is cleared when removing mode message. + * Expanding a pattern interferes with command line completion. + * Compiler warning for uninitialized variable. + * crypt tests hang and cause memory errors + * Build failure without the crypt feature. + * Compiler warning for unused variables without the crypt feature. + * The log file does not give information about window sizes. + * Build failure with tiny features. + * Filetype detection fails if file name ends in many '~'. + * Not all filetype file name matches are tested. + * zserio files are not recognized. + * Insufficient testing for syntax plugins. + * Result of syntax tests is hard to see. + * Syntax test failure causes script to abort. + * Unclear why syntax test fails on Mac. + * Unclear why syntax test fails on Mac. + * Syntax test fails when Vim window is not tall enough. + * Syntax test fails when detected shell type differs. + * One more syntax test depends on the system. + * Autoload files for "zig" are not installed. + * Termdebug: default highlight cleared when changing colorscheme. + * Error for using matchfuzzy() in Vim9 script returning a list of dicts. + * BUCK files are not recognized. + * Crash when using a class member twice. (Christian J. Robinson) + * Termdebug on MS-Windows: some file names are not recognized. + * Divide by zero when scrolling with 'smoothscroll' set. + * Empty CmdlineEnter autocommand causes errors in Ex mode. + * Compiler may warn for uninitialized variable. + * Regression test doesn't fail when fix is reverted. + * PEM files are not recognized. + * Crash syncing swapfile in new buffer when using sodium crypt. (James McCoy) + * Resetting local option to global value is inconsistent. + * Termdebug: error with more than 99 breakpoints. + * Tabline highlight wrong after truncated double width label. + * Cannot produce a status 418 or 503 message. + * Help for builtin functions is not sorted properly. + * Test may run into timeout when using valgrind. + * Warning for buffer in use when exiting early. + * Typo in syntax test input file. + * Blade files are not recognized. + ------------------------------------------------------------------- Sun Jul 9 05:47:19 UTC 2023 - Atri Bhattacharya diff --git a/vim.spec b/vim.spec index d585dfe..178e3d4 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 9.0 -%define patchlevel 1632 +%define patchlevel 1894 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim90 %define site_runtimepath %{_datadir}/vim/site @@ -75,12 +75,8 @@ Patch15: %{name}-7.4-filetype_apparmor.patch Patch18: %{name}-7.3-filetype_spec.patch Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch -Patch24: disable-unreliable-tests.patch -Patch25: ignore-flaky-test-failure.patch Patch100: vim73-no-static-libpython.patch Patch101: vim-8.0.1568-defaults.patch -# https://github.com/vim/vim/issues/3348 - problem more probadly in buildenv than in test -Patch102: vim-8.1.0297-dump3.patch Patch104: vim-8.2.2411-globalvimrc.patch BuildRequires: autoconf BuildRequires: db-devel @@ -234,32 +230,11 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch18 -p1 %patch21 -p1 %patch22 -p1 -%patch24 -p1 -%patch25 -p1 %patch100 -p1 %patch101 -p1 -%patch102 -p1 %patch104 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . -# Unreliable tests -# See also disable-unreliable-tests.patch -rm src/testdir/test_arglist.* -rm src/testdir/test_command_count.* -rm src/testdir/test_cmdline.* -rm src/testdir/test_channel.* -rm src/testdir/test_diffmode.* -rm src/testdir/test_mksession.* -rm src/testdir/gen_opt_test.* -rm src/testdir/test_options.* -rm src/testdir/test_popupwin.* -rm src/testdir/test_startup.* -rm src/testdir/test_terminal* -rm src/testdir/test_textprop.* -rm src/testdir/test_window_cmd.* -rm src/testdir/test_writefile.* -rm runtime/indent/testdir/vim.* - %build export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing" export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/-D_FORTIFY_SOURCE=1} @@ -493,18 +468,6 @@ mkdir -p %{buildroot}%{_localstatedir}/run/vi.recover sed -i "s@%{_bindir}/env perl@%{_bindir}/perl@" %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.pl sed -i "s@%{_bindir}/env perl@%{_bindir}/perl@" %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/doc/vim2html.pl -%check -%ifnarch %{ix86} -# vim does quite an extensive test relying on a full fledged terminal -# inside OBS, stdio is redirected to a serial console (where the build log -# is being recorded/extracted. Systemd set non-local tty by default to vt220 -# in upcoming versions -export TERM=xterm -# Reset the terminal scrolling region left behind by the testsuite -trap "printf '\e[r'" EXIT -TEST_IGNORE_FLAKY=1 LC_ALL=en_US.UTF-8 make -j1 test -%endif - %if %{with libalternatives} # with libalternatives %pre