Date: Thursday, April 11, 2013 @ 00:42:42 Author: dwallace Revision: 88071
upgpkg: vim-systemd 20130410-1 upgpkg: vim-systemd 20130410-1 Modified: vim-systemd/trunk/0001-Add-more-syntax-keywords-for-service-and-socket-file.patch vim-systemd/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-Add-more-syntax-keywords-for-service-and-socket-file.patch | 40 +--------- PKGBUILD | 26 +++--- 2 files changed, 20 insertions(+), 46 deletions(-) Modified: 0001-Add-more-syntax-keywords-for-service-and-socket-file.patch =================================================================== --- 0001-Add-more-syntax-keywords-for-service-and-socket-file.patch 2013-04-10 19:40:26 UTC (rev 88070) +++ 0001-Add-more-syntax-keywords-for-service-and-socket-file.patch 2013-04-10 22:42:42 UTC (rev 88071) @@ -1,29 +1,6 @@ ---- syntax-systemd.vim 2011-09-15 21:23:14.123456789 -0000 -+++ syntax-systemd.vim 2012-11-18 23:03:14.123456789 -0400 -@@ -41,17 +41,19 @@ syn keyword sdTodo contained TODO XXX FIXME NOTE - " [Unit] {{{1 - " see systemd.unit(5) - syn region sdUnitBlock matchgroup=sdHeader start=/^\[Unit\]/ end=/^\[/me=e-2 contains=sdUnitKey --syn match sdUnitKey contained /^Description=/ -+syn match sdUnitKey contained /^Description=\|Documentation=/ -+syn match sdUnitKey contained /^ConditionHost=/ contains=sdConditionFlag -+syn match sdUnitKey contained /^RequiresMountsFor=/ nextgroup=sdFilename,sdErr - syn match sdUnitKey contained /^\%(Requires\|RequiresOverridable\|Requisite\|RequisiteOverridable\|Wants\|BindTo\|Conflicts\|Before\|After\|OnFailure\|Names\)=/ nextgroup=sdUnitList - syn match sdUnitKey contained /^\%(OnFailureIsolate\|IgnoreOnIsolate\|IgnoreOnSnapshot\|StopWhenUnneeded\|RefuseManualStart\|RefuseManualStop\|AllowIsolate\|DefaultDependencies\)=/ nextgroup=sdBool,sdErr - syn match sdUnitKey contained /^JobTimeoutSec=/ nextgroup=sdDuration,sdErr --syn match sdUnitKey contained /^Condition\(PathExists\|PathExistsGlob\|PathIsDirectory\|DirectoryNotEmpty\|FileIsExecutable\)=|\=!\=/ contains=sdConditionFlag nextgroup=sdFilename,sdErr -+syn match sdUnitKey contained /^Condition\(PathExists\|PathExistsGlob\|PathIsDirectory\|PathIsSymbolicLink\|PathIsMountPoint\|PathIsReadWrite\|DirectoryNotEmpty\|FileNotEmpty\|FileIsExecutable\)=|\=!\=/ contains=sdConditionFlag nextgroup=sdFilename,sdErr - syn match sdUnitKey contained /^ConditionVirtualization=|\=!\=/ contains=sdConditionFlag nextgroup=sdVirtType,sdErr - syn match sdUnitKey contained /^ConditionSecurity=|\=!\=/ contains=sdConditionFlag nextgroup=sdSecurityType,sdErr - syn match sdUnitKey contained /^Condition\(KernelCommandLine\|Null\)=|\=!\=/ contains=sdConditionFlag - syn match sdUnitList contained /.*/ contains=sdUnitName,sdErr - syn match sdConditionFlag contained /[!|]/ --syn keyword sdVirtType contained nextgroup=sdErr qemu kvm vmware microsoft oracle xen pidns openvz -+syn keyword sdVirtType contained nextgroup=sdErr vm container qemu kvm vmware microsoft oracle xen bochs chroot openvz lxc lxc-libvirt systemd-nspawn pidns - syn keyword sdSecurityType contained nextgroup=sdErr selinux - - " [Install] {{{1 -@@ -145,15 +147,19 @@ syn region sdServiceBlock matchgroup=sdHeader start=/^\[Service\]/ end=/^\[/me=e +--- syntax-systemd.vim 2013-04-10 18:35:36.393637187 -0400 ++++ /home/daniel/syntax-systemd.vim 2013-04-10 18:39:22.290301255 -0400 +@@ -152,7 +152,10 @@ syn match sdServiceKey contained /^BusName=/ syn match sdServiceKey contained /^\%(RemainAfterExit\|GuessMainPID\|PermissionsStartOnly\|RootDirectoryStartOnly\|NonBlocking\|ControlGroupModify\)=/ nextgroup=sdBool,sdErr syn match sdServiceKey contained /^\%(SysVStartPriority\|FsckPassNo\)=/ nextgroup=sdUInt,sdErr @@ -35,17 +12,15 @@ syn match sdServiceKey contained /^Sockets=/ nextgroup=sdUnitList syn match sdServiceKey contained /^PIDFile=/ nextgroup=sdFilename,sdErr syn match sdServiceKey contained /^Type=/ nextgroup=sdServiceType,sdErr - syn match sdServiceKey contained /^Restart=/ nextgroup=sdRestartType,sdErr - syn match sdServiceKey contained /^NotifyAccess=/ nextgroup=sdNotifyType,sdErr --syn keyword sdServiceType contained nextgroup=sdErr simple forking dbus oneshot notify -+syn keyword sdServiceType contained nextgroup=sdErr simple forking oneshot dbus notify idle +@@ -161,6 +164,7 @@ + syn keyword sdServiceType contained nextgroup=sdErr simple forking dbus oneshot notify idle syn keyword sdRestartType contained nextgroup=sdErr no on-success on-failure on-abort always syn keyword sdNotifyType contained nextgroup=sdErr none main all +syn keyword sdLimitActionType contained nextgroup=sdErr none reboot reboot-force reboot-immediate " [Socket] {{{1 syn region sdSocketBlock matchgroup=sdHeader start=/^\[Socket\]/ end=/^\[/me=e-2 contains=sdSocketKey,sdExecKey -@@ -161,7 +167,7 @@ syn match sdSocketKey contained /^Listen\%(Stream\|Datagram\|SequentialPacket\|F +@@ -168,7 +172,7 @@ syn match sdSocketKey contained /^Listen\%(FIFO\|Special\)=/ nextgroup=sdFilename,sdErr syn match sdSocketKey contained /^\%(Socket\|Directory\)Mode=/ nextgroup=sdOctal,sdErr syn match sdSocketKey contained /^\%(Backlog\|MaxConnections\|Priority\|ReceiveBuffer\|SendBuffer\|IPTTL\|Mark\|PipeSize\|MessageQueueMaxMessages\|MessageQueueMessageSize\)=/ nextgroup=sdUInt,sdErr @@ -54,7 +29,7 @@ syn match sdSocketKey contained /^BindToDevice=/ syn match sdSocketKey contained /^Service=/ nextgroup=sdUnitList syn match sdSocketKey contained /^BindIPv6Only=/ nextgroup=sdBindIPv6,sdErr -@@ -236,6 +242,7 @@ hi def link sdOctal sdValue +@@ -243,6 +247,7 @@ hi def link sdDuration sdValue hi def link sdVirtType sdValue hi def link sdServiceType sdValue @@ -62,4 +37,3 @@ hi def link sdNotifyType sdValue hi def link sdSecurityType sdValue hi def link sdSecureBits sdValue - Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-10 19:40:26 UTC (rev 88070) +++ PKGBUILD 2013-04-10 22:42:42 UTC (rev 88071) @@ -3,7 +3,10 @@ # Contributor: Jason St. John <jstjohn .. purdue . edu> pkgname=vim-systemd -pkgver=20130326 +pkgver=20130410 +pkgver(){ + date +%Y%m%d +} pkgrel=1 pkgdesc="Vim syntax highlighting for systemd unit files" arch=('any') @@ -15,12 +18,19 @@ "syntax-udev.vim::http://fedorapeople.org/cgit/wwoods/public_git/vim-scripts.git/plain/syntax/udev.vim" "ftdetect-udev.vim::http://fedorapeople.org/cgit/wwoods/public_git/vim-scripts.git/plain/ftdetect/udev.vim" '0001-Add-more-syntax-keywords-for-service-and-socket-file.patch') +md5sums=('75071aeb14c1db7a9c92cd5839691ccc' + 'b022fcc3ddc10a49a52e960868924103' + '3089ca7384668a4a6ccbee979663599f' + '8c49e2ad82ff1b1dca1defbdbbc199fd' + '69ed799ec3c7bc9d07284085d17af243') +prepare(){ + # Patch submitted upstream but not applied in Git tree + patch -Np0 --follow-symlinks -i "$srcdir/0001-Add-more-syntax-keywords-for-service-and-socket-file.patch" +} package() { cd "$srcdir" - # Patch submitted upstream but not applied in Git tree - patch -Np0 --follow-symlinks -i "$srcdir/0001-Add-more-syntax-keywords-for-service-and-socket-file.patch" install -Dm644 syntax-systemd.vim "$pkgdir/usr/share/vim/vimfiles/syntax/systemd.vim" install -Dm644 ftdetect-systemd.vim "$pkgdir/usr/share/vim/vimfiles/ftdetect/systemd.vim" @@ -28,13 +38,3 @@ install -Dm644 ftdetect-udev.vim "$pkgdir/usr/share/vim/vimfiles/ftdetect/udev.vim" } -md5sums=('0d860125c3ffaf34fe395376ed3bee20' - 'b022fcc3ddc10a49a52e960868924103' - '3089ca7384668a4a6ccbee979663599f' - '8c49e2ad82ff1b1dca1defbdbbc199fd' - '5b8cfccad0f9b1eb06b83c9b9a2d6714') -md5sums=('0d860125c3ffaf34fe395376ed3bee20' - 'b022fcc3ddc10a49a52e960868924103' - '3089ca7384668a4a6ccbee979663599f' - '8c49e2ad82ff1b1dca1defbdbbc199fd' - 'de60add46404e8b2af33d877e3a21c4f')