Attachment 202790 Details for Bug 234421 – vagrant 2.2.4_1 with curl and ca_root_nss dependencies

[patch] vagrant 2.2.4_1 with curl and ca_root_nss dependencies

vagrant-2.2.4_1.patch (text/plain), 2.54 KB, created by joe on 2019-03-11 04:09:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2019-03-11 04:09:50 UTC

Size: 2.54 KB

patch

obsolete

>diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile
>index 82eb97ec3..fe0ed7014 100644
>--- a/sysutils/vagrant/Makefile
>+++ b/sysutils/vagrant/Makefile
>@@ -4,6 +4,7 @@
> PORTNAME=	vagrant
> PORTVERSION=	2.2.4
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	sysutils rubygems devel
> 
> MAINTAINER=	joe@thrallingpenguin.com
>@@ -35,7 +36,9 @@ RUN_DEPENDS=	rubygem-bcrypt_pbkdf>=1.0.0:security/rubygem-bcrypt_pbkdf \
> 		rubygem-winrm>=2.1:sysutils/rubygem-winrm \
> 		rubygem-winrm-elevated>=1.1:sysutils/rubygem-winrm-elevated \
> 		rubygem-winrm-fs>=1.0:sysutils/rubygem-winrm-fs \
>-		rubygem-ruby_dep>=0:devel/rubygem-ruby_dep
>+		rubygem-ruby_dep>=0:devel/rubygem-ruby_dep \
>+		ca_root_nss>=0:security/ca_root_nss \
>+		curl:ftp/curl
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	hashicorp
>@@ -71,8 +74,6 @@ do-build:
> 		${GEMFILES} -- ${CONFIGURE_ARGS})
> 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/build_info
> 	${MKDIR} ${STAGEDIR}${DATADIR}/embedded/rgloader
>-	${INSTALL_DATA} ${FILESDIR}/cacert.pem \
>-		${STAGEDIR}${DATADIR}/embedded/cacert.pem
> 	${INSTALL_SCRIPT} ${FILESDIR}/loader.rb \
> 		${STAGEDIR}${DATADIR}/embedded/rgloader/loader.rb
> 
>diff --git a/sysutils/vagrant/files/patch-bin_vagrant b/sysutils/vagrant/files/patch-bin_vagrant
>index 3a766b149..83ac90513 100644
>--- a/sysutils/vagrant/files/patch-bin_vagrant
>+++ b/sysutils/vagrant/files/patch-bin_vagrant
>@@ -1,5 +1,5 @@
>---- bin/vagrant.orig	2018-11-16 19:25:33 UTC
>-+++ bin/vagrant
>+--- bin/vagrant.orig	2019-02-27 15:35:56.000000000 +0000
>++++ bin/vagrant	2019-03-11 03:50:43.415883000 +0000
> @@ -5,6 +5,9 @@
>  # initializing which have historically resulted in stack traces.
>  Signal.trap("INT") { abort }
>@@ -10,3 +10,14 @@
>  # Disable exception reporting by default if available
>  if Thread.respond_to?(:report_on_exception=)
>    Thread.report_on_exception = false
>+@@ -16,7 +19,9 @@
>+ 
>+ # These will be the options that are passed to initialize the Vagrant
>+ # environment.
>+-opts = {}
>++opts = {
>++  :ca_cert => '@PREFIX@/share/certs/ca-root-nss.crt'
>++}
>+ 
>+ if idx = argv.index("--")
>+   argv_extra = argv.slice(idx+1, argv.length-2)
>diff --git a/sysutils/vagrant/pkg-plist b/sysutils/vagrant/pkg-plist
>index 3254ba1aa..6852ef5dc 100644
>--- a/sysutils/vagrant/pkg-plist
>+++ b/sysutils/vagrant/pkg-plist
>@@ -969,6 +969,5 @@ bin/vagrant
> %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/vagrant.gemspec
> %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/version.txt
> %%GEMS_DIR%%specifications/vagrant-%%PORTVERSION%%.gemspec
>-%%DATADIR%%/embedded/cacert.pem
> %%DATADIR%%/embedded/rgloader/loader.rb
> @dir %%GEMS_DIR%%extensions

Flags:

joe: maintainer-approval+

Actions: View | Diff

Attachments on bug 234421: 202790