Accepting request 196363 from editors

- Updated to revision 009, fixes the following problems
  * Character classes such as [a-z] to not react to 'ignorecase'.
    Breaks man page highlighting. (Mario Grgic)
  * Pattern with two alternative look-behind matches does not match.
    (Amadeus Demarzi)
  * Memory access error in Ruby syntax highlighting. (Christopher Chow)
  * When closing a window fails ":bwipe" may hang.
  * Using "vaB" while 'virtualedit' is set selects the wrong area.
    (Dimitar Dimitrov)
  * mkdir("foo/bar/", "p") gives an error message. (David Barnett)
  * Creating a preview window on startup leaves the screen layout in a
    messed up state. (Marius Gedminas)
  * New regexp engine can't be interrupted.
  * When a file was not decrypted (yet), writing it may destroy the
    contents. 

- update apparmor.vim (taken from AppArmor 2.8.2)
  * add network vsock

OBS-URL: https://build.opensuse.org/request/show/196363
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=109

apparmor.vim

@@ -128,22 +128,22 @@ syn cluster sdEntry contains=sdEntryWriteExec,sdEntryR,sdEntryW,sdEntryIX,sdEntr
 " Capability line
 
 " normal capabilities - really keep this list? syn match sdCap should be enough... (difference: sdCapKey words would loose underlining)
-syn keyword  sdCapKey          block_suspend chown dac_override dac_read_search fowner fsetid ipc_lock ipc_owner kill lease linux_immutable mknod net_admin net_bind_service net_broadcast net_raw setfcap setgid setpcap setuid sys_boot sys_chroot syslog sys_nice sys_pacct sys_ptrace sys_resource sys_time sys_tty_config wake_alarm
+syn keyword  sdCapKey          block_suspend chown dac_override dac_read_search fowner fsetid ipc_lock ipc_owner kill lease linux_immutable mknod net_admin net_bind_service net_broadcast net_raw setfcap setgid setpcap setuid syslog sys_boot sys_chroot sys_nice sys_pacct sys_ptrace sys_resource sys_time sys_tty_config wake_alarm
 
 " dangerous capabilities - highlighted separately
 syn keyword sdCapDanger	       audit_control audit_write mac_override mac_admin set_fcap sys_admin sys_module sys_rawio
 
 " full line. Keywords are from sdCapKey + sdCapDanger
-syn match  sdCap /\v^\s*(audit\s+)?(deny\s+)?capability\s+(audit_control|audit_write|block_suspend|chown|dac_override|dac_read_search|fowner|fsetid|ipc_lock|ipc_owner|kill|lease|linux_immutable|mac_admin|mac_override|mknod|net_admin|net_bind_service|net_broadcast|net_raw|setfcap|setgid|setpcap|setuid|sys_admin|sys_boot|sys_chroot|syslog|sys_module|sys_nice|sys_pacct|sys_ptrace|sys_rawio|sys_resource|sys_time|sys_tty_config|wake_alarm)\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
+syn match  sdCap /\v^\s*(audit\s+)?(deny\s+)?capability\s+(audit_control|audit_write|block_suspend|chown|dac_override|dac_read_search|fowner|fsetid|ipc_lock|ipc_owner|kill|lease|linux_immutable|mac_admin|mac_override|mknod|net_admin|net_bind_service|net_broadcast|net_raw|setfcap|setgid|setpcap|setuid|syslog|sys_admin|sys_boot|sys_chroot|sys_module|sys_nice|sys_pacct|sys_ptrace|sys_rawio|sys_resource|sys_time|sys_tty_config|wake_alarm)\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
 " all capabilities ('capability' without any keyword)
 syn match  sdCapDanger /\v^\s*(audit\s+)?(deny\s+)?capability\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
 
 " 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+)?network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc))?(\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+)?network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|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
 " network rules containing 'raw'
-syn match  sdNetworkDanger         /\v^\s*(audit\s+)?(deny\s+)?network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc))?(\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+)?network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|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
 " 'all networking' includes raw -> mark as dangerous
 syn match  sdNetworkDanger         /\v^\s*(audit\s+)?(deny\s+)?network\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
 

vim-7.4-patches.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7921b2b09cbfb440f83a5670b01af1befde5cbbd42906b747d85a3726f7c7041
+size 8856

vim.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Aug 26 09:15:30 UTC 2013 - idonmez@suse.com
+
+- Updated to revision 009, fixes the following problems
+  * Character classes such as [a-z] to not react to 'ignorecase'.
+    Breaks man page highlighting. (Mario Grgic)
+  * Pattern with two alternative look-behind matches does not match.
+    (Amadeus Demarzi)
+  * Memory access error in Ruby syntax highlighting. (Christopher Chow)
+  * When closing a window fails ":bwipe" may hang.
+  * Using "vaB" while 'virtualedit' is set selects the wrong area.
+    (Dimitar Dimitrov)
+  * mkdir("foo/bar/", "p") gives an error message. (David Barnett)
+  * Creating a preview window on startup leaves the screen layout in a
+    messed up state. (Marius Gedminas)
+  * New regexp engine can't be interrupted.
+  * When a file was not decrypted (yet), writing it may destroy the
+    contents. 
+
+-------------------------------------------------------------------
+Sat Aug 24 23:41:27 UTC 2013 - opensuse@cboltz.de
+
+- update apparmor.vim (taken from AppArmor 2.8.2)
+  * add network vsock
+
 -------------------------------------------------------------------
 Fri Aug 16 12:08:44 UTC 2013 - idonmez@suse.com
 

vim.spec

@@ -17,14 +17,13 @@
 
 
 %define pkg_version 7.4
-#%define official_ptchlvl 0
+%define official_ptchlvl 009
 %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}
 
 Name:           vim
-#Version:        7.4.%{official_ptchlvl}
+Version:        7.4.%{official_ptchlvl}
-Version:        7.4
 Release:        0
 BuildRequires:  db-devel
 %if 0%{?suse_version} > 1020
@@ -88,7 +87,7 @@ Source18:       missing-vim-client
 Source19:       gvim.desktop
 Source20:       spec.skeleton
 Source23:       apparmor.vim
-#Source98:       %{name}-7.4-patches.tar.bz2
+Source98:       %{name}-7.4-patches.tar.bz2
 Source99:       %{name}-7.4-rpmlintrc
 Patch3:         %{name}-7.4-disable_lang_no.patch
 Patch4:         %{name}-7.3-gvimrc_fontset.patch
@@ -167,14 +166,14 @@ You need package vim for the help and other documentation too. If you
 want less features, you might want to install vim instead.
 
 %prep
-%setup -q -n %{VIM_SUBDIR}
+%setup -q -n %{VIM_SUBDIR} -b 98
-#for p in ../vim-%{pkg_version}-patches/%{pkg_version}*; do
+for p in ../vim-%{pkg_version}-patches/%{pkg_version}*; do
-#    test -e $p || break
+    test -e $p || break
-#    test ${p#*/%{pkg_version}.} -le %{official_ptchlvl} || exit 1
+    test ${p#*/%{pkg_version}.} -le %{official_ptchlvl} || exit 1
-#    echo Patch $p
+    echo Patch $p
-#    patch -s -p0 < $p
+    patch -s -p0 < $p
-#done
+done
-#unset p
+unset p
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1