Hello community, here is the log from the commit of package vim for openSUSE:Leap:15.2 checked in at 2020-06-10 16:50:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/vim (Old) and /work/SRC/openSUSE:Leap:15.2/.vim.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vim" Wed Jun 10 16:50:07 2020 rev:63 rq:812456 version:8.0.1568 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/vim/vim.changes 2020-01-15 16:28:04.816741850 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.vim.new.3606/vim.changes 2020-06-10 16:50:11.476408973 +0200 @@ -1,0 +2,6 @@ +Fri May 29 08:53:29 UTC 2020 - Ismail Dönmez <[email protected]> + +- Add restrict-shell-commands.patch to disable using interfaces in + restricted mode, fixes bsc#1172225 CVE-2019-20807 + +------------------------------------------------------------------- New: ---- restrict-shell-commands.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim.spec ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.444414682 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.448414694 +0200 @@ -67,6 +67,7 @@ Patch100: vim73-no-static-libpython.patch Patch101: vim-8.0.1568-defaults.patch Patch102: source-check-sandbox.patch +Patch103: restrict-shell-commands.patch BuildRequires: autoconf BuildRequires: db-devel BuildRequires: fdupes @@ -172,6 +173,7 @@ %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # Unreliable tests ++++++ disable-unreliable-tests.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.504414856 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.504414856 +0200 @@ -1,7 +1,7 @@ -Index: vim-8.0.1358/src/testdir/test_alot.vim +Index: vim-8.0.1568/src/testdir/test_alot.vim =================================================================== ---- vim-8.0.1358.orig/src/testdir/test_alot.vim -+++ vim-8.0.1358/src/testdir/test_alot.vim +--- vim-8.0.1568.orig/src/testdir/test_alot.vim ++++ vim-8.0.1568/src/testdir/test_alot.vim @@ -32,12 +32,10 @@ source test_join.vim source test_jumps.vim source test_lambda.vim @@ -23,10 +23,10 @@ source test_true_false.vim source test_unlet.vim source test_virtualedit.vim -Index: vim-8.0.1358/src/testdir/Makefile +Index: vim-8.0.1568/src/testdir/Makefile =================================================================== ---- vim-8.0.1358.orig/src/testdir/Makefile -+++ vim-8.0.1358/src/testdir/Makefile +--- vim-8.0.1568.orig/src/testdir/Makefile ++++ vim-8.0.1568/src/testdir/Makefile @@ -142,6 +142,3 @@ test_gui_init.res: test_gui_init.vim @echo "$(RUN_GVIMTEST_WITH_GVIMRC)" >> vimcmd $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @@ -34,11 +34,11 @@ - -opt_test.vim: ../option.c gen_opt_test.vim - $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c -Index: vim-8.0.1358/src/Makefile +Index: vim-8.0.1568/src/Makefile =================================================================== ---- vim-8.0.1358.orig/src/Makefile -+++ vim-8.0.1358/src/Makefile -@@ -2225,7 +2225,6 @@ test_arglist \ +--- vim-8.0.1568.orig/src/Makefile ++++ vim-8.0.1568/src/Makefile +@@ -2232,7 +2232,6 @@ test_arglist \ test_netbeans \ test_normal \ test_number \ @@ -46,7 +46,7 @@ test_packadd \ test_partial \ test_paste \ -@@ -2275,8 +2274,6 @@ test_arglist \ +@@ -2282,8 +2281,6 @@ test_arglist \ test_tagjump \ test_taglist \ test_tcl \ @@ -55,11 +55,11 @@ test_textformat \ test_textobjects \ test_timers \ -Index: vim-8.0.1358/src/testdir/Make_all.mak +Index: vim-8.0.1568/src/testdir/Make_all.mak =================================================================== ---- vim-8.0.1358.orig/src/testdir/Make_all.mak -+++ vim-8.0.1358/src/testdir/Make_all.mak -@@ -138,7 +138,6 @@ NEW_TESTS = test_arabic.res \ +--- vim-8.0.1568.orig/src/testdir/Make_all.mak ++++ vim-8.0.1568/src/testdir/Make_all.mak +@@ -139,7 +139,6 @@ NEW_TESTS = test_arabic.res \ test_netbeans.res \ test_normal.res \ test_number.res \ @@ -67,7 +67,7 @@ test_packadd.res \ test_paste.res \ test_perl.res \ -@@ -168,8 +167,6 @@ NEW_TESTS = test_arabic.res \ +@@ -170,8 +169,6 @@ NEW_TESTS = test_arabic.res \ test_system.res \ test_tab.res \ test_tcl.res \ @@ -76,7 +76,7 @@ test_textformat.res \ test_textobjects.res \ test_undo.res \ -@@ -191,4 +188,3 @@ NEW_TESTS = test_arabic.res \ +@@ -194,4 +191,3 @@ NEW_TESTS = test_arabic.res \ # Explicit dependencies. test49.out: test49.vim ++++++ restrict-shell-commands.patch ++++++ Index: vim-8.0.1568/src/evalfunc.c =================================================================== --- vim-8.0.1568.orig/src/evalfunc.c +++ vim-8.0.1568/src/evalfunc.c @@ -6434,7 +6434,7 @@ f_histadd(typval_T *argvars UNUSED, typv #endif rettv->vval.v_number = FALSE; - if (check_restricted() || check_secure()) + if (check_secure()) return; #ifdef FEAT_CMDHIST str = get_tv_string_chk(&argvars[0]); /* NULL on type error */ @@ -7439,6 +7439,9 @@ f_luaeval(typval_T *argvars, typval_T *r char_u *str; char_u buf[NUMBUFLEN]; + if (check_restricted() || check_secure()) + return; + str = get_tv_string_buf(&argvars[0], buf); do_luaeval(str, argvars + 1, rettv); } @@ -8161,6 +8164,9 @@ f_mzeval(typval_T *argvars, typval_T *re char_u *str; char_u buf[NUMBUFLEN]; + if (check_restricted() || check_secure()) + return; + str = get_tv_string_buf(&argvars[0], buf); do_mzeval(str, rettv); } @@ -8371,6 +8377,10 @@ f_py3eval(typval_T *argvars, typval_T *r char_u *str; char_u buf[NUMBUFLEN]; + if (check_restricted() || check_secure()) + return; + + str = get_tv_string_buf(&argvars[0], buf); if (p_pyx == 0) p_pyx = 3; @@ -8389,6 +8399,9 @@ f_pyeval(typval_T *argvars, typval_T *re char_u *str; char_u buf[NUMBUFLEN]; + if (check_restricted() || check_secure()) + return; + if (p_pyx == 0) p_pyx = 2; @@ -8404,6 +8417,10 @@ f_pyeval(typval_T *argvars, typval_T *re static void f_pyxeval(typval_T *argvars, typval_T *rettv) { + + if (check_restricted() || check_secure()) + return; + # if defined(FEAT_PYTHON) && defined(FEAT_PYTHON3) init_pyxversion(); if (p_pyx == 2) @@ -10245,7 +10262,7 @@ f_setbufvar(typval_T *argvars, typval_T typval_T *varp; char_u nbuf[NUMBUFLEN]; - if (check_restricted() || check_secure()) + if (check_secure()) return; (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ varname = get_tv_string_chk(&argvars[1]); @@ -10765,7 +10782,7 @@ f_settabvar(typval_T *argvars, typval_T rettv->vval.v_number = 0; - if (check_restricted() || check_secure()) + if (check_secure()) return; tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL)); @@ -13581,7 +13598,7 @@ f_writefile(typval_T *argvars, typval_T list_T *list; rettv->vval.v_number = -1; - if (check_restricted() || check_secure()) + if (check_secure()) return; if (argvars[0].v_type != VAR_LIST) Index: vim-8.0.1568/src/ex_docmd.c =================================================================== --- vim-8.0.1568.orig/src/ex_docmd.c +++ vim-8.0.1568/src/ex_docmd.c @@ -2397,6 +2397,13 @@ do_one_cmd( goto doend; } #endif + + if (restricted != 0 && (ea.argt & EX_RESTRICT)) + { + errormsg = _("E981: Command not allowed in rvim"); + goto doend; + } + if (!curbuf->b_p_ma && (ea.argt & MODIFY)) { /* Command not allowed in non-'modifiable' buffer */ Index: vim-8.0.1568/src/if_perl.xs =================================================================== --- vim-8.0.1568.orig/src/if_perl.xs +++ vim-8.0.1568/src/if_perl.xs @@ -930,6 +930,7 @@ VIM_init(void) #ifdef DYNAMIC_PERL static char *e_noperl = N_("Sorry, this command is disabled: the Perl library could not be loaded."); #endif +static char *e_perlsandbox = N_("E299: Perl evaluation forbidden in sandbox without the Safe module"); /* * ":perl" @@ -978,13 +979,12 @@ ex_perl(exarg_T *eap) vim_free(script); } -#ifdef HAVE_SANDBOX - if (sandbox) + if (sandbox || secure) { safe = perl_get_sv("VIM::safe", FALSE); # ifndef MAKE_TEST /* avoid a warning for unreachable code */ if (safe == NULL || !SvTRUE(safe)) - EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module")); + EMSG(_(e_perlsandbox)); else # endif { @@ -996,8 +996,8 @@ ex_perl(exarg_T *eap) } } else -#endif - perl_eval_sv(sv, G_DISCARD | G_NOARGS); + + perl_eval_sv(sv, G_DISCARD | G_NOARGS); SvREFCNT_dec(sv); @@ -1259,13 +1259,12 @@ do_perleval(char_u *str, typval_T *rettv ENTER; SAVETMPS; -#ifdef HAVE_SANDBOX - if (sandbox) + if (sandbox || secure) { safe = get_sv("VIM::safe", FALSE); # ifndef MAKE_TEST /* avoid a warning for unreachable code */ if (safe == NULL || !SvTRUE(safe)) - EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module")); + EMSG(_(e_perlsandbox)); else # endif { @@ -1281,7 +1280,7 @@ do_perleval(char_u *str, typval_T *rettv } } else -#endif /* HAVE_SANDBOX */ + sv = eval_pv((char *)str, 0); if (sv) { Index: vim-8.0.1568/src/ex_cmds.h =================================================================== --- vim-8.0.1568.orig/src/ex_cmds.h +++ vim-8.0.1568/src/ex_cmds.h @@ -56,6 +56,7 @@ * curbuf_lock is set */ #define MODIFY 0x200000L /* forbidden in non-'modifiable' buffer */ #define EXFLAGS 0x400000L /* allow flags after count in argument */ +#define EX_RESTRICT 0x800000L // forbidden in restricted mode #define FILES (XFILE | EXTRA) /* multiple extra files allowed */ #define WORD1 (EXTRA | NOSPC) /* one extra word allowed */ #define FILE1 (FILES | NOSPC) /* 1 file allowed, defaults to current file */ @@ -860,13 +861,13 @@ EX(CMD_lunmap, "lunmap", ex_unmap, EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, ADDR_LINES), EX(CMD_lua, "lua", ex_lua, - RANGE|EXTRA|NEEDARG|CMDWIN, + RANGE|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_luado, "luado", ex_luado, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN, + RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_luafile, "luafile", ex_luafile, - RANGE|FILE1|NEEDARG|CMDWIN, + RANGE|FILE1|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_lvimgrep, "lvimgrep", ex_vimgrep, RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE, @@ -929,10 +930,10 @@ EX(CMD_mode, "mode", ex_mode, WORD1|TRLBAR|CMDWIN, ADDR_LINES), EX(CMD_mzscheme, "mzscheme", ex_mzscheme, - RANGE|EXTRA|DFLALL|NEEDARG|CMDWIN|SBOXOK, + RANGE|EXTRA|DFLALL|NEEDARG|CMDWIN|SBOXOK|EX_RESTRICT, ADDR_LINES), EX(CMD_mzfile, "mzfile", ex_mzfile, - RANGE|FILE1|NEEDARG|CMDWIN, + RANGE|FILE1|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_next, "next", ex_next, RANGE|NOTADR|BANG|FILES|EDITCMD|ARGOPT|TRLBAR, @@ -1115,37 +1116,37 @@ EX(CMD_pwd, "pwd", ex_pwd, TRLBAR|CMDWIN, ADDR_LINES), EX(CMD_python, "python", ex_python, - RANGE|EXTRA|NEEDARG|CMDWIN, + RANGE|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_pydo, "pydo", ex_pydo, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN, + RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_pyfile, "pyfile", ex_pyfile, - RANGE|FILE1|NEEDARG|CMDWIN, + RANGE|FILE1|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_py3, "py3", ex_py3, - RANGE|EXTRA|NEEDARG|CMDWIN, + RANGE|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_py3do, "py3do", ex_py3do, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN, + RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_python3, "python3", ex_py3, - RANGE|EXTRA|NEEDARG|CMDWIN, + RANGE|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_py3file, "py3file", ex_py3file, - RANGE|FILE1|NEEDARG|CMDWIN, + RANGE|FILE1|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_pyx, "pyx", ex_pyx, - RANGE|EXTRA|NEEDARG|CMDWIN, + RANGE|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_pyxdo, "pyxdo", ex_pyxdo, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN, + RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_pythonx, "pythonx", ex_pyx, - RANGE|EXTRA|NEEDARG|CMDWIN, + RANGE|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_pyxfile, "pyxfile", ex_pyxfile, - RANGE|FILE1|NEEDARG|CMDWIN, + RANGE|FILE1|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_quit, "quit", ex_quit, BANG|RANGE|COUNT|NOTADR|TRLBAR|CMDWIN, @@ -1199,13 +1200,13 @@ EX(CMD_runtime, "runtime", ex_runtime, BANG|NEEDARG|FILES|TRLBAR|SBOXOK|CMDWIN, ADDR_LINES), EX(CMD_ruby, "ruby", ex_ruby, - RANGE|EXTRA|NEEDARG|CMDWIN, + RANGE|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_rubydo, "rubydo", ex_rubydo, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN, + RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_rubyfile, "rubyfile", ex_rubyfile, - RANGE|FILE1|NEEDARG|CMDWIN, + RANGE|FILE1|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_rundo, "rundo", ex_rundo, NEEDARG|FILE1, @@ -1472,13 +1473,13 @@ EX(CMD_tabs, "tabs", ex_tabs, TRLBAR|CMDWIN, ADDR_TABS), EX(CMD_tcl, "tcl", ex_tcl, - RANGE|EXTRA|NEEDARG|CMDWIN, + RANGE|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_tcldo, "tcldo", ex_tcldo, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN, + RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_tclfile, "tclfile", ex_tclfile, - RANGE|FILE1|NEEDARG|CMDWIN, + RANGE|FILE1|NEEDARG|CMDWIN|EX_RESTRICT, ADDR_LINES), EX(CMD_tearoff, "tearoff", ex_tearoff, NEEDARG|EXTRA|TRLBAR|NOTRLCOM|CMDWIN, ++++++ vim-7.3-filetype_changes.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.628415216 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.628415216 +0200 @@ -1,8 +1,8 @@ -Index: vim-8.0.0000/runtime/filetype.vim +Index: vim-8.0.1568/runtime/filetype.vim =================================================================== ---- vim-8.0.0000.orig/runtime/filetype.vim -+++ vim-8.0.0000/runtime/filetype.vim -@@ -414,6 +414,9 @@ au BufNewFile,BufRead *.css setf css +--- vim-8.0.1568.orig/runtime/filetype.vim ++++ vim-8.0.1568/runtime/filetype.vim +@@ -311,6 +311,9 @@ au BufNewFile,BufRead *.css setf css " Century Term Command Scripts (*.cmd too) au BufNewFile,BufRead *.con setf cterm @@ -12,10 +12,10 @@ " Changelog au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch \ setf debchangelog -Index: vim-8.0.0000/runtime/syntax/changes.vim +Index: vim-8.0.1568/runtime/syntax/changes.vim =================================================================== --- /dev/null -+++ vim-8.0.0000/runtime/syntax/changes.vim ++++ vim-8.0.1568/runtime/syntax/changes.vim @@ -0,0 +1,41 @@ +" Vim syntax file +" Filename: changes.vim ++++++ vim-7.3-filetype_ftl.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.636415239 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.640415251 +0200 @@ -1,8 +1,8 @@ -Index: vim-8.0.0000/runtime/filetype.vim +Index: vim-8.0.1568/runtime/filetype.vim =================================================================== ---- vim-8.0.0000.orig/runtime/filetype.vim -+++ vim-8.0.0000/runtime/filetype.vim -@@ -2770,3 +2770,7 @@ endfunc +--- vim-8.0.1568.orig/runtime/filetype.vim ++++ vim-8.0.1568/runtime/filetype.vim +@@ -2143,3 +2143,7 @@ endfunc " Restore 'cpoptions' let &cpo = s:cpo_save unlet s:cpo_save @@ -10,10 +10,10 @@ +" FreeMarker templates +au BufNewFile,BufRead *.ftl setf ftl + -Index: vim-8.0.0000/runtime/syntax/ftl.vim +Index: vim-8.0.1568/runtime/syntax/ftl.vim =================================================================== --- /dev/null -+++ vim-8.0.0000/runtime/syntax/ftl.vim ++++ vim-8.0.1568/runtime/syntax/ftl.vim @@ -0,0 +1,36 @@ +" Vim syntax file +" Language: FreeMarker Template Language (FTL) ++++++ vim-7.3-filetype_spec.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.648415274 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.648415274 +0200 @@ -1,8 +1,8 @@ -Index: vim-8.0.1358/runtime/filetype.vim +Index: vim-8.0.1568/runtime/filetype.vim =================================================================== ---- vim-8.0.1358.orig/runtime/filetype.vim -+++ vim-8.0.1358/runtime/filetype.vim -@@ -1543,7 +1543,7 @@ au BufNewFile,BufRead *.hog,snort.conf,v +--- vim-8.0.1568.orig/runtime/filetype.vim ++++ vim-8.0.1568/runtime/filetype.vim +@@ -1549,7 +1549,7 @@ au BufNewFile,BufRead *.hog,snort.conf,v au BufNewFile,BufRead *.rules call dist#ft#FTRules() " Spec (Linux RPM) @@ -11,10 +11,10 @@ " Speedup (AspenTech plant simulator) au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup -Index: vim-8.0.1358/runtime/syntax/spec.vim +Index: vim-8.0.1568/runtime/syntax/spec.vim =================================================================== ---- vim-8.0.1358.orig/runtime/syntax/spec.vim -+++ vim-8.0.1358/runtime/syntax/spec.vim +--- vim-8.0.1568.orig/runtime/syntax/spec.vim ++++ vim-8.0.1568/runtime/syntax/spec.vim @@ -102,7 +102,7 @@ syn case ignore "%% PreAmble Section %% "Copyright and Serial were deprecated by License and Epoch ++++++ vim-7.3-gvimrc_fontset.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.656415296 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.660415309 +0200 @@ -1,7 +1,7 @@ -Index: vim-8.0.0000/runtime/gvimrc_example.vim +Index: vim-8.0.1568/runtime/gvimrc_example.vim =================================================================== ---- vim-8.0.0000.orig/runtime/gvimrc_example.vim -+++ vim-8.0.0000/runtime/gvimrc_example.vim +--- vim-8.0.1568.orig/runtime/gvimrc_example.vim ++++ vim-8.0.1568/runtime/gvimrc_example.vim @@ -14,9 +14,6 @@ " Make external commands work through a pipe instead of a pseudo-tty "set noguipty ++++++ vim-7.3-help_tags.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.668415331 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.668415331 +0200 @@ -1,8 +1,8 @@ -Index: vim-8.0.0000/runtime/doc/Makefile +Index: vim-8.0.1568/runtime/doc/Makefile =================================================================== ---- vim-8.0.0000.orig/runtime/doc/Makefile -+++ vim-8.0.0000/runtime/doc/Makefile -@@ -313,6 +313,7 @@ all: tags vim.man evim.man vimdiff.man v +--- vim-8.0.1568.orig/runtime/doc/Makefile ++++ vim-8.0.1568/runtime/doc/Makefile +@@ -317,6 +317,7 @@ all: tags vim.man evim.man vimdiff.man v # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. vimtags: $(DOCS) ++++++ vim-7.3-mktemp_tutor.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.680415367 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.680415367 +0200 @@ -1,6 +1,7 @@ -diff -rup vim73.orig/src/vimtutor vim73/src/vimtutor ---- vim73.orig/src/vimtutor 2010-05-15 13:04:10.000000000 +0200 -+++ vim73/src/vimtutor 2010-11-21 05:28:54.592338812 +0100 +Index: vim-8.0.1568/src/vimtutor +=================================================================== +--- vim-8.0.1568.orig/src/vimtutor ++++ vim-8.0.1568/src/vimtutor @@ -24,8 +24,7 @@ xx=$1 export xx ++++++ vim-7.3-name_vimrc.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.688415389 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.692415402 +0200 @@ -1,8 +1,8 @@ -Index: vim-8.0.0000/src/feature.h +Index: vim-8.0.1568/src/feature.h =================================================================== ---- vim-8.0.0000.orig/src/feature.h -+++ vim-8.0.0000/src/feature.h -@@ -934,12 +934,13 @@ +--- vim-8.0.1568.orig/src/feature.h ++++ vim-8.0.1568/src/feature.h +@@ -933,12 +933,13 @@ * SYS_VIMRC_FILE Name of the system-wide .vimrc file. */ /* #define SYS_VIMRC_FILE "/etc/vimrc" */ ++++++ vim-7.3-sh_is_bash.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.700415424 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.700415424 +0200 @@ -1,7 +1,7 @@ -Index: vim-8.0.0000/runtime/syntax/sh.vim +Index: vim-8.0.1568/runtime/syntax/sh.vim =================================================================== ---- vim-8.0.0000.orig/runtime/syntax/sh.vim -+++ vim-8.0.0000/runtime/syntax/sh.vim +--- vim-8.0.1568.orig/runtime/syntax/sh.vim ++++ vim-8.0.1568/runtime/syntax/sh.vim @@ -64,6 +64,13 @@ if !exists("b:is_kornshell") && !exists( endif endif ++++++ vim-7.3-use_awk.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.716415471 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.716415471 +0200 @@ -1,6 +1,7 @@ -diff -rup vim73.orig/runtime/tools/mve.awk vim73/runtime/tools/mve.awk ---- vim73.orig/runtime/tools/mve.awk 2010-05-15 13:04:00.000000000 +0200 -+++ vim73/runtime/tools/mve.awk 2010-11-21 05:22:46.096963787 +0100 +Index: vim-8.0.1568/runtime/tools/mve.awk +=================================================================== +--- vim-8.0.1568.orig/runtime/tools/mve.awk ++++ vim-8.0.1568/runtime/tools/mve.awk @@ -1,4 +1,4 @@ -#!/usr/bin/nawk -f +#!/usr/bin/awk -f ++++++ vim-7.4-disable_lang_no.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.732415518 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.732415518 +0200 @@ -1,7 +1,7 @@ -Index: vim-8.0.1358/src/po/Makefile +Index: vim-8.0.1568/src/po/Makefile =================================================================== ---- vim-8.0.1358.orig/src/po/Makefile -+++ vim-8.0.1358/src/po/Makefile +--- vim-8.0.1568.orig/src/po/Makefile ++++ vim-8.0.1568/src/po/Makefile @@ -25,7 +25,6 @@ LANGUAGES = \ lv \ nb \ @@ -10,7 +10,7 @@ pl \ pt_BR \ ru \ -@@ -67,7 +66,6 @@ MOFILES = \ +@@ -68,7 +67,6 @@ MOFILES = \ lv.mo \ nb.mo \ nl.mo \ @@ -18,7 +18,7 @@ pl.mo \ pt_BR.mo \ ru.mo \ -@@ -108,7 +106,6 @@ CHECKFILES = \ +@@ -110,7 +108,6 @@ CHECKFILES = \ ko.UTF-8.ck \ nb.ck \ nl.ck \ ++++++ vim-7.4-filetype_apparmor.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.740415541 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.740415541 +0200 @@ -1,8 +1,8 @@ -Index: vim-8.0.0000/runtime/filetype.vim +Index: vim-8.0.1568/runtime/filetype.vim =================================================================== ---- vim-8.0.0000.orig/runtime/filetype.vim -+++ vim-8.0.0000/runtime/filetype.vim -@@ -115,6 +115,10 @@ au BufNewFile,BufRead proftpd.conf* cal +--- vim-8.0.1568.orig/runtime/filetype.vim ++++ vim-8.0.1568/runtime/filetype.vim +@@ -98,6 +98,10 @@ au BufNewFile,BufRead proftpd.conf* cal " Apache config file au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf setf apache ++++++ vim-7.4-filetype_mine.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.748415564 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.748415564 +0200 @@ -1,7 +1,7 @@ -Index: vim-7.4.1816/runtime/filetype.vim +Index: vim-8.0.1568/runtime/filetype.vim =================================================================== ---- vim-7.4.1816.orig/runtime/filetype.vim -+++ vim-7.4.1816/runtime/filetype.vim +--- vim-8.0.1568.orig/runtime/filetype.vim ++++ vim-8.0.1568/runtime/filetype.vim @@ -17,7 +17,7 @@ augroup filetypedetect " Ignored extensions ++++++ vim-7.4-highlight_fstab.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.756415587 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.756415587 +0200 @@ -1,7 +1,7 @@ -Index: vim-8.0.1358/runtime/syntax/fstab.vim +Index: vim-8.0.1568/runtime/syntax/fstab.vim =================================================================== ---- vim-8.0.1358.orig/runtime/syntax/fstab.vim -+++ vim-8.0.1358/runtime/syntax/fstab.vim +--- vim-8.0.1568.orig/runtime/syntax/fstab.vim ++++ vim-8.0.1568/runtime/syntax/fstab.vim @@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/ " Device syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError ++++++ vim-8.0-ttytype-test.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.768415622 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.768415622 +0200 @@ -1,7 +1,7 @@ -Index: vim-8.0.1358/src/testdir/test_options.vim +Index: vim-8.0.1568/src/testdir/test_options.vim =================================================================== ---- vim-8.0.1358.orig/src/testdir/test_options.vim -+++ vim-8.0.1358/src/testdir/test_options.vim +--- vim-8.0.1568.orig/src/testdir/test_options.vim ++++ vim-8.0.1568/src/testdir/test_options.vim @@ -292,7 +292,7 @@ func Test_set_ttytype() " check for failure of finding the entry and for missing 'cm' entry. try @@ -11,11 +11,11 @@ catch /E522\|E437/ endtry -Index: vim-8.0.1358/src/testdir/test_startup.vim +Index: vim-8.0.1568/src/testdir/test_startup.vim =================================================================== ---- vim-8.0.1358.orig/src/testdir/test_startup.vim -+++ vim-8.0.1358/src/testdir/test_startup.vim -@@ -251,19 +251,6 @@ func Test_silent_ex_mode() +--- vim-8.0.1568.orig/src/testdir/test_startup.vim ++++ vim-8.0.1568/src/testdir/test_startup.vim +@@ -265,19 +265,6 @@ func Test_silent_ex_mode() call assert_notmatch('E315:', out) endfunc ++++++ vim73-no-static-libpython.patch ++++++ --- /var/tmp/diff_new_pack.0H85Yq/_old 2020-06-10 16:50:13.788415680 +0200 +++ /var/tmp/diff_new_pack.0H85Yq/_new 2020-06-10 16:50:13.792415692 +0200 @@ -1,8 +1,8 @@ -Index: vim-8.0.0092/src/configure.ac +Index: vim-8.0.1568/src/configure.ac =================================================================== ---- vim-8.0.0092.orig/src/configure.ac -+++ vim-8.0.0092/src/configure.ac -@@ -1203,7 +1203,7 @@ eof +--- vim-8.0.1568.orig/src/configure.ac ++++ vim-8.0.1568/src/configure.ac +@@ -1214,7 +1214,7 @@ eof if test "${vi_cv_var_python_version}" = "1.4"; then vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" else
