diff --git a/0011-remove-ssl-extension.patch b/0011-remove-ssl-extension.patch new file mode 100644 index 0000000..42ea285 --- /dev/null +++ b/0011-remove-ssl-extension.patch @@ -0,0 +1,37 @@ +--- a/Rakefile 2023-06-15 22:40:35.000000000 +0200 ++++ b/Rakefile 2023-06-18 13:28:25.379062875 +0200 +@@ -1,16 +1,11 @@ + require 'rubygems' + require 'bundler/setup' +-require "rake/extensiontask" + + # Immediately sync all stdout so that tools like buildbot can + # immediately load in the output. + $stdout.sync = true + $stderr.sync = true + +-Rake::ExtensionTask.new "vagrant_ssl" do |ext| +- ext.lib_dir = "lib/vagrant" +-end +- + # Load all the rake tasks from the "tasks" folder. This folder + # allows us to nicely separate rake tasks into individual files + # based on their role, which makes development and debugging easier +diff '--color=auto' -ru a/vagrant.gemspec b/vagrant.gemspec +--- a/vagrant.gemspec 2023-06-15 22:40:35.000000000 +0200 ++++ b/vagrant.gemspec 2023-06-18 13:18:26.678462256 +0200 +@@ -49,7 +49,6 @@ + # Constraint rake to properly handle deprecated method usage + # from within rspec + s.add_development_dependency "rake", "~> 13.0" +- s.add_development_dependency "rake-compiler" + s.add_development_dependency "rspec", "~> 3.11" + s.add_development_dependency "rspec-its", "~> 1.3.0" + s.add_development_dependency "fake_ftp", "~> 0.3.0" +@@ -105,6 +104,5 @@ + + s.files = unignored_files + s.executables = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact +- s.extensions = ["ext/vagrant_ssl/extconf.rb"] + s.require_path = 'lib' + end diff --git a/vagrant-2.3.6.tar.gz b/vagrant-2.3.6.tar.gz deleted file mode 100644 index e107e5e..0000000 --- a/vagrant-2.3.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f9780b32d979e7cf4565a56fa6dc40b3c9b1b73e4cae9931b1d4a706d0d4d9e -size 3292039 diff --git a/vagrant-2.3.7.tar.gz b/vagrant-2.3.7.tar.gz new file mode 100644 index 0000000..78fd064 --- /dev/null +++ b/vagrant-2.3.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa8a96319aa7b9ff5f4a991b77cbf37f549549d84737624bcebefa8f2004bf45 +size 3296042 diff --git a/vagrant.changes b/vagrant.changes index b3de6c2..e4275e6 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Jun 18 10:48:43 UTC 2023 - Georg Pfuetzenreuter + +- Update to 2.3.7 + * https://github.com/hashicorp/vagrant/blob/v2.3.7/CHANGELOG.md#237-june-15-2023 + + IMPROVEMENTS: + - command/ssh: Enable deprecated key types and algorithms [GH-13179] + - core: Update user error message on failed extension installs [GH-13207] + - core: Support loading legacy providers in OpenSSL 3 [GH-13178] + - provisioner/salt: Verify bootstrap-salt download [GH-13166] + + BUG FIXES: + - communicator/ssh: Remove keyboard-interactive auth method [GH-13194] + - provisioner/salt: Fix usage on Windows guests [GH-13086] + + VAGRANT-GO: + - Update data layer implementation [GH-12904] + - Update dependencies [GH-13201] + +- add 0011-remove-ssl-extension.patch to remove the vagrant ssl extension + ------------------------------------------------------------------- Tue May 30 07:53:25 UTC 2023 - Илья Индиго diff --git a/vagrant.spec b/vagrant.spec index 5c08bbb..1aa50a1 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -25,7 +25,7 @@ Name: vagrant -Version: 2.3.6 +Version: 2.3.7 Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT @@ -57,6 +57,7 @@ Patch7: 0007-Don-t-abuse-relative-paths-in-plugins.patch Patch8: 0008-Skip-failing-tests.patch Patch9: 0009-Disable-Subprocess-unit-test.patch Patch10: 0010-Remove-dependency-on-grpc-tools.patch +Patch11: 0011-remove-ssl-extension.patch # force only one ruby version # CAUTION: if you change this, then you *must* also change the sed calls which @@ -388,6 +389,9 @@ rm -rf %{buildroot}%{vagrant_dir}/{.runner.sh,Dockerfile,Makefile,go.mod,go.sum, # we use our own binstub rm -rf %{buildroot}%{vagrant_dir}/binstubs/ +# some compatibility helper for winrm which we do not use (https://github.com/hashicorp/vagrant/pull/13178) +rm -r %{buildroot}%{vagrant_dir}/ext/vagrant_ssl + %fdupes %{buildroot}%{dirname:%vagrant_plugin_dir} %check