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-03-05 13:42:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant" Fri Mar 5 13:42:54 2021 rev:30 rq:876042 version:2.2.14 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2021-02-02 14:24:43.995304245 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.2378/vagrant.changes 2021-03-05 13:42:56.615494966 +0100 @@ -1,0 +2,25 @@ +Mon Mar 1 10:21:49 UTC 2021 - Dan ??erm??k <dcer...@suse.com> + +- 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 + +------------------------------------------------------------------- Old: ---- 0011-Remove-not-required-bcrypt_pbkdf-gem.patch 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch New: ---- 0011-Bump-listen-gem-version-and-remove-ruby_dep.patch 0012-Bump-bcrypt_pbkdf-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.547495813 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.551495816 +0100 @@ -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 <bi...@debian.org>, License GPL-2.0+ # @@ -59,10 +59,10 @@ 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: %{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 @@ # 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" ++++++ 0001-bin-vagrant-silence-warning-about-installer.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.579495842 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.583495845 +0100 @@ -36,5 +36,5 @@ # # Unset - Disables experimental features -- -2.30.0 +2.30.1 ++++++ 0002-Use-a-private-temporary-dir.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.591495852 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.591495852 +0100 @@ -94,5 +94,5 @@ + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.30.0 +2.30.1 ++++++ 0003-plugins-don-t-abuse-require_relative.patch.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.603495863 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.603495863 +0100 @@ -154,5 +154,5 @@ module VagrantPlugins module GuestSUSE -- -2.30.0 +2.30.1 ++++++ 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.615495874 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.615495874 +0100 @@ -33,5 +33,5 @@ module VagrantPlugins module ProviderVirtualBox -- -2.30.0 +2.30.1 ++++++ 0005-do-not-depend-on-wdm.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.627495885 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.627495885 +0100 @@ -21,5 +21,5 @@ 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 ++++++ 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.643495900 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.647495904 +0100 @@ -22,5 +22,5 @@ module VagrantPlugins module DockerProvider -- -2.30.0 +2.30.1 ++++++ 0007-Don-t-abuse-relative-paths-in-plugins.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.659495914 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.659495914 +0100 @@ -64,5 +64,5 @@ require_relative "../installer" -- -2.30.0 +2.30.1 ++++++ 0008-Skip-failing-tests.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.667495922 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.667495922 +0100 @@ -30,5 +30,5 @@ end end -- -2.30.0 +2.30.1 ++++++ 0009-Disable-Subprocess-unit-test.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.683495937 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.683495937 +0100 @@ -33,5 +33,5 @@ thread = Thread.new{ sp.execute } sleep(0.1) -- -2.30.0 +2.30.1 ++++++ 0010-Update-rake-to-13.0.patch ++++++ --- /var/tmp/diff_new_pack.7MWXUj/_old 2021-03-05 13:42:57.695495948 +0100 +++ /var/tmp/diff_new_pack.7MWXUj/_new 2021-03-05 13:42:57.695495948 +0100 @@ -22,5 +22,5 @@ s.add_development_dependency "rspec-its", "~> 1.3.0" s.add_development_dependency "webmock", "~> 2.3.1" -- -2.30.0 +2.30.1 ++++++ 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch -> 0011-Bump-listen-gem-version-and-remove-ruby_dep.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0012-Bump-listen-gem-version-and-remove-ruby_dep.patch 2021-02-02 14:24:43.571303585 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.2378/0011-Bump-listen-gem-version-and-remove-ruby_dep.patch 2021-03-05 13:42:56.483494845 +0100 @@ -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?= <dcer...@suse.com> 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 @@ 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 @@ 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 @@ # from within rspec s.add_development_dependency "rake", "~> 13.0" -- -2.30.0 +2.30.1 ++++++ 0012-Bump-bcrypt_pbkdf-version.patch ++++++ >From b0bb600f7641078b6e748e67a9bd7c7a1accaa50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com> 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
