From 66398402d70ab1ab31b1d4a05209dda737c5f9f2f7518514b82beb9a86abbad0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 8 Jan 2018 08:08:55 +0000 Subject: [PATCH 1/3] Accepting request 562328 from home:cboltz:branches:editors - Update apparmor.vim (taken from AppArmor 2.12) * add support for the "smc" network keyword OBS-URL: https://build.opensuse.org/request/show/562328 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=468 --- apparmor.vim | 4 ++-- vim.changes | 6 ++++++ vim.spec | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apparmor.vim b/apparmor.vim index 498ef7d..02e8906 100644 --- a/apparmor.vim +++ b/apparmor.vim @@ -142,9 +142,9 @@ 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|kcm|qipcrtr))?(\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|smc))?(\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|kcm|qipcrtr))?(\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|smc))?(\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 diff --git a/vim.changes b/vim.changes index 9eb80b4..0393258 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 7 17:08:12 UTC 2018 - suse-beta@cboltz.de + +- Update apparmor.vim (taken from AppArmor 2.12) + * add support for the "smc" network keyword + ------------------------------------------------------------------- Wed Dec 20 10:51:27 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 8fcd2ce..ee4092e 100644 --- a/vim.spec +++ b/vim.spec @@ -1,7 +1,7 @@ # # spec file for package vim # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 892d7729e20b00078081143cc7d126e703786233314b87ac6d5e7a86a03e3423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 8 Jan 2018 11:38:51 +0000 Subject: [PATCH 2/3] - Updated to revision 1428, fixes the following problems * No test for expanding backticks. * Cursor column is not updated after ]s. (Gary Johnson) * Accessing freed memory in vimgrep. * Accessing invalid memory with overlong byte sequence. * No fallback to underline when undercurl is not set. (Ben Jackson) * Error in return not caught by try/catch. * The timer_pause test is flaky on Travis. * execute() does not work in completion of user command. (thinca) * "gf" and don't accept ? and & in URL. (Dmitrii Tcyganok) * The :leftabove modifier doesn't work for :copen. * Compiler warning on 64 bit MS-Windows system. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=469 --- vim-8.0.1417.tar.gz | 3 --- vim-8.0.1428.tar.gz | 3 +++ vim.changes | 16 ++++++++++++++++ vim.spec | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) delete mode 100644 vim-8.0.1417.tar.gz create mode 100644 vim-8.0.1428.tar.gz diff --git a/vim-8.0.1417.tar.gz b/vim-8.0.1417.tar.gz deleted file mode 100644 index c396549..0000000 --- a/vim-8.0.1417.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ead219e791fea02363fe1975b2dbae4cfefa503553c4ef2f972df5ba95f92c04 -size 13412925 diff --git a/vim-8.0.1428.tar.gz b/vim-8.0.1428.tar.gz new file mode 100644 index 0000000..1a50a92 --- /dev/null +++ b/vim-8.0.1428.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:481f0f3478dbf6dcf4d0a63d7974966fc0773b17630c46a95825773608ea1f22 +size 13415243 diff --git a/vim.changes b/vim.changes index 0393258..3e5e3c5 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 8 11:32:31 UTC 2018 - idonmez@suse.com + +- Updated to revision 1428, fixes the following problems + * No test for expanding backticks. + * Cursor column is not updated after ]s. (Gary Johnson) + * Accessing freed memory in vimgrep. + * Accessing invalid memory with overlong byte sequence. + * No fallback to underline when undercurl is not set. (Ben Jackson) + * Error in return not caught by try/catch. + * The timer_pause test is flaky on Travis. + * execute() does not work in completion of user command. (thinca) + * "gf" and don't accept ? and & in URL. (Dmitrii Tcyganok) + * The :leftabove modifier doesn't work for :copen. + * Compiler warning on 64 bit MS-Windows system. + ------------------------------------------------------------------- Sun Jan 7 17:08:12 UTC 2018 - suse-beta@cboltz.de diff --git a/vim.spec b/vim.spec index ee4092e..542a39d 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 8.0 -%define patchlevel 1417 +%define patchlevel 1428 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim80 %define site_runtimepath %{_datadir}/vim/site From 78df4ea2f4501da52764bb2f53475e986e30c1527fc7f19d2f7281ac57f0f8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 9 Jan 2018 12:49:32 +0000 Subject: [PATCH 3/3] Accepting request 562500 from home:michel_mno:branches:editors - ignore make check transient errors for PowerPC bypass boo#1072651 OBS-URL: https://build.opensuse.org/request/show/562500 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=470 --- vim.changes | 6 ++++++ vim.spec | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/vim.changes b/vim.changes index 3e5e3c5..bb9e468 100644 --- a/vim.changes +++ b/vim.changes @@ -14,6 +14,12 @@ Mon Jan 8 11:32:31 UTC 2018 - idonmez@suse.com * The :leftabove modifier doesn't work for :copen. * Compiler warning on 64 bit MS-Windows system. +------------------------------------------------------------------- +Mon Jan 8 11:18:32 UTC 2018 - normand@linux.vnet.ibm.com + +- ignore make check transient errors for PowerPC + bypass boo#1072651 + ------------------------------------------------------------------- Sun Jan 7 17:08:12 UTC 2018 - suse-beta@cboltz.de diff --git a/vim.spec b/vim.spec index 542a39d..75c2ace 100644 --- a/vim.spec +++ b/vim.spec @@ -341,7 +341,12 @@ 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 +%ifarch ppc ppc64 ppc64le +LC_ALL=en_US.UTF-8 make test || { echo "Ignore transient errors for PowerPC. boo#1072651"; } +%else +make test LC_ALL=en_US.UTF-8 make test +%endif %post %{_sbindir}/update-alternatives --install %{_bindir}/vim vim %{_bindir}/vim-nox11 20