pool/vim
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 546472 from editors

Browse Source 
- 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/request/show/546472
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=196
This commit is contained in:
Dominique Leuenberger 2017-12-03 09:10:45 +00:00 committed by Git OBS Bridge
commit de75fbeca3
9 changed files with 131 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
disable-unreliable-tests.patch
View File

@ -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.1358.orig/src/testdir/test_alot.vim
+++ vim-8.0.0627/src/testdir/test_alot.vim +++ vim-8.0.1358/src/testdir/test_alot.vim
@@ -32,12 +32,10 @@ source test_join.vim @@ -32,12 +32,10 @@ source test_join.vim
source test_jumps.vim source test_jumps.vim
source test_lambda.vim source test_lambda.vim
@ -15,11 +15,69 @@ Index: vim-8.0.0627/src/testdir/test_alot.vim
source test_put.vim source test_put.vim
source test_recover.vim source test_recover.vim
source test_reltime.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_tagcase.vim
source test_tagjump.vim source test_tagjump.vim
source test_taglist.vim source test_taglist.vim
-source test_timers.vim -source test_timers.vim
source test_true_false.vim source test_true_false.vim
source test_unlet.vim source test_unlet.vim
source test_window_cmd.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
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 \
@@ -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
+++ 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 \
@@ -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
-test_options.res test_alot.res: opt_test.vim

16
vim-7.3-filetype_spec.patch
View File

@ -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.1358.orig/runtime/filetype.vim
+++ vim-8.0.0000/runtime/filetype.vim +++ vim-8.0.1358/runtime/filetype.vim
@@ -2069,7 +2069,7 @@ endfunc @@ -1543,7 +1543,7 @@ au BufNewFile,BufRead *.hog,snort.conf,v
au BufNewFile,BufRead *.rules call dist#ft#FTRules()
" Spec (Linux RPM) " Spec (Linux RPM)
-au BufNewFile,BufRead *.spec setf spec -au BufNewFile,BufRead *.spec setf spec
@ -11,10 +11,10 @@ Index: vim-8.0.0000/runtime/filetype.vim
" Speedup (AspenTech plant simulator) " Speedup (AspenTech plant simulator)
au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup 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.1358.orig/runtime/syntax/spec.vim
+++ vim-8.0.0000/runtime/syntax/spec.vim +++ vim-8.0.1358/runtime/syntax/spec.vim
@@ -102,7 +102,7 @@ syn case ignore @@ -102,7 +102,7 @@ syn case ignore
"%% PreAmble Section %% "%% PreAmble Section %%
"Copyright and Serial were deprecated by License and Epoch "Copyright and Serial were deprecated by License and Epoch

16
vim-7.4-disable_lang_no.patch
View File

@ -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.1358.orig/src/po/Makefile
+++ vim-8.0.0000/src/po/Makefile +++ vim-8.0.1358/src/po/Makefile
@@ -24,7 +24,6 @@ LANGUAGES = \ @@ -25,7 +25,6 @@ LANGUAGES = \
ko.UTF-8 \ lv \
nb \ nb \
nl \ nl \
- no \ - no \
pl \ pl \
pt_BR \ pt_BR \
ru \ ru \
@@ -65,7 +64,6 @@ MOFILES = \ @@ -67,7 +66,6 @@ MOFILES = \
ko.UTF-8.mo \ lv.mo \
nb.mo \ nb.mo \
nl.mo \ nl.mo \
- no.mo \ - no.mo \
pl.mo \ pl.mo \
pt_BR.mo \ pt_BR.mo \
ru.mo \ ru.mo \
@@ -106,7 +104,6 @@ CHECKFILES = \ @@ -108,7 +106,6 @@ CHECKFILES = \
ko.UTF-8.ck \ ko.UTF-8.ck \
nb.ck \ nb.ck \
nl.ck \ nl.ck \

16
vim-7.4-highlight_fstab.patch
View File

@ -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.1358.orig/runtime/syntax/fstab.vim
+++ vim-8.0.0000/runtime/syntax/fstab.vim +++ vim-8.0.1358/runtime/syntax/fstab.vim
@@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/ @@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/
" Device " Device
syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError 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 none proc linproc tmpfs debugfs devpts devtmpfs sysfs usbfs
syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
syn keyword fsDeviceKeyword contained sshfs nextgroup=fsDeviceSshfs syn keyword fsDeviceKeyword contained PARTLABEL nextgroup=fsDevicePARTLABEL
@@ -52,7 +52,7 @@ syn keyword fsMountPointKeyword containe @@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe
" Type " Type
syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
syn match fsTypeUnknown /\s\+\zs\w\+/ contained syn match fsTypeUnknown /\s\+\zs\w\+/ contained
@ -20,12 +20,12 @@ Index: vim-8.0.0000/runtime/syntax/fstab.vim
" Options " 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 keyword fsOptionsYesNo yes no
syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
syn keyword fsOptionsSize 512 1024 2048 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 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 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 pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx
syn match fsOptionsGeneral /_netdev/ syn match fsOptionsGeneral /_netdev/
" Options: adfs " Options: adfs

41
vim-8.0-ttytype-test.patch
View File

@ -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.1358.orig/src/testdir/test_options.vim
+++ vim-8.0.0566/src/testdir/test_startup.vim +++ vim-8.0.1358/src/testdir/test_options.vim
@@ -208,16 +208,3 @@ func Test_silent_ex_mode() @@ -292,7 +292,7 @@ func Test_set_ttytype()
let out = system(GetVimCommand() . '-u NONE -es -c''set verbose=1|h|exe "%norm\<c-y>\<c-d>"'' -c cq') " 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) call assert_notmatch('E315:', out)
endfunc endfunc
-
-func Test_default_term() -func Test_default_term()
- if !has('unix') || has('gui_running') - if !has('unix') || has('gui_running')
- " can't get output of Vim. - " 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) - call assert_match("defaulting to 'ansi'", out)
- let $TERM = save_term - let $TERM = save_term
-endfunc -endfunc
Index: vim-8.0.0566/src/testdir/test_options.vim -
=================================================================== func Test_zzz_startinsert()
--- vim-8.0.0566.orig/src/testdir/test_options.vim " Test :startinsert
+++ vim-8.0.0566/src/testdir/test_options.vim call writefile(['123456'], 'Xtestout')
@@ -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

3
vim-8.0.0627.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95ce59cd03813a8be16bda5834b2ef43e7b703eaf5087149454d238b670c1804
size 13117898

3
vim-8.0.1358.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:473d61f83f1a7cb5f290a390cc784b1f2a229e4440cfa92370d29061c7525cf1
size 13407369

13
vim.changes
View File

@ -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 Tue Nov 14 13:03:01 UTC 2017 - mpluskal@suse.com

8
vim.spec
View File

@ -17,8 +17,8 @@
%define pkg_version 8.0 %define pkg_version 8.0
%define patchlevel 0627 %define patchlevel 1358
%define patchlevel_compact 627 %define patchlevel_compact 1358
%define VIM_SUBDIR vim80 %define VIM_SUBDIR vim80
%define site_runtimepath %{_datadir}/vim/site %define site_runtimepath %{_datadir}/vim/site
%define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} %define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags}
@ -164,6 +164,10 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
# See also disable-unreliable-tests.patch # See also disable-unreliable-tests.patch
rm src/testdir/test_cmdline.* rm src/testdir/test_cmdline.*
rm src/testdir/test_channel.* 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 %build
export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing" export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing"