From 79b7ffdfe8d2d8f8ef056e94193e982a86a5c59d7d90bf8c8aec5d566cc95035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Tue, 27 Feb 2024 19:18:13 +0000 Subject: [PATCH] Accepting request 1152484 from home:13ilya:branches:Virtualization:vagrant - Added file childprocess-5.0.patch for support childprocess 5.0. OBS-URL: https://build.opensuse.org/request/show/1152484 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=88 --- childprocess-5.0.patch | 12 ++++++++++++ vagrant.changes | 5 +++++ vagrant.spec | 9 +++++---- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 childprocess-5.0.patch diff --git a/childprocess-5.0.patch b/childprocess-5.0.patch new file mode 100644 index 0000000..e294150 --- /dev/null +++ b/childprocess-5.0.patch @@ -0,0 +1,12 @@ +diff -Pdpru vagrant-2.3.7.orig/vagrant.gemspec vagrant-2.3.7/vagrant.gemspec +--- vagrant-2.3.7.orig/vagrant.gemspec 2023-06-15 23:40:35.000000000 +0300 ++++ vagrant-2.3.7/vagrant.gemspec 2024-02-27 22:06:34.169040881 +0300 +@@ -16,7 +16,7 @@ Gem::Specification.new do |s| + s.required_rubygems_version = ">= 1.3.6" + + s.add_dependency "bcrypt_pbkdf", "~> 1.1" +- s.add_dependency "childprocess", "~> 4.1.0" ++ s.add_dependency "childprocess", "~> 5.0.0" + s.add_dependency "ed25519", "~> 1.3.0" + s.add_dependency "erubi" + s.add_dependency 'googleapis-common-protos-types', '~> 1.3' diff --git a/vagrant.changes b/vagrant.changes index 8e45fdf..37fab91 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 19:14:03 UTC 2024 - Илья Индиго <13ilya@gmail.com> + +- Added file childprocess-5.0.patch for support childprocess 5.0. + ------------------------------------------------------------------- Mon Feb 12 05:43:13 UTC 2024 - Johannes Kastl diff --git a/vagrant.spec b/vagrant.spec index 340a011..6e8f91e 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -65,6 +65,7 @@ Patch11: 0011-Remove-vagrant-ssl-extension.patch Patch12: 0012-Bump-rgl-dependency-to-0.6.6.patch Patch13: 0013-Bump-webrick-dependency-to-1.8.0.patch Patch14: 0014-Bump-vagrant_cloud_dependency.patch +Patch15: childprocess-5.0.patch # force only one ruby version # CAUTION: if you change this, then you *must* also change the sed calls which @@ -87,8 +88,8 @@ BuildRequires: %{rubygem bundler} BuildRequires: %{ruby} < 3.4 # s.add_dependency "bcrypt_pbkdf", "~> 1.1" BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } -# s.add_dependency "childprocess", "~> 4.1.0" -BuildRequires: %{rubygem childprocess:4.1 } +# s.add_dependency "childprocess", "~> 5.0.0" +BuildRequires: %{rubygem childprocess:5.0 } # s.add_dependency "ed25519", "~> 1.3.0" BuildRequires: %{rubygem ed25519:1.3 >= 1.3.0 } # s.add_dependency "erubi" @@ -184,8 +185,8 @@ BuildRequires: fdupes # s.add_dependency "bcrypt_pbkdf", "~> 1.1" Requires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } -# s.add_dependency "childprocess", "~> 4.1.0" -Requires: %{rubygem childprocess:4.1} +# s.add_dependency "childprocess", "~> 5.0.0" +Requires: %{rubygem childprocess:5.0} # s.add_dependency "ed25519", "~> 1.3.0" Requires: %{rubygem ed25519:1.3 >= 1.3.0} # s.add_dependency "erubi"