diff options
Diffstat (limited to 'sysutils/vagrant')
| -rw-r--r-- | sysutils/vagrant/Makefile | 31 | ||||
| -rw-r--r-- | sysutils/vagrant/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/vagrant/files/patch-bin_vagrant | 11 | ||||
| -rw-r--r-- | sysutils/vagrant/files/patch-gemspec | 17 | ||||
| -rw-r--r-- | sysutils/vagrant/files/patch-vagrant.gemspec | 20 | ||||
| -rw-r--r-- | sysutils/vagrant/pkg-plist | 15 |
6 files changed, 50 insertions, 50 deletions
diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile index 749772fc3bb4..26155cc12a87 100644 --- a/sysutils/vagrant/Makefile +++ b/sysutils/vagrant/Makefile @@ -1,10 +1,10 @@ PORTNAME= vagrant -PORTVERSION= 2.3.7 +PORTVERSION= 2.4.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils rubygems devel -MAINTAINER= joe@thrallingpenguin.com +MAINTAINER= ports@FreeBSD.org COMMENT= Vagrant Virtual Machine Manager WWW= https://www.vagrantup.com/ @@ -17,30 +17,30 @@ BUILD_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ curl:ftp/curl \ rubygem-bcrypt_pbkdf>=1.1:security/rubygem-bcrypt_pbkdf \ - rubygem-childprocess>=5.0:devel/rubygem-childprocess \ + rubygem-childprocess-gitlab>=4.1.0:devel/rubygem-childprocess-gitlab \ rubygem-ed25519>=1.3.0:security/rubygem-ed25519 \ rubygem-erubi>=0:www/rubygem-erubi \ rubygem-googleapis-common-protos-types>=1.3.0:devel/rubygem-googleapis-common-protos-types \ - rubygem-grpc>=1.48.0:net/rubygem-grpc \ + rubygem-grpc-gitlab>=1.56.0:net/rubygem-grpc-gitlab \ rubygem-hashicorp-checkpoint>=0.1.5<0.2:www/rubygem-hashicorp-checkpoint \ - rubygem-i18n>=1.12,2:devel/rubygem-i18n \ + rubygem-i18n>=1.12,2<2,2:devel/rubygem-i18n \ rubygem-ipaddr>=1.2.4:net/rubygem-ipaddr \ - rubygem-listen>=3.7:devel/rubygem-listen \ + rubygem-listen>=3.7<4:devel/rubygem-listen \ rubygem-log4r>=1.1.9<1.1.11:sysutils/rubygem-log4r \ - rubygem-mime-types>=3.3:misc/rubygem-mime-types \ + rubygem-mime-types-gitlab>=3.3:misc/rubygem-mime-types-gitlab \ rubygem-net-ftp>=0.2:ftp/rubygem-net-ftp \ rubygem-net-scp>=4.0.0:security/rubygem-net-scp \ rubygem-net-sftp>=4.0:security/rubygem-net-sftp \ rubygem-net-ssh>=7.0.0:security/rubygem-net-ssh \ - rubygem-rb-kqueue>=0.2.0:devel/rubygem-rb-kqueue \ + rubygem-rb-kqueue>=0.2.0<0.3:devel/rubygem-rb-kqueue \ rubygem-rexml>=3.2:textproc/rubygem-rexml \ rubygem-rgl>=0.5.10:devel/rubygem-rgl \ - rubygem-rubyzip>=2.3.2:archivers/rubygem-rubyzip \ - rubygem-vagrant_cloud>=3.1.1:sysutils/rubygem-vagrant_cloud \ + rubygem-rubyzip-gitlab>=2.3.2:archivers/rubygem-rubyzip-gitlab \ + rubygem-vagrant_cloud-gitlab>=3.1.1<3.2:sysutils/rubygem-vagrant_cloud-gitlab \ rubygem-wdm>=0.1.1:devel/rubygem-wdm \ + rubygem-winrm>=2.3.6<3:sysutils/rubygem-winrm \ rubygem-winrm-elevated>=1.2.3<2:sysutils/rubygem-winrm-elevated \ - rubygem-winrm-fs>=1.3.5<2:filesystems/rubygem-winrm-fs \ - rubygem-winrm>=2.3.6<3:sysutils/rubygem-winrm + rubygem-winrm-fs>=1.3.5<2:filesystems/rubygem-winrm-fs USES= cpe ruby shebangfix CPE_VENDOR= hashicorp @@ -78,6 +78,8 @@ REMOVE_TARGETS= .envrc .runner.sh .vimrc .yardopts flake.lock flake.nix Gemfile REMOVE_TARGETS_EXT= gem_make.out mkmf.log +.include <bsd.port.pre.mk> + post-patch: @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \ ${WRKSRC}/bin/vagrant \ @@ -97,6 +99,7 @@ do-build: ${STAGEDIR}${DATADIR}/embedded/rgloader/loader.rb post-install: + ${FIND} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} -name '*.so' -exec ${STRIP_CMD} {} + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/doc ${RM} -r ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/ext ${RM} -r ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/nix @@ -115,4 +118,4 @@ post-install-ZSH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/share/zsh/site-functions ${RLN} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/contrib/zsh/_vagrant ${STAGEDIR}${PREFIX}/share/share/zsh/site-functions -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/vagrant/distinfo b/sysutils/vagrant/distinfo index a04471420252..7b9639b6ca5d 100644 --- a/sysutils/vagrant/distinfo +++ b/sysutils/vagrant/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693243733 -SHA256 (hashicorp-vagrant-v2.3.7_GH0.tar.gz) = fa8a96319aa7b9ff5f4a991b77cbf37f549549d84737624bcebefa8f2004bf45 -SIZE (hashicorp-vagrant-v2.3.7_GH0.tar.gz) = 3296042 +TIMESTAMP = 1752906954 +SHA256 (hashicorp-vagrant-v2.4.1_GH0.tar.gz) = 19cfa306e3ffae5ddbf30504f61a1a3124aa9a87721b130a14098d4ea1febf89 +SIZE (hashicorp-vagrant-v2.4.1_GH0.tar.gz) = 3342333 diff --git a/sysutils/vagrant/files/patch-bin_vagrant b/sysutils/vagrant/files/patch-bin_vagrant index 83ac905135c8..7102a3a53c49 100644 --- a/sysutils/vagrant/files/patch-bin_vagrant +++ b/sysutils/vagrant/files/patch-bin_vagrant @@ -10,14 +10,3 @@ # 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/files/patch-gemspec b/sysutils/vagrant/files/patch-gemspec new file mode 100644 index 000000000000..531ad29f232a --- /dev/null +++ b/sysutils/vagrant/files/patch-gemspec @@ -0,0 +1,17 @@ +--- vagrant.gemspec.orig 2024-01-19 20:59:12 UTC ++++ vagrant.gemspec +@@ -16,11 +16,11 @@ Gem::Specification.new do |s| + s.required_rubygems_version = ">= 1.3.6" + + s.add_dependency "bcrypt_pbkdf", "~> 1.1" +- s.add_dependency "childprocess", "~> 4.1.0" +- s.add_dependency "ed25519", "~> 1.3.0" ++ s.add_dependency "childprocess", ">= 4.1.0" ++ s.add_dependency "ed25519", ">= 1.3.0" + s.add_dependency "erubi" + s.add_dependency 'googleapis-common-protos-types', '~> 1.3' +- s.add_dependency "grpc", "~> 1.56.0" ++ s.add_dependency "grpc", ">= 1.56.0" + s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" + s.add_dependency "i18n", "~> 1.12" + s.add_dependency "listen", "~> 3.7" diff --git a/sysutils/vagrant/files/patch-vagrant.gemspec b/sysutils/vagrant/files/patch-vagrant.gemspec deleted file mode 100644 index b662791a630b..000000000000 --- a/sysutils/vagrant/files/patch-vagrant.gemspec +++ /dev/null @@ -1,20 +0,0 @@ ---- vagrant.gemspec.orig 2023-06-15 20:40:35 UTC -+++ vagrant.gemspec -@@ -16,7 +16,7 @@ Gem::Specification.new do |s| - s.required_rubygems_version = ">= 1.3.6" - - s.add_dependency "bcrypt_pbkdf", "~> 1.1" -- s.add_dependency "childprocess", "~> 4.1.0" -+ s.add_dependency "childprocess", "~> 5.0.0" - s.add_dependency "ed25519", "~> 1.3.0" - s.add_dependency "erubi" - s.add_dependency 'googleapis-common-protos-types', '~> 1.3' -@@ -34,7 +34,7 @@ Gem::Specification.new do |s| - s.add_dependency "rexml", "~> 3.2" - s.add_dependency "rgl", "~> 0.5.10" - s.add_dependency "rubyzip", "~> 2.3.2" -- s.add_dependency "vagrant_cloud", "~> 3.0.5" -+ s.add_dependency "vagrant_cloud", "~> 3.1.1" - s.add_dependency "wdm", "~> 0.1.1" - s.add_dependency "winrm", ">= 2.3.6", "< 3.0" - s.add_dependency "winrm-elevated", ">= 1.2.3", "< 2.0" diff --git a/sysutils/vagrant/pkg-plist b/sysutils/vagrant/pkg-plist index f444b811c074..c2600f43d113 100644 --- a/sysutils/vagrant/pkg-plist +++ b/sysutils/vagrant/pkg-plist @@ -1,5 +1,6 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/CHANGELOG.md +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/.copywrite.hcl %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/LICENSE %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/README.md %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/RELEASE.md @@ -18,9 +19,12 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/contrib/zsh/generate_zsh_completion.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/README.md %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.key.ed25519 +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.key.rsa %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.pub +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.pub.ed25519 +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.pub.rsa %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant.rb -%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant_ssl.so %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builder.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/box_add.rb @@ -174,6 +178,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/uploader.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/which.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/windows_path.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/vagrant_ssl.so %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/vagrantfile.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/version.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/README.md @@ -1045,6 +1050,9 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/suse/network_dhcp.erb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/suse/network_static.erb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/suse/network_static6.erb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/license/license.html.tmpl +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/license/license.rtf.tmpl +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/license/license.tmpl %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/locales/comm_winrm.yml %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/locales/command_ps.yml %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/locales/command_rdp.yml @@ -1076,8 +1084,11 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/host/remote.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/machine/remote.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/machine_index/remote.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/builder/mkmf.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/fake_ftp.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/log4r.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/net-ssh.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/rubygems.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/plugin/remote.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/plugin/remote/command.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/plugin/remote/communicator.rb @@ -1217,7 +1228,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alma/plugin.rb %%GEMS_DIR%%/cache/vagrant-%%PORTVERSION%%.gem %%GEMS_DIR%%/extensions/%%BUILD_TARGET%%/%%RUBY_VER%%/vagrant-%%PORTVERSION%%/gem.build_complete -%%GEMS_DIR%%/extensions/%%BUILD_TARGET%%/%%RUBY_VER%%/vagrant-%%PORTVERSION%%/vagrant_ssl.so +%%GEMS_DIR%%/extensions/%%BUILD_TARGET%%/%%RUBY_VER%%/vagrant-%%PORTVERSION%%/vagrant/vagrant_ssl.so %%GEMS_DIR%%/specifications/vagrant-%%PORTVERSION%%.gemspec %%DATADIR%%/embedded/rgloader/loader.rb @dir %%GEMS_DIR%%/extensions |