r415 - in trunk/vim/debian: . patches
Matthijs Mohlmann
active2-guest at costa.debian.org
Sat Nov 26 11:55:24 UTC 2005
Author: active2-guest
Date: 2005-11-26 11:55:23 +0000 (Sat, 26 Nov 2005)
New Revision: 415
Added:
trunk/vim/debian/patches/149_sshconfig.vim.diff
Modified:
trunk/vim/debian/changelog
Log:
* Updated ssh_config and sshd_config syntax files
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-11-25 22:58:27 UTC (rev 414)
+++ trunk/vim/debian/changelog 2005-11-26 11:55:23 UTC (rev 415)
@@ -32,8 +32,11 @@
side-effects such as not being able to paste from a register while
in visual mode.
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org> Sat, 19 Nov 2005 23:32:49 -0500
+ [ Matthijs Mohlmann ]
+ * Updated syntax for sshd_config and ssh_config.
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org> Sat, 26 Nov 2005 12:38:15 +0100
+
vim (1:6.4-001+2) unstable; urgency=low
[ Stefano Zacchiroli ]
Added: trunk/vim/debian/patches/149_sshconfig.vim.diff
===================================================================
--- trunk/vim/debian/patches/149_sshconfig.vim.diff 2005-11-25 22:58:27 UTC (rev 414)
+++ trunk/vim/debian/patches/149_sshconfig.vim.diff 2005-11-26 11:55:23 UTC (rev 415)
@@ -0,0 +1,325 @@
+diff -ruN vim64.orig/runtime/syntax/sshconfig.vim vim64/runtime/syntax/sshconfig.vim
+--- vim64.orig/runtime/syntax/sshconfig.vim 2005-11-26 12:26:47.199463000 +0100
++++ vim64/runtime/syntax/sshconfig.vim 2005-11-26 12:32:26.800686750 +0100
+@@ -1,34 +1,38 @@
+ " Vim syntax file
+-" This is a GENERATED FILE. Please always refer to source file at the URI below.
+ " Language: OpenSSH server configuration file (ssh_config)
+ " Maintainer: David Ne\v{c}as (Yeti) <yeti at physics.muni.cz>
+-" Last Change: 2003-05-06
++" Last Change: 2005-01-23
+ " URL: http://trific.ath.cx/Ftp/vim/syntax/sshconfig.vim
+
+-" Setup
++" Setup {{{
++" React to possibly already-defined syntax.
++" For version 5.x: Clear all syntax items unconditionally
++" For version 6.x: Quit when a syntax file was already loaded
+ if version >= 600
+- if exists("b:current_syntax")
+- finish
+- endif
++ if exists("b:current_syntax")
++ finish
++ endif
+ else
+- syntax clear
++ syntax clear
+ endif
+
+ if version >= 600
+- setlocal iskeyword=_,-,a-z,A-Z,48-57
++ setlocal iskeyword=_,-,a-z,A-Z,48-57
+ else
+- set iskeyword=_,-,a-z,A-Z,48-57
++ set iskeyword=_,-,a-z,A-Z,48-57
+ endif
+
+ syn case ignore
+-
+-" Comments
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
++" Comments {{{
+ syn match sshconfigComment "#.*$" contains=sshconfigTodo
+ syn keyword sshconfigTodo TODO FIXME NOT contained
+-
+-" Constants
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
++" Constants {{{
+ syn keyword sshconfigYesNo yes no ask
++" protocol v1
+ syn keyword sshconfigCipher blowfish des 3des
++" protocol v2
+ syn keyword sshconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
+ syn keyword sshconfigCipher arcfour aes192-cbc aes256-cbc
+ syn keyword sshconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96
+@@ -44,56 +48,63 @@
+ syn match sshconfigNumber "\d\+"
+ syn match sshconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>"
+ syn match sshconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>"
++" FIXME: this matches quite a few things which are NOT valid IPv6 addresses
+ syn match sshconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}[:/]\d\+\>"
+-
+-" Keywords
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
++" Keywords {{{
+ syn keyword sshconfigHostSect Host
+-syn keyword sshconfigKeyword AFSTokenPassing BatchMode BindAddress
++syn keyword sshconfigKeyword AddressFamily BatchMode BindAddress
+ syn keyword sshconfigKeyword ChallengeResponseAuthentication CheckHostIP
+-syn keyword sshconfigKeyword Cipher Ciphers ClearAllForwardings Compression
+-syn keyword sshconfigKeyword CompressionLevel ConnectionAttempts
+-syn keyword sshconfigKeyword DynamicForward EscapeChar ForwardAgent ForwardX11
+-syn keyword sshconfigKeyword GatewayPorts GlobalKnownHostsFile
+-syn keyword sshconfigKeyword HostbasedAuthentication HostKeyAlgorithms
+-syn keyword sshconfigKeyword HostKeyAlias HostName IdentityFile KeepAlive
+-syn keyword sshconfigKeyword KerberosAuthentication KerberosTgtPassing
+-syn keyword sshconfigKeyword LocalForward LogLevel MACs
+-syn keyword sshconfigKeyword NoHostAuthenticationForLocalhost
++syn keyword sshconfigKeyword Cipher Ciphers ClearAllForwardings
++syn keyword sshconfigKeyword Compression CompressionLevel ConnectTimeout
++syn keyword sshconfigKeyword ConnectionAttempts ControlMaster
++syn keyword sshconfigKeyword ControlPath DynamicForward EnableSSHKeysign
++syn keyword sshconfigKeyword EscapeChar ForwardAgent ForwardX11
++syn keyword sshconfigKeyword ForwardX11Trusted GSSAPIAuthentication
++syn keyword sshconfigKeyword GSSAPIDelegateCredentials GatewayPorts
++syn keyword sshconfigKeyword GlobalKnownHostsFile HostKeyAlgorithms
++syn keyword sshconfigKeyword HostKeyAlias HostName HostbasedAuthentication
++syn keyword sshconfigKeyword IdentitiesOnly IdentityFile LocalForward
++syn keyword sshconfigKeyword LogLevel MACs NoHostAuthenticationForLocalhost
+ syn keyword sshconfigKeyword NumberOfPasswordPrompts PasswordAuthentication
+ syn keyword sshconfigKeyword Port PreferredAuthentications Protocol
+-syn keyword sshconfigKeyword ProxyCommand PubkeyAuthentication RemoteForward
++syn keyword sshconfigKeyword ProxyCommand PubkeyAuthentication
++syn keyword sshconfigKeyword RSAAuthentication RemoteForward SetupTimeOut
+ syn keyword sshconfigKeyword RhostsAuthentication RhostsRSAAuthentication
+-syn keyword sshconfigKeyword RSAAuthentication SmartcardDevice
+-syn keyword sshconfigKeyword StrictHostKeyChecking UsePrivilegedPort User
+-syn keyword sshconfigKeyword UserKnownHostsFile XAuthLocation HashKnownHosts
+-
+-" Define the default highlighting
++syn keyword sshconfigKeyword SendEnv ServerAliveCountMax ServerAliveInterval
++syn keyword sshconfigKeyword SmartcardDevice StrictHostKeyChecking
++syn keyword sshconfigKeyword TCPKeepAlive UsePrivilegedPort User
++syn keyword sshconfigKeyword UserKnownHostsFile VerifyHostKeyDNS XAuthLocation
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
++" Define the default highlighting {{{
++" For version 5.7 and earlier: Only when not done already
++" For version 5.8 and later: Only when an item doesn't have highlighting yet
+ if version >= 508 || !exists("did_sshconfig_syntax_inits")
+- if version < 508
+- let did_sshconfig_syntax_inits = 1
+- command -nargs=+ HiLink hi link <args>
+- else
+- command -nargs=+ HiLink hi def link <args>
+- endif
+-
+- HiLink sshconfigComment Comment
+- HiLink sshconfigTodo Todo
+- HiLink sshconfigHostPort sshconfigConstant
+- HiLink sshconfigNumber sshconfigConstant
+- HiLink sshconfigConstant Constant
+- HiLink sshconfigYesNo sshconfigEnum
+- HiLink sshconfigCipher sshconfigEnum
+- HiLink sshconfigMAC sshconfigEnum
+- HiLink sshconfigHostKeyAlg sshconfigEnum
+- HiLink sshconfigLogLevel sshconfigEnum
+- HiLink sshconfigSysLogFacility sshconfigEnum
+- HiLink sshconfigPreferredAuth sshconfigEnum
+- HiLink sshconfigEnum Function
+- HiLink sshconfigSpecial Special
+- HiLink sshconfigKeyword Keyword
+- HiLink sshconfigHostSect Type
+- delcommand HiLink
++ if version < 508
++ let did_sshconfig_syntax_inits = 1
++ command -nargs=+ HiLink hi link <args>
++ else
++ command -nargs=+ HiLink hi def link <args>
++ endif
++
++ HiLink sshconfigComment Comment
++ HiLink sshconfigTodo Todo
++ HiLink sshconfigHostPort sshconfigConstant
++ HiLink sshconfigNumber sshconfigConstant
++ HiLink sshconfigConstant Constant
++ HiLink sshconfigYesNo sshconfigEnum
++ HiLink sshconfigCipher sshconfigEnum
++ HiLink sshconfigMAC sshconfigEnum
++ HiLink sshconfigHostKeyAlg sshconfigEnum
++ HiLink sshconfigLogLevel sshconfigEnum
++ HiLink sshconfigSysLogFacility sshconfigEnum
++ HiLink sshconfigPreferredAuth sshconfigEnum
++ HiLink sshconfigEnum Function
++ HiLink sshconfigSpecial Special
++ HiLink sshconfigKeyword Keyword
++ HiLink sshconfigHostSect Type
++ delcommand HiLink
+ endif
+-
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
+ let b:current_syntax = "sshconfig"
+
+diff -ruN vim64.orig/runtime/syntax/sshdconfig.vim vim64/runtime/syntax/sshdconfig.vim
+--- vim64.orig/runtime/syntax/sshdconfig.vim 2005-11-26 12:26:47.067454750 +0100
++++ vim64/runtime/syntax/sshdconfig.vim 2005-11-26 12:35:15.567234000 +0100
+@@ -1,32 +1,34 @@
+ " Vim syntax file
+-" This is a GENERATED FILE. Please always refer to source file at the URI below.
+ " Language: OpenSSH server configuration file (sshd_config)
+ " Maintainer: David Ne\v{c}as (Yeti) <yeti at physics.muni.cz>
+-" Last Change: 2003-05-06
++" Last Change: 2005-01-23
+ " URL: http://trific.ath.cx/Ftp/vim/syntax/sshdconfig.vim
+
+-" Setup
++" Setup {{{
++" React to possibly already-defined syntax.
++" For version 5.x: Clear all syntax items unconditionally
++" For version 6.x: Quit when a syntax file was already loaded
+ if version >= 600
+- if exists("b:current_syntax")
+- finish
+- endif
++ if exists("b:current_syntax")
++ finish
++ endif
+ else
+- syntax clear
++ syntax clear
+ endif
+
+ if version >= 600
+- setlocal iskeyword=_,-,a-z,A-Z,48-57
++ setlocal iskeyword=_,-,a-z,A-Z,48-57
+ else
+- set iskeyword=_,-,a-z,A-Z,48-57
++ set iskeyword=_,-,a-z,A-Z,48-57
+ endif
+
+ syn case ignore
+-
+-" Comments
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
++" Comments {{{
+ syn match sshdconfigComment "#.*$" contains=sshdconfigTodo
+ syn keyword sshdconfigTodo TODO FIXME NOT contained
+-
+-" Constants
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
++" Constants {{{
+ syn keyword sshdconfigYesNo yes no
+ syn keyword sshdconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
+ syn keyword sshdconfigCipher aes192-cbc aes256-cbc
+@@ -42,57 +44,67 @@
+ syn match sshdconfigNumber "\d\+"
+ syn match sshdconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>"
+ syn match sshdconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>"
++" FIXME: this matches quite a few things which are NOT valid IPv6 addresses
+ syn match sshdconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}:\d\+\>"
+ syn match sshdconfigTime "\<\(\d\+[sSmMhHdDwW]\)\+\>"
+-
+-" Keywords
+-syn keyword sshdconfigKeyword AFSTokenPassing AllowGroups AllowTcpForwarding
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
++" Keywords {{{
++syn keyword sshdconfigKeyword AFSTokenPassing AcceptEnv
++syn keyword sshdconfigKeyword AllowGroups AllowTcpForwarding
+ syn keyword sshdconfigKeyword AllowUsers AuthorizedKeysFile Banner
+-syn keyword sshdconfigKeyword ChallengeResponseAuthentication Ciphers
+-syn keyword sshdconfigKeyword ClientAliveInterval ClientAliveCountMax
+-syn keyword sshdconfigKeyword Compression DenyGroups DenyUsers GatewayPorts
+-syn keyword sshdconfigKeyword HostbasedAuthentication HostKey IgnoreRhosts
+-syn keyword sshdconfigKeyword IgnoreUserKnownHosts KeepAlive
++syn keyword sshdconfigKeyword ChallengeResponseAuthentication
++syn keyword sshdconfigKeyword Ciphers ClientAliveCountMax
++syn keyword sshdconfigKeyword ClientAliveInterval Compression
++syn keyword sshdconfigKeyword DenyGroups DenyUsers GSSAPIAuthentication
++syn keyword sshdconfigKeyword GSSAPICleanupCredentials GatewayPorts
++syn keyword sshdconfigKeyword HostKey HostbasedAuthentication
++syn keyword sshdconfigKeyword IgnoreRhosts IgnoreUserKnownHosts
+ syn keyword sshdconfigKeyword KerberosAuthentication KerberosOrLocalPasswd
+ syn keyword sshdconfigKeyword KerberosTgtPassing KerberosTicketCleanup
+ syn keyword sshdconfigKeyword KeyRegenerationInterval ListenAddress
+-syn keyword sshdconfigKeyword LoginGraceTime LogLevel MACs MaxStartups
+-syn keyword sshdconfigKeyword PAMAuthenticationViaKbdInt
+-syn keyword sshdconfigKeyword PasswordAuthentication PermitEmptyPasswords
+-syn keyword sshdconfigKeyword PermitRootLogin PermitUserEnvironment PidFile
+-syn keyword sshdconfigKeyword Port PrintLastLog PrintMotd Protocol
+-syn keyword sshdconfigKeyword PubkeyAuthentication RhostsAuthentication
+-syn keyword sshdconfigKeyword RhostsRSAAuthentication RSAAuthentication
++syn keyword sshdconfigKeyword LogLevel LoginGraceTime MACs MaxAuthTries
++syn keyword sshdconfigKeyword MaxStartups PasswordAuthentication
++syn keyword sshdconfigKeyword PermitEmptyPasswords PermitRootLogin
++syn keyword sshdconfigKeyword PermitUserEnvironment PidFile Port
++syn keyword sshdconfigKeyword PrintLastLog PrintMotd Protocol
++syn keyword sshdconfigKeyword PubkeyAuthentication RSAAuthentication
++syn keyword sshdconfigKeyword RhostsAuthentication RhostsRSAAuthentication
+ syn keyword sshdconfigKeyword ServerKeyBits StrictModes Subsystem
+-syn keyword sshdconfigKeyword SyslogFacility UseLogin UsePrivilegeSeparation
+-syn keyword sshdconfigKeyword VerifyReverseMapping X11DisplayOffset
+-syn keyword sshdconfigKeyword X11Forwarding X11UseLocalhost XAuthLocation
+-
+-" Define the default highlighting
++syn keyword sshdconfigKeyword SyslogFacility TCPKeepAlive UseDNS
++syn keyword sshdconfigKeyword UseLogin UsePAM UsePrivilegeSeparation
++syn keyword sshdconfigKeyword X11DisplayOffset X11Forwarding
++syn keyword sshdconfigKeyword X11UseLocalhost XAuthLocation
++syn keyword sshdconfigKeyword GSSAPINoMICAuthentication GssapiAuthentication
++syn keyword sshdconfigKeyword GssapiKeyExchange GssapiUseSessionCredCache
++syn keyword sshdconfigKeyword KerberosGetAFSToken
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
++" Define the default highlighting {{{
++" For version 5.7 and earlier: Only when not done already
++" For version 5.8 and later: Only when an item doesn't have highlighting yet
+ if version >= 508 || !exists("did_sshdconfig_syntax_inits")
+- if version < 508
+- let did_sshdconfig_syntax_inits = 1
+- command -nargs=+ HiLink hi link <args>
+- else
+- command -nargs=+ HiLink hi def link <args>
+- endif
+-
+- HiLink sshdconfigComment Comment
+- HiLink sshdconfigTodo Todo
+- HiLink sshdconfigHostPort sshdconfigConstant
+- HiLink sshdconfigTime sshdconfigConstant
+- HiLink sshdconfigNumber sshdconfigConstant
+- HiLink sshdconfigConstant Constant
+- HiLink sshdconfigYesNo sshdconfigEnum
+- HiLink sshdconfigCipher sshdconfigEnum
+- HiLink sshdconfigMAC sshdconfigEnum
+- HiLink sshdconfigRootLogin sshdconfigEnum
+- HiLink sshdconfigLogLevel sshdconfigEnum
+- HiLink sshdconfigSysLogFacility sshdconfigEnum
+- HiLink sshdconfigEnum Function
+- HiLink sshdconfigSpecial Special
+- HiLink sshdconfigKeyword Keyword
+- delcommand HiLink
++ if version < 508
++ let did_sshdconfig_syntax_inits = 1
++ command -nargs=+ HiLink hi link <args>
++ else
++ command -nargs=+ HiLink hi def link <args>
++ endif
++
++ HiLink sshdconfigComment Comment
++ HiLink sshdconfigTodo Todo
++ HiLink sshdconfigHostPort sshdconfigConstant
++ HiLink sshdconfigTime sshdconfigConstant
++ HiLink sshdconfigNumber sshdconfigConstant
++ HiLink sshdconfigConstant Constant
++ HiLink sshdconfigYesNo sshdconfigEnum
++ HiLink sshdconfigCipher sshdconfigEnum
++ HiLink sshdconfigMAC sshdconfigEnum
++ HiLink sshdconfigRootLogin sshdconfigEnum
++ HiLink sshdconfigLogLevel sshdconfigEnum
++ HiLink sshdconfigSysLogFacility sshdconfigEnum
++ HiLink sshdconfigEnum Function
++ HiLink sshdconfigSpecial Special
++ HiLink sshdconfigKeyword Keyword
++ delcommand HiLink
+ endif
+-
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
+ let b:current_syntax = "sshdconfig"
More information about the pkg-vim-maintainers
mailing list