Hello community,
here is the log from the commit of package vim
checked in at Fri Aug 24 00:22:55 CEST 2007.
--------
--- vim/vim.changes 2007-07-26 14:30:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/vim/vim.changes 2007-08-22 16:10:28.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Aug 22 15:40:16 CEST 2007 - mkoenig@suse.de
+
+- really enable syntax highlighting [#274600]
+- update apparmor syntax rules [#301605]
+
+-------------------------------------------------------------------
+Wed Aug 15 11:38:42 CEST 2007 - kssingvo@suse.de
+
+- fixed helpline issue CVE-2007-2953, swamp#12271 [#292433]
+
+-------------------------------------------------------------------
New:
----
7.1.039
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vim.spec ++++++
--- /var/tmp/diff_new_pack.X28734/_old 2007-08-24 00:19:56.000000000 +0200
+++ /var/tmp/diff_new_pack.X28734/_new 2007-08-24 00:19:56.000000000 +0200
@@ -12,7 +12,7 @@
Name: vim
Version: 7.1
-Release: 17
+Release: 30
#
License: Other uncritical OpenSource License, http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
Group: Productivity/Editors/Vi
@@ -86,6 +86,7 @@
# tbd??? %name-6.3-ga-utf8.diff
# tbd??? %name-6.3-initvals.diff
# tbd??? vim64-svn-crash.patch
+Patch100: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.039
Summary: Vi IMproved
%description
@@ -279,6 +280,7 @@
%patch16
%patch17 -p1
%patch18
+%patch100 -p0
cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} .
rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no*
@@ -631,6 +633,11 @@
%endif
%changelog
+* Wed Aug 22 2007 - mkoenig@suse.de
+- really enable syntax highlighting [#274600]
+- update apparmor syntax rules [#301605]
+* Wed Aug 15 2007 - kssingvo@suse.de
+- fixed helpline issue CVE-2007-2953, swamp#12271 [#292433]
* Thu Jul 26 2007 - mkoenig@suse.de
- avoid duplicate installs of manpages [#294155]
- remove old Obsoletes for vim-fat
++++++ MD5SUMS -> 7.1.039 ++++++
--- vim/MD5SUMS 2007-07-27 02:13:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/vim/7.1.039 2007-08-15 11:38:03.000000000 +0200
@@ -1,40 +1,39 @@
-b5898bacfee498cda764d36bf4f5ce36 ANNOUNCEMENT.vim-7.1
-bb5de5c69831c4f411d2d962d99d27b7 README.Japanese-XIM
-b1e72810b3c324870e4f3531bfa4985a README.SuSE
-d4148ae39dd6a2f44ecfa31e1032dc01 apparmor.vim
-1cb6cc16807c7a00e7edbe877f120c28 changes.vim
-50a25e6b2bbd575e8e9c5beaad0374ea gvim.desktop
-1a8999174cb7da60d00b29bd11a61c9f gvim.png
-c77b6e2cfe149bf37746cea2342fc125 missing-vim-client
-a22337344a1d8721dcd2f8e2dbfb0381 ppd.vim
-d41d8cd98f00b204e9800998ecf8427e ready
-abbdbef70fb039c9d4f1473b81c811b9 suse.gvimrc
-c0c43d3bf1c9e492d2568d871a47fbb9 suse.vimrc
-693a99efbe2f870dfbb14cffc076b8ae vim-7.0-apparmor.patch
-c43a19a842fb14ddae9cb0f07f584783 vim-7.0-filetype_ftl.patch
-00fc791513f40c5d59afed7e2cbb3bbe vim-7.0-filetype_ycp.patch
-6d18136b8efa23695fb74ef8a0552b07 vim-7.0-flex-array.diff
-ae340486d3df30851b75e1d932b6215b vim-7.0-grub.patch
-7f4b974a89a2805915543821eb1f63c2 vim-7.0-gvimrc_fontset.patch
-4172c55e7cf8b64d315d680906449abc vim-7.0-help_tags.patch
-cb7cffc646df36cac243d01ab8355db5 vim-7.0-highlight_fstab.patch
-4d949d37855f7c08c038faa233656a3d vim-7.0-mktemp_tutor.patch
-de7dc507ab3cbe849bedcf0732515779 vim-7.0-name_vimrc.patch
-6f4de447f8fdbfecf223c1ce64183695 vim-7.0-no_nb.patch
-9b3118e15e9df09fe41a8099f5401385 vim-7.0-ruby_ldflags_configure.patch
-b8f447a5268e1e4f362241f4c1d87bce vim-7.0-sh_is_bash.patch
-289e250035bf2bf1605c3f2efa8312cc vim-7.0-use_awk.patch
-4f6f74710b2766287d14483e41dcf628 vim-7.1-extra.tar.bz2
-19d3164189effe754a040642a91b38e4 vim-7.1-ftplugin_changelog.patch
-f140fee7ddb10965c504141ae075a744 vim-7.1-lang.tar.bz2
-5da605b6f246041aba27bd4d44a6987b vim-7.1-rpmlintrc
-6129c16f40fd94ead81a0d0d54ae96aa vim-7.1-syntax_spec.patch
-44c6b4914f38d6f9aa959640b89da329 vim-7.1.tar.bz2
-22fee901411458375469c682a7a429d2 vim.changes
-f95e2478b11cf9aca7a07aecaf247583 vim.spec
-6ef897bfbc34352109ffb44fa46fc35e vim132
-d6e7da6cb2e1682c81296386b5880beb vimrc_example1
-1cfc06f62e9c3e5ec2fc9a00bb297da7 vimrc_example2
-432277e236417d160563b2e7b6096155 vitmp.1
-3674b260d95707a2da993c5cfd08831d vitmp.c
-542baf16af53a42a180bd1247dd5b940 ycp.vim
+To: vim-dev@vim.org
+Subject: patch 7.1.039
+Fcc: outbox
+From: Bram Moolenaar
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.039
+Problem: A tag in a help file that starts with "help-tags" and contains a
+ percent sign may make Vim crash. (Ulf Harnhammar)
+Solution: Use puts() instead of fprintf().
+Files: src/ex_cmds.c
+
+
+*** ../vim-7.1.038/src/ex_cmds.c Tue Jul 24 11:15:46 2007
+--- src/ex_cmds.c Wed Jul 25 20:06:20 2007
+***************
+*** 6374,6382 ****
+ for (i = 0; i < ga.ga_len; ++i)
+ {
+ s = ((char_u **)ga.ga_data)[i];
+! if (STRNCMP(s, "help-tags", 9) == 0)
+ /* help-tags entry was added in formatted form */
+! fprintf(fd_tags, (char *)s);
+ else
+ {
+ fprintf(fd_tags, "%s\t/*", s);
+--- 6374,6382 ----
+ for (i = 0; i < ga.ga_len; ++i)
+ {
+ s = ((char_u **)ga.ga_data)[i];
+! if (STRNCMP(s, "help-tags\t", 10) == 0)
+ /* help-tags entry was added in formatted form */
+! fputs((char *)s, fd_tags);
+ else
+ {
+ fprintf(fd_tags, "%s\t/*", s);
++++++ apparmor.vim ++++++
--- vim/apparmor.vim 2006-12-15 17:15:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/vim/apparmor.vim 2007-08-22 16:09:43.000000000 +0200
@@ -52,10 +52,14 @@
hi sdEntryCPX ctermfg=darkgreen
hi sdEntryW ctermfg=darkyellow
hi sdCap ctermfg=lightblue
+ hi sdNetwork ctermfg=lightblue
+ hi sdNetworkDanger ctermfg=darkred
hi sdCapKey cterm=underline ctermfg=lightblue
+ hi sdCapDanger ctermfg=darkred
hi def link sdEntryR Normal
+ hi def link sdEntryK Normal
hi def link sdFlags Normal
- hi sdCapDanger ctermfg=darkred
+ hi sdEntryChangeProfile ctermfg=darkgreen cterm=underline
"else
" dark background
" hi sdProfileName ctermfg=white
@@ -86,9 +90,6 @@
" that many rules and profiles shouldn't be _extremely_ large...
syn sync fromstart
-syn keyword sdCapKey chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease
-syn keyword sdCapDanger sys_admin
-
syn keyword sdFlagKey complain audit debug
" highlight some invalid syntax
@@ -101,29 +102,53 @@
syn cluster sdEntry contains=sdEntryWriteExec,sdEntryR,sdEntryW,sdEntryIX,sdEntryPX,sdEntryCPX,sdEntryUX,sdEntryCUX,sdEntryM,sdCap
+
+" Capability line
+syn keyword sdCapKey chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease
+syn keyword sdCapDanger sys_admin
+
+syn match sdCap /\v^\s*capability\s+\S+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger nextgroup=@sdEntry,sdComment,sdError,sdInclude
+
+" Network line
+" Syntax: network domain (inet, ...) type (stream, ...) protocol (tcp, ...)
+syn keyword sdNetworkDanger raw
+syn match sdNetwork /\v^\s*network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|packet|ash|econet|atmsvc|sna|irda|pppox|wanpipe|bluetooth))?(\s+(stream|dgram|seqpacket|raw|rdm|packet))?(\s+(tcp|udp|icmp))?,(\s*$|(\s*#.*$)\@=)/ contains=sdNetworkDanger nextgroup=@sdEntry,sdComment,sdError,sdInclude
+"syn match sdNetworkDanger /\v^\s*network(\s+(inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|packet|ash|econet|atmsvc|sna|irda|pppox|wanpipe|bluetooth))?(\s+(raw))?(\s+(tcp|udp|icmp))?,(\s*$|(\s*#.*$)\@=)/
+
+syn match sdEntryChangeProfile /\v^\s*change_profile\s+(\/|\@\{\S*\})\S*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+
+" file permissions
+"
" write + exec/mmap - danger!
-syn match sdEntryWriteExec /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|m|[iuUpP]x)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+" known bug: accepts 'aw' to keep things simple
+syn match sdEntryWriteExec /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|a|m|k|[iuUpP]x)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
-" unconstrained entry, flag the line red
-syn match sdEntryUX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|ux)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
-" Ux - like ux + clean environment
-syn match sdEntryCUX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|Ux)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
-" standard exec entry, flag the line blue
-syn match sdEntryPX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|px)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
-" Px - like px + clean environment
-syn match sdEntryCPX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|Px)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
-" standard exec entry, flag the line green
-syn match sdEntryIX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|ix)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
-" mmap with PROT_EXEC
-syn match sdEntryM /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+" ux(mr) - unconstrained entry, flag the line red
+syn match sdEntryUX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|ux)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+" Ux(mr) - like ux + clean environment
+syn match sdEntryCUX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|Ux)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+" px(mr) - standard exec entry, flag the line blue
+syn match sdEntryPX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|px)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+" Px(mr) - like px + clean environment
+syn match sdEntryCPX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|Px)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+" ix(mr) - standard exec entry, flag the line green
+syn match sdEntryIX /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k|ix)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+" mr - mmap with PROT_EXEC
+syn match sdEntryM /\v^\s*(\/|\@\{\S*\})\S*\s+(r|m|k)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
" if we've got u or i without x, it's an error
-syn match sdError /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|u|p|i)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+syn match sdError /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|k|u|p|i)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+
+" write + append is an error also
+syn match sdError /\v^\s*(\/|\@\{\S*\})\S*\s+([lrkupi]*w[lrkupi]*a[lrkupi]*|[lrkupi]*a[lrkupi]*w[lrkupi]*)\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
" write entry, flag the line yellow
-syn match sdEntryW /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
-" Capability line
-syn match sdCap /\v^\s*capability\s+\S+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger nextgroup=@sdEntry,sdComment,sdError,sdInclude
+syn match sdEntryW /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|w|k)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+" append entry, flag the line yellow
+syn match sdEntryW /\v^\s*(\/|\@\{\S*\})\S*\s+(l|r|k|a)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError,sdInclude
+
+" read entry + locking, currently no highlighting
+syn match sdEntryK /\v^\s*(\/|\@\{\S*\})\S*\s+[rlk]+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError
" read entry, no highlighting
syn match sdEntryR /\v^\s*(\/|\@\{\S*\})\S*\s+[rl]+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob nextgroup=@sdEntry,sdComment,sdError
++++++ suse.vimrc ++++++
--- vim/suse.vimrc 2007-01-23 18:02:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/vim/suse.vimrc 2007-08-22 16:09:26.000000000 +0200
@@ -6,7 +6,7 @@
" commented lines start with `"'
" enable syntax highlighting
-" syntax on
+syntax on
" automatically indent lines (default)
" set noautoindent
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org