diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-11-22 20:31:54 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-11-22 21:50:22 +0900 |
| commit | b102175b4dcfebe7455e3b27653fab0288f68326 (patch) | |
| tree | e184a4130edbd1d49e325de7e379bacdc54406fe /test | |
| parent | 6f59f0bebc5fe1ae84028832cc777160d853e302 (diff) | |
Merge RubyGems-3.3.25 and Bundler-2.3.25
Diffstat (limited to 'test')
6 files changed, 21 insertions, 16 deletions
diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock b/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock index cf11ab247b..aa975b1cd0 100644 --- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock +++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock @@ -160,21 +160,21 @@ dependencies = [ [[package]] name = "rb-sys" -version = "0.9.31" +version = "0.9.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc41b26ea88da6100f538d31467941e41ab0c002999d687315e67d3b371b796" +checksum = "2d2bde30824a18f2e68cd1c8004cec16656764c6efc385bc1c7fb4c904b276a5" dependencies = [ - "bindgen", - "linkify", "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.31" +version = "0.9.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79be4233eabd2bf9e19eb8116391aeaf4b89b87a7ab38e0ded44de9158006e46" +checksum = "5ff5d3ba92624df9c66bf0d1f0251d96284f08ac9773b7723d370e3f225c1d38" dependencies = [ + "bindgen", + "linkify", "regex", "shell-words", ] diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml b/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml index 8dfbaf5799..6673f78464 100644 --- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml +++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -rb-sys = { version = "0.9.31", features = ["gem"] } +rb-sys = { version = "0.9.35", features = ["gem"] } diff --git a/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock b/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock index 23f571b1e7..e7e91de576 100644 --- a/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +++ b/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock @@ -153,21 +153,21 @@ dependencies = [ [[package]] name = "rb-sys" -version = "0.9.31" +version = "0.9.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc41b26ea88da6100f538d31467941e41ab0c002999d687315e67d3b371b796" +checksum = "2d2bde30824a18f2e68cd1c8004cec16656764c6efc385bc1c7fb4c904b276a5" dependencies = [ - "bindgen", - "linkify", "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.31" +version = "0.9.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79be4233eabd2bf9e19eb8116391aeaf4b89b87a7ab38e0ded44de9158006e46" +checksum = "5ff5d3ba92624df9c66bf0d1f0251d96284f08ac9773b7723d370e3f225c1d38" dependencies = [ + "bindgen", + "linkify", "regex", "shell-words", ] diff --git a/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml b/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml index 3a37a73f73..814afe10f7 100644 --- a/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +++ b/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -rb-sys = { version = "0.9.31", features = ["gem"] } +rb-sys = { version = "0.9.35", features = ["gem"] } diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb index d1411ddc56..5fd2bbb9c2 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -183,7 +183,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase assert_equal [dep("a")], @set.dependencies - assert_equal %w[git://github.com/example/repository.git master], + assert_equal %w[https://github.com/example/repository.git master], @git_set.repositories["a"] expected = { "a" => Gem::Requirement.create("!") } @@ -196,7 +196,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase assert_equal [dep("a")], @set.dependencies - assert_equal %w[git://github.com/example/example.git master], + assert_equal %w[https://github.com/example/example.git master], @git_set.repositories["a"] expected = { "a" => Gem::Requirement.create("!") } diff --git a/test/rubygems/test_gem_source_git.rb b/test/rubygems/test_gem_source_git.rb index 5702da0597..147c6df1d2 100644 --- a/test/rubygems/test_gem_source_git.rb +++ b/test/rubygems/test_gem_source_git.rb @@ -63,6 +63,11 @@ class TestGemSourceGit < Gem::TestCase end def test_checkout_submodules + # We need to allow to checkout submodules with file:// protocol + # CVE-2022-39253 + # https://lore.kernel.org/lkml/xmqq4jw1uku5.fsf@gitster.g/ + system(@git, *%W[config --global protocol.file.allow always]) + source = Gem::Source::Git.new @name, @repository, "master", true git_gem "b" |