From 1a3435b908cc3bfade373a54df8fbf30eb2396b2b89e1201e989080c33744004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 5 Feb 2020 16:37:59 +0000 Subject: [PATCH] Accepting request 770161 from home:dancermak:branches:Virtualization:vagrant Bump the version of i18n, rubyzip and net-ssh OBS-URL: https://build.opensuse.org/request/show/770161 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=40 --- ...rant-silence-warning-about-installer.patch | 2 +- 0002-Use-a-private-temporary-dir.patch | 2 +- ...on-t-wait-for-shutdown-h-now-to-fini.patch | 2 +- ...s-don-t-abuse-require_relative.patch.patch | 2 +- ...-boo-1044087-added-by-robert.muntean.patch | 2 +- 0006-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 +- ...x-unit-tests-for-GuestLinux-Cap-Halt.patch | 2 +- 0010-Skip-failing-tests.patch | 2 +- ...-dependencies-if-vagrant-spec-is-not.patch | 2 +- 0012-Disable-Subprocess-unit-test.patch | 2 +- 0013-Update-some-outdated-gem-versions.patch | 36 +++++++++++++++++++ vagrant.changes | 22 ++++++++++++ vagrant.spec | 32 ++++++++++------- 15 files changed, 90 insertions(+), 24 deletions(-) create mode 100644 0013-Update-some-outdated-gem-versions.patch diff --git a/0001-bin-vagrant-silence-warning-about-installer.patch b/0001-bin-vagrant-silence-warning-about-installer.patch index 9ecbf5c..f1b7277 100644 --- a/0001-bin-vagrant-silence-warning-about-installer.patch +++ b/0001-bin-vagrant-silence-warning-about-installer.patch @@ -1,7 +1,7 @@ From 2aceecad34427d322bb011e5964a3c7d5818c3ae Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH 01/12] bin/vagrant: silence warning about installer +Subject: [PATCH 01/13] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl --- diff --git a/0002-Use-a-private-temporary-dir.patch b/0002-Use-a-private-temporary-dir.patch index 78613a7..abc9aad 100644 --- a/0002-Use-a-private-temporary-dir.patch +++ b/0002-Use-a-private-temporary-dir.patch @@ -1,7 +1,7 @@ From 3f9506dee9cfe960b593ba9d28786fe3b5164643 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH 02/12] Use a private temporary dir +Subject: [PATCH 02/13] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). diff --git a/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch b/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch index 352e608..ac35cb0 100644 --- a/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch +++ b/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch @@ -1,7 +1,7 @@ From 86b44992811600404c8d967a6e74910396ff874e Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 3 Feb 2015 10:35:17 -0200 -Subject: [PATCH 03/12] linux/cap/halt: don't wait for `shutdown -h now` to +Subject: [PATCH 03/13] linux/cap/halt: don't wait for `shutdown -h now` to finish When running a Debian 8 lxc guest (with the vagrant-lxc plugin), which diff --git a/0004-plugins-don-t-abuse-require_relative.patch.patch b/0004-plugins-don-t-abuse-require_relative.patch.patch index 90bddab..a9bc7fd 100644 --- a/0004-plugins-don-t-abuse-require_relative.patch.patch +++ b/0004-plugins-don-t-abuse-require_relative.patch.patch @@ -1,7 +1,7 @@ From e589e6be6b7697717fcae15428e443b9be0fd629 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 04/12] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 04/13] plugins-don-t-abuse-require_relative.patch Signed-off-by: Johannes Kastl --- diff --git a/0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch b/0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch index dc2c43d..1e83710 100644 --- a/0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch +++ b/0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch @@ -1,7 +1,7 @@ From d6b0b98c0eabc78da7c97839630235fa9ed32075 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 05/12] fix vbox package boo#1044087, added by +Subject: [PATCH 05/13] 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 diff --git a/0006-do-not-depend-on-wdm.patch b/0006-do-not-depend-on-wdm.patch index ebfe878..f6885ef 100644 --- a/0006-do-not-depend-on-wdm.patch +++ b/0006-do-not-depend-on-wdm.patch @@ -1,7 +1,7 @@ From 486c955ffe349c52ab5a4cfd831b09df83de88bf Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 06/12] do not depend on wdm +Subject: [PATCH 06/13] do not depend on wdm Signed-off-by: Johannes Kastl --- diff --git a/0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch b/0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch index 8aefce0..828f7c7 100644 --- a/0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch +++ b/0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch @@ -1,7 +1,7 @@ From e4c16b7f40c37f08f431f84ac8f6994e5dfbd771 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 07/12] do not abuse relative paths in docker plugin to make +Subject: [PATCH 07/13] 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 diff --git a/0008-Don-t-abuse-relative-paths-in-plugins.patch b/0008-Don-t-abuse-relative-paths-in-plugins.patch index 29e3884..a6a3b6b 100644 --- a/0008-Don-t-abuse-relative-paths-in-plugins.patch +++ b/0008-Don-t-abuse-relative-paths-in-plugins.patch @@ -1,7 +1,7 @@ From 977541aad0f8711d080938c491f3567819c02ab2 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 08/12] Don't abuse relative paths in plugins +Subject: [PATCH 08/13] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch b/0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch index ea06d8f..d89f795 100644 --- a/0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch +++ b/0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch @@ -1,7 +1,7 @@ From c388ca93ac0254cb2e635558e90e57a9cd93cb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 14 Mar 2019 00:25:05 +0100 -Subject: [PATCH 09/12] Fix unit tests for GuestLinux::Cap::Halt +Subject: [PATCH 09/13] Fix unit tests for GuestLinux::Cap::Halt This test fails since we patch `shutdown -h now` to be `shutdown -h now &` instead. diff --git a/0010-Skip-failing-tests.patch b/0010-Skip-failing-tests.patch index e1cf9dc..7e064e8 100644 --- a/0010-Skip-failing-tests.patch +++ b/0010-Skip-failing-tests.patch @@ -1,7 +1,7 @@ From af5720555a656230e30333d592c84de50737a2bc 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 10/12] Skip failing tests +Subject: [PATCH 10/13] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- diff --git a/0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch b/0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch index 53a346a..f38f92d 100644 --- a/0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch +++ b/0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch @@ -1,7 +1,7 @@ From d8a6e1573ee0b845b851c760ceced71f250e9576 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 1 Jul 2019 17:44:54 +0200 -Subject: [PATCH 11/12] Do not list / load dependencies if `vagrant` spec is +Subject: [PATCH 11/13] Do not list / load dependencies if `vagrant` spec is not loaded in `vagrant_internal_specs` as this fails, due to `find` returning `nil`. diff --git a/0012-Disable-Subprocess-unit-test.patch b/0012-Disable-Subprocess-unit-test.patch index c339865..368f465 100644 --- a/0012-Disable-Subprocess-unit-test.patch +++ b/0012-Disable-Subprocess-unit-test.patch @@ -1,7 +1,7 @@ From 5625949476713ea00facfc87f8ce4c42e751f216 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 12/12] Disable Subprocess unit test +Subject: [PATCH 12/13] 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 diff --git a/0013-Update-some-outdated-gem-versions.patch b/0013-Update-some-outdated-gem-versions.patch new file mode 100644 index 0000000..b46a8cd --- /dev/null +++ b/0013-Update-some-outdated-gem-versions.patch @@ -0,0 +1,36 @@ +From 5d9ef14f8e93ec7c6af8372805d92fc69182099e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Mon, 27 Jan 2020 15:01:16 +0100 +Subject: [PATCH 13/13] Update some outdated gem versions + +--- + vagrant.gemspec | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index fb2925da5..c76951d10 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -19,16 +19,16 @@ Gem::Specification.new do |s| + s.add_dependency "childprocess", "~> 0.6.0" + s.add_dependency "ed25519", "~> 1.2.4" + s.add_dependency "erubis", "~> 2.7.0" +- s.add_dependency "i18n", "~> 1.1" ++ s.add_dependency "i18n", "~> 1.8" + s.add_dependency "listen", "~> 3.1.5" + s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" + s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" +- s.add_dependency "net-ssh", "~> 5.1.0" ++ s.add_dependency "net-ssh", "~> 5.2.0" + s.add_dependency "net-sftp", "~> 2.1" + s.add_dependency "net-scp", "~> 1.2.0" + s.add_dependency "rb-kqueue", "~> 0.2.0" + s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" +- s.add_dependency "rubyzip", "~> 1.3" ++ s.add_dependency "rubyzip", "~> 2.0" + s.add_dependency "winrm", "~> 2.1" + s.add_dependency "winrm-fs", "~> 1.0" + s.add_dependency "winrm-elevated", "~> 1.1" +-- +2.25.0 + diff --git a/vagrant.changes b/vagrant.changes index 2524b07..6713319 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Feb 5 08:12:50 UTC 2020 - Dan Čermák + +- Bump the version of i18n, rubyzip and net-ssh + + Rebased patches: + * 0001-bin-vagrant-silence-warning-about-installer.patch + * 0002-Use-a-private-temporary-dir.patch + * 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch + * 0004-plugins-don-t-abuse-require_relative.patch.patch + * 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + * 0006-do-not-depend-on-wdm.patch + * 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + * 0008-Don-t-abuse-relative-paths-in-plugins.patch + * 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch + * 0010-Skip-failing-tests.patch + * 0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch + * 0012-Disable-Subprocess-unit-test.patch + + Added patch: + * 0013-Update-some-outdated-gem-versions.patch + ------------------------------------------------------------------- Tue Jan 28 10:46:16 UTC 2020 - Dan Čermák diff --git a/vagrant.spec b/vagrant.spec index a158f8a..c84b75a 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -61,6 +61,8 @@ Patch10: 0010-Skip-failing-tests.patch # https://github.com/hashicorp/vagrant/pull/10945 Patch11: 0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch Patch12: 0012-Disable-Subprocess-unit-test.patch +# https://github.com/hashicorp/vagrant/pull/11339 +Patch13: 0013-Update-some-outdated-gem-versions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,8 +97,9 @@ BuildRequires: %{rubygem childprocess:0.6 } BuildRequires: %{rubygem ed25519:1.2 >= 1.2.4 } # s.add_dependency "erubis", "~> 2.7.0" BuildRequires: %{rubygem erubis:2.7 } -# s.add_dependency "i18n", "~> 1.1" -BuildRequires: %{rubygem i18n:1 >= 1.1 } +# PATCHED +# s.add_dependency "i18n", "~> 1.8" +BuildRequires: %{rubygem i18n:1 >= 1.8 } # s.add_dependency "listen", "~> 3.1.5" BuildRequires: %{rubygem listen:3.1 >= 3.1.5 } # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" @@ -104,8 +107,9 @@ BuildRequires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5 } # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" BuildRequires: %{rubygem log4r:1.1 >= 1.1.9 } BuildConflicts: %{rubygem log4r:1.1 >= 1.1.11 } -# s.add_dependency "net-ssh", "~> 5.1.0" -BuildRequires: %{rubygem net-ssh:5.1} +# PATCHED +# s.add_dependency "net-ssh", "~> 5.2.0" +BuildRequires: %{rubygem net-ssh:5.2} # s.add_dependency "net-sftp", "~> 2.1" BuildRequires: %{rubygem net-sftp:2 >= 2.1 } # s.add_dependency "net-scp", "~> 1.2.0" @@ -115,8 +119,9 @@ BuildRequires: %{rubygem rb-kqueue:0.2 } # s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" BuildRequires: %{rubygem rest-client >= 1.6} BuildConflicts: %{rubygem rest-client >= 3.0} -# s.add_dependency "rubyzip", "~> 1.3" -BuildRequires: %{rubygem rubyzip:1 >= 1.3} +# PATCHED +# s.add_dependency "rubyzip", "~> 2.0" +BuildRequires: %{rubygem rubyzip:2} # Intentionally removed, wdm only works on Windows # BuildRequires: %%{rubygem wdm } # s.add_dependency "winrm", "~> 2.1" @@ -178,8 +183,9 @@ Requires: %{rubygem childprocess:0.6} Requires: %{rubygem ed25519:1.2 >= 1.2.4} # s.add_dependency "erubis", "~> 2.7.0" Requires: %{rubygem erubis:2.7} -# s.add_dependency "i18n", "~> 1.1" -Requires: %{rubygem i18n:1 >= 1.1} +# PATCHED +# s.add_dependency "i18n", "~> 1.8" +Requires: %{rubygem i18n:1 >= 1.8} # s.add_dependency "listen", "~> 3.1.5" Requires: %{rubygem listen >= 3.1.5} # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" @@ -187,8 +193,9 @@ Requires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5} # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" Requires: %{rubygem log4r:1.1 >= 1.1.9 } Requires: %{rubygem log4r:1.1 < 1.1.11 } -# s.add_dependency "net-ssh", "~> 5.1.0" -Requires: %{rubygem net-ssh:5.1} +# PATCHED +# s.add_dependency "net-ssh", "~> 5.2.0" +Requires: %{rubygem net-ssh:5.2} # s.add_dependency "net-sftp", "~> 2.1" Requires: %{rubygem net-sftp:2 >= 2.1} # s.add_dependency "net-scp", "~> 1.2.0" @@ -198,8 +205,9 @@ Requires: %{rubygem rb-kqueue:0.2} # s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" Requires: %{rubygem rest-client >= 1.6} Requires: %{rubygem rest-client < 3.0} -# s.add_dependency "rubyzip", "~> 1.3" -Requires: %{rubygem rubyzip:1 >= 1.3} +# PATCHED +# s.add_dependency "rubyzip", "~> 2.0" +Requires: %{rubygem rubyzip:2} # s.add_dependency "wdm", "~> 0.1.0" # skip wdm, Windows only # s.add_dependency "winrm", "~> 2.1"