[arch-commits] Commit in vagrant-substrate/repos (10 files)
Jonathan Steel
jsteel at archlinux.org
Tue Dec 22 20:58:26 UTC 2015
Date: Tuesday, December 22, 2015 @ 21:58:26
Author: jsteel
Revision: 154300
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
vagrant-substrate/repos/community-testing-i686/
vagrant-substrate/repos/community-testing-i686/PKGBUILD
(from rev 154299, vagrant-substrate/trunk/PKGBUILD)
vagrant-substrate/repos/community-testing-i686/libiconv.patch
(from rev 154299, vagrant-substrate/trunk/libiconv.patch)
vagrant-substrate/repos/community-testing-i686/puppet_module_libiconv.patch
(from rev 154299, vagrant-substrate/trunk/puppet_module_libiconv.patch)
vagrant-substrate/repos/community-testing-i686/readline.patch
(from rev 154299, vagrant-substrate/trunk/readline.patch)
vagrant-substrate/repos/community-testing-x86_64/
vagrant-substrate/repos/community-testing-x86_64/PKGBUILD
(from rev 154299, vagrant-substrate/trunk/PKGBUILD)
vagrant-substrate/repos/community-testing-x86_64/libiconv.patch
(from rev 154299, vagrant-substrate/trunk/libiconv.patch)
vagrant-substrate/repos/community-testing-x86_64/puppet_module_libiconv.patch
(from rev 154299, vagrant-substrate/trunk/puppet_module_libiconv.patch)
vagrant-substrate/repos/community-testing-x86_64/readline.patch
(from rev 154299, vagrant-substrate/trunk/readline.patch)
-------------------------------------------------------+
community-testing-i686/PKGBUILD | 69 ++++++++++++++++
community-testing-i686/libiconv.patch | 13 +++
community-testing-i686/puppet_module_libiconv.patch | 23 +++++
community-testing-i686/readline.patch | 10 ++
community-testing-x86_64/PKGBUILD | 69 ++++++++++++++++
community-testing-x86_64/libiconv.patch | 13 +++
community-testing-x86_64/puppet_module_libiconv.patch | 23 +++++
community-testing-x86_64/readline.patch | 10 ++
8 files changed, 230 insertions(+)
Copied: vagrant-substrate/repos/community-testing-i686/PKGBUILD (from rev 154299, vagrant-substrate/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2015-12-22 20:58:26 UTC (rev 154300)
@@ -0,0 +1,69 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=vagrant-substrate
+_pkgname=vagrant-installers
+pkgver=524.64c5261
+pkgrel=1
+pkgdesc="Substrate layer for Vagrant"
+arch=('i686' 'x86_64')
+url="http://vagrantup.com"
+license=('MIT')
+options=('!emptydirs')
+makedepends=('git' 'puppet' 'chrpath' 'wget')
+depends=('lzo')
+source=(git://github.com/mitchellh/$_pkgname.git#commit=64c5261
+ puppet_module_libiconv.patch
+ libiconv.patch
+ readline.patch)
+md5sums=('SKIP'
+ 'f6ac254962cf77cc4fba443c2d89644e'
+ 'c1bd61a5617b64654c33a2afc506e499'
+ 'a4f87b2483c7bd724bb94a69aa5cf733')
+
+pkgver() {
+ cd $_pkgname
+
+ echo $(git rev-list --count HEAD).$(git describe --always)
+}
+
+prepare() {
+ cd $_pkgname/substrate
+
+ # Use $srcdir for the working directory
+ sed -i "s:/vagrant-substrate:$srcdir/$_pkgname/vagrant-substrate:" \
+ hiera/common.yaml
+
+ # Don't create a zip of the substrate
+ sed -i '48,50d' modules/vagrant_substrate/manifests/init.pp
+
+ # Do not set file ownership
+ find . -name *.pp -exec sed -i "/owner.*.=.*.root/d" {} +
+ 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
+ sed -i 's/^ environment/# environment/' modules/ruby/manifests/source.pp
+}
+
+build() {
+ cd $_pkgname/substrate
+
+ FACTER_param_output_dir="$srcdir" puppet apply \
+ --detailed-exitcodes \
+ --hiera_config=config/hiera.yaml --confdir=config \
+ --modulepath=modules manifests/init.pp || test $? -eq 2
+}
+
+package() {
+ cd $_pkgname
+
+ install -d "$pkgdir"/opt
+
+ cp -r vagrant-substrate/staging "$pkgdir"/opt/vagrant
+
+ install -Dm644 LICENSE.md \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: vagrant-substrate/repos/community-testing-i686/libiconv.patch (from rev 154299, vagrant-substrate/trunk/libiconv.patch)
===================================================================
--- community-testing-i686/libiconv.patch (rev 0)
+++ community-testing-i686/libiconv.patch 2015-12-22 20:58:26 UTC (rev 154300)
@@ -0,0 +1,13 @@
+--- 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
Copied: vagrant-substrate/repos/community-testing-i686/puppet_module_libiconv.patch (from rev 154299, vagrant-substrate/trunk/puppet_module_libiconv.patch)
===================================================================
--- community-testing-i686/puppet_module_libiconv.patch (rev 0)
+++ community-testing-i686/puppet_module_libiconv.patch 2015-12-22 20:58:26 UTC (rev 154300)
@@ -0,0 +1,23 @@
+--- 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"],
+ }
+ }
Copied: vagrant-substrate/repos/community-testing-i686/readline.patch (from rev 154299, vagrant-substrate/trunk/readline.patch)
===================================================================
--- community-testing-i686/readline.patch (rev 0)
+++ community-testing-i686/readline.patch 2015-12-22 20:58:26 UTC (rev 154300)
@@ -0,0 +1,10 @@
+--- modules/readline/manifests/init.pp
++++ modules/readline/manifests/init.pp
+@@ -61,6 +61,7 @@ class readline(
+ cwd => $source_dir_path,
+ environment => $real_autotools_environment,
+ install_sentinel => "${prefix}/lib/libreadline.a",
++ make_command => "make SHLIB_LIBS=-lncurses",
+ make_notify => $make_notify,
+ make_sentinel => "${source_dir_path}/libreadline.a",
+ require => Exec["untar-readline"]
Copied: vagrant-substrate/repos/community-testing-x86_64/PKGBUILD (from rev 154299, vagrant-substrate/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2015-12-22 20:58:26 UTC (rev 154300)
@@ -0,0 +1,69 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=vagrant-substrate
+_pkgname=vagrant-installers
+pkgver=524.64c5261
+pkgrel=1
+pkgdesc="Substrate layer for Vagrant"
+arch=('i686' 'x86_64')
+url="http://vagrantup.com"
+license=('MIT')
+options=('!emptydirs')
+makedepends=('git' 'puppet' 'chrpath' 'wget')
+depends=('lzo')
+source=(git://github.com/mitchellh/$_pkgname.git#commit=64c5261
+ puppet_module_libiconv.patch
+ libiconv.patch
+ readline.patch)
+md5sums=('SKIP'
+ 'f6ac254962cf77cc4fba443c2d89644e'
+ 'c1bd61a5617b64654c33a2afc506e499'
+ 'a4f87b2483c7bd724bb94a69aa5cf733')
+
+pkgver() {
+ cd $_pkgname
+
+ echo $(git rev-list --count HEAD).$(git describe --always)
+}
+
+prepare() {
+ cd $_pkgname/substrate
+
+ # Use $srcdir for the working directory
+ sed -i "s:/vagrant-substrate:$srcdir/$_pkgname/vagrant-substrate:" \
+ hiera/common.yaml
+
+ # Don't create a zip of the substrate
+ sed -i '48,50d' modules/vagrant_substrate/manifests/init.pp
+
+ # Do not set file ownership
+ find . -name *.pp -exec sed -i "/owner.*.=.*.root/d" {} +
+ 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
+ sed -i 's/^ environment/# environment/' modules/ruby/manifests/source.pp
+}
+
+build() {
+ cd $_pkgname/substrate
+
+ FACTER_param_output_dir="$srcdir" puppet apply \
+ --detailed-exitcodes \
+ --hiera_config=config/hiera.yaml --confdir=config \
+ --modulepath=modules manifests/init.pp || test $? -eq 2
+}
+
+package() {
+ cd $_pkgname
+
+ install -d "$pkgdir"/opt
+
+ cp -r vagrant-substrate/staging "$pkgdir"/opt/vagrant
+
+ install -Dm644 LICENSE.md \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: vagrant-substrate/repos/community-testing-x86_64/libiconv.patch (from rev 154299, vagrant-substrate/trunk/libiconv.patch)
===================================================================
--- community-testing-x86_64/libiconv.patch (rev 0)
+++ community-testing-x86_64/libiconv.patch 2015-12-22 20:58:26 UTC (rev 154300)
@@ -0,0 +1,13 @@
+--- 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
Copied: vagrant-substrate/repos/community-testing-x86_64/puppet_module_libiconv.patch (from rev 154299, vagrant-substrate/trunk/puppet_module_libiconv.patch)
===================================================================
--- community-testing-x86_64/puppet_module_libiconv.patch (rev 0)
+++ community-testing-x86_64/puppet_module_libiconv.patch 2015-12-22 20:58:26 UTC (rev 154300)
@@ -0,0 +1,23 @@
+--- 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"],
+ }
+ }
Copied: vagrant-substrate/repos/community-testing-x86_64/readline.patch (from rev 154299, vagrant-substrate/trunk/readline.patch)
===================================================================
--- community-testing-x86_64/readline.patch (rev 0)
+++ community-testing-x86_64/readline.patch 2015-12-22 20:58:26 UTC (rev 154300)
@@ -0,0 +1,10 @@
+--- modules/readline/manifests/init.pp
++++ modules/readline/manifests/init.pp
+@@ -61,6 +61,7 @@ class readline(
+ cwd => $source_dir_path,
+ environment => $real_autotools_environment,
+ install_sentinel => "${prefix}/lib/libreadline.a",
++ make_command => "make SHLIB_LIBS=-lncurses",
+ make_notify => $make_notify,
+ make_sentinel => "${source_dir_path}/libreadline.a",
+ require => Exec["untar-readline"]
More information about the arch-commits
mailing list