From 6dfd9c39ab68bbc917ffc374b2fa515f676f891f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Dec 2022 20:08:29 +0000 Subject: gentoo auto-resync : 26:12:2022 - 20:08:29 --- dev-ruby/Manifest.gz | Bin 108766 -> 108759 bytes dev-ruby/ffi/Manifest | 1 - .../ffi/files/ffi-1.14.2-32bit-long-double.patch | 19 -- dev-ruby/rack/Manifest | 1 - dev-ruby/rack/files/rack-2.2.3.1-ruby30.patch | 210 --------------------- 5 files changed, 231 deletions(-) delete mode 100644 dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch delete mode 100644 dev-ruby/rack/files/rack-2.2.3.1-ruby30.patch (limited to 'dev-ruby') diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz index 20799d6264d4..26eb3110c2f0 100644 Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest index 96cd4aaed749..e98811c5ae75 100644 --- a/dev-ruby/ffi/Manifest +++ b/dev-ruby/ffi/Manifest @@ -1,5 +1,4 @@ AUX backport-pr-962.patch 1773 BLAKE2B b4eb227a949136143a98e8a5ed9067599d3a4ec14376c52619e2f3db56906ed028f9be889aa6eea5abe7e7ca9c3196208ede7dc5768cba43ecf9d000f1e3e1da SHA512 dc6a17bccde42b3a64e7de3bed5fe0818a4bfe9e109b665ccf06963a4939fec2a77e3fcff073cf3a4feccb68d3dc05bbb4885ebe53c2060965e114041c9e3ce5 -AUX ffi-1.14.2-32bit-long-double.patch 701 BLAKE2B d8a3f2a00f8b93f42953bf5317cf6ae45ed662c81b993f83b728125d6fae15c6f75d11e0f76b0f46912b1c52c849764d3393a09c3ac1e35f3557e97bd3662364 SHA512 9cfe4e1c80e08c672eee30fe3b170d667e72cc2e047f4edd1e9573bfe6d4dca315a84baa54855756631f90c04fee59a417f286df95662f6abcfd3728c1b1a4d7 AUX pr-957-sparc.patch 1681 BLAKE2B e08a03d5e054ce030c04cb0645ed2683faa9d0ec8782313464112e3dd3adf0b8ee40f7fbea9aec15ee7590189e93f03617fe06b506e2ea049535e48bc33a8f23 SHA512 32bd488a3cc4b0c81d8f7f9f2875e591b8de7bf741b838aab3f20ea64025984b3d83c393e1e8f0b628f009b2473d381139655f965cc746dc9074cbe57171cb7d DIST ffi-git-1.15.5.tgz 168139 BLAKE2B 2ddd5bd7bfb7bcd39b6d740cbb1e0f4cd419ce6cb4ec12926f91f254b3f3142bc6166728a81a6f23dccfbf7aec911c63237c20fb0e2c70d30d48f4648e352585 SHA512 3668bafae936bf5010f014fbcf63258b023bcc318882775e7d2fcfc11334722ec2b6e8a8b9c910d406889fb173dd503c5c13f5af8e4f6927921f12f688461707 EBUILD ffi-1.15.5-r1.ebuild 1820 BLAKE2B cd58c39dcd6688408f839583603a53a53d4ab36eec95f8bc40627b73848cff51cab253b3d189f22b8d35e6005fce9e86812b26c517d16e71b392b2dde085c997 SHA512 6b2996653ab0b19c4dcd9c86a52689033f435a0594ebdccdad38f36b411d17604a1c04230494a8ffcc7ce5a41b6a2fe46565af07ed154545217d06bb5fdeb4bc diff --git a/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch b/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch deleted file mode 100644 index 7373a8c28cda..000000000000 --- a/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/815130 -https://github.com/ffi/ffi/commit/315d66e7b0768856d589e15bf597f4816d5cd524 - -From 0ef7a9d7d22c9a7779def3f8c7f0166d996a2401 Mon Sep 17 00:00:00 2001 -From: xtkoba <69125751+xtkoba@users.noreply.github.com> -Date: Wed, 29 Sep 2021 19:24:44 +0900 -Subject: [PATCH] Keep `LONGDOUBLE_ADJ >= sizeof(long double)` - ---- a/ext/ffi_c/Call.c -+++ b/ext/ffi_c/Call.c -@@ -71,7 +71,7 @@ - #define FLOAT32_ADJ (4) - #define FLOAT64_ADJ (8) - #define ADDRESS_ADJ (sizeof(void *)) --#define LONGDOUBLE_ADJ (ffi_type_longdouble.alignment) -+#define LONGDOUBLE_ADJ (ffi_type_longdouble.alignment > sizeof(long double) ? ffi_type_longdouble.alignment : sizeof(long double)) - - #endif /* USE_RAW */ - diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest index 191bd549ae0c..55add7bdc217 100644 --- a/dev-ruby/rack/Manifest +++ b/dev-ruby/rack/Manifest @@ -1,4 +1,3 @@ -AUX rack-2.2.3.1-ruby30.patch 7607 BLAKE2B c9f39f901fbc809093cfb4702fed3495dc1091ef0241f0df20fef4659f667e65ab93d96a9128a6b2c47e809cfb4a63b8834c46898edbb59dfd0d824066802e0b SHA512 13b7a938d9af575362d39b06bb3a50ce1fb7afe632c02a5c3cd46670518752d4dccee56da055c6d67da503df971ecce0ae744e2d2e6cca513483561f695e081e DIST rack-2.2.4.tar.gz 278632 BLAKE2B 2d12a9c1e239590a4aedea5f3bb4c171b6032255658688a151e665aa1cb33dee17754c7b2736f8f1725c70b8344f5f6664cace8c4d4cb4e9f6f2ee1c7a3117c0 SHA512 aef54a06efce54d58e600829bbf550162bf68fe710b61b2b81022b2a8581819fb575e03992f493f11ed5f3391349f21cd142f6acc5b6017ec4c8e21cb17e4874 EBUILD rack-2.2.4.ebuild 1708 BLAKE2B 9db82605b298705172d939cc7acdcb07ea1f5a6439d6ce6f0964326d27f6376c2648381b6e808b4c0ed269f77c72a5b41c8f54dd153759899fa6cb27c58ed1df SHA512 69db8c6487db112df55989c59c7e6f09c16f8063de327658bd0d8646f3bddc84899e0828fb179903798d69eaa16cea8cde056b9ccf0363dc335eed959b585a39 MISC metadata.xml 392 BLAKE2B 625ee54c32c0350c08e68ec422fd024c364bf2dc26b5402363db0909d5720fea9a8741cf7ef8bcdcec21bcf3ee4efb6ccc514231d12ceb87b927035ee5a1d408 SHA512 96436f55bc9e3d93373e6e3c4858048aef3811654f8d5f11aa9b37b89b012e0d1770c1617764b4ef72d5e4656b0113a1bf15f9398c9bc23f55de774591020afc diff --git a/dev-ruby/rack/files/rack-2.2.3.1-ruby30.patch b/dev-ruby/rack/files/rack-2.2.3.1-ruby30.patch deleted file mode 100644 index 467fb3487d67..000000000000 --- a/dev-ruby/rack/files/rack-2.2.3.1-ruby30.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 43b5565a73817d66b6d96de2e28d525a2a56f852 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= -Date: Mon, 4 Apr 2022 23:17:19 +0200 -Subject: [PATCH] Newer rubies spec compatibility. - ---- - Gemfile | 5 +++++ - lib/rack/utils.rb | 7 +++++-- - test/spec_mock.rb | 34 +++++++++++++++++----------------- - test/testrequest.rb | 4 ++-- - 4 files changed, 29 insertions(+), 21 deletions(-) - -diff --git a/Gemfile b/Gemfile -index dc075a4ca..5768eedf7 100644 ---- a/Gemfile -+++ b/Gemfile -@@ -14,6 +14,11 @@ end - - gem "rubocop", require: false - -+group :test do -+ gem "webrick" # gemified in Ruby 3.1+ -+ gem "psych", "~> 4.0" # using YAML#unsafe_load in tests which is 4.0+ only -+end -+ - # Alternative solution that might work, but it has bad interactions with - # Gemfile.lock if that gets committed/reused: - # c_platforms = [:mri] if Gem.platforms.last.os == "java" -diff --git a/lib/rack/utils.rb b/lib/rack/utils.rb -index d3b3b1d42..34849ded1 100644 ---- a/lib/rack/utils.rb -+++ b/lib/rack/utils.rb -@@ -22,6 +22,9 @@ module Utils - COMMON_SEP = QueryParser::COMMON_SEP - KeySpaceConstrainedParams = QueryParser::Params - -+ RFC2822_DAY_NAME = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ] -+ RFC2822_MONTH_NAME = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ] -+ - class << self - attr_accessor :default_query_parser - end -@@ -327,8 +330,8 @@ def rfc2822(time) - # weekday and month. - # - def rfc2109(time) -- wday = Time::RFC2822_DAY_NAME[time.wday] -- mon = Time::RFC2822_MONTH_NAME[time.mon - 1] -+ wday = RFC2822_DAY_NAME[time.wday] -+ mon = RFC2822_MONTH_NAME[time.mon - 1] - time.strftime("#{wday}, %d-#{mon}-%Y %H:%M:%S GMT") - end - -diff --git a/test/spec_mock.rb b/test/spec_mock.rb -index d2311f5a2..73fb7b235 100644 ---- a/test/spec_mock.rb -+++ b/test/spec_mock.rb -@@ -47,7 +47,7 @@ - it "provide sensible defaults" do - res = Rack::MockRequest.new(app).request - -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "GET" - env["SERVER_NAME"].must_equal "example.org" - env["SERVER_PORT"].must_equal "80" -@@ -60,23 +60,23 @@ - - it "allow GET/POST/PUT/DELETE/HEAD" do - res = Rack::MockRequest.new(app).get("", input: "foo") -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "GET" - - res = Rack::MockRequest.new(app).post("", input: "foo") -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "POST" - - res = Rack::MockRequest.new(app).put("", input: "foo") -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "PUT" - - res = Rack::MockRequest.new(app).patch("", input: "foo") -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "PATCH" - - res = Rack::MockRequest.new(app).delete("", input: "foo") -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "DELETE" - - Rack::MockRequest.env_for("/", method: "HEAD")["REQUEST_METHOD"] -@@ -102,11 +102,11 @@ - - it "allow posting" do - res = Rack::MockRequest.new(app).get("", input: "foo") -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["mock.postdata"].must_equal "foo" - - res = Rack::MockRequest.new(app).post("", input: StringIO.new("foo")) -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["mock.postdata"].must_equal "foo" - end - -@@ -115,7 +115,7 @@ - get("https://bla.example.org:9292/meh/foo?bar") - res.must_be_kind_of Rack::MockResponse - -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "GET" - env["SERVER_NAME"].must_equal "bla.example.org" - env["SERVER_PORT"].must_equal "9292" -@@ -129,7 +129,7 @@ - get("https://example.org/foo") - res.must_be_kind_of Rack::MockResponse - -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "GET" - env["SERVER_NAME"].must_equal "example.org" - env["SERVER_PORT"].must_equal "443" -@@ -144,7 +144,7 @@ - get("foo") - res.must_be_kind_of Rack::MockResponse - -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "GET" - env["SERVER_NAME"].must_equal "example.org" - env["SERVER_PORT"].must_equal "80" -@@ -155,13 +155,13 @@ - - it "properly convert method name to an uppercase string" do - res = Rack::MockRequest.new(app).request(:get) -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "GET" - end - - it "accept params and build query string for GET requests" do - res = Rack::MockRequest.new(app).get("/foo?baz=2", params: { foo: { bar: "1" } }) -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "GET" - env["QUERY_STRING"].must_include "baz=2" - env["QUERY_STRING"].must_include "foo[bar]=1" -@@ -171,7 +171,7 @@ - - it "accept raw input in params for GET requests" do - res = Rack::MockRequest.new(app).get("/foo?baz=2", params: "foo[bar]=1") -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "GET" - env["QUERY_STRING"].must_include "baz=2" - env["QUERY_STRING"].must_include "foo[bar]=1" -@@ -181,7 +181,7 @@ - - it "accept params and build url encoded params for POST requests" do - res = Rack::MockRequest.new(app).post("/foo", params: { foo: { bar: "1" } }) -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "POST" - env["QUERY_STRING"].must_equal "" - env["PATH_INFO"].must_equal "/foo" -@@ -191,7 +191,7 @@ - - it "accept raw input in params for POST requests" do - res = Rack::MockRequest.new(app).post("/foo", params: "foo[bar]=1") -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "POST" - env["QUERY_STRING"].must_equal "" - env["PATH_INFO"].must_equal "/foo" -@@ -202,7 +202,7 @@ - it "accept params and build multipart encoded params for POST requests" do - files = Rack::Multipart::UploadedFile.new(File.join(File.dirname(__FILE__), "multipart", "file1.txt")) - res = Rack::MockRequest.new(app).post("/foo", params: { "submit-name" => "Larry", "files" => files }) -- env = YAML.load(res.body) -+ env = YAML.unsafe_load(res.body) - env["REQUEST_METHOD"].must_equal "POST" - env["QUERY_STRING"].must_equal "" - env["PATH_INFO"].must_equal "/foo" -diff --git a/test/testrequest.rb b/test/testrequest.rb -index aabe7fa6b..481a4e54d 100644 ---- a/test/testrequest.rb -+++ b/test/testrequest.rb -@@ -42,7 +42,7 @@ def GET(path, header = {}) - http.request(get) { |response| - @status = response.code.to_i - begin -- @response = YAML.load(response.body) -+ @response = YAML.unsafe_load(response.body) - rescue TypeError, ArgumentError - @response = nil - end -@@ -60,7 +60,7 @@ def POST(path, formdata = {}, header = {}) - post.basic_auth user, passwd if user && passwd - http.request(post) { |response| - @status = response.code.to_i -- @response = YAML.load(response.body) -+ @response = YAML.unsafe_load(response.body) - } - } - end -- cgit v1.2.3