diff --git a/vim-9.0.1357.tar.gz b/vim-9.0.1357.tar.gz deleted file mode 100644 index f1520a1..0000000 --- a/vim-9.0.1357.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa98cf211abdfb122c5d3bbcf26122411afb3291dd99f8cf40efa7b8fee898fa -size 16967796 diff --git a/vim-9.0.1367.tar.gz b/vim-9.0.1367.tar.gz new file mode 100644 index 0000000..2ca3c3e --- /dev/null +++ b/vim-9.0.1367.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e09f6febf5dc7d4d99d468ebbc58369765580681d3382134f63ba6cd746b17d +size 16974115 diff --git a/vim-fix-sh-syntax.patch b/vim-fix-sh-syntax.patch deleted file mode 100644 index dd6f327..0000000 --- a/vim-fix-sh-syntax.patch +++ /dev/null @@ -1,59 +0,0 @@ -# sh/bash highlight broken since upgrade of sh.vim version 205 -# => upgrade to version 207 which fixes it -# https://github.com/vim/vim/issues/11937#issuecomment-1421116531 -# http://www.drchip.org/astronaut/vim/syntax/sh.vim.gz ---- vim-9.0.1307/runtime/syntax/sh.vim 2023-02-13 17:10:04.000000000 +0100 -+++ /usr/share/vim/vim90/syntax/sh.vim 2023-02-17 12:19:44.967178736 +0100 -@@ -2,8 +2,8 @@ - " Language: shell (sh) Korn shell (ksh) bash (sh) - " Maintainer: Charles E. Campbell - " Previous Maintainer: Lennart Schultz --" Last Change: Dec 20, 2022 --" Version: 205 -+" Last Change: Feb 11, 2023 -+" Version: 207 - " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH - " For options and settings, please use: :help ft-sh-syntax - " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) and heredoc fixes from Felipe Contreras -@@ -166,7 +166,7 @@ - syn cluster shLoopoList add=shForPP - endif - syn cluster shPPSLeftList contains=shAlias,shArithmetic,shCmdParenRegion,shCommandSub,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shHereString,shRedir,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable --syn cluster shPPSRightList contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm -+syn cluster shPPSRightList contains=shDeref,shDerefSimple,shEscape,shPosnParm - syn cluster shSubShList contains=@shCommandSubList,shCommandSubBQ,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator - syn cluster shTestList contains=shArithmetic,shCharClass,shCommandSub,shCommandSubBQ,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shSpecialDQ,shExDoubleQuote,shExpr,shExSingleQuote,shNumber,shOperator,shSingleQuote,shTest,shTestOpr - syn cluster shNoZSList contains=shSpecialNoZS -@@ -335,7 +335,7 @@ - " systems too, however, so the following syntax will flag $(..) as - " an Error under /bin/sh. By consensus of vimdev'ers! - if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") -- syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]\|$" skip='\\\\\|\\.' end=")" contains=@shCommandSubList -+ syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]" skip='\\\\\|\\.' end=")" contains=@shCommandSubList - syn region shArithmetic matchgroup=shArithRegion start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList - syn region shArithmetic matchgroup=shArithRegion start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList - syn match shSkipInitWS contained "^\s\+" -@@ -503,7 +503,6 @@ - " ksh: ${.sh.*} variables: {{{1 - " ======================================== - if exists("b:is_kornshell") --" syn match shDerefVar contained "[.]*" nextgroup=@shDerefVarList - syn match shDerefVar contained "\.\+" nextgroup=@shDerefVarList - endif - -@@ -548,6 +547,7 @@ - " bash : ${parameter,pattern} Case modification - " bash : ${parameter,,pattern} Case modification - " bash : ${@:start:qty} display command line arguments from start to start+qty-1 (inferred) -+" bash : ${parameter@operator} transforms parameter (operator∈[uULqEPARa]) - syn cluster shDerefPatternList contains=shDerefPattern,shDerefString - if !exists("g:sh_no_error") - syn match shDerefOpError contained ":[[:punct:]]" -@@ -563,6 +563,7 @@ - endif - if exists("b:is_bash") - syn match shDerefOp contained "[,^]\{1,2}" nextgroup=@shDerefPatternList -+ syn match shDerefOp contained "@[uULQEPAKa]" - endif - syn region shDerefString contained matchgroup=shDerefDelim start=+\%(\\\)\@ + +- Updated to version 9.0.1367, fixes the following problems +- dropped vim-fix-sh-syntax.patch +- fixes boo#1208828 - CVE-2023-1127 + * Using null_object results in an internal error. (Ernie Rael) + * Compilation error with some compilers. + * Too many "else if" statements in handling options. + * Cue files are not recognized. + * extendnew() not sufficiently tested. + * ml_get error when going to another tab. (Daniel J. Perry) + * Crash when :def function has :break in skipped block. (Ernie Rael) + * Build error with older Mac OS. + * Functions for setting options are in random order. + * Divide by zero in zero-width window. + ------------------------------------------------------------------- Sun Feb 26 19:30:47 UTC 2023 - Ondřej Súkup diff --git a/vim.spec b/vim.spec index 5ebfbc4..fcb33a7 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 9.0 -%define patchlevel 1357 +%define patchlevel 1367 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim90 %define site_runtimepath %{_datadir}/vim/site @@ -78,7 +78,6 @@ 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 -Patch105: vim-fix-sh-syntax.patch BuildRequires: autoconf BuildRequires: db-devel BuildRequires: fdupes @@ -217,7 +216,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch101 -p1 %patch102 -p1 %patch104 -p1 -%patch105 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # Unreliable tests