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

Accepting request 398167 from editors

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/398167
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=173
This commit is contained in:
Dominique Leuenberger 2016-05-31 10:08:31 +00:00 committed by Git OBS Bridge
commit e828a336df
6 changed files with 120 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apparmor.vim
View File

@ -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|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))?(\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|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))?(\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

57
perl-5.24.patch Normal file
View File

@ -0,0 +1,57 @@
UPDADE: Use Perl macro SvREFCNT_inc_void_NN() instead of SvREFCNT()++
suggested by Ken Takata.
=for apidoc Am|void|SvREFCNT_inc_void_NN|SV* sv
Same as C<SvREFCNT_inc>, but can only be used if you don't need the return
value, and you know that C<sv> is not C<NULL>. The macro doesn't need
to return a meaningful value, or check for NULLness, so it's smaller
and faster.
diff -r 030b239e7b25 src/if_perl.xs
--- a/src/if_perl.xs Sun May 01 23:15:06 2016 +0200
+++ b/src/if_perl.xs Mon May 02 08:17:33 2016 +0200
@@ -602,13 +602,20 @@ static struct {
};
/* Work around for perl-5.18.
- * The definitions of S_SvREFCNT_inc and S_SvREFCNT_dec are needed, so include
- * "perl\lib\CORE\inline.h", after Perl_sv_free2 is defined.
- * The linker won't complain about undefined __impl_Perl_sv_free2. */
+ * For now, only the definitions of S_SvREFCNT_dec are needed in
+ * "perl\lib\CORE\inline.h". */
#if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
-# define PL_memory_wrap "panic: memory wrap" /* Dummy */
-# include <inline.h>
-# undef PL_memory_wrap
+static void
+S_SvREFCNT_dec(pTHX_ SV *sv)
+{
+ if (LIKELY(sv != NULL)) {
+ U32 rc = SvREFCNT(sv);
+ if (LIKELY(rc > 1))
+ SvREFCNT(sv) = rc - 1;
+ else
+ Perl_sv_free2(aTHX_ sv, rc);
+ }
+}
#endif
/*
@@ -777,7 +784,7 @@ newWINrv(SV *rv, win_T *ptr)
sv_setiv(ptr->w_perl_private, PTR2IV(ptr));
}
else
- SvREFCNT_inc(ptr->w_perl_private);
+ SvREFCNT_inc_void_NN(ptr->w_perl_private);
SvRV(rv) = ptr->w_perl_private;
SvROK_on(rv);
return sv_bless(rv, gv_stashpv("VIWIN", TRUE));
@@ -793,7 +800,7 @@ newBUFrv(SV *rv, buf_T *ptr)
sv_setiv(ptr->b_perl_private, PTR2IV(ptr));
}
else
- SvREFCNT_inc(ptr->b_perl_private);
+ SvREFCNT_inc_void_NN(ptr->b_perl_private);
SvRV(rv) = ptr->b_perl_private;
SvROK_on(rv);
return sv_bless(rv, gv_stashpv("VIBUF", TRUE));

3
v7.4.1816.tar.gz
View File

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

3
v7.4.1842.tar.gz Normal file
View File

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

55
vim.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Thu May 26 08:24:46 UTC 2016 - suse-beta@cboltz.de
- Update apparmor.vim (taken from AppArmor 2.10.1)
* add support for the "unspec" network keyword
-------------------------------------------------------------------
Wed May 25 10:53:20 UTC 2016 - idonmez@suse.com
- Updated to revision 1842, fixes the following problems
* non-antialiased misnamed.
* When timer_stop() is called with a string there is no proper
error message.
* Memory leak in debug commands.
* Cannot use an Ex command for 'keywordprg'.
* Possible crash when conceal is active.
* When splitting and closing a window the status height changes.
* When using a partial on a dictionary it always gets bound to that
dictionary.
* The BufUnload event is triggered twice, when :bunload is used with
`bufhidden` set to `unload` or `delete`.
* Functions specifically for testing do not sort together.
* Cannot get the items stored in a partial.
* When using packages an "after" directory cannot be used.
* The code to reallocate the buffer used for quickfix is repeated.
* get() works for Partial but not for Funcref.
-------------------------------------------------------------------
Tue May 24 07:12:15 UTC 2016 - idonmez@suse.com
- Fix build with perl 5.24 (perl-5.24.patch)
-------------------------------------------------------------------
Tue May 10 07:06:48 UTC 2016 - idonmez@suse.com
- Updated to revision 1829, fixes the following problems
* No error when invoking a callback when it's not safe.
* May try to access buffer that's already freed.
* No message on channel log when buffer was freed.
-------------------------------------------------------------------
Mon May 9 14:46:34 UTC 2016 - idonmez@suse.com
- Updated to revision 1826, fixes the following problems
* The screen is not updated if a callback is invoked when closing
a channel.
* Help completion adds @en to all matches except the first one.
* Compiler warnings when sprintf() is a macro.
* Removing language from help tags too often.
* Redirecting stdout of a channel to "null" doesn't work.
* When a job is no longer referenced and does not have an exit
callback the process may hang around in defunc state.
* When job writes to buffer nothing is written.
* Callbacks are invoked when it's not safe.
-------------------------------------------------------------------
Mon May 2 07:24:31 UTC 2016 - idonmez@suse.com

4
vim.spec
View File

@ -17,7 +17,7 @@
%define pkg_version 7.4
%define patchlevel 1816
%define patchlevel 1842
%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}
@ -90,6 +90,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: perl-5.24.patch
Patch100: vim73-no-static-libpython.patch
%description
@ -164,6 +165,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
%patch18 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch100 -p1
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .