Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2021-02-02 14:24:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant" Tue Feb 2 14:24:36 2021 rev:29 rq:867754 version:2.2.14 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2021-01-22 12:15:37.653788551 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.28504/vagrant.changes 2021-02-02 14:24:43.995304245 +0100 @@ -1,0 +2,21 @@ +Fri Jan 29 15:35:11 UTC 2021 - Dan ??erm??k <dcer...@suse.com> + +- Remove pointless ruby_dep dependency and bump listen version + + Add patch: + * 0012-Bump-listen-gem-version-and-remove-ruby_dep.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 + * 0011-Remove-not-required-bcrypt_pbkdf-gem.patch + +------------------------------------------------------------------- New: ---- 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.043305875 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.043305875 +0100 @@ -61,6 +61,8 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -97,8 +99,9 @@ BuildRequires: %{rubygem erubi } # s.add_dependency "i18n", "~> 1.8" BuildRequires: %{rubygem i18n:1 >= 1.8 } -# s.add_dependency "listen", "~> 3.1" -BuildRequires: %{rubygem listen:3 >= 3.1 } +# PATCHED +# s.add_dependency "listen", "~> 3.4" +BuildRequires: %{rubygem listen:3 >= 3.4 } # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" BuildRequires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5 } # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" @@ -135,15 +138,13 @@ BuildRequires: %{rubygem rspec:3.5 } # s.add_development_dependency "rspec-its", "~> 1.3.0" BuildRequires: %{rubygem rspec-its:1.3 } -# s.add_dependency "ruby_dep", "<= 1.3.1" -BuildRequires: %{rubygem ruby_dep <= 1.3.1 } # s.add_development_dependency "webmock", "~> 2.3.1" BuildRequires: %{rubygem webmock:2.3 >= 2.3.1 } # s.add_development_dependency "fake_ftp", "~> 0.1.1" BuildRequires: %{rubygem fake_ftp:0.1 >= 0.1.1 } # Prevent have choice for rubygem(ruby:2.7.0:listen:3) >= 3.1 -BuildRequires: %{rubygem listen:3.1} +BuildRequires: %{rubygem listen:3.4} # Prevent have choice for rubygem(ruby:2.6.0:mime-types) >= 2 BuildRequires: %{rubygem mime-types:3 } # Prevent have choice for rubygem(ruby:2.6.0:builder) >= 2.1.2 @@ -186,8 +187,9 @@ Requires: %{rubygem erubi} # s.add_dependency "i18n", "~> 1.8" Requires: %{rubygem i18n:1 >= 1.8} -# s.add_dependency "listen", "~> 3.1" -Requires: %{rubygem listen:3 >= 3.1} +# PATCHED +# s.add_dependency "listen", "~> 3.4" +Requires: %{rubygem listen:3 >= 3.4} # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" Requires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5} # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" @@ -215,8 +217,6 @@ Requires: %{rubygem winrm-elevated:1 >= 1.2.1} # s.add_dependency "vagrant_cloud", "~> 3.0.2" Requires: %{rubygem vagrant_cloud:3.0 >= 3.0.2} -# s.add_dependency "ruby_dep", "<= 1.3.1" -Requires: %{rubygem ruby_dep <= 1.3.1 } Requires: bsdtar ++++++ 0001-bin-vagrant-silence-warning-about-installer.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.063305906 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.067305912 +0100 @@ -1,7 +1,7 @@ From 3559bd65aa796772e31abbeb4bd92e0829ed5e99 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <terce...@debian.org> Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH 01/11] bin/vagrant: silence warning about installer +Subject: [PATCH 01/12] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl <ka...@b1-systems.de> --- ++++++ 0002-Use-a-private-temporary-dir.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.075305925 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.075305925 +0100 @@ -1,7 +1,7 @@ From b2c6ef61dc339eae73640c357e6be6e1f8cf723a Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <terce...@debian.org> Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH 02/11] Use a private temporary dir +Subject: [PATCH 02/12] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). ++++++ 0003-plugins-don-t-abuse-require_relative.patch.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.083305937 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.083305937 +0100 @@ -1,7 +1,7 @@ From 402f323f982ea36af2db24ac62ec527ff6530515 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <ka...@b1-systems.de> Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 03/11] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 03/12] plugins-don-t-abuse-require_relative.patch Signed-off-by: Johannes Kastl <ka...@b1-systems.de> --- ++++++ 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.091305949 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.095305956 +0100 @@ -1,7 +1,7 @@ From cb36ee51bb914627bda93641135721ee88b640a4 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <ka...@b1-systems.de> Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 04/11] fix vbox package boo#1044087, added by +Subject: [PATCH 04/12] fix vbox package boo#1044087, added by robert.munte...@gmail.com on Sun Aug 13 19:07:06 UTC 2017 Signed-off-by: Johannes Kastl <ka...@b1-systems.de> ++++++ 0005-do-not-depend-on-wdm.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.103305968 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.103305968 +0100 @@ -1,7 +1,7 @@ From b65df008243ff8016b0e5714da53b5fb221e5961 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <ka...@b1-systems.de> Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 05/11] do not depend on wdm +Subject: [PATCH 05/12] do not depend on wdm Signed-off-by: Johannes Kastl <ka...@b1-systems.de> --- ++++++ 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.111305980 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.115305987 +0100 @@ -1,7 +1,7 @@ From 4f32f38bb823405a3e3fcd54ebf878ad7c2ff78d Mon Sep 17 00:00:00 2001 From: Johannes Kastl <ka...@b1-systems.de> Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 06/11] do not abuse relative paths in docker plugin to make +Subject: [PATCH 06/12] do not abuse relative paths in docker plugin to make docker work, added by t...@tmkn.uk on Thu Oct 26 19:42:46 UTC 2017 Signed-off-by: Johannes Kastl <ka...@b1-systems.de> ++++++ 0007-Don-t-abuse-relative-paths-in-plugins.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.123305999 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.123305999 +0100 @@ -1,7 +1,7 @@ From 555f29e1367c56ad4aa17447a5108a7f3be1b91d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com> Date: Fri, 11 Jan 2019 12:32:28 +0100 -Subject: [PATCH 07/11] Don't abuse relative paths in plugins +Subject: [PATCH 07/12] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ++++++ 0008-Skip-failing-tests.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.131306011 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.131306011 +0100 @@ -1,7 +1,7 @@ From 5f9ae130821abc783b793fc222c471cebadf1891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com> Date: Mon, 1 Apr 2019 17:28:31 +0200 -Subject: [PATCH 08/11] Skip failing tests +Subject: [PATCH 08/12] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- ++++++ 0009-Disable-Subprocess-unit-test.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.143306030 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.143306030 +0100 @@ -1,7 +1,7 @@ From 5e3f0edc8a1bc1db2355c424684a3fcd7f654e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com> Date: Wed, 28 Aug 2019 13:39:58 +0200 -Subject: [PATCH 09/11] Disable Subprocess unit test +Subject: [PATCH 09/12] 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 ++++++ 0010-Update-rake-to-13.0.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.155306049 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.155306049 +0100 @@ -1,7 +1,7 @@ From 25b740d34eac7a430f248711ac6b97caadeecac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com> Date: Fri, 4 Dec 2020 14:54:50 +0100 -Subject: [PATCH 10/11] Update rake to ~> 13.0 +Subject: [PATCH 10/12] Update rake to ~> 13.0 (cherry picked from commit 1916f69425f8a0f86e3d7249a25a116c5cf2a771) --- ++++++ 0011-Remove-not-required-bcrypt_pbkdf-gem.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.163306061 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.167306068 +0100 @@ -1,7 +1,7 @@ From c87044b9007fa5f6331206b5edd9f7b6bfde4cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com> Date: Fri, 22 Jan 2021 09:35:47 +0100 -Subject: [PATCH 11/11] Remove not required bcrypt_pbkdf gem +Subject: [PATCH 11/12] Remove not required bcrypt_pbkdf gem This gem is no longer required by vagrant and was forgotten to get removed. ++++++ 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch ++++++ >From b249aefa283644b029adf807907023af5794f595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com> Date: Fri, 22 Jan 2021 12:36:25 +0100 Subject: [PATCH 12/12] Bump listen gem version and remove ruby_dep listen no longer depends on ruby_dep and thus this pointlessly drags in another dependency. (cherry picked from commit 97ebb9103f9b073f39bf7d4b06d8dbf966793752) --- vagrant.gemspec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/vagrant.gemspec b/vagrant.gemspec index 225283771..465bffaff 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency "erubi" s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" s.add_dependency "i18n", "~> 1.8" - s.add_dependency "listen", "~> 3.1" + s.add_dependency "listen", "~> 3.4" 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| s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0" - # NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions - # of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5). - # Explicit constraint is defined to provide required dependency to listen without imposing - # tighter restrictions on valid ruby versions - s.add_dependency "ruby_dep", "<= 1.3.1" - # Constraint rake to properly handle deprecated method usage # from within rspec s.add_development_dependency "rake", "~> 13.0" -- 2.30.0
