[arch-commits] Commit in vagrant/trunk (PKGBUILD nfs.patch)

[Jonathan Steel]

    Date: Wednesday, September 3, 2014 @ 18:40:03
  Author: jsteel
Revision: 118223

upgpkg: vagrant 1.6.4-1

Modified:
  vagrant/trunk/PKGBUILD
Deleted:
  vagrant/trunk/nfs.patch

-----------+
 PKGBUILD  |   19 ++++++-------------
 nfs.patch |   20 --------------------
 2 files changed, 6 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-03 11:44:58 UTC (rev 118222)
+++ PKGBUILD	2014-09-03 16:40:03 UTC (rev 118223)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
 # Contributor: Ido Rosen <ido at kernel.org>
 # Contributor: Brett Hoerner <brett at bretthoerner.com>
 # Contributor: Jochen Schalanda <jochen+aur at schalanda.name>
@@ -10,8 +10,8 @@
 # Contributor: Steven Nance <steven at devtrw.com>
 
 pkgname=vagrant
-pkgver=1.6.3
-pkgrel=2
+pkgver=1.6.4
+pkgrel=1
 pkgdesc="Build and distribute virtualized development environments"
 arch=('i686' 'x86_64')
 url="http://vagrantup.com"
@@ -19,19 +19,12 @@
 options=('!emptydirs')
 depends=('ruby' 'curl' 'lzo' 'libidn' 'rtmpdump')
 makedepends=('git')
-source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
-        nfs.patch
-        http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip)
-md5sums=('55a91a9d9cba7b8b9d126c75b114e510' 'a670dd93057fbd782176e0275b034bee')
+source=($pkgname-$pkgver.tar.gz::http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
+        http://pkgbuild.com/~jsteel/arch/$pkgname/substrate_archlinux_$CARCH.zip)
+md5sums=('a7981a9ead12f67db3c4720e0322af80')
 [[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4'
 [[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b'
 
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  patch -Np0 -i "$srcdir"/nfs.patch
-}
-
 build() {
   cd "$srcdir"/$pkgname-$pkgver
 

Deleted: nfs.patch
===================================================================
--- nfs.patch	2014-09-03 11:44:58 UTC (rev 118222)
+++ nfs.patch	2014-09-03 16:40:03 UTC (rev 118223)
@@ -1,20 +0,0 @@
---- plugins/hosts/arch/cap/nfs.rb.orig	2014-07-23 21:02:12.794095252 +0100
-+++ plugins/hosts/arch/cap/nfs.rb	2014-07-23 21:06:54.738384725 +0100
-@@ -4,7 +4,7 @@
-       class NFS
-         def self.nfs_check_command(env)
-           if systemd?
--            return "/usr/sbin/systemctl status nfsd"
-+            return "/usr/sbin/systemctl status nfs-server"
-           else
-             return "/etc/rc.d/nfs-server status"
-           end
-@@ -12,7 +12,7 @@
- 
-         def self.nfs_start_command(env)
-           if systemd?
--            return "/usr/sbin/systemctl start nfsd rpc-idmapd rpc-mountd rpcbind"
-+            return "/usr/sbin/systemctl start nfs-server nfs-idmapd nfs-mountd rpcbind"
-           else
-             return "sh -c 'for s in {rpcbind,nfs-common,nfs-server}; do /etc/rc.d/$s start; done'"
-           end