[arch-commits] Commit in vagrant-substrate/trunk (PKGBUILD)

[Jonathan Steel]

    Date: Tuesday, February 28, 2017 @ 15:56:58
  Author: jsteel
Revision: 214213

upgpkg: vagrant-substrate 582.d66af96-1

Modified:
  vagrant-substrate/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-28 13:12:26 UTC (rev 214212)
+++ PKGBUILD	2017-02-28 15:56:58 UTC (rev 214213)
@@ -2,16 +2,16 @@
 
 pkgname=vagrant-substrate
 _pkgname=vagrant-installers
-pkgver=575.af28386
+pkgver=582.d66af96
 pkgrel=1
 pkgdesc="Substrate layer for Vagrant"
 arch=('i686' 'x86_64')
 url="http://vagrantup.com"
 license=('MIT')
-options=('!emptydirs')
+options=('!emptydirs' '!makeflags')
 makedepends=('git' 'puppet' 'chrpath' 'wget')
 depends=('lzo')
-source=(git://github.com/mitchellh/$_pkgname.git#commit=af28386)
+source=(git://github.com/mitchellh/$_pkgname.git#commit=d66af96)
 md5sums=('SKIP')
 
 pkgver() {
@@ -26,10 +26,15 @@
   # Use $srcdir for the working directory
   sed -i "s:/vagrant-substrate:$srcdir/$_pkgname/vagrant-substrate:" \
     hiera/common.yaml
+  sed -i "s:\"/opt/vagrant\":\"$srcdir/$_pkgname/opt/vagrant\":" \
+    hiera/common.yaml
 
   # Use latest openssl
-  sed -i 's/openssl-1.0.2e.tar.gz/openssl-1.0.2j.tar.gz/' \
+  sed -i 's/openssl-1.0.2e.tar.gz/openssl-1.0.2k.tar.gz/' \
     modules/openssl/manifests/init.pp
+  # Disable SSLv3
+  sed -i '16 s/shared/shared no-ssl3-method/' \
+    modules/openssl/manifests/install/linux.pp
 
   # Don't create a zip of the substrate
   sed -i '48,50d' modules/vagrant_substrate/manifests/init.pp
@@ -40,7 +45,10 @@
 
   # Fix compile issues
   # https://github.com/mitchellh/vagrant-installers/issues/60
-  sed -i 's/^    environment/#    environment/' modules/ruby/manifests/source.pp
+  sed -i '19 s/-I/-O2 -I/' modules/vagrant_substrate/manifests/staging/posix.pp
+  # chmod u+w the file before chrpath
+  sed -i 's/chrpath --replace/chmod u+w $name; chrpath --replace/' \
+    modules/vagrant_substrate/manifests/staging/linux_chrpath.pp
 }
 
 build() {