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

[Jonathan Steel]

    Date: Wednesday, September 28, 2016 @ 18:36:41
  Author: jsteel
Revision: 190732

upgpkg: vagrant-substrate 554.9772186-1

Modified:
  vagrant-substrate/trunk/PKGBUILD
Deleted:
  vagrant-substrate/trunk/libiconv.patch
  vagrant-substrate/trunk/puppet_module_libiconv.patch

------------------------------+
 PKGBUILD                     |   17 ++++-------------
 libiconv.patch               |   13 -------------
 puppet_module_libiconv.patch |   23 -----------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-28 18:24:42 UTC (rev 190731)
+++ PKGBUILD	2016-09-28 18:36:41 UTC (rev 190732)
@@ -2,7 +2,7 @@
 
 pkgname=vagrant-substrate
 _pkgname=vagrant-installers
-pkgver=526.6bb2e80
+pkgver=554.9772186
 pkgrel=1
 pkgdesc="Substrate layer for Vagrant"
 arch=('i686' 'x86_64')
@@ -11,13 +11,9 @@
 options=('!emptydirs' '!makeflags')
 makedepends=('git' 'puppet' 'chrpath' 'wget')
 depends=('lzo')
-source=(git://github.com/mitchellh/$_pkgname.git#commit=6bb2e80
-        puppet_module_libiconv.patch
-        libiconv.patch
+source=(git://github.com/mitchellh/$_pkgname.git#commit=9772186
         readline.patch)
 md5sums=('SKIP'
-         'f6ac254962cf77cc4fba443c2d89644e'
-         'c1bd61a5617b64654c33a2afc506e499'
          'a4f87b2483c7bd724bb94a69aa5cf733')
 
 pkgver() {
@@ -33,14 +29,10 @@
   sed -i "s:/vagrant-substrate:$srcdir/$_pkgname/vagrant-substrate:" \
     hiera/common.yaml
 
-  # use latest openssl
-  sed -i 's/openssl-1.0.2e.tar.gz/openssl-1.0.2g.tar.gz/' \
+  # Use latest openssl
+  sed -i 's/openssl-1.0.2e.tar.gz/openssl-1.0.2j.tar.gz/' \
     modules/openssl/manifests/init.pp
 
-  # use latest ruby 2.2
-  sed -i 's/ruby-2.2.3/ruby-2.2.4/' \
-    modules/ruby/manifests/source.pp
-    
   # Don't create a zip of the substrate
   sed -i '48,50d' modules/vagrant_substrate/manifests/init.pp
 
@@ -49,7 +41,6 @@
   find . -name *.pp -exec sed -i "/group.*.=.*.root/d" {} +
 
   # Fix compile issues
-  patch -Np0 -i "$srcdir"/puppet_module_libiconv.patch
   patch -Np0 -i "$srcdir"/readline.patch
 
   # https://github.com/mitchellh/vagrant-installers/issues/60

Deleted: libiconv.patch
===================================================================
--- libiconv.patch	2016-09-28 18:24:42 UTC (rev 190731)
+++ libiconv.patch	2016-09-28 18:36:41 UTC (rev 190732)
@@ -1,13 +0,0 @@
---- libiconv-1.14/srclib/stdio.in.h.orig	2015-07-20 12:35:55.202286213 +0100
-+++ libiconv-1.14/srclib/stdio.in.h	2015-07-20 12:36:05.922285829 +0100
-@@ -1007,8 +1007,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if 0 || 0

Deleted: puppet_module_libiconv.patch
===================================================================
--- puppet_module_libiconv.patch	2016-09-28 18:24:42 UTC (rev 190731)
+++ puppet_module_libiconv.patch	2016-09-28 18:36:41 UTC (rev 190732)
@@ -1,23 +0,0 @@
---- modules/libiconv/manifests/init.pp.orig	2015-07-20 09:32:21.162683278 +0100
-+++ modules/libiconv/manifests/init.pp	2015-07-20 12:28:16.068969435 +0100
-@@ -46,6 +46,12 @@
-     require => Wget::Fetch["libiconv"],
-   }
- 
-+  exec { "patch-libiconv":
-+    command => 'patch -Np0 -i ../../../libiconv.patch',
-+    cwd     => $file_cache_dir,
-+    require => Exec["untar-libiconv"],
-+  }
-+
-   autotools { "libiconv":
-     configure_flags  => "--prefix=${prefix} --disable-dependency-tracking",
-     cwd              => $source_dir_path,
-@@ -53,6 +59,6 @@
-     install_sentinel => "${prefix}/lib/libiconv.a",
-     make_notify      => $make_notify,
-     make_sentinel    => "${source_dir_path}/lib/.libs/iconv.o",
--    require          => Exec["untar-libiconv"],
-+    require          => Exec["untar-libiconv", "patch-libiconv"],
-   }
- }