Date: Thu, 14 Mar 2019 23:15:28 +0000 (UTC) From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495742 - in head/sysutils/vagrant: . files Message-ID: <201903142315.x2ENFSJ5086422@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cmt Date: Thu Mar 14 23:15:28 2019 New Revision: 495742 URL: https://svnweb.freebsd.org/changeset/ports/495742 Log: Use CA certificates from ca_root_nss for TLS validation instead of embedding a very old version of that file, and depend on ca_root_nss for that. Add dependency on curl, which has been missing for a long time. PR: 234421 Submitted by: joe@thrallingpenguin.com Reported by: corvid@openmailbox.org Approved by: joe@thrallingpenguin.com (maintainer) Deleted: head/sysutils/vagrant/files/cacert.pem Modified: head/sysutils/vagrant/Makefile head/sysutils/vagrant/files/patch-bin_vagrant head/sysutils/vagrant/pkg-plist Modified: head/sysutils/vagrant/Makefile ============================================================================== --- head/sysutils/vagrant/Makefile Thu Mar 14 22:54:03 2019 (r495741) +++ head/sysutils/vagrant/Makefile Thu Mar 14 23:15:28 2019 (r495742) @@ -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/ruby 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 Modified: head/sysutils/vagrant/files/patch-bin_vagrant ============================================================================== --- head/sysutils/vagrant/files/patch-bin_vagrant Thu Mar 14 22:54:03 2019 (r495741) +++ head/sysutils/vagrant/files/patch-bin_vagrant Thu Mar 14 23:15:28 2019 (r495742) @@ -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) Modified: head/sysutils/vagrant/pkg-plist ============================================================================== --- head/sysutils/vagrant/pkg-plist Thu Mar 14 22:54:03 2019 (r495741) +++ head/sysutils/vagrant/pkg-plist Thu Mar 14 23:15:28 2019 (r495742) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903142315.x2ENFSJ5086422>