From 95c2c4fcff37a1c8420548635663d1c46b0e5ef4c566fc23aefbeda5e08a7b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 28 Sep 2015 10:55:49 +0000 Subject: [PATCH 1/2] Accepting request 333989 from home:cboltz:branches:editors - Updated apparmor.vim (taken from AppArmor 2.10.0) * add support for the "ib" and "mpls" network keywords Please also submit the updated apparmor.vim to Leap (which has a totally outdated apparmor.vim currently). OBS-URL: https://build.opensuse.org/request/show/333989 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=287 --- apparmor.vim | 4 ++-- vim.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apparmor.vim b/apparmor.vim index 2419b51..6af311e 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+(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|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+(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 " network rules containing 'raw' -syn match sdNetworkDanger /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network(\s+(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|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+(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 " '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 f5f5b65..581e32f 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 26 20:39:19 UTC 2015 - opensuse@cboltz.de + +- Updated apparmor.vim (taken from AppArmor 2.10.0) + * add support for the "ib" and "mpls" network keywords + ------------------------------------------------------------------- Mon Sep 14 13:20:02 UTC 2015 - idonmez@suse.com From 23fd83ff2fc606d7c1b50852f1036aaa0472b63558b614e1fc08c62f1c12d6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 30 Sep 2015 09:20:10 +0000 Subject: [PATCH 2/2] - Updated to revision 889, fixes the following problems * Crash when changing the 'tags' option from a remote command. (Benjamin Fritz) * 'smarttab' is also effective when 'paste' is enabled. (Alexander Monakov) * May get into an invalid state when using getchar() in an expression mapping. * Vim leaks memory, when 'wildignore' filters out all matches. * Compiler warning for unused variable. (Tony Mechelynck) * Not obvious how to contribute. * ":find" sometimes fails. (Excanoe) * Coverity error for clearing only one byte of struct. * Can't see line numbers in nested function calls. * Test 49 fails. * When leaving the command line window with CTRL-C while a completion menu is displayed the menu isn't removed. * Block-mode replace works characterwise instead of blockwise after column 147. (Issue #422) * When doing an upwards search without wildcards the search fails if the initial directory doesn't exist. * Using uninitialized memory for regexp with back reference. (Dominique Pelle) * The OptionSet autocommands are not triggered from setwinvar(). * Triggering OptionSet from setwinvar() isn't tested. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=288 --- v7.4.865.tar.gz | 3 --- v7.4.889.tar.gz | 3 +++ vim.changes | 21 +++++++++++++++++++++ vim.spec | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) delete mode 100644 v7.4.865.tar.gz create mode 100644 v7.4.889.tar.gz diff --git a/v7.4.865.tar.gz b/v7.4.865.tar.gz deleted file mode 100644 index 3c69468..0000000 --- a/v7.4.865.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3c92b2bc6ba7933b38fdf1879f8d7014efeb7b94aead6ef82f7c4a954fb75cf -size 12212189 diff --git a/v7.4.889.tar.gz b/v7.4.889.tar.gz new file mode 100644 index 0000000..7d9d0ce --- /dev/null +++ b/v7.4.889.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4247eb470e965a5fc08989b26ad30998b7f3efce1d5a5001b85666ee26ee4f3 +size 12284392 diff --git a/vim.changes b/vim.changes index 581e32f..ca2bac9 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Sep 30 09:10:28 UTC 2015 - idonmez@suse.com + +- Updated to revision 889, fixes the following problems + * Crash when changing the 'tags' option from a remote command. (Benjamin Fritz) + * 'smarttab' is also effective when 'paste' is enabled. (Alexander Monakov) + * May get into an invalid state when using getchar() in an expression mapping. + * Vim leaks memory, when 'wildignore' filters out all matches. + * Compiler warning for unused variable. (Tony Mechelynck) + * Not obvious how to contribute. + * ":find" sometimes fails. (Excanoe) + * Coverity error for clearing only one byte of struct. + * Can't see line numbers in nested function calls. + * Test 49 fails. + * When leaving the command line window with CTRL-C while a completion menu is displayed the menu isn't removed. + * Block-mode replace works characterwise instead of blockwise after column 147. (Issue #422) + * When doing an upwards search without wildcards the search fails if the initial directory doesn't exist. + * Using uninitialized memory for regexp with back reference. (Dominique Pelle) + * The OptionSet autocommands are not triggered from setwinvar(). + * Triggering OptionSet from setwinvar() isn't tested. + ------------------------------------------------------------------- Sat Sep 26 20:39:19 UTC 2015 - opensuse@cboltz.de diff --git a/vim.spec b/vim.spec index 6e977d9..1a96bfb 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 7.4 -%define patchlevel 865 +%define patchlevel 889 %define VIM_SUBDIR vim74 %define site_runtimepath /usr/share/vim/site %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags}