Date: Monday, November 14, 2022 @ 22:18:00
Author: kpcyrd
Revision: 1348229
archrelease: copy trunk to community-x86_64
Added:
vagrant/repos/community-x86_64/PKGBUILD
(from rev 1348227, vagrant/trunk/PKGBUILD)
vagrant/repos/community-x86_64/vagrant-2.3.2-net-ssh-gem-update.patch
(from rev 1348227, vagrant/trunk/vagrant-2.3.2-net-ssh-gem-update.patch)
Deleted:
vagrant/repos/community-x86_64/PKGBUILD
vagrant/repos/community-x86_64/vagrant-2.3.2-net-ssh-gem-update.patch
----------------------------------------+
PKGBUILD | 177 +++++++++++++++----------------
vagrant-2.3.2-net-ssh-gem-update.patch | 54 ++++-----
2 files changed, 117 insertions(+), 114 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-14 22:17:57 UTC (rev 1348228)
+++ PKGBUILD 2022-11-14 22:18:00 UTC (rev 1348229)
@@ -1,87 +0,0 @@
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Ido Rosen <[email protected]>
-# Contributor: Brett Hoerner <[email protected]>
-# Contributor: Jochen Schalanda <[email protected]>
-# Contributor: Mathieu Clabaut <[email protected]>
-# Contributor: helios <[email protected]>
-# Contributor: George Ornbo <[email protected]>
-# Contributor: Niklas Heer <[email protected]>
-# Contributor: Steven Nance <[email protected]>
-
-pkgname=vagrant
-pkgver=2.3.2
-pkgrel=2
-pkgdesc="Build and distribute virtualized development environments"
-arch=('x86_64')
-url="https://vagrantup.com";
-license=('MIT')
-options=('!emptydirs')
-depends=('curl' 'libarchive' 'libssh2' 'libxml2' 'libxslt' 'rsync'
- 'ruby' 'xz' 'perl')
-makedepends=('git' 'go')
-conflicts=('vagrant-substrate')
-replaces=('vagrant-substrate')
-source=($pkgname-$pkgver.tar.gz::https://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
- vagrant-2.3.2-net-ssh-gem-update.patch
-
"git+https://github.com/mitchellh/vagrant-installers.git#commit=9ef6148";)
-md5sums=('dbc1b9385657d37028be2ffbbb298793'
- 'f2592b99fb1c894c45815415c1e80efe'
- 'SKIP')
-
-prepare() {
- patch -Np1 -d $pkgname-$pkgver -i ../vagrant-2.3.2-net-ssh-gem-update.patch
- cd vagrant-installers
- local _gemdir="$(gem env gemdir)"
-
- # Allow Vagrant to see the system gems as these have been de-vendored from
the ruby package
- sed -i "s_\"gems\", vagrantVersion)_\"gems\", vagrantVersion,
\":$_gemdir\")_g" substrate/launcher/main.go
-}
-
-build() {
- cd $pkgname-$pkgver
- gem build $pkgname.gemspec
-
- export GO111MODULE=off # golang 1.16 uses modules by default and packages
below fail to compile
- cd "$srcdir"/vagrant-installers/substrate/launcher
- go get github.com/mitchellh/osext
-
- go build \
- -trimpath \
- -buildmode=pie \
- -ldflags "-extldflags \"${LDFLAGS}\"" \
- -o vagrant
-}
-
-package() {
- cd $pkgname-$pkgver
-
- INSTALLERS_DIR="$srcdir"/vagrant-installers/substrate
- EMBEDDED_DIR="$pkgdir"/opt/vagrant/embedded
-
- install -d
"$pkgdir"/usr/{bin,share/bash-completion/completions,share/zsh/site-functions}
- install -Dm644 "$INSTALLERS_DIR"/common/gemrc "$EMBEDDED_DIR"/etc/gemrc
-
- echo "{ \"vagrant_version\": \"$pkgver\" }" > "$EMBEDDED_DIR"/manifest.json
-
- gem install $pkgname-$pkgver.gem \
- --no-document --no-user-install --install-dir "$EMBEDDED_DIR"/gems/$pkgver
-
- install -Dm755 "$INSTALLERS_DIR"/launcher/vagrant \
- "$pkgdir"/opt/$pkgname/bin/$pkgname
-
- ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
-
- install -Dm644 contrib/bash/completion.sh \
- "$pkgdir"/usr/share/bash-completion/completions/$pkgname
-
- install -Dm644 contrib/zsh/_vagrant \
- "$pkgdir"/usr/share/zsh/site-functions/_vagrant
-
- install -Dm644 contrib/vim/vagrantfile.vim \
- "$pkgdir"/usr/share/vim/vimfiles/ftdetect/vagrantfile.vim
-
- install -Dm644 LICENSE \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
- find "$pkgdir"/opt/vagrant/embedded/gems -name gem_make.out -delete
-}
Copied: vagrant/repos/community-x86_64/PKGBUILD (from rev 1348227,
vagrant/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-14 22:18:00 UTC (rev 1348229)
@@ -0,0 +1,90 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Ido Rosen <[email protected]>
+# Contributor: Brett Hoerner <[email protected]>
+# Contributor: Jochen Schalanda <[email protected]>
+# Contributor: Mathieu Clabaut <[email protected]>
+# Contributor: helios <[email protected]>
+# Contributor: George Ornbo <[email protected]>
+# Contributor: Niklas Heer <[email protected]>
+# Contributor: Steven Nance <[email protected]>
+
+pkgname=vagrant
+pkgver=2.3.2
+pkgrel=3
+pkgdesc="Build and distribute virtualized development environments"
+arch=('x86_64')
+url="https://vagrantup.com";
+license=('MIT')
+options=('!emptydirs')
+depends=('curl' 'libarchive' 'libssh2' 'libxml2' 'libxslt' 'rsync'
+ 'ruby' 'xz' 'perl')
+makedepends=('git' 'go')
+conflicts=('vagrant-substrate')
+replaces=('vagrant-substrate')
+source=($pkgname-$pkgver.tar.gz::https://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
+ vagrant-2.3.2-net-ssh-gem-update.patch
+
"git+https://github.com/mitchellh/vagrant-installers.git#commit=9ef6148";)
+md5sums=('dbc1b9385657d37028be2ffbbb298793'
+ 'f2592b99fb1c894c45815415c1e80efe'
+ 'SKIP')
+sha256sums=('76d3737e273fa73501f7c12a4814f6a63851b8119118575cc77e9911ce3acb06'
+ '74602976d0513e82c225b6aaefa08351ff75ca534f666ca308878101e3d1f6bf'
+ 'SKIP')
+
+prepare() {
+ patch -Np1 -d $pkgname-$pkgver -i ../vagrant-2.3.2-net-ssh-gem-update.patch
+ cd vagrant-installers
+ local _gemdir="$(gem env gemdir)"
+
+ # Allow Vagrant to see the system gems as these have been de-vendored from
the ruby package
+ sed -i "s_\"gems\", vagrantVersion)_\"gems\", vagrantVersion,
\":$_gemdir\")_g" substrate/launcher/main.go
+}
+
+build() {
+ cd $pkgname-$pkgver
+ gem build $pkgname.gemspec
+
+ export GO111MODULE=off # golang 1.16 uses modules by default and packages
below fail to compile
+ cd "$srcdir"/vagrant-installers/substrate/launcher
+ go get github.com/mitchellh/osext
+
+ go build \
+ -trimpath \
+ -buildmode=pie \
+ -ldflags "-extldflags \"${LDFLAGS}\"" \
+ -o vagrant
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ INSTALLERS_DIR="$srcdir"/vagrant-installers/substrate
+ EMBEDDED_DIR="$pkgdir"/opt/vagrant/embedded
+
+ install -d
"$pkgdir"/usr/{bin,share/bash-completion/completions,share/zsh/site-functions}
+ install -Dm644 "$INSTALLERS_DIR"/common/gemrc "$EMBEDDED_DIR"/etc/gemrc
+
+ echo "{ \"vagrant_version\": \"$pkgver\" }" > "$EMBEDDED_DIR"/manifest.json
+
+ gem install $pkgname-$pkgver.gem \
+ --no-document --no-user-install --install-dir "$EMBEDDED_DIR"/gems/$pkgver
+
+ install -Dm755 "$INSTALLERS_DIR"/launcher/vagrant \
+ "$pkgdir"/opt/$pkgname/bin/$pkgname
+
+ ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
+
+ install -Dm644 contrib/bash/completion.sh \
+ "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+
+ install -Dm644 contrib/zsh/_vagrant \
+ "$pkgdir"/usr/share/zsh/site-functions/_vagrant
+
+ install -Dm644 contrib/vim/vagrantfile.vim \
+ "$pkgdir"/usr/share/vim/vimfiles/ftdetect/vagrantfile.vim
+
+ install -Dm644 LICENSE \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+ find "$pkgdir"/opt/vagrant/embedded/gems -name gem_make.out -delete
+}
Deleted: vagrant-2.3.2-net-ssh-gem-update.patch
===================================================================
--- vagrant-2.3.2-net-ssh-gem-update.patch 2022-11-14 22:17:57 UTC (rev
1348228)
+++ vagrant-2.3.2-net-ssh-gem-update.patch 2022-11-14 22:18:00 UTC (rev
1348229)
@@ -1,27 +0,0 @@
-From 34d4bc3820c7f2b4decfef26a8617aea1dfc2a21 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]>
-Date: Tue, 1 Nov 2022 14:23:32 +0100
-Subject: [PATCH] Bump net-ssh to ~> 7.0
-
-This also requires a bump of net-scp and net-sftp
----
- vagrant.gemspec | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 68884f35b1..50deba9809 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
- s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
- s.add_dependency "mime-types", "~> 3.3"
- s.add_dependency "net-ftp", "~> 0.1"
-- s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2"
-- s.add_dependency "net-sftp", "~> 3.0"
-- s.add_dependency "net-scp", "~> 3.0.0"
-+ s.add_dependency "net-ssh", "~> 7.0"
-+ s.add_dependency "net-sftp", "~> 4.0"
-+ s.add_dependency "net-scp", "~> 4.0"
- s.add_dependency "rb-kqueue", "~> 0.2.0"
- s.add_dependency "rexml", "~> 3.2"
- s.add_dependency "rgl", "~> 0.5.7"
Copied: vagrant/repos/community-x86_64/vagrant-2.3.2-net-ssh-gem-update.patch
(from rev 1348227, vagrant/trunk/vagrant-2.3.2-net-ssh-gem-update.patch)
===================================================================
--- vagrant-2.3.2-net-ssh-gem-update.patch (rev 0)
+++ vagrant-2.3.2-net-ssh-gem-update.patch 2022-11-14 22:18:00 UTC (rev
1348229)
@@ -0,0 +1,27 @@
+From 34d4bc3820c7f2b4decfef26a8617aea1dfc2a21 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]>
+Date: Tue, 1 Nov 2022 14:23:32 +0100
+Subject: [PATCH] Bump net-ssh to ~> 7.0
+
+This also requires a bump of net-scp and net-sftp
+---
+ vagrant.gemspec | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/vagrant.gemspec b/vagrant.gemspec
+index 68884f35b1..50deba9809 100644
+--- a/vagrant.gemspec
++++ b/vagrant.gemspec
+@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
+ s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
+ s.add_dependency "mime-types", "~> 3.3"
+ s.add_dependency "net-ftp", "~> 0.1"
+- s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2"
+- s.add_dependency "net-sftp", "~> 3.0"
+- s.add_dependency "net-scp", "~> 3.0.0"
++ s.add_dependency "net-ssh", "~> 7.0"
++ s.add_dependency "net-sftp", "~> 4.0"
++ s.add_dependency "net-scp", "~> 4.0"
+ s.add_dependency "rb-kqueue", "~> 0.2.0"
+ s.add_dependency "rexml", "~> 3.2"
+ s.add_dependency "rgl", "~> 0.5.7"
