summaryrefslogtreecommitdiff
path: root/community/vagrant
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-03-21 03:22:19 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-03-21 03:22:19 +0000
commitd0f33415f254cb2fee06fd89f9cfed4535322f37 (patch)
tree66c13d72eac4f0110772b4675231c891334137bc /community/vagrant
parent7e108c74958ec076a3734822f61f145d0d69547f (diff)
Fri Mar 21 03:19:28 UTC 2014
Diffstat (limited to 'community/vagrant')
-rw-r--r--community/vagrant/PKGBUILD17
-rw-r--r--community/vagrant/plugins.patch31
2 files changed, 43 insertions, 5 deletions
diff --git a/community/vagrant/PKGBUILD b/community/vagrant/PKGBUILD
index b9af83136..233fbedf9 100644
--- a/community/vagrant/PKGBUILD
+++ b/community/vagrant/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 107806 2014-03-19 20:47:07Z jsteel $
+# $Id: PKGBUILD 108009 2014-03-20 20:53:49Z jsteel $
# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
# Contributor: Ido Rosen <ido@kernel.org>
# Contributor: Brett Hoerner <brett@bretthoerner.com>
@@ -11,7 +11,7 @@
pkgname=vagrant
pkgver=1.5.1
-pkgrel=4
+pkgrel=5
pkgdesc="Build and distribute virtualized development environments"
arch=('i686' 'x86_64')
url="http://vagrantup.com"
@@ -21,10 +21,17 @@ makedepends=('git')
depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump')
source=(git://github.com/mitchellh/$pkgname.git
git://github.com/mitchellh/$pkgname-installers.git
+ plugins.patch
http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip)
-md5sums=('SKIP' 'SKIP')
-[[ $CARCH == i686 ]] && md5sums[2]='c04042b24de56d18a041bc005e5ecaa4'
-[[ $CARCH == x86_64 ]] && md5sums[2]='53d8a137e0b50fee8509a7d1c15fd33b'
+md5sums=('SKIP' 'SKIP'
+ 'c73455203b22aaf89e3a7779ebbe81ed')
+[[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4'
+[[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b'
+
+prepare() {
+ # Remove proprietary plugins
+ patch -Np1 -i "$srcdir"/plugins.patch
+}
build() {
cd "$srcdir"/$pkgname
diff --git a/community/vagrant/plugins.patch b/community/vagrant/plugins.patch
new file mode 100644
index 000000000..8c2bc9ba7
--- /dev/null
+++ b/community/vagrant/plugins.patch
@@ -0,0 +1,31 @@
+--- src/vagrant-installers/package/support/install_vagrant.sh.orig 2014-03-20 19:49:56.853976851 +0000
++++ src/vagrant-installers/package/support/install_vagrant.sh 2014-03-20 19:53:25.921123996 +0000
+@@ -55,28 +55,6 @@
+ export PATH="${EMBEDDED_DIR}/bin:${PATH}"
+ ${GEM_COMMAND} install vagrant.gem --no-ri --no-rdoc
+
+-# Install extensions
+-${GEM_COMMAND} install vagrant-login --no-ri --no-rdoc --source "http://gems.hashicorp.com"
+-${GEM_COMMAND} install vagrant-share --no-ri --no-rdoc --source "http://gems.hashicorp.com"
+-
+-# Setup the system plugins
+-cat <<EOF >${EMBEDDED_DIR}/plugins.json
+-{
+- "version": "1",
+- "installed": {
+- "vagrant-login": {
+- "ruby_version": "0",
+- "vagrant_version": "${VERSION}"
+- },
+- "vagrant-share": {
+- "ruby_version": "0",
+- "vagrant_version": "${VERSION}"
+- }
+- }
+-}
+-EOF
+-chmod 0644 ${EMBEDDED_DIR}/plugins.json
+-
+ # Exit the temporary directory
+ popd
+ rm -rf ${TMP_DIR}