diff --git a/0001-bin-vagrant-silence-warning-about-installer.patch b/0001-bin-vagrant-silence-warning-about-installer.patch index 3227955..e02fab0 100644 --- a/0001-bin-vagrant-silence-warning-about-installer.patch +++ b/0001-bin-vagrant-silence-warning-about-installer.patch @@ -1,7 +1,7 @@ From 3559bd65aa796772e31abbeb4bd92e0829ed5e99 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH 01/10] bin/vagrant: silence warning about installer +Subject: [PATCH 01/11] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl --- @@ -36,5 +36,5 @@ index ba7e40076..8272e839e 100755 # # Unset - Disables experimental features -- -2.29.2 +2.30.0 diff --git a/0002-Use-a-private-temporary-dir.patch b/0002-Use-a-private-temporary-dir.patch index a485e47..8a224c5 100644 --- a/0002-Use-a-private-temporary-dir.patch +++ b/0002-Use-a-private-temporary-dir.patch @@ -1,7 +1,7 @@ From b2c6ef61dc339eae73640c357e6be6e1f8cf723a Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH 02/10] Use a private temporary dir +Subject: [PATCH 02/11] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). @@ -94,5 +94,5 @@ index 000000000..0cbbb53ac + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.29.2 +2.30.0 diff --git a/0003-plugins-don-t-abuse-require_relative.patch.patch b/0003-plugins-don-t-abuse-require_relative.patch.patch index 2f8b57b..5fd9c45 100644 --- a/0003-plugins-don-t-abuse-require_relative.patch.patch +++ b/0003-plugins-don-t-abuse-require_relative.patch.patch @@ -1,7 +1,7 @@ From 402f323f982ea36af2db24ac62ec527ff6530515 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 03/10] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 03/11] plugins-don-t-abuse-require_relative.patch Signed-off-by: Johannes Kastl --- @@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644 module VagrantPlugins module GuestSUSE -- -2.29.2 +2.30.0 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 efa9ed4..188f321 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 @@ -1,7 +1,7 @@ From cb36ee51bb914627bda93641135721ee88b640a4 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 04/10] fix vbox package boo#1044087, added by +Subject: [PATCH 04/11] fix vbox package boo#1044087, added by robert.munteanu@gmail.com on Sun Aug 13 19:07:06 UTC 2017 Signed-off-by: Johannes Kastl @@ -33,5 +33,5 @@ index a0baf516f..867fe2bf8 100644 module VagrantPlugins module ProviderVirtualBox -- -2.29.2 +2.30.0 diff --git a/0005-do-not-depend-on-wdm.patch b/0005-do-not-depend-on-wdm.patch index d04bd51..c22b382 100644 --- a/0005-do-not-depend-on-wdm.patch +++ b/0005-do-not-depend-on-wdm.patch @@ -1,7 +1,7 @@ From b65df008243ff8016b0e5714da53b5fb221e5961 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 05/10] do not depend on wdm +Subject: [PATCH 05/11] do not depend on wdm Signed-off-by: Johannes Kastl --- @@ -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.29.2 +2.30.0 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 572dd8c..0095575 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 @@ -1,7 +1,7 @@ From 4f32f38bb823405a3e3fcd54ebf878ad7c2ff78d Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 06/10] do not abuse relative paths in docker plugin to make +Subject: [PATCH 06/11] do not abuse relative paths in docker plugin to make docker work, added by tmkn@tmkn.uk on Thu Oct 26 19:42:46 UTC 2017 Signed-off-by: Johannes Kastl @@ -22,5 +22,5 @@ index 07c4e5333..e8142df8b 100644 module VagrantPlugins module DockerProvider -- -2.29.2 +2.30.0 diff --git a/0007-Don-t-abuse-relative-paths-in-plugins.patch b/0007-Don-t-abuse-relative-paths-in-plugins.patch index 51d6c15..282a9cb 100644 --- a/0007-Don-t-abuse-relative-paths-in-plugins.patch +++ b/0007-Don-t-abuse-relative-paths-in-plugins.patch @@ -1,7 +1,7 @@ From 555f29e1367c56ad4aa17447a5108a7f3be1b91d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 11 Jan 2019 12:32:28 +0100 -Subject: [PATCH 07/10] Don't abuse relative paths in plugins +Subject: [PATCH 07/11] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -64,5 +64,5 @@ index 7bc8ceca0..e938305e7 100644 require_relative "../installer" -- -2.29.2 +2.30.0 diff --git a/0008-Skip-failing-tests.patch b/0008-Skip-failing-tests.patch index 9bb036e..e62ef97 100644 --- a/0008-Skip-failing-tests.patch +++ b/0008-Skip-failing-tests.patch @@ -1,7 +1,7 @@ From 5f9ae130821abc783b793fc222c471cebadf1891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 1 Apr 2019 17:28:31 +0200 -Subject: [PATCH 08/10] Skip failing tests +Subject: [PATCH 08/11] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- @@ -30,5 +30,5 @@ index bc11309aa..4d329151a 100644 end end -- -2.29.2 +2.30.0 diff --git a/0009-Disable-Subprocess-unit-test.patch b/0009-Disable-Subprocess-unit-test.patch index 84e1be1..1828f09 100644 --- a/0009-Disable-Subprocess-unit-test.patch +++ b/0009-Disable-Subprocess-unit-test.patch @@ -1,7 +1,7 @@ From 5e3f0edc8a1bc1db2355c424684a3fcd7f654e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 28 Aug 2019 13:39:58 +0200 -Subject: [PATCH 09/10] Disable Subprocess unit test +Subject: [PATCH 09/11] Disable Subprocess unit test This unit test is *very* flaky on OBS' workers and causes random build failures. These are probably caused by worker being under high load and then @@ -33,5 +33,5 @@ index 0ff5835c8..757d8ef8a 100644 thread = Thread.new{ sp.execute } sleep(0.1) -- -2.29.2 +2.30.0 diff --git a/0010-Update-rake-to-13.0.patch b/0010-Update-rake-to-13.0.patch index aab8e4f..c2f5892 100644 --- a/0010-Update-rake-to-13.0.patch +++ b/0010-Update-rake-to-13.0.patch @@ -1,7 +1,7 @@ From 25b740d34eac7a430f248711ac6b97caadeecac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 4 Dec 2020 14:54:50 +0100 -Subject: [PATCH 10/10] Update rake to ~> 13.0 +Subject: [PATCH 10/11] Update rake to ~> 13.0 (cherry picked from commit 1916f69425f8a0f86e3d7249a25a116c5cf2a771) --- @@ -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.29.2 +2.30.0 diff --git a/0011-Remove-not-required-bcrypt_pbkdf-gem.patch b/0011-Remove-not-required-bcrypt_pbkdf-gem.patch new file mode 100644 index 0000000..195f8bc --- /dev/null +++ b/0011-Remove-not-required-bcrypt_pbkdf-gem.patch @@ -0,0 +1,27 @@ +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/11] 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/vagrant.changes b/vagrant.changes index 0510da9..959c9f9 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jan 22 09:55:23 UTC 2021 - Dan Čermák + +- Remove not required bcrypt_pbkdf gem + + Add patch: + * 0011-Remove-not-required-bcrypt_pbkdf-gem.patch + + 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 + ------------------------------------------------------------------- Fri Dec 11 10:01:47 UTC 2020 - Dan Čermák diff --git a/vagrant.spec b/vagrant.spec index 9b3d9c5..a5ffb01 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -59,6 +59,8 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -87,8 +89,6 @@ BuildRequires: %{ruby:2 >= 2.5} # # BuildRequires: %{rubygem bundler} -# s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" -BuildRequires: %{rubygem bcrypt_pbkdf:1.0 } # s.add_dependency "childprocess", "~> 4.0.0" BuildRequires: %{rubygem childprocess:4.0 } # s.add_dependency "ed25519", "~> 1.2.4" @@ -178,8 +178,6 @@ BuildRequires: fdupes # # -# s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" -Requires: %{rubygem bcrypt_pbkdf:1.0 } # s.add_dependency "childprocess", "~> 4.0.0" Requires: %{rubygem childprocess:4.0} # s.add_dependency "ed25519", "~> 1.2.4"