From 5fde9a46e13b500b4f49654e8bf35134a5e368ecc5b801a498df9c85cc590570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 6 Mar 2017 08:46:13 +0000 Subject: [PATCH 01/16] - Updated to revision 425, fixes the following problems * Packadd test does not clean up symlink. * Packadd test uses wrong directory name. * The E11 error message in the command line window is not translated. * The "zero count" error doesn't have a number. (Hirohito Higashi) * Xfontset and guifontwide are not tested. * Illegal memory access after "vapo". (Dominique Pelle) * Restoring help snapshot accesses freed memory. (Dominique Pelle) * GUI test fails on some systems. * Illegal memory access when 'complete' ends in a backslash. * Can't access b:changedtick from a dict reference. * Functions test fails. * Flags of :substitute not sufficiently tested. * Invalid memory access in :recover command. * :recover test fails on MS-Windows. * Illegal memory access with vi' * Not checking return valud of dict_add(). (Coverity) * When using complete() and typing a character undo is saved after the character was inserted. (Shougo) * Double free when compiled with EXITFREE and setting 'ttytype'. * b:changedtick can be unlocked, even though it has no effect. * Unlet command leaks memory. (Nikolai Pavlov) * islocked('d.changedtick') does not work. * Vim relies on limits.h to be included indirectly, but on Solaris 9 it may not be. (Ben Fritz) * When using CTRL-X CTRL-U inside a comment, the use of the comment leader may not work. (Klement) * When building with a shadow directory on macOS lacks the +clipboard feature. * Redrawing errors with GTK 3. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=421 --- test87-python36.patch | 38 ------------- vim-8.0.0324.tar.gz | 3 - vim-8.0.0425.tar.gz | 3 + vim.changes | 126 ++++++++++++++++++++++++++++++++++++++++++ vim.spec | 8 +-- 5 files changed, 131 insertions(+), 47 deletions(-) delete mode 100644 test87-python36.patch delete mode 100644 vim-8.0.0324.tar.gz create mode 100644 vim-8.0.0425.tar.gz diff --git a/test87-python36.patch b/test87-python36.patch deleted file mode 100644 index 0500723..0000000 --- a/test87-python36.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 70c8d2d8c412ad5639db8a018c7385fd99d0373f -Author: Anatol Pomozov -Date: Sat Jan 7 09:26:22 2017 -0800 - - Fix error messages for Python 3.6 - - https://github.com/vim/vim/issues/1359 - https://bugs.archlinux.org/task/52401 - https://bbs.archlinux.org/viewtopic.php?id=221579 - -diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok -index d90ef8625..b51788bde 100644 ---- a/src/testdir/test87.ok -+++ b/src/testdir/test87.ok -@@ -658,10 +658,10 @@ assert sys.stderr.closed()==False:NOT FAILED - assert sys.stdout.errors=="strict":NOT FAILED - assert sys.stderr.errors=="strict":NOT FAILED - assert sys.stdout.encoding==sys.stderr.encoding:NOT FAILED --sys.stdout.write(None):(, TypeError("Can't convert 'NoneType' object to str implicitly",)) -+sys.stdout.write(None):(, TypeError('argument must be str, bytes or bytearray, not None',)) - >> OutputWriteLines - sys.stdout.writelines(None):(, TypeError("'NoneType' object is not iterable",)) --sys.stdout.writelines([1]):(, TypeError("Can't convert 'int' object to str implicitly",)) -+sys.stdout.writelines([1]):(, TypeError('argument must be str, bytes or bytearray, not int',)) - >>> Testing *Iter* using sys.stdout.writelines(%s) - sys.stdout.writelines(FailingIter()):(, NotImplementedError('iter',)) - sys.stdout.writelines(FailingIterNext()):(, NotImplementedError('next',)) -@@ -700,8 +700,8 @@ vim.foreach_rtp(NoArgsCall()):(, TypeError('__call__() takes - vim.foreach_rtp(FailingCall()):(, NotImplementedError('call',)) - vim.foreach_rtp(int, 2):(, TypeError('foreach_rtp() takes exactly one argument (2 given)',)) - > import --import xxx_no_such_module_xxx:(, ImportError('No module named xxx_no_such_module_xxx',)) --import failing_import:(, ImportError('No module named failing_import',)) -+import xxx_no_such_module_xxx:(, ModuleNotFoundError("No module named 'xxx_no_such_module_xxx'",)) -+import failing_import:(, ModuleNotFoundError("No module named 'failing_import'",)) - import failing:(, NotImplementedError()) - > Options - >> OptionsItem diff --git a/vim-8.0.0324.tar.gz b/vim-8.0.0324.tar.gz deleted file mode 100644 index 19e9e60..0000000 --- a/vim-8.0.0324.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae00e1d1acb3e84f5f88b7df2a494199f168af28db0aa896bc8d9dbc2cc1d1cd -size 12985045 diff --git a/vim-8.0.0425.tar.gz b/vim-8.0.0425.tar.gz new file mode 100644 index 0000000..8f41385 --- /dev/null +++ b/vim-8.0.0425.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:226ec0b35d1e787d237d535f1f55319a8b9b8882bc423e181b514c192be2f461 +size 13011260 diff --git a/vim.changes b/vim.changes index 4010120..b8df981 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,129 @@ +------------------------------------------------------------------- +Mon Mar 6 08:40:25 UTC 2017 - idonmez@suse.com + +- Updated to revision 425, fixes the following problems + * Packadd test does not clean up symlink. + * Packadd test uses wrong directory name. + * The E11 error message in the command line window is not translated. + * The "zero count" error doesn't have a number. (Hirohito Higashi) + * Xfontset and guifontwide are not tested. + * Illegal memory access after "vapo". (Dominique Pelle) + * Restoring help snapshot accesses freed memory. (Dominique Pelle) + * GUI test fails on some systems. + * Illegal memory access when 'complete' ends in a backslash. + * Can't access b:changedtick from a dict reference. + * Functions test fails. + * Flags of :substitute not sufficiently tested. + * Invalid memory access in :recover command. + * :recover test fails on MS-Windows. + * Illegal memory access with vi' + * Not checking return valud of dict_add(). (Coverity) + * When using complete() and typing a character undo is saved after the + character was inserted. (Shougo) + * Double free when compiled with EXITFREE and setting 'ttytype'. + * b:changedtick can be unlocked, even though it has no effect. + * Unlet command leaks memory. (Nikolai Pavlov) + * islocked('d.changedtick') does not work. + * Vim relies on limits.h to be included indirectly, but on Solaris 9 it + may not be. (Ben Fritz) + * When using CTRL-X CTRL-U inside a comment, the use of the comment leader + may not work. (Klement) + * When building with a shadow directory on macOS lacks the +clipboard + feature. + * Redrawing errors with GTK 3. + * Not enough test coverage for Perl. + * No test for concatenating an empty string that results from out of + bounds indexing. + * The condition for when a typval needs to be cleared is too complicated. + * If [RO] in the status line is translated to a longer string, it is + trunctted to 4 bytes. + * Test to check that setting termcap key fails sometimes. + * Using uninitialized memory when 'isfname' is empty. + * Leaking memory when setting 'ttytype'. + * Crash when setting 'guicursor' to weird value. + * Invalid memory access in C-indent code. + * 'number' and 'relativenumber' are not properly tested. + * Sometimes VimL is used, which is confusing. + * GUI initialisation is not sufficiently tested. + * Tests fail on MS-Windows. + * Travis is too slow to keep up with patches. + * ]s does not move cursor with two spell errors in one line. + * Might free a dict item that wasn't allocated. + * Build fails with tiny features. + * If configure defines _LARGE_FILES some include files are included before + it is defined. + * Not all options are tested with a range of values. + * The 'balloondelay', 'ballooneval' and 'balloonexpr' options are not defined + without the +balloon_eval feature. Testing that an option value + fails does not work for unsupported options. + * Invalid memory access when setting wildchar empty. + * Leaking memory when setting v:completed_item. + * More options are not always defined. + * Build fails without +folding. + * Invalid memory access when using :sc in Ex mode. (Dominique Pelle) + * The "+ register is not tested. + * Size computations in spell file reading are not exactly right. + * Possible overflow when reading corrupted undo file. + CVE-2017-6349 bsc#1027057 + * Another possible overflow when reading corrupted undo file. + CVE-2017-6350 bsc#1027053 + * CTRL-Z and mouse click use CTRL-O unnecessary. + * With 'linebreak' set and 'breakat' includes ">" a double-wide character + results in "<<" displayed. + * Diff mode is not sufficiently tested. + * Warning in tiny build for unused variable. (Tony Mechelynck) + * Misplaced #ifdef. (Christ van Willigen) + * Timer test failed for no apparent reason. + * No tests for arabic. + * Tiny build has a problem with generating the options test. + * compiler warnings + * filtering lines through "cat", without changing the line count, changes + manual folds. + * Test for arabic does not check what is displayed. + * When the window scrolls horizontally when the popup menu is displayed + part of it may not be cleared. (Neovim issue #6184) + * Arabic support is verbose and not well tested. + * GUI test fails with Athena and Motif. + * When the same tag appears more than once, the order is + unpredictable. (Charles Campbell) + * Tabs are not aligned when scrolling horizontally and a Tab doesn't + fit. (Axel Bender) + * Testing the + register fails with Motif. + * 'balloonexpr' only works synchronously. + * Cannot build with the viminfo feature but without the eval feature. + * Illegal memory access with "t". + * Crash when using balloon_show() when not supported. (Hirohito Higashi) + * Some tests have a one second delay. + * Test fails with missing balloon feature. + * :map completion does not have . (Dominique Pelle) + * GUI tests may fail. + * Not enough testing for quickfix. + * v:progpath may become invalid after ":cd". + * The arabic shaping code is verbose. + * Filtering folds with marker method not tested. + * Updating folds does not work properly when inserting a file and a few + other situations. + * set_progpath is defined but not always used + * Newer gettext/iconv library has extra dll file. + * We can't change the case in menu entries, it breaks translations. + * Menu test fails on MS-Windows. + * Menu test fails on MS-Windows using gvim. + * Balloon eval is not tested. + * Balloon test fails on MS-Windows. + * Setting v:progpath is not quite right. + * Test for the clipboard fails sometimes. + * ASAN logs are disabled and don't cause a failure. + * Test for v:progpath fails on MS-Windows. + * When running :make the output may be in the system encoding, different + from 'encoding'. + * Diff mode is displayed wrong when adding a line at the end of a buffer. + * Python test fails with Python 3.6. + * The effect of adding "#" to 'cinoptions' is not always removed. + * Compiler warnings on MS-Windows. (Ajit Thakkar) + * Build errors when building without folding. + +- Drop test87-python36.patch, fixed upstream. + ------------------------------------------------------------------- Thu Feb 16 14:00:34 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 40196d9..d543010 100644 --- a/vim.spec +++ b/vim.spec @@ -17,8 +17,8 @@ %define pkg_version 8.0 -%define patchlevel 0324 -%define patchlevel_compact 324 +%define patchlevel 0425 +%define patchlevel_compact 425 %define VIM_SUBDIR vim80 %define site_runtimepath /usr/share/vim/site %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} @@ -92,7 +92,6 @@ Patch15: %{name}-7.4-filetype_apparmor.patch Patch18: %{name}-7.3-filetype_spec.patch Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch -Patch23: test87-python36.patch Patch100: vim73-no-static-libpython.patch %description @@ -162,9 +161,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch18 -p1 %patch21 -p1 %patch22 -p1 -%if 0%{?python3_version_nodots} >= 36 -%patch23 -p1 -%endif %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . From 722c1080b75cf2ce512a126db6a1b16b30caba1ac3fadab26d7eda52e2f4f059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 6 Mar 2017 08:49:06 +0000 Subject: [PATCH 02/16] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=422 --- vim.spec | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/vim.spec b/vim.spec index d543010..ac28ca2 100644 --- a/vim.spec +++ b/vim.spec @@ -110,24 +110,13 @@ Obsoletes: vim-plugin-matchit <= 1.13.2 Provides: vim-plugin-matchit = 1.13.2 %description data -Vim (Vi IMproved) is an almost compatible version of the UNIX editor -vi. Almost every possible command can be performed using only ASCII -characters. Only the 'Q' command is missing (you do not need it). Many -new features have been added: multilevel undo, command line history, -file name completion, block operations, and editing of binary data. - -Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions -of UNIX. - -For SUSE Linux, Vim is used as /usr/bin/vi. - -Package vim-data contains the runtime files. +This package contains optional runtime & syntax files for vim. %package -n gvim Summary: A GUI for Vi Group: Productivity/Editors/Vi Requires: gvim_client -Requires: vim-data +Requires: vim-data = %{version}-%{release} Provides: gvim-base = %{version}-%{release} Provides: gvim-enhanced = %{version}-%{release} Obsoletes: gvim-base < %{version}-%{release} @@ -137,8 +126,6 @@ Provides: vi Provides: vim_client %description -n gvim -Copy and modify /usr/share/vim/current/gvimrc to ~/.gvimrc if needed. - Package gvim contains the largest set of features of vim, which is graphical windows and language interpreter, like python, ruby, or perl. You need package vim for the help and other documentation too. If you From 433c3c08311e6c931b4ab5355ecbc8738b3a4ee0a9751499be22d9b6d45548b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 6 Mar 2017 08:56:40 +0000 Subject: [PATCH 03/16] OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=423 --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index ac28ca2..226b14f 100644 --- a/vim.spec +++ b/vim.spec @@ -323,7 +323,7 @@ export TERM=linux # Reset the terminal scrolling region left behind by the testsuite trap "printf '\e[r'" EXIT # Look for "TEST FAILURE" in the build log -make test +LC_ALL=en_US.UTF-8 make test %post -n gvim %icon_theme_cache_post From 2d14c1383251d237a87445034baac399ed5b0f1c7f16fd3670f5a48d09af70eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 11 Mar 2017 10:02:37 +0000 Subject: [PATCH 04/16] Accepting request 478641 from home:kukuk:branches:editors - Build default vim without X11 support, use update-alternatives to prefer gvim if installed for X11 support. OBS-URL: https://build.opensuse.org/request/show/478641 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=424 --- vim.changes | 6 ++++++ vim.spec | 43 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/vim.changes b/vim.changes index b8df981..80e9cf9 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 11 10:55:35 CET 2017 - kukuk@suse.de + +- Build default vim without X11 support, use update-alternatives + to prefer gvim if installed for X11 support. + ------------------------------------------------------------------- Mon Mar 6 08:40:25 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 226b14f..f950691 100644 --- a/vim.spec +++ b/vim.spec @@ -50,6 +50,8 @@ BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils PreReq: sh-utils +Requires(post): update-alternatives +Requires(preun): update-alternatives %{?libperl_requires} Provides: vi Provides: vim-base = %{version}-%{release} @@ -124,6 +126,8 @@ Obsoletes: gvim-enhanced < %{version}-%{release} Provides: gvim_client Provides: vi Provides: vim_client +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n gvim Package gvim contains the largest set of features of vim, which is @@ -189,10 +193,10 @@ autoconf popd # build vim -%configure ${COMMON_OPTIONS} --disable-gui --disable-gpm +%configure ${COMMON_OPTIONS} --disable-gui --disable-gpm --with-x=no sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h make %{?_smp_mflags} -cp src/vim vim +cp src/vim vim-nox11 # build gvim make distclean @@ -224,14 +228,17 @@ for f in egvim egview eview evim gex gvi gview gvimdiff rgview rgvim ; do done # install vim -install -D -m 0755 vim %{buildroot}/bin/vim +install -D -m 0755 vim-nox11 %{buildroot}%{_bindir}/vim-nox11 +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +ln -s -f %{_sysconfdir}/alternatives/vim %{buildroot}%{_bindir}/vim # compat symlinks -ln -s -f /bin/vim %{buildroot}/bin/vi -ln -s -f /bin/vim %{buildroot}%{_bindir}/vim -ln -s -f /bin/vim %{buildroot}%{_bindir}/vi -ln -s -f vim %{buildroot}%{_bindir}/edit -ln -s -f /bin/vim %{buildroot}/bin/ex +mkdir %{buildroot}/bin +ln -s -f %{_bindir}/vim %{buildroot}/bin/vi +ln -s -f %{_bindir}/vim %{buildroot}/bin/vim +ln -s -f vim %{buildroot}%{_bindir}/vi +ln -s -f vim %{buildroot}%{_bindir}/edit +ln -s -f %{_bindir}/vim %{buildroot}/bin/ex # man pages ln -s -f vim.1.gz %{buildroot}%{_mandir}/man1/vi.1.gz @@ -325,15 +332,32 @@ trap "printf '\e[r'" EXIT # Look for "TEST FAILURE" in the build log LC_ALL=en_US.UTF-8 make test +%post +%{_sbindir}/update-alternatives --install %{_bindir}/vim vim %{_bindir}/vim-nox11 10 + +%preun +if [ "$1" = 0 ] ; then + %{_sbindir}/update-alternatives --remove vim %{_bindir}/vim-nox11 +fi + %post -n gvim +%{_sbindir}/update-alternatives --install %{_bindir}/vim vim %{_bindir}/gvim 20 %icon_theme_cache_post +%preun -n gvim +if [ "$1" = 0 ] ; then + %{_sbindir}/update-alternatives --remove vim %{_bindir}/gvim +fi + %postun -n gvim %icon_theme_cache_postun %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/vimrc +%ghost %{_sysconfdir}/alternatives/vim +%{_bindir}/vim-nox11 +%{_bindir}/vim # symlinks /bin/vi /bin/vim @@ -343,7 +367,6 @@ LC_ALL=en_US.UTF-8 make test %{_bindir}/rview %{_bindir}/rvim %{_bindir}/vi -%{_bindir}/vim %{_bindir}/view %{_bindir}/vimdiff # additional binaries @@ -470,6 +493,8 @@ LC_ALL=en_US.UTF-8 make test %defattr(-,root,root,-) %doc runtime/doc/gui_x11.txt %ghost %config(missingok) %{_sysconfdir}/gvimrc +%ghost %{_sysconfdir}/alternatives/vim +%{_bindir}/vim %{_bindir}/egview %{_bindir}/egvim %{_bindir}/eview From 168258fd49fd519f3c9dc13a82599b98b3f9b7c1f7d69b1403f0fb47f7fe4c4b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 20 Mar 2017 07:58:11 +0000 Subject: [PATCH 05/16] Accepting request 481189 from home:cboltz:branches:editors - Update apparmor.vim (taken from AppArmor 2.11) * add support for the "kcm" and "qipcrtr" network keywords * update change_profile rule highlighting Please forward this change to Factory and ideally also to Leap. OBS-URL: https://build.opensuse.org/request/show/481189 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=425 --- apparmor.vim | 10 +++++----- vim.changes | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apparmor.vim b/apparmor.vim index 4b7bf59..498ef7d 100644 --- a/apparmor.vim +++ b/apparmor.vim @@ -142,17 +142,17 @@ syn match sdCapDanger /\v^\s*(audit\s+)?(deny\s+|allow\s+)?capability\s*,(\s*$| " Network line " Syntax: network domain (inet, ...) type (stream, ...) protocol (tcp, ...) " TODO: 'owner' isn't supported, but will be (JJ, 2011-01-11) -syn match sdNetwork /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network(\s+(unspec|unix|inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|netlink|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|ib|mpls|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc|vsock))?(\s+(stream|dgram|seqpacket|rdm|packet))?(\s+tcp|\s+udp|\s+icmp)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude +syn match sdNetwork /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network(\s+(unspec|unix|inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|netlink|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|ib|mpls|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc|vsock|kcm|qipcrtr))?(\s+(stream|dgram|seqpacket|rdm|packet))?(\s+tcp|\s+udp|\s+icmp)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " network rules containing 'raw' -syn match sdNetworkDanger /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network(\s+(unspec|unix|inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|netlink|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|ib|mpls|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc|vsock))?(\s+(raw))(\s+tcp|\s+udp|\s+icmp)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude +syn match sdNetworkDanger /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network(\s+(unspec|unix|inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|netlink|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|ib|mpls|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc|vsock|kcm|qipcrtr))?(\s+(raw))(\s+tcp|\s+udp|\s+icmp)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " 'all networking' includes raw -> mark as dangerous syn match sdNetworkDanger /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " Change Profile -" TODO: audit and deny support will be added (JJ, 2011-01-11) -syn match sdEntryChangeProfile /\v^\s*change_profile\s+-\>\s+\S+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude - +syn match sdEntryChangeProfile /\v^\s*(audit\s+)?(deny\s+|allow\s+)?change_profile\s+(safe\s+[/@]\S+|unsafe\s+[/@]\S+|[/@]\S+)?\s*(-\>\s*\S+)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude +" bare change_profile rule +syn match sdEntryChangeProfile /\v^\s*(audit\s+)?(deny\s+|allow\s+)?change_profile\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " rlimit " TODO: audit and deny support will be added (JJ, 2011-01-11) diff --git a/vim.changes b/vim.changes index 80e9cf9..77719c9 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Mar 19 20:55:16 UTC 2017 - suse-beta@cboltz.de + +- Update apparmor.vim (taken from AppArmor 2.11) + * add support for the "kcm" and "qipcrtr" network keywords + * update change_profile rule highlighting + ------------------------------------------------------------------- Sat Mar 11 10:55:35 CET 2017 - kukuk@suse.de From f8c6b603c200e859d2c247a4ece3d6f5035bccd9253208c012a23f189caaf1f5 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 21 Mar 2017 08:08:22 +0000 Subject: [PATCH 06/16] Accepting request 481405 from home:kukuk:branches:editors - Disable term=xxx test, does not work with any vim version OBS-URL: https://build.opensuse.org/request/show/481405 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=426 --- vim-8.0-ttytype-test.patch | 12 ++++++++++++ vim.changes | 5 +++++ vim.spec | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 vim-8.0-ttytype-test.patch diff --git a/vim-8.0-ttytype-test.patch b/vim-8.0-ttytype-test.patch new file mode 100644 index 0000000..3b0aa08 --- /dev/null +++ b/vim-8.0-ttytype-test.patch @@ -0,0 +1,12 @@ +--- src/testdir/test_options.vim ++++ src/testdir/test_options.vim 2017/03/20 15:39:06 +@@ -283,7 +283,8 @@ + " FIXME: "set ttytype=" gives E522 instead of E529 + " in travis on some builds. Why? Commented out this test for now. + " call assert_fails('set ttytype=', 'E529:') +- call assert_fails('set ttytype=xxx', 'E522:') ++ " Does not work, not even with older versions of vim ++ " call assert_fails('set ttytype=xxx', 'E522:') + set ttytype& + call assert_equal(&ttytype, &term) + endif diff --git a/vim.changes b/vim.changes index 77719c9..70909d0 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 20 16:46:58 CET 2017 - kukuk@suse.de + +- Disable term=xxx test, does not work with any vim version + ------------------------------------------------------------------- Sun Mar 19 20:55:16 UTC 2017 - suse-beta@cboltz.de diff --git a/vim.spec b/vim.spec index f950691..5f0b3c7 100644 --- a/vim.spec +++ b/vim.spec @@ -94,6 +94,7 @@ Patch15: %{name}-7.4-filetype_apparmor.patch Patch18: %{name}-7.3-filetype_spec.patch Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch +Patch23: vim-8.0-ttytype-test.patch Patch100: vim73-no-static-libpython.patch %description @@ -152,6 +153,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch18 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p0 %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . From 65f4ad965194374dc5535e1387ce58c65aa3aa913be07fef306056d20e4f383c Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 21 Mar 2017 08:18:32 +0000 Subject: [PATCH 07/16] OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=427 --- vim.changes | 1 + vim.spec | 87 ++++++++++++++++++++++++++--------------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/vim.changes b/vim.changes index 70909d0..21af605 100644 --- a/vim.changes +++ b/vim.changes @@ -2,6 +2,7 @@ Mon Mar 20 16:46:58 CET 2017 - kukuk@suse.de - Disable term=xxx test, does not work with any vim version + * vim-8.0-ttytype-test.patch ------------------------------------------------------------------- Sun Mar 19 20:55:16 UTC 2017 - suse-beta@cboltz.de diff --git a/vim.spec b/vim.spec index 5f0b3c7..84991b0 100644 --- a/vim.spec +++ b/vim.spec @@ -20,48 +20,11 @@ %define patchlevel 0425 %define patchlevel_compact 425 %define VIM_SUBDIR vim80 -%define site_runtimepath /usr/share/vim/site -%define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} - +%define site_runtimepath %{_datadir}/vim/site +%define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} Name: vim Version: %{pkg_version}.%{patchlevel_compact} Release: 0 -BuildRequires: autoconf -BuildRequires: db-devel -BuildRequires: fdupes -BuildRequires: gettext-devel -BuildRequires: gpm-devel -BuildRequires: gtk3-devel -%if 0%{?suse_version} > 1200 -BuildRequires: pkgconfig(xt) -%endif -BuildRequires: krb5-mini -BuildRequires: libacl-devel -BuildRequires: lua-devel -BuildRequires: ncurses-devel -BuildRequires: perl -BuildRequires: pkgconfig -BuildRequires: python-devel -BuildRequires: python3-devel -# Needed to convert svg to png -BuildRequires: rsvg-view -BuildRequires: ruby-devel -BuildRequires: update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: fileutils -PreReq: sh-utils -Requires(post): update-alternatives -Requires(preun): update-alternatives -%{?libperl_requires} -Provides: vi -Provides: vim-base = %{version}-%{release} -Provides: vim-enhanced = %{version}-%{release} -Provides: vim-python = %{version}-%{release} -Obsoletes: vim-base < %{version}-%{release} -Obsoletes: vim-enhanced < %{version}-%{release} -Obsoletes: vim-python < %{version}-%{release} -Provides: vim_client -Recommends: vim-data = %{version}-%{release} Summary: Vi IMproved License: Vim Group: Productivity/Editors/Vi @@ -96,6 +59,42 @@ Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch Patch23: vim-8.0-ttytype-test.patch Patch100: vim73-no-static-libpython.patch +BuildRequires: autoconf +BuildRequires: db-devel +BuildRequires: fdupes +BuildRequires: gettext-devel +BuildRequires: gpm-devel +BuildRequires: gtk3-devel +BuildRequires: krb5-mini +BuildRequires: libacl-devel +BuildRequires: lua-devel +BuildRequires: ncurses-devel +BuildRequires: perl +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: python3-devel +# Needed to convert svg to png +BuildRequires: rsvg-view +BuildRequires: ruby-devel +BuildRequires: update-desktop-files +PreReq: fileutils +PreReq: sh-utils +Requires(post): update-alternatives +Requires(preun): update-alternatives +Recommends: vim-data = %{version}-%{release} +Provides: vi +Provides: vim-base = %{version}-%{release} +Provides: vim-enhanced = %{version}-%{release} +Provides: vim-python = %{version}-%{release} +Obsoletes: vim-base < %{version}-%{release} +Obsoletes: vim-enhanced < %{version}-%{release} +Obsoletes: vim-python < %{version}-%{release} +Provides: vim_client +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?libperl_requires} +%if 0%{?suse_version} > 1200 +BuildRequires: pkgconfig(xt) +%endif %description Vim (Vi IMproved) is an almost compatible version of the UNIX editor @@ -107,10 +106,10 @@ file name completion, block operations, and editing of binary data. %package data Summary: Vi IMproved Group: Productivity/Editors/Vi -BuildArch: noarch # Used to be in vim-plugins package Obsoletes: vim-plugin-matchit <= 1.13.2 Provides: vim-plugin-matchit = 1.13.2 +BuildArch: noarch %description data This package contains optional runtime & syntax files for vim. @@ -120,6 +119,8 @@ Summary: A GUI for Vi Group: Productivity/Editors/Vi Requires: gvim_client Requires: vim-data = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: gvim-base = %{version}-%{release} Provides: gvim-enhanced = %{version}-%{release} Obsoletes: gvim-base < %{version}-%{release} @@ -127,8 +128,6 @@ Obsoletes: gvim-enhanced < %{version}-%{release} Provides: gvim_client Provides: vi Provides: vim_client -Requires(post): update-alternatives -Requires(preun): update-alternatives %description -n gvim Package gvim contains the largest set of features of vim, which is @@ -216,7 +215,7 @@ gcc %{optflags} %{SOURCE13} -o vitmp for size in %{_datadir}/icons/hicolor/*[0-9]x[0-9]*; do SIZE=$(echo $size | awk -Fx {'print $2}') install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps - rsvg-convert -h ${SIZE} -w ${SIZE} %{S:24} -o %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/gvim.png + rsvg-convert -h ${SIZE} -w ${SIZE} %{SOURCE24} -o %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/gvim.png done install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/scalable/apps install -m 0644 %{SOURCE24} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/gvim.svg @@ -317,7 +316,7 @@ rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c rm %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/demoserver.py # Create ghost files (see vim.conf) -mkdir -p %{buildroot}/var/run/vi.recover +mkdir -p %{buildroot}%{_localstatedir}/run/vi.recover %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tutor From 371ea81107dd34d236ca01ca90c3d642f4689bdb7b13af72d6a22e1f7ccea753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 27 Mar 2017 10:19:43 +0000 Subject: [PATCH 08/16] - Updated to revision 514, fixes the following problems * Insufficient testing for statusline. * 'makeencoding' missing from the options window. * Git and hg see new files after running tests. (Manuel Ortega) * Options test does not always test everything. * Options test fails or hangs on MS-Windows. * 'cinoptions' cannot set indent for extern block. * "make shadow" creates an invalid link. * Quite a few beeps when running tests. * Clang version not correctly detected. * Some functions are not tested. * Running the options test sometimes resizes the terminal. * The packadd test does not create the symlink correctly and does not test the right thing. * The fnamemodify test changes 'shell' in a way later tests may not be able to use system(). * Using ":%argdel" while the argument list is already empty gives an error. (Pavol Juhas) * Not enough test coverage in Insert mode. * Dead code in #ifdef. * Patch shell command uses double quotes around the argument, which allows for $HOME to be expanded. (Etienne) * Terminal width is set to 80 in test3. * Diffpatch fails when the file name has a quote. * Getpgid is not supported on all systems. * The ";" command does not work after characters with a lower byte that is NUL. * Getting font name does not work on X11. * Some macros are in lower case, which can be confusing. * Part of fold patch accidentally included. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=428 --- vim-8.0.0425.tar.gz | 3 -- vim-8.0.0514.tar.gz | 3 ++ vim.changes | 108 ++++++++++++++++++++++++++++++++++++++++++++ vim.spec | 6 +-- 4 files changed, 114 insertions(+), 6 deletions(-) delete mode 100644 vim-8.0.0425.tar.gz create mode 100644 vim-8.0.0514.tar.gz diff --git a/vim-8.0.0425.tar.gz b/vim-8.0.0425.tar.gz deleted file mode 100644 index 8f41385..0000000 --- a/vim-8.0.0425.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:226ec0b35d1e787d237d535f1f55319a8b9b8882bc423e181b514c192be2f461 -size 13011260 diff --git a/vim-8.0.0514.tar.gz b/vim-8.0.0514.tar.gz new file mode 100644 index 0000000..ec79c72 --- /dev/null +++ b/vim-8.0.0514.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d53e3bad5fa2e7ed6ea56e0a2a063cd4ec576390722eae042da8878c2ed2fba +size 13060466 diff --git a/vim.changes b/vim.changes index 21af605..7b575d4 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,111 @@ +------------------------------------------------------------------- +Mon Mar 27 10:14:04 UTC 2017 - idonmez@suse.com + +- Updated to revision 514, fixes the following problems + * Insufficient testing for statusline. + * 'makeencoding' missing from the options window. + * Git and hg see new files after running tests. (Manuel Ortega) + * Options test does not always test everything. + * Options test fails or hangs on MS-Windows. + * 'cinoptions' cannot set indent for extern block. + * "make shadow" creates an invalid link. + * Quite a few beeps when running tests. + * Clang version not correctly detected. + * Some functions are not tested. + * Running the options test sometimes resizes the terminal. + * The packadd test does not create the symlink correctly and does not test + the right thing. + * The fnamemodify test changes 'shell' in a way later tests may not be + able to use system(). + * Using ":%argdel" while the argument list is already empty gives an + error. (Pavol Juhas) + * Not enough test coverage in Insert mode. + * Dead code in #ifdef. + * Patch shell command uses double quotes around the argument, which allows + for $HOME to be expanded. (Etienne) + * Terminal width is set to 80 in test3. + * Diffpatch fails when the file name has a quote. + * Getpgid is not supported on all systems. + * The ";" command does not work after characters with a lower byte that + is NUL. + * Getting font name does not work on X11. + * Some macros are in lower case, which can be confusing. + * Part of fold patch accidentally included. + * v:progpath is not reliably set. + * Some macros are in lower case. + * Some macros are in lower case. + * Adding fold marker creates new comment. + * Compiler warnings for comparing unsigned char with 256 always being + true. (Manuel Ortega) + * The mode test may hang in Test_mode(). (Michael Soyka) + * Typo in MinGW test makefile. + * Using :move messes up manual folds. + * Potential crash if adding list or dict to dict fails. + * Old fix for :move messing up folding no longer needed, now that we have + a proper solution. + * Can't build on HPUX. + * Test 45 hangs on MS-Windows. + * If an MS-Windows tests succeeds at first and then fails in a way it does + not produce a test.out file it looks like the test succeeded. + * Resetting 'compatible' in defaults.vim has unexpected side effects. + (David Fishburn) + * Can't find executable name on Solaris and FreeBSD. + * Off-by-one error in using :move with folding. + * There are still a few macros that should be all-caps. + * Using g< after :for does not show the right output. (Marcin Szamotulski) + * After aborting an Ex command g< does not work. (Marcin Szamotulski) + * Compiler warnings on MS-Windows. + * Not enough testing for help commands. + * Exit callback test sometimes fails. + * When a test fails and test.log is created, Test_edit_CTRL_I matches it + instead of test1.in. + * No test covering arg_all(). + * The client-server feature is not tested. + * Not enough testing for the client-server feature. + * Missing change to main.c. + * The client-server test may hang when failing. + * Tests use assert_true(0) and assert_false(1) to report errors. + * remote_peek() is not tested. + * The remote_peek() test fails on MS-Windows. + * Unnecessary if statement. + * The setbufvar() function may mess up the window layout. (Kay Z.) + * Illegal memory access when using :all. (Dominique Pelle) + * Using :lhelpgrep with an argument that should fail does not produce an + error if the previous :helpgrep worked. + * Not all windows commands are tested. + * Crash and endless loop when closing windows in a SessionLoadPost + autocommand. + * The autocmd test hangs on MS-Windows. + * Running tests leaves an "xxx" file behind. + * Clipboard and "* register is not tested. + * Splitting a 'winfixwidth' window vertically makes it one column + smaller. (Dominique Pelle) + * The quotestar test fails when a required feature is missing. + * A failing client-server request can make Vim hang. + * Crash with cd command with very long argument. + * Build failure with older compiler on MS-Windows. + * The quotestar test uses a timer instead of a timeout, thus it cannot be + rerun like a flaky test. + * Insufficient testing for folding. + * Arabic support is not fully tested. + * Two autocmd tests are skipped on MS-Windows. + * taglist() does not prioritize tags for a buffer. + * Quotestar test is still a bit flaky. + * On MS-Windows ":!start" does not work as expected. + * Coverity complains about possible NULL pointer. + * Endless loop in updating folds with 32 bit ints. + * Looking up an Ex command is a bit slow. + * Failed window split for :stag not handled. (Coverity CID 99204) + * Can't build with ANSI C. + * Client-server tests fail when $DISPLAY is not set. + * Coveralls no longer shows per-file coverage. + * No link to codecov.io results. + * Typo in link to codecov.io results. + * Menuage for skipping client-server tests is unclear. + * Check for available characters takes too long. + * Getting name of cleared highlight group is wrong. (Matt Wozniski) + * Script for creating cmdidxs can be improved. + ------------------------------------------------------------------- Mon Mar 20 16:46:58 CET 2017 - kukuk@suse.de diff --git a/vim.spec b/vim.spec index 84991b0..0f4603f 100644 --- a/vim.spec +++ b/vim.spec @@ -17,8 +17,8 @@ %define pkg_version 8.0 -%define patchlevel 0425 -%define patchlevel_compact 425 +%define patchlevel 0514 +%define patchlevel_compact 514 %define VIM_SUBDIR vim80 %define site_runtimepath %{_datadir}/vim/site %define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} @@ -105,8 +105,8 @@ file name completion, block operations, and editing of binary data. %package data Summary: Vi IMproved -Group: Productivity/Editors/Vi # Used to be in vim-plugins package +Group: Productivity/Editors/Vi Obsoletes: vim-plugin-matchit <= 1.13.2 Provides: vim-plugin-matchit = 1.13.2 BuildArch: noarch From 3ba21ec500e507102f21930b7bb286740c3f0ac61b94edf70d493203c5c4f2ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 31 Mar 2017 09:20:25 +0000 Subject: [PATCH 09/16] - Update spec.skeleton with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=429 --- spec.skeleton | 23 +++++++++++------------ vim.changes | 5 +++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/spec.skeleton b/spec.skeleton index 9caecb4..3b00d92 100644 --- a/spec.skeleton +++ b/spec.skeleton @@ -15,18 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: specRPM_CREATION_NAME -Version: -Release: -License: +Version: +Release: 0 Summary: -Url: -Group: -Source: -Patch: -BuildRequires: -PreReq: -Provides: +# FIXME: Select a correct license from https://github.com/openSUSE/spec-cleaner#spdx-licenses +License: +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" +Group: +Url: +Source: +BuildRequires: BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,10 +39,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} %{?_smp_mflags} +%make_install %post - %postun %files diff --git a/vim.changes b/vim.changes index 7b575d4..53af8a7 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 31 09:19:29 UTC 2017 - idonmez@suse.com + +- Update spec.skeleton with spec-cleaner + ------------------------------------------------------------------- Mon Mar 27 10:14:04 UTC 2017 - idonmez@suse.com From 8cdf18f2e214337911ad07c7445b2b8573ac95218bc249ae8caa8348b99ab7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 5 Apr 2017 09:24:06 +0000 Subject: [PATCH 10/16] - Updated to revision 542, fixes the following problems * ml_get errors in silent Ex mode. (Dominique Pelle) * A large count on a normal command causes trouble. (Dominique Pelle) * There is no way to remove quickfix lists (for testing). * Storing a zero byte from a multi-byte character causes fold text to show up wrong. * Character classes are not well tested. They can differ between platforms. * Using a function pointer instead of the actual function, which we know. * GtkForm handling is outdated. * MS-Windows: when 'clipboard' is "unnamed" yyp does not work in a :global command. * dv} deletes part of a multi-byte character. (Urtica Dioica) * Folds are messed up when 'encodin' is "utf-8". * Coverity complains about possible negative value. * RISC OS support was removed long ago, but one file is still included. * When 'wildmenu' is set and 'wildmode' has "longest" then the first file name is highlighted, even though the text shows the longest match. * Line in test commented out. * Buffer overflow when 'columns' is very big. (Nikolai Pavlov) * Test with long directory name fails on non-unix systems. * Test with long directory name fails on Mac. * Abbreviation doesn't work after backspacing newline. (Hkonrk) * Defaults.vim does not work well with tiny features. (crd477) * Memory leak when exiting from within a user function. * Quickfix window not updated when freeing quickfix stack. * Illegal memory access with :z and large count. * No test for falling back to default term value. * Startup test fails on Mac. * Building unit tests fails. * Compiler warning on MS-Windows. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=430 --- vim-8.0.0514.tar.gz | 3 --- vim-8.0.0542.tar.gz | 3 +++ vim.changes | 35 +++++++++++++++++++++++++++++++++++ vim.spec | 4 ++-- 4 files changed, 40 insertions(+), 5 deletions(-) delete mode 100644 vim-8.0.0514.tar.gz create mode 100644 vim-8.0.0542.tar.gz diff --git a/vim-8.0.0514.tar.gz b/vim-8.0.0514.tar.gz deleted file mode 100644 index ec79c72..0000000 --- a/vim-8.0.0514.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d53e3bad5fa2e7ed6ea56e0a2a063cd4ec576390722eae042da8878c2ed2fba -size 13060466 diff --git a/vim-8.0.0542.tar.gz b/vim-8.0.0542.tar.gz new file mode 100644 index 0000000..8fb88d7 --- /dev/null +++ b/vim-8.0.0542.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecd05c5e4dff3ed7125d23e2908eb39b699974d48c5f06c95a227afa1f6550d9 +size 13068846 diff --git a/vim.changes b/vim.changes index 53af8a7..9058695 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Wed Apr 5 09:19:45 UTC 2017 - idonmez@suse.com + +- Updated to revision 542, fixes the following problems + * ml_get errors in silent Ex mode. (Dominique Pelle) + * A large count on a normal command causes trouble. (Dominique Pelle) + * There is no way to remove quickfix lists (for testing). + * Storing a zero byte from a multi-byte character causes fold text to show + up wrong. + * Character classes are not well tested. They can differ between platforms. + * Using a function pointer instead of the actual function, which we know. + * GtkForm handling is outdated. + * MS-Windows: when 'clipboard' is "unnamed" yyp does not work in a :global + command. + * dv} deletes part of a multi-byte character. (Urtica Dioica) + * Folds are messed up when 'encodin' is "utf-8". + * Coverity complains about possible negative value. + * RISC OS support was removed long ago, but one file is still included. + * When 'wildmenu' is set and 'wildmode' has "longest" then the first file + name is highlighted, even though the text shows the longest match. + * Line in test commented out. + * Buffer overflow when 'columns' is very big. (Nikolai Pavlov) + * Test with long directory name fails on non-unix systems. + * Test with long directory name fails on Mac. + * Abbreviation doesn't work after backspacing newline. (Hkonrk) + * Defaults.vim does not work well with tiny features. (crd477) + * Memory leak when exiting from within a user function. + * Quickfix window not updated when freeing quickfix stack. + * Illegal memory access with :z and large count. + * No test for falling back to default term value. + * Startup test fails on Mac. + * Building unit tests fails. + * Compiler warning on MS-Windows. + * getpos() can return a negative line number. (haya14busa) + ------------------------------------------------------------------- Fri Mar 31 09:19:29 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 0f4603f..7ab3dae 100644 --- a/vim.spec +++ b/vim.spec @@ -17,8 +17,8 @@ %define pkg_version 8.0 -%define patchlevel 0514 -%define patchlevel_compact 514 +%define patchlevel 0542 +%define patchlevel_compact 542 %define VIM_SUBDIR vim80 %define site_runtimepath %{_datadir}/vim/site %define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} From 8b6db25affa77d21476fd497e09b784b362e8adec314e0fc2840137505954745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 10 Apr 2017 11:46:50 +0000 Subject: [PATCH 11/16] Accepting request 487033 from home:scarabeus_iv:branches:editors - Update the update-alternatives code OBS-URL: https://build.opensuse.org/request/show/487033 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=431 --- vim.changes | 5 +++++ vim.spec | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/vim.changes b/vim.changes index 9058695..4c8ba1b 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 10 11:41:51 UTC 2017 - tchvatal@suse.com + +- Update the update-alternatives code + ------------------------------------------------------------------- Wed Apr 5 09:19:45 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 7ab3dae..e404743 100644 --- a/vim.spec +++ b/vim.spec @@ -80,7 +80,7 @@ BuildRequires: update-desktop-files PreReq: fileutils PreReq: sh-utils Requires(post): update-alternatives -Requires(preun): update-alternatives +Requires(postun): update-alternatives Recommends: vim-data = %{version}-%{release} Provides: vi Provides: vim-base = %{version}-%{release} @@ -120,7 +120,7 @@ Group: Productivity/Editors/Vi Requires: gvim_client Requires: vim-data = %{version}-%{release} Requires(post): update-alternatives -Requires(preun): update-alternatives +Requires(postun): update-alternatives Provides: gvim-base = %{version}-%{release} Provides: gvim-enhanced = %{version}-%{release} Obsoletes: gvim-base < %{version}-%{release} @@ -336,8 +336,8 @@ LC_ALL=en_US.UTF-8 make test %post %{_sbindir}/update-alternatives --install %{_bindir}/vim vim %{_bindir}/vim-nox11 10 -%preun -if [ "$1" = 0 ] ; then +%postun +if [ ! -e %{_bindir}/vim-nox11 ] ; then %{_sbindir}/update-alternatives --remove vim %{_bindir}/vim-nox11 fi @@ -345,8 +345,8 @@ fi %{_sbindir}/update-alternatives --install %{_bindir}/vim vim %{_bindir}/gvim 20 %icon_theme_cache_post -%preun -n gvim -if [ "$1" = 0 ] ; then +%prostun -n gvim +if [ ! -e %{_bindir}/gvim ] ; then %{_sbindir}/update-alternatives --remove vim %{_bindir}/gvim fi From 6c43c72238f146708c07f684355dbd65d7b5e972a0abe7ba020e61a42f2a88ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 10 Apr 2017 12:24:42 +0000 Subject: [PATCH 12/16] - Updated to revision 559, fixes the following problems * Test_edit causes older xfce4-terminal to close. (Dominique Pelle) * Cppcheck warnings. * Edit test may fail on some systems. * Swap file exists briefly when opening the command window. * Extra line break in verbosefile when using ":echomsg". (Ingo Karkat) * Saving the redo buffer only works one time, resulting in the "." command not working well for a function call inside another function call. (Ingo Karkat) * No test for the 8g8 command. * Some etags format tags file use 0x01, breaking the parsing. * The typeahead buffer is reallocated too often. * Toupper and tolower don't work properly for Turkish when 'casemap' is empty. (Bjorn Linse) * Toupper/tolower test with Turkish locale fails on Mac. * Toupper and tolower don't work properly for Turkish when 'casemap' contains "keepascii". (Bjorn Linse) * Toupper/tolower test fails on OSX without Darwin. * Getting the window position fails if both the GUI and term code is built in. * GTK: using static gravities is not useful. * The :ownsyntax command is not tested. * Setting ttytype to xxx does not always fail as expected. (Marvin Schmidt) OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=432 --- vim-8.0.0542.tar.gz | 3 --- vim-8.0.0559.tar.gz | 3 +++ vim.changes | 27 +++++++++++++++++++++++++++ vim.spec | 6 ++---- 4 files changed, 32 insertions(+), 7 deletions(-) delete mode 100644 vim-8.0.0542.tar.gz create mode 100644 vim-8.0.0559.tar.gz diff --git a/vim-8.0.0542.tar.gz b/vim-8.0.0542.tar.gz deleted file mode 100644 index 8fb88d7..0000000 --- a/vim-8.0.0542.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ecd05c5e4dff3ed7125d23e2908eb39b699974d48c5f06c95a227afa1f6550d9 -size 13068846 diff --git a/vim-8.0.0559.tar.gz b/vim-8.0.0559.tar.gz new file mode 100644 index 0000000..bab3fab --- /dev/null +++ b/vim-8.0.0559.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47a25d3d352c2239ddf16b7e4a878522e1b8c84af2ba34c4d1619901ba90e3e8 +size 13073911 diff --git a/vim.changes b/vim.changes index 4c8ba1b..fa7608b 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Mon Apr 10 12:17:59 UTC 2017 - idonmez@suse.com + +- Updated to revision 559, fixes the following problems + * Test_edit causes older xfce4-terminal to close. (Dominique Pelle) + * Cppcheck warnings. + * Edit test may fail on some systems. + * Swap file exists briefly when opening the command window. + * Extra line break in verbosefile when using ":echomsg". (Ingo Karkat) + * Saving the redo buffer only works one time, resulting in the "." command + not working well for a function call inside another function + call. (Ingo Karkat) + * No test for the 8g8 command. + * Some etags format tags file use 0x01, breaking the parsing. + * The typeahead buffer is reallocated too often. + * Toupper and tolower don't work properly for Turkish when 'casemap' + is empty. (Bjorn Linse) + * Toupper/tolower test with Turkish locale fails on Mac. + * Toupper and tolower don't work properly for Turkish when 'casemap' + contains "keepascii". (Bjorn Linse) + * Toupper/tolower test fails on OSX without Darwin. + * Getting the window position fails if both the GUI and term code is + built in. + * GTK: using static gravities is not useful. + * The :ownsyntax command is not tested. + * Setting ttytype to xxx does not always fail as expected. (Marvin Schmidt) + ------------------------------------------------------------------- Mon Apr 10 11:41:51 UTC 2017 - tchvatal@suse.com diff --git a/vim.spec b/vim.spec index e404743..6a4ec2d 100644 --- a/vim.spec +++ b/vim.spec @@ -17,8 +17,8 @@ %define pkg_version 8.0 -%define patchlevel 0542 -%define patchlevel_compact 542 +%define patchlevel 0559 +%define patchlevel_compact 559 %define VIM_SUBDIR vim80 %define site_runtimepath %{_datadir}/vim/site %define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} @@ -57,7 +57,6 @@ Patch15: %{name}-7.4-filetype_apparmor.patch Patch18: %{name}-7.3-filetype_spec.patch Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch -Patch23: vim-8.0-ttytype-test.patch Patch100: vim73-no-static-libpython.patch BuildRequires: autoconf BuildRequires: db-devel @@ -152,7 +151,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch18 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p0 %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . From 860d6357ea72c5aaab45e52764ba2e214e927ca6c6138ca54ce25058921c63b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 10 Apr 2017 12:25:46 +0000 Subject: [PATCH 13/16] not working well for a function call inside another function call. is empty. (Bjorn Linse) contains "keepascii". (Bjorn Linse) built in. * Setting ttytype to xxx does not always fail as expected. - Remove vim-8.0-ttytype-test.patch, fixed upstream. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=433 --- vim.changes | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vim.changes b/vim.changes index fa7608b..6faab25 100644 --- a/vim.changes +++ b/vim.changes @@ -8,22 +8,22 @@ Mon Apr 10 12:17:59 UTC 2017 - idonmez@suse.com * Swap file exists briefly when opening the command window. * Extra line break in verbosefile when using ":echomsg". (Ingo Karkat) * Saving the redo buffer only works one time, resulting in the "." command - not working well for a function call inside another function - call. (Ingo Karkat) + not working well for a function call inside another function call. * No test for the 8g8 command. * Some etags format tags file use 0x01, breaking the parsing. * The typeahead buffer is reallocated too often. * Toupper and tolower don't work properly for Turkish when 'casemap' - is empty. (Bjorn Linse) + is empty. (Bjorn Linse) * Toupper/tolower test with Turkish locale fails on Mac. * Toupper and tolower don't work properly for Turkish when 'casemap' - contains "keepascii". (Bjorn Linse) + contains "keepascii". (Bjorn Linse) * Toupper/tolower test fails on OSX without Darwin. * Getting the window position fails if both the GUI and term code is - built in. + built in. * GTK: using static gravities is not useful. * The :ownsyntax command is not tested. - * Setting ttytype to xxx does not always fail as expected. (Marvin Schmidt) + * Setting ttytype to xxx does not always fail as expected. +- Remove vim-8.0-ttytype-test.patch, fixed upstream. ------------------------------------------------------------------- Mon Apr 10 11:41:51 UTC 2017 - tchvatal@suse.com From acb400f3da63288f485398d47c7b91c749e220b6ae32961f835e4f3f450a5834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 10 Apr 2017 12:25:57 +0000 Subject: [PATCH 14/16] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=434 --- vim-8.0-ttytype-test.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 vim-8.0-ttytype-test.patch diff --git a/vim-8.0-ttytype-test.patch b/vim-8.0-ttytype-test.patch deleted file mode 100644 index 3b0aa08..0000000 --- a/vim-8.0-ttytype-test.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/testdir/test_options.vim -+++ src/testdir/test_options.vim 2017/03/20 15:39:06 -@@ -283,7 +283,8 @@ - " FIXME: "set ttytype=" gives E522 instead of E529 - " in travis on some builds. Why? Commented out this test for now. - " call assert_fails('set ttytype=', 'E529:') -- call assert_fails('set ttytype=xxx', 'E522:') -+ " Does not work, not even with older versions of vim -+ " call assert_fails('set ttytype=xxx', 'E522:') - set ttytype& - call assert_equal(&ttytype, &term) - endif From 75a476fe66ca5655406c9d9a0c64cbcce7d1717cfd8eb351c6252e29efb1e543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 18 Apr 2017 10:49:27 +0000 Subject: [PATCH 15/16] - Updated to revision 566, fixes the following problems * :windo allows for ! but it's not supported. * Undefined behavior when using backslash after empty line. * Not enough test coverage for syntax commands. * Crash when getting the window position in tmux. * Cannot detect Bazel BUILD files on some systems. * Using freed memory in :caddbuf after clearing quickfix list. * Setting nocompatible for the tiny version moves the cursor. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=435 --- vim-8.0-ttytype-test.patch | 34 ++++++++++++++++++++++++++++++++++ vim-8.0.0559.tar.gz | 3 --- vim-8.0.0566.tar.gz | 3 +++ vim.changes | 12 ++++++++++++ vim.spec | 10 +++++----- 5 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 vim-8.0-ttytype-test.patch delete mode 100644 vim-8.0.0559.tar.gz create mode 100644 vim-8.0.0566.tar.gz diff --git a/vim-8.0-ttytype-test.patch b/vim-8.0-ttytype-test.patch new file mode 100644 index 0000000..a8e33c8 --- /dev/null +++ b/vim-8.0-ttytype-test.patch @@ -0,0 +1,34 @@ +Index: vim-8.0.0566/src/testdir/test_startup.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') + call assert_notmatch('E315:', out) + endfunc +- +-func Test_default_term() +- if !has('unix') || has('gui_running') +- " can't get output of Vim. +- return +- endif +- +- let save_term = $TERM +- let $TERM = 'unknownxxx' +- let out = system(GetVimCommand() . ' -c''set term'' -c cq') +- 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 + diff --git a/vim-8.0.0559.tar.gz b/vim-8.0.0559.tar.gz deleted file mode 100644 index bab3fab..0000000 --- a/vim-8.0.0559.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47a25d3d352c2239ddf16b7e4a878522e1b8c84af2ba34c4d1619901ba90e3e8 -size 13073911 diff --git a/vim-8.0.0566.tar.gz b/vim-8.0.0566.tar.gz new file mode 100644 index 0000000..68e0951 --- /dev/null +++ b/vim-8.0.0566.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e292777fc41e1971ad59187dd8f45eb3f14213121153a8d49f51873490bc0963 +size 13074061 diff --git a/vim.changes b/vim.changes index 6faab25..2523090 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Apr 18 10:15:22 UTC 2017 - idonmez@suse.com + +- Updated to revision 566, fixes the following problems + * :windo allows for ! but it's not supported. + * Undefined behavior when using backslash after empty line. + * Not enough test coverage for syntax commands. + * Crash when getting the window position in tmux. + * Cannot detect Bazel BUILD files on some systems. + * Using freed memory in :caddbuf after clearing quickfix list. + * Setting nocompatible for the tiny version moves the cursor. + ------------------------------------------------------------------- Mon Apr 10 12:17:59 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 6a4ec2d..5c2fc11 100644 --- a/vim.spec +++ b/vim.spec @@ -17,8 +17,8 @@ %define pkg_version 8.0 -%define patchlevel 0559 -%define patchlevel_compact 559 +%define patchlevel 0566 +%define patchlevel_compact 566 %define VIM_SUBDIR vim80 %define site_runtimepath %{_datadir}/vim/site %define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} @@ -57,6 +57,7 @@ Patch15: %{name}-7.4-filetype_apparmor.patch Patch18: %{name}-7.3-filetype_spec.patch Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch +Patch23: vim-8.0-ttytype-test.patch Patch100: vim73-no-static-libpython.patch BuildRequires: autoconf BuildRequires: db-devel @@ -151,6 +152,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch18 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . @@ -343,12 +345,10 @@ fi %{_sbindir}/update-alternatives --install %{_bindir}/vim vim %{_bindir}/gvim 20 %icon_theme_cache_post -%prostun -n gvim +%postun -n gvim if [ ! -e %{_bindir}/gvim ] ; then %{_sbindir}/update-alternatives --remove vim %{_bindir}/gvim fi - -%postun -n gvim %icon_theme_cache_postun %files From 71539ec39c788ed5264c38013a5c03785a9d4fdfd0809433096173523ce48780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 18 Apr 2017 10:49:54 +0000 Subject: [PATCH 16/16] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=436 --- vim.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/vim.changes b/vim.changes index 2523090..af02434 100644 --- a/vim.changes +++ b/vim.changes @@ -9,6 +9,7 @@ Tue Apr 18 10:15:22 UTC 2017 - idonmez@suse.com * Cannot detect Bazel BUILD files on some systems. * Using freed memory in :caddbuf after clearing quickfix list. * Setting nocompatible for the tiny version moves the cursor. +- Refresh and re-add vim-8.0-ttytype-test.patch ------------------------------------------------------------------- Mon Apr 10 12:17:59 UTC 2017 - idonmez@suse.com