From d2743eddbe1c6eecfebf96308e651fc60ef967b81d8d1e1ca8be99851ea55bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 29 Nov 2017 11:53:57 +0000 Subject: [PATCH 1/5] - Update to revision 1358 * Too many changes to list - Fixes CVE-2017-1000382 bsc#1065958 - Refresh patches: * disable-unreliable-tests.patch * vim-7.3-filetype_spec.patch * vim-7.4-disable_lang_no.patch * vim-7.4-highlight_fstab.patch * vim-8.0-ttytype-test.patch OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=456 --- disable-unreliable-tests.patch | 10 ++++----- vim-7.3-filetype_spec.patch | 16 ++++++------- vim-7.4-disable_lang_no.patch | 16 ++++++------- vim-7.4-highlight_fstab.patch | 16 ++++++------- vim-8.0-ttytype-test.patch | 41 ++++++++++++++++++---------------- vim-8.0.0627.tar.gz | 3 --- vim-8.0.1358.tar.gz | 3 +++ vim.changes | 13 +++++++++++ vim.spec | 5 +++-- 9 files changed, 70 insertions(+), 53 deletions(-) delete mode 100644 vim-8.0.0627.tar.gz create mode 100644 vim-8.0.1358.tar.gz diff --git a/disable-unreliable-tests.patch b/disable-unreliable-tests.patch index 2f92dbe..2d46b4a 100644 --- a/disable-unreliable-tests.patch +++ b/disable-unreliable-tests.patch @@ -1,7 +1,7 @@ -Index: vim-8.0.0627/src/testdir/test_alot.vim +Index: vim-8.0.1358/src/testdir/test_alot.vim =================================================================== ---- vim-8.0.0627.orig/src/testdir/test_alot.vim -+++ vim-8.0.0627/src/testdir/test_alot.vim +--- vim-8.0.1358.orig/src/testdir/test_alot.vim ++++ vim-8.0.1358/src/testdir/test_alot.vim @@ -32,12 +32,10 @@ source test_join.vim source test_jumps.vim source test_lambda.vim @@ -15,11 +15,11 @@ Index: vim-8.0.0627/src/testdir/test_alot.vim source test_put.vim source test_recover.vim source test_reltime.vim -@@ -51,7 +49,6 @@ source test_tabpage.vim +@@ -53,7 +51,6 @@ source test_tabpage.vim source test_tagcase.vim source test_tagjump.vim source test_taglist.vim -source test_timers.vim source test_true_false.vim source test_unlet.vim - source test_window_cmd.vim + source test_virtualedit.vim diff --git a/vim-7.3-filetype_spec.patch b/vim-7.3-filetype_spec.patch index 2a3ae3b..184c502 100644 --- a/vim-7.3-filetype_spec.patch +++ b/vim-7.3-filetype_spec.patch @@ -1,9 +1,9 @@ -Index: vim-8.0.0000/runtime/filetype.vim +Index: vim-8.0.1358/runtime/filetype.vim =================================================================== ---- vim-8.0.0000.orig/runtime/filetype.vim -+++ vim-8.0.0000/runtime/filetype.vim -@@ -2069,7 +2069,7 @@ endfunc - +--- 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 + au BufNewFile,BufRead *.rules call dist#ft#FTRules() " Spec (Linux RPM) -au BufNewFile,BufRead *.spec setf spec @@ -11,10 +11,10 @@ Index: vim-8.0.0000/runtime/filetype.vim " Speedup (AspenTech plant simulator) au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup -Index: vim-8.0.0000/runtime/syntax/spec.vim +Index: vim-8.0.1358/runtime/syntax/spec.vim =================================================================== ---- vim-8.0.0000.orig/runtime/syntax/spec.vim -+++ vim-8.0.0000/runtime/syntax/spec.vim +--- vim-8.0.1358.orig/runtime/syntax/spec.vim ++++ vim-8.0.1358/runtime/syntax/spec.vim @@ -102,7 +102,7 @@ syn case ignore "%% PreAmble Section %% "Copyright and Serial were deprecated by License and Epoch diff --git a/vim-7.4-disable_lang_no.patch b/vim-7.4-disable_lang_no.patch index 0e1effa..5413c36 100644 --- a/vim-7.4-disable_lang_no.patch +++ b/vim-7.4-disable_lang_no.patch @@ -1,24 +1,24 @@ -Index: vim-8.0.0000/src/po/Makefile +Index: vim-8.0.1358/src/po/Makefile =================================================================== ---- vim-8.0.0000.orig/src/po/Makefile -+++ vim-8.0.0000/src/po/Makefile -@@ -24,7 +24,6 @@ LANGUAGES = \ - ko.UTF-8 \ +--- vim-8.0.1358.orig/src/po/Makefile ++++ vim-8.0.1358/src/po/Makefile +@@ -25,7 +25,6 @@ LANGUAGES = \ + lv \ nb \ nl \ - no \ pl \ pt_BR \ ru \ -@@ -65,7 +64,6 @@ MOFILES = \ - ko.UTF-8.mo \ +@@ -67,7 +66,6 @@ MOFILES = \ + lv.mo \ nb.mo \ nl.mo \ - no.mo \ pl.mo \ pt_BR.mo \ ru.mo \ -@@ -106,7 +104,6 @@ CHECKFILES = \ +@@ -108,7 +106,6 @@ CHECKFILES = \ ko.UTF-8.ck \ nb.ck \ nl.ck \ diff --git a/vim-7.4-highlight_fstab.patch b/vim-7.4-highlight_fstab.patch index 8f664e8..8d4a83e 100644 --- a/vim-7.4-highlight_fstab.patch +++ b/vim-7.4-highlight_fstab.patch @@ -1,7 +1,7 @@ -Index: vim-8.0.0000/runtime/syntax/fstab.vim +Index: vim-8.0.1358/runtime/syntax/fstab.vim =================================================================== ---- vim-8.0.0000.orig/runtime/syntax/fstab.vim -+++ vim-8.0.0000/runtime/syntax/fstab.vim +--- vim-8.0.1358.orig/runtime/syntax/fstab.vim ++++ vim-8.0.1358/runtime/syntax/fstab.vim @@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/ " Device syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError @@ -10,8 +10,8 @@ Index: vim-8.0.0000/runtime/syntax/fstab.vim +syn keyword fsDeviceKeyword contained none proc linproc tmpfs debugfs devpts devtmpfs sysfs usbfs syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID - syn keyword fsDeviceKeyword contained sshfs nextgroup=fsDeviceSshfs -@@ -52,7 +52,7 @@ syn keyword fsMountPointKeyword containe + syn keyword fsDeviceKeyword contained PARTLABEL nextgroup=fsDevicePARTLABEL +@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe " Type syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown syn match fsTypeUnknown /\s\+\zs\w\+/ contained @@ -20,12 +20,12 @@ Index: vim-8.0.0000/runtime/syntax/fstab.vim " Options " ------- -@@ -64,7 +64,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-] +@@ -68,7 +68,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-] 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 nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user users 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 nosuid nosymfollow nouser owner pamconsole rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user users 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 ++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 pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx syn match fsOptionsGeneral /_netdev/ " Options: adfs diff --git a/vim-8.0-ttytype-test.patch b/vim-8.0-ttytype-test.patch index a8e33c8..f758959 100644 --- a/vim-8.0-ttytype-test.patch +++ b/vim-8.0-ttytype-test.patch @@ -1,12 +1,24 @@ -Index: vim-8.0.0566/src/testdir/test_startup.vim +Index: vim-8.0.1358/src/testdir/test_options.vim =================================================================== ---- vim-8.0.0566.orig/src/testdir/test_startup.vim -+++ vim-8.0.0566/src/testdir/test_startup.vim -@@ -208,16 +208,3 @@ func Test_silent_ex_mode() - let out = system(GetVimCommand() . '-u NONE -es -c''set verbose=1|h|exe "%norm\\"'' -c cq') +--- vim-8.0.1358.orig/src/testdir/test_options.vim ++++ vim-8.0.1358/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 + set ttytype=xxx +- call assert_report('set ttype=xxx did not fail') ++ "call assert_report('set ttype=xxx did not fail') + catch /E522\|E437/ + endtry + +Index: vim-8.0.1358/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() call assert_notmatch('E315:', out) endfunc -- + -func Test_default_term() - if !has('unix') || has('gui_running') - " can't get output of Vim. @@ -19,16 +31,7 @@ Index: vim-8.0.0566/src/testdir/test_startup.vim - call assert_match("defaulting to 'ansi'", out) - let $TERM = save_term -endfunc -Index: vim-8.0.0566/src/testdir/test_options.vim -=================================================================== ---- vim-8.0.0566.orig/src/testdir/test_options.vim -+++ vim-8.0.0566/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 - set ttytype=xxx -- call assert_report('set ttype=xxx did not fail') -+ "call assert_report('set ttype=xxx did not fail') - catch /E522\|E437/ - endtry - +- + func Test_zzz_startinsert() + " Test :startinsert + call writefile(['123456'], 'Xtestout') diff --git a/vim-8.0.0627.tar.gz b/vim-8.0.0627.tar.gz deleted file mode 100644 index 03536ad..0000000 --- a/vim-8.0.0627.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95ce59cd03813a8be16bda5834b2ef43e7b703eaf5087149454d238b670c1804 -size 13117898 diff --git a/vim-8.0.1358.tar.gz b/vim-8.0.1358.tar.gz new file mode 100644 index 0000000..d4e6eff --- /dev/null +++ b/vim-8.0.1358.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:473d61f83f1a7cb5f290a390cc784b1f2a229e4440cfa92370d29061c7525cf1 +size 13407369 diff --git a/vim.changes b/vim.changes index a32509c..988a4c4 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Nov 29 11:36:40 UTC 2017 - idonmez@suse.com + +- Update to revision 1358 + * Too many changes to list +- Fixes CVE-2017-1000382 bsc#1065958 +- Refresh patches: + * disable-unreliable-tests.patch + * vim-7.3-filetype_spec.patch + * vim-7.4-disable_lang_no.patch + * vim-7.4-highlight_fstab.patch + * vim-8.0-ttytype-test.patch + ------------------------------------------------------------------- Tue Nov 14 13:03:01 UTC 2017 - mpluskal@suse.com diff --git a/vim.spec b/vim.spec index fb72c35..fcd5ee6 100644 --- a/vim.spec +++ b/vim.spec @@ -17,8 +17,8 @@ %define pkg_version 8.0 -%define patchlevel 0627 -%define patchlevel_compact 627 +%define patchlevel 1358 +%define patchlevel_compact 1358 %define VIM_SUBDIR vim80 %define site_runtimepath %{_datadir}/vim/site %define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} @@ -164,6 +164,7 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # See also disable-unreliable-tests.patch rm src/testdir/test_cmdline.* rm src/testdir/test_channel.* +rm src/testdir/test_writefile.* %build export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing" From af1453510c98726e17a6bbab5828fe3b6f0ec3d6df668c6a053d25eed10b22ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 29 Nov 2017 13:28:09 +0000 Subject: [PATCH 2/5] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=457 --- vim.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vim.spec b/vim.spec index fcd5ee6..b6e85e4 100644 --- a/vim.spec +++ b/vim.spec @@ -164,6 +164,7 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # See also disable-unreliable-tests.patch rm src/testdir/test_cmdline.* rm src/testdir/test_channel.* +rm src/testdir/test_options.* rm src/testdir/test_writefile.* %build From 972478a4bfc0912fbca4b2666589c5f7a6336a2034664388e21e8f608343eb5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 29 Nov 2017 14:11:38 +0000 Subject: [PATCH 3/5] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=458 --- disable-unreliable-tests.patch | 11 +++++++++++ vim.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/disable-unreliable-tests.patch b/disable-unreliable-tests.patch index 2d46b4a..bd5fcad 100644 --- a/disable-unreliable-tests.patch +++ b/disable-unreliable-tests.patch @@ -23,3 +23,14 @@ Index: vim-8.0.1358/src/testdir/test_alot.vim source test_true_false.vim source test_unlet.vim source test_virtualedit.vim +Index: vim-8.0.1358/src/testdir/Makefile +=================================================================== +--- vim-8.0.1358.orig/src/testdir/Makefile ++++ vim-8.0.1358/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 $< + @rm vimcmd +- +-opt_test.vim: ../option.c gen_opt_test.vim +- $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c diff --git a/vim.spec b/vim.spec index b6e85e4..5d00b59 100644 --- a/vim.spec +++ b/vim.spec @@ -164,6 +164,7 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # See also disable-unreliable-tests.patch rm src/testdir/test_cmdline.* rm src/testdir/test_channel.* +rm src/testdir/gen_opt_test.vim rm src/testdir/test_options.* rm src/testdir/test_writefile.* From 70118158087a2647aa8bc613911dd74594768ab56524a88875970d0f0bfb68b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 29 Nov 2017 14:18:03 +0000 Subject: [PATCH 4/5] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=459 --- disable-unreliable-tests.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/disable-unreliable-tests.patch b/disable-unreliable-tests.patch index bd5fcad..3eb24bd 100644 --- a/disable-unreliable-tests.patch +++ b/disable-unreliable-tests.patch @@ -34,3 +34,32 @@ Index: vim-8.0.1358/src/testdir/Makefile - -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 +=================================================================== +--- vim-8.0.1358.orig/src/Makefile ++++ vim-8.0.1358/src/Makefile +@@ -2225,7 +2225,6 @@ test_arglist \ + test_netbeans \ + test_normal \ + test_number \ +- test_options \ + test_packadd \ + test_partial \ + test_paste \ +Index: vim-8.0.1358/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 \ + test_netbeans.res \ + test_normal.res \ + test_number.res \ +- test_options.res \ + test_packadd.res \ + test_paste.res \ + test_perl.res \ +@@ -191,4 +190,3 @@ NEW_TESTS = test_arabic.res \ + # Explicit dependencies. + test49.out: test49.vim + +-test_options.res test_alot.res: opt_test.vim From ff60c361c621c50e9b0eaf53f18634ee08c3645c4c7170f1b3e3bf661fac3f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 29 Nov 2017 14:56:28 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=460 --- disable-unreliable-tests.patch | 20 +++++++++++++++++++- vim.spec | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/disable-unreliable-tests.patch b/disable-unreliable-tests.patch index 3eb24bd..6368d1a 100644 --- a/disable-unreliable-tests.patch +++ b/disable-unreliable-tests.patch @@ -46,6 +46,15 @@ Index: vim-8.0.1358/src/Makefile test_packadd \ test_partial \ test_paste \ +@@ -2275,8 +2274,6 @@ test_arglist \ + test_tagjump \ + test_taglist \ + test_tcl \ +- test_terminal \ +- test_terminal_fail \ + test_textformat \ + test_textobjects \ + test_timers \ Index: vim-8.0.1358/src/testdir/Make_all.mak =================================================================== --- vim-8.0.1358.orig/src/testdir/Make_all.mak @@ -58,7 +67,16 @@ Index: vim-8.0.1358/src/testdir/Make_all.mak test_packadd.res \ test_paste.res \ test_perl.res \ -@@ -191,4 +190,3 @@ NEW_TESTS = test_arabic.res \ +@@ -168,8 +167,6 @@ NEW_TESTS = test_arabic.res \ + test_system.res \ + test_tab.res \ + test_tcl.res \ +- test_terminal.res \ +- test_terminal_fail.res \ + test_textformat.res \ + test_textobjects.res \ + test_undo.res \ +@@ -191,4 +188,3 @@ NEW_TESTS = test_arabic.res \ # Explicit dependencies. test49.out: test49.vim diff --git a/vim.spec b/vim.spec index 5d00b59..8547fd4 100644 --- a/vim.spec +++ b/vim.spec @@ -166,6 +166,7 @@ rm src/testdir/test_cmdline.* rm src/testdir/test_channel.* rm src/testdir/gen_opt_test.vim rm src/testdir/test_options.* +rm src/testdir/test_terminal* rm src/testdir/test_writefile.* %build