diff --git a/CVE-2019-12735.patch b/CVE-2019-12735.patch deleted file mode 100644 index 40e0f75543ee6b0ad3f45c0a962e51c3bb5ded20..0000000000000000000000000000000000000000 --- a/CVE-2019-12735.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5ec772a6c389958cf831e5cf4ebe25aebb6b8d8e Mon Sep 17 00:00:00 2001 -From: Bram Moolenaar -Date: Wed, 22 May 2019 22:38:25 +0200 -Subject: [PATCH] patch 8.1.1365: source command doesn't check for the sandbox - -Problem: Source command doesn't check for the sandbox. (Armin Razmjou) -Solution: Check for the sandbox when sourcing a file. ---- - src/getchar.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/getchar.c b/src/getchar.c -index 679eae1..8c4b2b4 100644 ---- a/src/getchar.c -+++ b/src/getchar.c -@@ -1433,6 +1433,12 @@ openscript( - EMSG(_(e_nesting)); - return; - } -+ -+ // Disallow sourcing a file in the sandbox, the commands would be executed -+ // later, possibly outside of the sandbox. -+ if (check_secure()) -+ return; -+ - #ifdef FEAT_EVAL - if (ignore_script) - /* Not reading from script, also don't open one. Warning message? */ --- -1.8.3.1 diff --git a/Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch b/Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch new file mode 100644 index 0000000000000000000000000000000000000000..a7148d29d2b5e6ec93a31f039ce1257f97f0411f --- /dev/null +++ b/Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch @@ -0,0 +1,56 @@ +From ea3ebd50e2a4ec26ee503f352a1280e11e4af93b Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Tue, 14 Jul 2020 12:14:03 +0200 +Subject: [PATCH] if_lua.c: new Lua 5.4.0 defines luaL_typeerror, so don't + define it twice + +--- + src/if_lua.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/if_lua.c b/src/if_lua.c +index 9b03c97..81faf92 100644 +--- a/src/if_lua.c ++++ b/src/if_lua.c +@@ -109,6 +109,9 @@ static luaV_Funcref *luaV_pushfuncref(lua_State *L, char_u *name); + #define luaL_loadbufferx dll_luaL_loadbufferx + #define luaL_argerror dll_luaL_argerror + #endif ++#if LUA_VERSION_NUM >= 504 ++#define luaL_typeerror dll_luaL_typeerror ++#endif + #define luaL_checkany dll_luaL_checkany + #define luaL_checklstring dll_luaL_checklstring + #define luaL_checkinteger dll_luaL_checkinteger +@@ -203,6 +206,9 @@ int (*dll_luaL_loadfilex) (lua_State *L, const char *filename, const char *mode) + int (*dll_luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode); + int (*dll_luaL_argerror) (lua_State *L, int numarg, const char *extramsg); + #endif ++#if LUA_VERSION_NUM >= 504 ++int (*dll_luaL_typeerror) (lua_State *L, int narg, const char *tname); ++#endif + void (*dll_luaL_checkany) (lua_State *L, int narg); + const char *(*dll_luaL_checklstring) (lua_State *L, int numArg, size_t *l); + lua_Integer (*dll_luaL_checkinteger) (lua_State *L, int numArg); +@@ -314,6 +320,9 @@ static const luaV_Reg luaV_dll[] = { + {"luaL_loadfilex", (luaV_function) &dll_luaL_loadfilex}, + {"luaL_loadbufferx", (luaV_function) &dll_luaL_loadbufferx}, + {"luaL_argerror", (luaV_function) &dll_luaL_argerror}, ++#endif ++#if LUA_VERSION_NUM >= 504 ++ {"luaL_typeerror", (luaV_function) &dll_luaL_typeerror}, + #endif + {"luaL_checkany", (luaV_function) &dll_luaL_checkany}, + {"luaL_checklstring", (luaV_function) &dll_luaL_checklstring}, +@@ -443,7 +452,7 @@ lua_enabled(int verbose) + } + #endif + +-#if LUA_VERSION_NUM > 501 ++#if LUA_VERSION_NUM > 501 && LUA_VERSION_NUM < 504 + static int + luaL_typeerror(lua_State *L, int narg, const char *tname) + { +-- +2.23.0 + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 95e39f5d7069ad76f8fd861bd0ec2b3d63d5e0ba..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# vim - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 7790020e53d49b07c168e5c8c1cefec267ceb52e..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# vim - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/backport-Fix-build-failuers-with-perl-5.32.patch b/backport-Fix-build-failuers-with-perl-5.32.patch new file mode 100644 index 0000000000000000000000000000000000000000..63b2150a770ac0a40bdf4c3643905786dd91cb87 --- /dev/null +++ b/backport-Fix-build-failuers-with-perl-5.32.patch @@ -0,0 +1,111 @@ +From 5d35e2ad1027e394877e096f618536da0ad11ffa Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Mon, 22 Jun 2020 00:00:44 +0800 +Subject: [PATCH] Fix build failures with Perl 5.32 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +More functions are needed in latest Perl 5.32. This patch fixes the following build failures: +``` +In file included from /usr/lib/perl5/5.32/core_perl/CORE/perl.h:3909, + from if_perl.xs:61: +if_perl.xs: In function ‘perl_win_free’: +/usr/lib/perl5/5.32/core_perl/CORE/sv.h:351:26: warning: implicit declaration of function ‘Perl_SvREFCNT_dec’; did you mean ‘S_SvREFCNT_dec’? [-Wimplicit-function-declaration] + 351 | #define SvREFCNT_dec(sv) Perl_SvREFCNT_dec(aTHX_ MUTABLE_SV(sv)) + | ^~~~~~~~~~~~~~~~~ +/usr/lib/perl5/5.32/core_perl/CORE/sv.h:351:26: note: in definition of macro ‘SvREFCNT_dec’ + 351 | #define SvREFCNT_dec(sv) Perl_SvREFCNT_dec(aTHX_ MUTABLE_SV(sv)) + | ^~~~~~~~~~~~~~~~~ +if_perl.xs: In function ‘ex_perl’: +/usr/lib/perl5/5.32/core_perl/CORE/sv.h:1842:28: warning: implicit declaration of function ‘Perl_SvTRUE’ [-Wimplicit-function-declaration] + 1842 | #define SvTRUE(sv) Perl_SvTRUE(aTHX_ sv) + | ^~~~~~~~~~~ +/usr/lib/perl5/5.32/core_perl/CORE/sv.h:1842:28: note: in definition of macro ‘SvTRUE’ + 1842 | #define SvTRUE(sv) Perl_SvTRUE(aTHX_ sv) + | ^~~~~~~~~~~ +In file included from /usr/lib/perl5/5.32/core_perl/CORE/perl.h:5544, + from if_perl.xs:61: +if_perl.c: In function ‘XS_VIM_Msg’: +/usr/lib/perl5/5.32/core_perl/CORE/pp.h:71:17: warning: implicit declaration of function ‘Perl_POPMARK’; did you mean ‘S_POPMARK’? [-Wimplicit-function-declaration] + 71 | #define POPMARK Perl_POPMARK(aTHX) + | ^~~~~~~~~~~~ +/usr/lib/perl5/5.32/core_perl/CORE/pp.h:71:17: note: in definition of macro ‘POPMARK’ + 71 | #define POPMARK Perl_POPMARK(aTHX) + | ^~~~~~~~~~~~ +/usr/lib/perl5/5.32/core_perl/CORE/XSUB.h:157:7: note: in expansion of macro ‘dAXMARK’ + 157 | dSP; dAXMARK; dITEMS + | ^~~~~~~ +if_perl.c:1661:11: note: in expansion of macro ‘dXSARGS’ +gcc -c -I. -Iproto -DHAVE_CONFIG_H -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 version.c -o objects/version.o +link.sh: $LINK_AS_NEEDED set to 'yes': invoking linker directly. + gcc -L. -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -fstack-protector-strong -rdynamic -Wl,-export-dynamic -Wl,-E -Wl,-rpath,/usr/lib/perl5/5.32/core_perl/CORE -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -L/usr/local/lib -Wl,--as-needed -o vim objects/arabic.o objects/arglist.o objects/autocmd.o objects/beval.o objects/buffer.o objects/change.o objects/blob.o objects/blowfish.o objects/cindent.o objects/clientserver.o objects/clipboard.o objects/cmdexpand.o objects/cmdhist.o objects/crypt.o objects/crypt_zip.o objects/debugger.o objects/dict.o objects/diff.o objects/digraph.o objects/drawline.o objects/drawscreen.o objects/edit.o objects/eval.o objects/evalbuffer.o objects/evalfunc.o objects/evalvars.o objects/evalwindow.o objects/ex_cmds.o objects/ex_cmds2.o objects/ex_docmd.o objects/ex_eval.o objects/ex_getln.o objects/fileio.o objects/filepath.o objects/findfile.o objects/fold.o objects/getchar.o objects/hardcopy.o objects/hashtab.o objects/highlight.o objects/if_cscope.o objects/if_xcmdsrv.o objects/indent.o objects/insexpand.o objects/list.o objects/map.o objects/mark.o objects/mbyte.o objects/memline.o objects/menu.o objects/misc1.o objects/misc2.o objects/mouse.o objects/move.o objects/normal.o objects/ops.o objects/option.o objects/optionstr.o objects/os_unix.o objects/pathdef.o objects/popupmenu.o objects/popupwin.o objects/profiler.o objects/pty.o objects/quickfix.o objects/regexp.o objects/register.o objects/screen.o objects/scriptfile.o objects/search.o objects/session.o objects/sha256.o objects/sign.o objects/sound.o objects/spell.o objects/spellfile.o objects/spellsuggest.o objects/syntax.o objects/tag.o objects/term.o objects/terminal.o objects/testing.o objects/textformat.o objects/textobject.o objects/textprop.o objects/time.o objects/ui.o objects/undo.o objects/usercmd.o objects/userfunc.o objects/version.o objects/vim9compile.o objects/vim9execute.o objects/vim9script.o objects/viminfo.o objects/window.o objects/bufwrite.o objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o objects/if_lua.o objects/if_perl.o objects/if_perlsfio.o objects/if_python.o objects/if_python3.o objects/if_tcl.o objects/if_ruby.o objects/netbeans.o objects/channel.o objects/xdiffi.o objects/xemit.o objects/xprepare.o objects/xutils.o objects/xhistogram.o objects/xpatience.o objects/charset.o objects/json.o objects/main.o objects/memfile.o objects/message.o -lm -ltinfo -lelf -lacl -lattr -lgpm -ldl -Wl,-E -Wl,-rpath,/usr/lib/perl5/5.32/core_perl/CORE -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -fstack-protector-strong -L/usr/local/lib -L/usr/lib/perl5/5.32/core_perl/CORE -lperl -lpthread -ldl -lm -lcrypt -lutil -lc -L/usr/lib -ltclstub8.6 -ldl -lz -lpthread -lm +/usr/bin/ld: objects/if_perl.o: in function `cur_val': +if_perl.c:(.text+0xaee): undefined reference to `Perl_SvREFCNT_dec' +/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_Count': +if_perl.c:(.text+0xc29): undefined reference to `Perl_POPMARK' +/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_Number': +if_perl.c:(.text+0xe89): undefined reference to `Perl_POPMARK' +/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_Name': +if_perl.c:(.text+0x10e9): undefined reference to `Perl_POPMARK' +/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_DESTROY': +if_perl.c:(.text+0x13f5): undefined reference to `Perl_POPMARK' +/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_Append': +if_perl.c:(.text+0x15ea): undefined reference to `Perl_POPMARK' +/usr/bin/ld: objects/if_perl.o:if_perl.c:(.text+0x1a4a): more undefined references to `Perl_POPMARK' follow +/usr/bin/ld: objects/if_perl.o: in function `perl_win_free': +if_perl.c:(.text+0x4bb7): undefined reference to `Perl_SvREFCNT_dec' +/usr/bin/ld: objects/if_perl.o: in function `perl_buf_free': +if_perl.c:(.text+0x4c27): undefined reference to `Perl_SvREFCNT_dec' +/usr/bin/ld: objects/if_perl.o: in function `ex_perl': +if_perl.c:(.text+0x4d58): undefined reference to `Perl_SvTRUE' +/usr/bin/ld: if_perl.c:(.text+0x4d8a): undefined reference to `Perl_SvREFCNT_dec' +/usr/bin/ld: objects/if_perl.o: in function `do_perleval': +if_perl.c:(.text+0x51f7): undefined reference to `Perl_SvTRUE' +/usr/bin/ld: if_perl.c:(.text+0x5433): undefined reference to `Perl_SvREFCNT_dec' +/usr/bin/ld: objects/if_perl.o: in function `ex_perldo': +if_perl.c:(.text+0x577c): undefined reference to `Perl_SvREFCNT_dec' +/usr/bin/ld: if_perl.c:(.text+0x5943): undefined reference to `Perl_SvTRUE' +collect2: error: ld returned 1 exit status +link.sh: Linking failed +``` +--- + src/if_perl.xs | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff -Naur a/src/if_perl.xs b/src/if_perl.xs +--- a/src/if_perl.xs 2019-02-23 22:00:57.000000000 +0800 ++++ b/src/if_perl.xs 2020-08-15 10:43:20.621318684 +0800 +@@ -649,6 +649,10 @@ + Perl_sv_free2(aTHX_ sv, rc); + } + } ++/* perl-5.32 needs Perl_SvREFCNT_dec */ ++# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) ++#define Perl_SvREFCNT_dec S_SvREFCNT_dec ++# endif + # endif + + /* perl-5.26 also needs S_TOPMARK and S_POPMARK. */ +@@ -673,6 +677,21 @@ + assert((PL_markstack_ptr > PL_markstack) || !"MARK underflow"); + return *PL_markstack_ptr--; + } ++/* perl-5.32 needs Perl_POPMARK */ ++# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) ++#define Perl_POPMARK S_POPMARK ++# endif ++# endif ++ ++/* perl-5.32 needs Perl_SvTRUE */ ++# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) ++PERL_STATIC_INLINE bool ++Perl_SvTRUE(pTHX_ SV *sv) { ++ if (!LIKELY(sv)) ++ return FALSE; ++ SvGETMAGIC(sv); ++ return SvTRUE_nomg_NN(sv); ++} + # endif + + /* diff --git a/vim-7.0-fixkeys.patch b/vim-7.0-fixkeys.patch index 5554e1bfdf082ac7dae56ca33db1fcb1cc777b3a..4092b3e63c15ab798f9bf13d4942350685b5a8e8 100644 --- a/vim-7.0-fixkeys.patch +++ b/vim-7.0-fixkeys.patch @@ -1,9 +1,10 @@ ---- vim70aa/src/term.c.orig 2006-03-01 23:07:55.000000000 +0100 -+++ vim70aa/src/term.c 2006-03-14 15:39:12.000000000 +0100 -@@ -1008,14 +1008,14 @@ +diff -up vim81/src/term.c.fixkeys vim81/src/term.c +--- vim81/src/term.c.fixkeys 2019-12-12 09:00:20.685567074 +0100 ++++ vim81/src/term.c 2019-12-12 09:21:36.708769626 +0100 +@@ -957,14 +957,14 @@ static struct builtin_term builtin_termc {K_XRIGHT, IF_EB("\033[1;*C", ESC_STR "[1;*C")}, {K_XLEFT, IF_EB("\033[1;*D", ESC_STR "[1;*D")}, - /* An extra set of function keys for vt100 mode */ + // An extra set of function keys for vt100 mode - {K_XF1, IF_EB("\033O*P", ESC_STR "O*P")}, - {K_XF2, IF_EB("\033O*Q", ESC_STR "O*Q")}, - {K_XF3, IF_EB("\033O*R", ESC_STR "O*R")}, diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch index f82a66c04d7d370da94885e761bac583521e54f3..87ddef43a943ff2ad42fb8252a24df2312e73b6d 100644 --- a/vim-7.4-fstabsyntax.patch +++ b/vim-7.4-fstabsyntax.patch @@ -1,6 +1,6 @@ -diff -up vim80/runtime/syntax/fstab.vim.fstabsyntax vim80/runtime/syntax/fstab.vim ---- vim80/runtime/syntax/fstab.vim.fstabsyntax 2017-11-19 20:32:49.000000000 +0100 -+++ vim80/runtime/syntax/fstab.vim 2017-11-20 16:01:31.494316342 +0100 +diff -up vim81/runtime/syntax/fstab.vim.fstabsyntax vim81/runtime/syntax/fstab.vim +--- vim81/runtime/syntax/fstab.vim.fstabsyntax 2019-06-11 09:55:23.000000000 +0200 ++++ vim81/runtime/syntax/fstab.vim 2019-06-11 10:14:22.223616868 +0200 @@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe " Type syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown @@ -14,8 +14,8 @@ diff -up vim80/runtime/syntax/fstab.vim.fstabsyntax vim80/runtime/syntax/fstab.v syn keyword fsOptionsYesNo yes no syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck syn keyword fsOptionsSize 512 1024 2048 --syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx -+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx +-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail ++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail syn match fsOptionsGeneral /_netdev/ " Options: adfs diff --git a/vim-7.4-licensemacro-1151450.patch b/vim-7.4-licensemacro-1151450.patch deleted file mode 100644 index 3a6e0a71ef0f9dc6700318c52e00ab7144ad0f81..0000000000000000000000000000000000000000 --- a/vim-7.4-licensemacro-1151450.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up vim74_new/runtime/syntax/spec.vim.1151450 vim74_new/runtime/syntax/spec.vim ---- vim74_new/runtime/syntax/spec.vim.1151450 2014-10-13 10:45:07.570944538 +0200 -+++ vim74_new/runtime/syntax/spec.vim 2014-10-13 10:44:09.046945965 +0200 -@@ -88,9 +88,9 @@ syn region specSectionMacroBracketArea o - "%% Files Section %% - "TODO %config valid parameters: missingok\|noreplace - "TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\) --syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier -+syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier - "tip: remember to include new itens in specFilesArea above --syn match specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>' -+syn match specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>' - - "valid options for certain section headers - syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1 diff --git a/vim-7.4-nowarnings.patch b/vim-7.4-nowarnings.patch index c77f9fce661613c2277e9897d5e800851376a2a5..a98e9d61aeb45495221c5c4e15b026aba5a2414f 100644 --- a/vim-7.4-nowarnings.patch +++ b/vim-7.4-nowarnings.patch @@ -1,11 +1,11 @@ -diff -up vim74/src/ex_docmd.c.e319 vim74/src/ex_docmd.c ---- vim74/src/ex_docmd.c.e319 2016-02-17 14:48:23.033995923 +0100 -+++ vim74/src/ex_docmd.c 2016-02-17 14:48:03.712890575 +0100 -@@ -4630,6 +4630,7 @@ get_flags(exarg_T *eap) +diff -up vim81/src/ex_docmd.c.backup vim81/src/ex_docmd.c +--- vim81/src/ex_docmd.c.backup 2019-01-22 17:35:28.701320672 +0100 ++++ vim81/src/ex_docmd.c 2019-01-22 17:36:56.644540351 +0100 +@@ -4793,6 +4793,7 @@ get_flags(exarg_T *eap) void ex_ni(exarg_T *eap) { + return; if (!eap->skip) - eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version"); + eap->errmsg = N_("E319: Sorry, the command is not available in this version"); } diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch index 440da18637dc433f26736b5da168459b2a44e5e8..b41f2fe3bf6bfd3a63c90860b276d8d8cbebadbb 100644 --- a/vim-7.4-syncolor.patch +++ b/vim-7.4-syncolor.patch @@ -1,25 +1,26 @@ -diff -up vim80/src/syntax.c.syncolor vim80/src/syntax.c ---- vim80/src/syntax.c.syncolor 2017-08-15 12:14:21.716020676 +0200 -+++ vim80/src/syntax.c 2017-08-15 12:30:31.380158974 +0200 -@@ -6972,8 +6972,8 @@ static char *(highlight_init_light[]) = +diff --git a/src/highlight.c b/src/highlight.c +index 9322f96..f7147a0 100644 +--- a/src/highlight.c ++++ b/src/highlight.c +@@ -211,8 +211,8 @@ static char *(highlight_init_light[]) = { CENT("Visual term=reverse", "Visual term=reverse guibg=LightGrey"), #ifdef FEAT_DIFF - CENT("DiffAdd term=bold ctermbg=LightBlue", - "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"), + CENT("DiffAdd term=bold ctermbg=LightRed", -+ "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"), ++ "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"), CENT("DiffChange term=bold ctermbg=LightMagenta", "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"), CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan", -@@ -7066,8 +7066,8 @@ static char *(highlight_init_dark[]) = { +@@ -304,8 +304,8 @@ static char *(highlight_init_dark[]) = { CENT("Visual term=reverse", "Visual term=reverse guibg=DarkGrey"), #ifdef FEAT_DIFF - CENT("DiffAdd term=bold ctermbg=DarkBlue", - "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"), + CENT("DiffAdd term=bold ctermbg=DarkRed", -+ "DiffAdd term=bold ctermbg=DarkRed guibg=DarkBlue"), ++ "DiffAdd term=bold ctermbg=DarkRed guibg=DarkBlue"), CENT("DiffChange term=bold ctermbg=DarkMagenta", "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"), CENT("DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan", diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index 5cb1a88ce309bcee36a44236b62225bfbff0951a..1ef4c9b154dec44af75606739602fcb0ece39481 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,14 +1,20 @@ -diff -up vim80/runtime/defaults.vim.copy-paste vim80/runtime/defaults.vim ---- vim80/runtime/defaults.vim.copy-paste 2016-12-19 09:01:20.351119199 +0100 -+++ vim80/runtime/defaults.vim 2016-12-19 09:01:53.735738941 +0100 -@@ -64,12 +64,6 @@ map Q gq +diff -up vim81/runtime/defaults.vim.copypaste vim81/runtime/defaults.vim +--- vim81/runtime/defaults.vim.copypaste 2019-10-30 10:30:23.108710252 +0100 ++++ vim81/runtime/defaults.vim 2019-10-30 10:36:19.127508406 +0100 +@@ -73,18 +73,6 @@ map Q gq " Revert with ":iunmap ". inoremap u -" In many terminal emulators the mouse works just fine. By enabling it you -" can position the cursor, Visually select and scroll with the mouse. +-" Only xterm can grab the mouse events when using the shift key, for other +-" terminals use ":", select text and press Esc. -if has('mouse') -- set mouse=a +- if &term =~ 'xterm' +- set mouse=a +- else +- set mouse=nvi +- endif -endif - " Switch syntax highlighting on when the terminal has colors or when using the diff --git a/vim-8.1-450.tar.bz2 b/vim-8.2.tar.bz2 similarity index 56% rename from vim-8.1-450.tar.bz2 rename to vim-8.2.tar.bz2 index 364bb7eb5f7d73e1e2907cc740cd0b6d0b337ff9..ceeb7c26e5f950f5018d6d732ddc1d186c0cbcbf 100644 Binary files a/vim-8.1-450.tar.bz2 and b/vim-8.2.tar.bz2 differ diff --git a/vim.spec b/vim.spec index 110dbb6e6f7053cc4f8b9fe57013f2dc06a170b3..c7a014ced01419ac09d8bb772743ff54240a122d 100644 --- a/vim.spec +++ b/vim.spec @@ -6,16 +6,17 @@ %{!?_with_lua__:%define _with_lua__ 1} %{!?_with_netbeans__:%define _with_netbeans__ 1} -%define vimdir vim81 +%define vimdir vim82 +%define python_ver 3.8 Name: vim Epoch: 2 -Version: 8.1.450 -Release: 7 +Version: 8.2 +Release: 5 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim and MIT URL: http://www.vim.org -Source0: ftp://ftp.vim.org/pub/vim/unix/vim-8.1-450.tar.bz2 +Source0: ftp://ftp.vim.org/pub/vim/unix/vim-8.2.tar.bz2 Source1: virc Source2: vimrc @@ -27,13 +28,12 @@ Patch0004: vim-7.0-rclocation.patch Patch0005: vim-7.4-checkhl.patch Patch0006: vim-7.4-fstabsyntax.patch Patch0007: vim-7.4-syncolor.patch -Patch0008: vim-7.4-licensemacro-1151450.patch Patch0009: vim-7.4-globalsyntax.patch Patch0010: vim-7.4-releasestring-1318991.patch Patch0011: vim-8.0-copy-paste.patch Patch0012: vim-python3-tests.patch - -Patch6000: CVE-2019-12735.patch +Patch0013: Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch +Patch0014: backport-Fix-build-failuers-with-perl-5.32.patch Patch9000: bugfix-rm-modify-info-version.patch @@ -136,7 +136,7 @@ sed -i 's/vimrc/virc/' os_unix.h %configure --with-features=small --with-x=no --enable-multibyte --disable-netbeans \ --disable-pythoninterp --disable-perlinterp --disable-tclinterp --with-tlib=ncurses \ --enable-gui=no --disable-gpm --exec-prefix=/ \ - --enable-fail-if-missing \ + --enable-fail-if-missing --with-python3-config-dir=/usr/lib64/python%{python_ver}/config-%{python_ver}-%{_arch}-linux-gnu \ %if %{_with_selinux__} --enable-selinux \ %else @@ -150,7 +150,7 @@ mv os_unix.h.bak os_unix.h %configure --with-features=huge --enable-pythoninterp=dynamic --enable-python3interp=dynamic \ --enable-perlinterp=dynamic --disable-tclinterp --with-x=yes --enable-xim --enable-multibyte \ --with-tlib=ncurses --enable-gtk3-check --enable-gui=gtk3 \ - --enable-cscope --enable-fail-if-missing \ + --enable-cscope --enable-fail-if-missing --with-python3-config-dir=/usr/lib64/python%{python_ver}/config-%{python_ver}-%{_arch}-linux-gnu \ %if %{_with_netbeans__} --enable-netbeans \ %else @@ -176,7 +176,7 @@ mv os_unix.h.bak os_unix.h %configure --with-features=huge --enable-pythoninterp=dynamic --enable-python3interp=dynamic \ --enable-perlinterp=dynamic --disable-tclinterp --with-x=no --enable-gui=no --enable-multibyte \ - --enable-cscope --with-tlib=ncurses \ + --enable-cscope --with-tlib=ncurses --with-python3-config-dir=/usr/lib64/python%{python_ver}/config-%{python_ver}-%{_arch}-linux-gnu \ --enable-fail-if-missing \ %if %{_with_netbeans__} --enable-netbeans \ @@ -377,6 +377,7 @@ popd %lang(sk.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/sk.cp1250 %lang(sr) %{_datadir}/%{name}/%{vimdir}/lang/sr %lang(sv) %{_datadir}/%{name}/%{vimdir}/lang/sv +%lang(tr) %{_datadir}/%{name}/%{vimdir}/lang/tr %lang(uk) %{_datadir}/%{name}/%{vimdir}/lang/uk %lang(uk.cp1251) %{_datadir}/%{name}/%{vimdir}/lang/uk.cp1251 %lang(vi) %{_datadir}/%{name}/%{vimdir}/lang/vi @@ -421,6 +422,39 @@ popd %{_mandir}/man1/evim.* %changelog +* Wed Oct 14 2020 Jie Yang - 2:8.2-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix wrong path passed to --with-python3-config-dir. + +* Sat Aug 15 2020 shixuantong - 2:8.2-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix build failuers with perl 5.32 + +* Fri Aug 7 2020 wenzhanli - 2:8.2-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix make test because lua update version 5.4.0 + +* Mon Jun 15 2020 chengquan -2:8.2-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix compilation errors caused by python upgrade + +* Thu Apr 16 2020 chengquan -2:8.2-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:upgrade software to v8.2 + +* Sat Feb 29 2020 openEuler Buildteam - 2:8.1.450-8 +- update virc/vimrc to make escape work in insert mode + * Thu Jan 21 2020 openEuler Buildteam - 2:8.1.450-7 - make vi/vim easy to uses diff --git a/vim.yaml b/vim.yaml new file mode 100644 index 0000000000000000000000000000000000000000..706d40e18bcbf62c9189bfda18b28d4ab578f604 --- /dev/null +++ b/vim.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: vim/vim +tag_prefix: ^v +seperator: . \ No newline at end of file diff --git a/vimrc b/vimrc index 698c4623c9d93d5a9e0284f4ac5b13083c31d2c7..c52b4461be9735505b1b6fed717f245344bc429e 100644 --- a/vimrc +++ b/vimrc @@ -1 +1,5 @@ set nocompatible " Use vim defaults +set backspace=indent,eol,start " allow backspacing over autoindent, line breaks, start of the insert +set ruler " display current row and column position +set viminfo='20,\"50 " read/write a .viminfo file, don't store more than 50 lines of registers +set history=50 " store 50 lines of command line history diff --git a/virc b/virc deleted file mode 100644 index 698c4623c9d93d5a9e0284f4ac5b13083c31d2c7..0000000000000000000000000000000000000000 --- a/virc +++ /dev/null @@ -1 +0,0 @@ -set nocompatible " Use vim defaults diff --git a/virctest1 b/virctest1 new file mode 100644 index 0000000000000000000000000000000000000000..aa46ebd88a5ab86c97c4faf7b03609e7f222f9fe --- /dev/null +++ b/virctest1 @@ -0,0 +1,6 @@ +set nocompatible " Use vim defaults +set backspace=indent,eol,start " allow backspacing over autoindent, line breaks, start of the insert +set ruler " display current row and column position +set viminfo='20,\"50 " read/write a .viminfo file, don't store more than 50 lines of registers +set history=50 " store 50 lines of command line history +test1test1test1test1test1test1test1 \ No newline at end of file