From a9ba8d81d65307136f24e657058d4e1a93b37292c5124347056a05935f0ae9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 1 Mar 2021 18:49:42 +0000 Subject: [PATCH] Accepting request 875964 from home:dancermak:branches:Virtualization:vagrant Fix removed dependency on bcrypt_pbkdf OBS-URL: https://build.opensuse.org/request/show/875964 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=53 --- ...rant-silence-warning-about-installer.patch | 2 +- 0002-Use-a-private-temporary-dir.patch | 2 +- ...s-don-t-abuse-require_relative.patch.patch | 2 +- ...-boo-1044087-added-by-robert.muntean.patch | 2 +- 0005-do-not-depend-on-wdm.patch | 2 +- ...ative-paths-in-docker-plugin-to-make.patch | 2 +- ...on-t-abuse-relative-paths-in-plugins.patch | 2 +- 0008-Skip-failing-tests.patch | 2 +- 0009-Disable-Subprocess-unit-test.patch | 2 +- 0010-Update-rake-to-13.0.patch | 2 +- ...sten-gem-version-and-remove-ruby_dep.patch | 12 ++++---- ...Remove-not-required-bcrypt_pbkdf-gem.patch | 27 ----------------- 0012-Bump-bcrypt_pbkdf-version.patch | 30 +++++++++++++++++++ vagrant.changes | 25 ++++++++++++++++ vagrant.spec | 16 ++++++---- 15 files changed, 81 insertions(+), 49 deletions(-) rename 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch => 0011-Bump-listen-gem-version-and-remove-ruby_dep.patch (84%) delete mode 100644 0011-Remove-not-required-bcrypt_pbkdf-gem.patch create mode 100644 0012-Bump-bcrypt_pbkdf-version.patch diff --git a/0001-bin-vagrant-silence-warning-about-installer.patch b/0001-bin-vagrant-silence-warning-about-installer.patch index 8d99eb9..469aeb8 100644 --- a/0001-bin-vagrant-silence-warning-about-installer.patch +++ b/0001-bin-vagrant-silence-warning-about-installer.patch @@ -36,5 +36,5 @@ index ba7e40076..8272e839e 100755 # # Unset - Disables experimental features -- -2.30.0 +2.30.1 diff --git a/0002-Use-a-private-temporary-dir.patch b/0002-Use-a-private-temporary-dir.patch index 43da130..5ec1cf9 100644 --- a/0002-Use-a-private-temporary-dir.patch +++ b/0002-Use-a-private-temporary-dir.patch @@ -94,5 +94,5 @@ index 000000000..0cbbb53ac + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.30.0 +2.30.1 diff --git a/0003-plugins-don-t-abuse-require_relative.patch.patch b/0003-plugins-don-t-abuse-require_relative.patch.patch index 80b6e82..65116ab 100644 --- a/0003-plugins-don-t-abuse-require_relative.patch.patch +++ b/0003-plugins-don-t-abuse-require_relative.patch.patch @@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644 module VagrantPlugins module GuestSUSE -- -2.30.0 +2.30.1 diff --git a/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch b/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch index f3ece24..b111d4b 100644 --- a/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch +++ b/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch @@ -33,5 +33,5 @@ index a0baf516f..867fe2bf8 100644 module VagrantPlugins module ProviderVirtualBox -- -2.30.0 +2.30.1 diff --git a/0005-do-not-depend-on-wdm.patch b/0005-do-not-depend-on-wdm.patch index 053a7ed..4ef3060 100644 --- a/0005-do-not-depend-on-wdm.patch +++ b/0005-do-not-depend-on-wdm.patch @@ -21,5 +21,5 @@ index a452e2b7a..6a586fd7c 100644 s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0" -- -2.30.0 +2.30.1 diff --git a/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch b/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch index 6ac8997..4d770b1 100644 --- a/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch +++ b/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch @@ -22,5 +22,5 @@ index 07c4e5333..e8142df8b 100644 module VagrantPlugins module DockerProvider -- -2.30.0 +2.30.1 diff --git a/0007-Don-t-abuse-relative-paths-in-plugins.patch b/0007-Don-t-abuse-relative-paths-in-plugins.patch index 2f5b751..049b868 100644 --- a/0007-Don-t-abuse-relative-paths-in-plugins.patch +++ b/0007-Don-t-abuse-relative-paths-in-plugins.patch @@ -64,5 +64,5 @@ index 7bc8ceca0..e938305e7 100644 require_relative "../installer" -- -2.30.0 +2.30.1 diff --git a/0008-Skip-failing-tests.patch b/0008-Skip-failing-tests.patch index 29745f9..8137f37 100644 --- a/0008-Skip-failing-tests.patch +++ b/0008-Skip-failing-tests.patch @@ -30,5 +30,5 @@ index bc11309aa..4d329151a 100644 end end -- -2.30.0 +2.30.1 diff --git a/0009-Disable-Subprocess-unit-test.patch b/0009-Disable-Subprocess-unit-test.patch index e5e5cc2..78ec582 100644 --- a/0009-Disable-Subprocess-unit-test.patch +++ b/0009-Disable-Subprocess-unit-test.patch @@ -33,5 +33,5 @@ index 0ff5835c8..757d8ef8a 100644 thread = Thread.new{ sp.execute } sleep(0.1) -- -2.30.0 +2.30.1 diff --git a/0010-Update-rake-to-13.0.patch b/0010-Update-rake-to-13.0.patch index 87b7854..5fefc43 100644 --- a/0010-Update-rake-to-13.0.patch +++ b/0010-Update-rake-to-13.0.patch @@ -22,5 +22,5 @@ index 6a586fd7c..3030a63e6 100644 s.add_development_dependency "rspec-its", "~> 1.3.0" s.add_development_dependency "webmock", "~> 2.3.1" -- -2.30.0 +2.30.1 diff --git a/0012-Bump-listen-gem-version-and-remove-ruby_dep.patch b/0011-Bump-listen-gem-version-and-remove-ruby_dep.patch similarity index 84% rename from 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch rename to 0011-Bump-listen-gem-version-and-remove-ruby_dep.patch index b6c3c21..e19cf2b 100644 --- a/0012-Bump-listen-gem-version-and-remove-ruby_dep.patch +++ b/0011-Bump-listen-gem-version-and-remove-ruby_dep.patch @@ -1,7 +1,7 @@ -From b249aefa283644b029adf807907023af5794f595 Mon Sep 17 00:00:00 2001 +From 8fb7b9348ee4728f3f236032f75a54290ed87d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 22 Jan 2021 12:36:25 +0100 -Subject: [PATCH 12/12] Bump listen gem version and remove ruby_dep +Subject: [PATCH 11/12] Bump listen gem version and remove ruby_dep listen no longer depends on ruby_dep and thus this pointlessly drags in another dependency. @@ -12,10 +12,10 @@ dependency. 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index 225283771..465bffaff 100644 +index 3030a63e6..edcdda02f 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec -@@ -20,7 +20,7 @@ Gem::Specification.new do |s| +@@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "erubi" s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" s.add_dependency "i18n", "~> 1.8" @@ -24,7 +24,7 @@ index 225283771..465bffaff 100644 s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" s.add_dependency "mime-types", "~> 3.3" s.add_dependency "net-ssh", ">= 6.2.0.rc1", "< 7" -@@ -33,12 +33,6 @@ Gem::Specification.new do |s| +@@ -34,12 +34,6 @@ Gem::Specification.new do |s| s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0" @@ -38,5 +38,5 @@ index 225283771..465bffaff 100644 # from within rspec s.add_development_dependency "rake", "~> 13.0" -- -2.30.0 +2.30.1 diff --git a/0011-Remove-not-required-bcrypt_pbkdf-gem.patch b/0011-Remove-not-required-bcrypt_pbkdf-gem.patch deleted file mode 100644 index b0bb062..0000000 --- a/0011-Remove-not-required-bcrypt_pbkdf-gem.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c87044b9007fa5f6331206b5edd9f7b6bfde4cef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Fri, 22 Jan 2021 09:35:47 +0100 -Subject: [PATCH 11/12] Remove not required bcrypt_pbkdf gem - -This gem is no longer required by vagrant and was forgotten to get removed. - -(cherry picked from commit c9ecc9041a910f192c4498dee045c96e3b8bb6a7) ---- - vagrant.gemspec | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index 3030a63e6..225283771 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -15,7 +15,6 @@ Gem::Specification.new do |s| - s.required_ruby_version = "~> 2.5", "< 2.8" - s.required_rubygems_version = ">= 1.3.6" - -- s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" - s.add_dependency "childprocess", "~> 4.0.0" - s.add_dependency "ed25519", "~> 1.2.4" - s.add_dependency "erubi" --- -2.30.0 - diff --git a/0012-Bump-bcrypt_pbkdf-version.patch b/0012-Bump-bcrypt_pbkdf-version.patch new file mode 100644 index 0000000..6a8bd64 --- /dev/null +++ b/0012-Bump-bcrypt_pbkdf-version.patch @@ -0,0 +1,30 @@ +From b0bb600f7641078b6e748e67a9bd7c7a1accaa50 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Mon, 1 Mar 2021 08:33:59 +0100 +Subject: [PATCH 12/12] Bump bcrypt_pbkdf version + +There were no functional changes between 1.0.0 and 1.1.0: +https://github.com/net-ssh/bcrypt_pbkdf-ruby/compare/b5d1a921fcec8daa368236f5b4c469e08200fd5c...v1.1.0 +so this update should be safe + +(cherry picked from commit d996166098a22ab0212d31592a6e97fb50ea8a5e) +--- + vagrant.gemspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index edcdda02f..7c554d4fb 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -15,7 +15,7 @@ Gem::Specification.new do |s| + s.required_ruby_version = "~> 2.5", "< 2.8" + s.required_rubygems_version = ">= 1.3.6" + +- s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" ++ s.add_dependency "bcrypt_pbkdf", "~> 1.1" + s.add_dependency "childprocess", "~> 4.0.0" + s.add_dependency "ed25519", "~> 1.2.4" + s.add_dependency "erubi" +-- +2.30.1 + diff --git a/vagrant.changes b/vagrant.changes index 4edf63e..08ca8d3 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Mar 1 10:21:49 UTC 2021 - Dan Čermák + +- Fix removed dependency on bcrypt_pbkdf + + Rebase patches: + * 0001-bin-vagrant-silence-warning-about-installer.patch + * 0002-Use-a-private-temporary-dir.patch + * 0003-plugins-don-t-abuse-require_relative.patch.patch + * 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + * 0005-do-not-depend-on-wdm.patch + * 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + * 0007-Don-t-abuse-relative-paths-in-plugins.patch + * 0008-Skip-failing-tests.patch + * 0009-Disable-Subprocess-unit-test.patch + * 0010-Update-rake-to-13.0.patch + * 0011-Bump-listen-gem-version-and-remove-ruby_dep.patch (was + 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch) + + Added patch: + * 0012-Bump-bcrypt_pbkdf-version.patch + + Removed patch: + * 0011-Remove-not-required-bcrypt_pbkdf-gem.patch + ------------------------------------------------------------------- Fri Jan 29 15:35:11 UTC 2021 - Dan Čermák diff --git a/vagrant.spec b/vagrant.spec index 35408fe..5bcc492 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -1,7 +1,7 @@ # # spec file for package vagrant # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Laurent Bigonville , License GPL-2.0+ # @@ -59,10 +59,10 @@ Patch8: 0008-Skip-failing-tests.patch Patch9: 0009-Disable-Subprocess-unit-test.patch # https://github.com/hashicorp/vagrant/pull/12097 Patch10: 0010-Update-rake-to-13.0.patch -# https://github.com/hashicorp/vagrant/pull/12147 -Patch11: 0011-Remove-not-required-bcrypt_pbkdf-gem.patch # https://github.com/hashicorp/vagrant/pull/12148 -Patch12: 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch +Patch11: 0011-Bump-listen-gem-version-and-remove-ruby_dep.patch +# https://github.com/hashicorp/vagrant/pull/12216 +Patch12: 0012-Bump-bcrypt_pbkdf-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,6 +91,9 @@ BuildRequires: %{ruby:2 >= 2.5} # # BuildRequires: %{rubygem bundler} +# PATCHED +# s.add_dependency "bcrypt_pbkdf", "~> 1.1" +BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } # s.add_dependency "childprocess", "~> 4.0.0" BuildRequires: %{rubygem childprocess:4.0 } # s.add_dependency "ed25519", "~> 1.2.4" @@ -177,8 +180,9 @@ BuildRequires: fdupes # Runtime dependencies #=============================================================================== -# -# +# PATCHED +# s.add_dependency "bcrypt_pbkdf", "~> 1.1" +Requires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } # s.add_dependency "childprocess", "~> 4.0.0" Requires: %{rubygem childprocess:4.0} # s.add_dependency "ed25519", "~> 1.2.4"