From 79713e75fcc5c5cb55d1b1beac008683b57c8805 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Jan 2024 06:54:34 +0000 Subject: gentoo auto-resync : 07:01:2024 - 06:54:33 --- dev-ruby/websocket-driver/Manifest | 1 - .../files/websocket-driver-0.7.5-ruby32.patch | 125 --------------------- 2 files changed, 126 deletions(-) delete mode 100644 dev-ruby/websocket-driver/files/websocket-driver-0.7.5-ruby32.patch (limited to 'dev-ruby/websocket-driver') diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest index e8ec185a3705..1e5442755bf9 100644 --- a/dev-ruby/websocket-driver/Manifest +++ b/dev-ruby/websocket-driver/Manifest @@ -1,4 +1,3 @@ -AUX websocket-driver-0.7.5-ruby32.patch 4305 BLAKE2B ba2a2142b496178381b4e568f2062422e802115f3fecee907d148829950e7e085aeb51083eb9a1e9376319582275a877193345b1238d26a070fed856576993ea SHA512 81013e4f3553272eb6ecd15e6c5ac55e7237076342c1e392ee37f55dc81bb2064612aa0a576498571e766d338b580bdc6c615efbaa71a197192106f515f0f78d DIST websocket-driver-0.7.6.tar.gz 26332 BLAKE2B e8da76846b519603f7eef9cef53afdff3d48176cba21de1ce6b17e3718dd33b8309aaca721d4d11480e34e04b1ed2bfbb8892af507fbc72c1ff846c800f46499 SHA512 5444a0748821ab651e9e5ed40fd737c9af50eca1f8046b3110ab436bb8c0c56250ee8a8e762ae1668249d9ebfa2712b52802950529a949aba2574ffc66c1c58a EBUILD websocket-driver-0.7.6.ebuild 823 BLAKE2B b0519a5a77fe44fc6366c3db1e60b4defc93a28ad29b20de0092487c315b398377303fd308588ec6f3909488e1d8314cb00f9f6fa1efc620c0bba5141e20462f SHA512 47bebf45482183f711d227e077a0d6f00d0a801db5c6cbf841d6521091236b6a1c059156c9da278eb51addbc15cc6dd89b016fd228e4c8cafdc2450bd7dae2cc MISC metadata.xml 353 BLAKE2B 6d6cd2bb65746c1d9bcd4ef50619b7005445623a728503bc4a5e99d38cd82a205c3ecf38e8ef4db9c1767d0b3376cf25f0d76c40b00c511c4926beb9648c5d91 SHA512 614b428fb42838fe85b90f37bb24bcffee597e90748b2da88b94098e8f96238a244fb00ddd7913ba414cb50817c0fa36438bfe7d05344a4d771e9d622594982a diff --git a/dev-ruby/websocket-driver/files/websocket-driver-0.7.5-ruby32.patch b/dev-ruby/websocket-driver/files/websocket-driver-0.7.5-ruby32.patch deleted file mode 100644 index e4f58e495cfd..000000000000 --- a/dev-ruby/websocket-driver/files/websocket-driver-0.7.5-ruby32.patch +++ /dev/null @@ -1,125 +0,0 @@ -https://github.com/faye/websocket-driver-ruby/commit/3a2931751c6893e312ee24d9c6392bd096a798fd - -From 3a2931751c6893e312ee24d9c6392bd096a798fd Mon Sep 17 00:00:00 2001 -From: James Coglan -Date: Sat, 10 Sep 2022 15:37:55 +0100 -Subject: [PATCH] Fix handling of default ports on Ruby 3.1 - ---- a/lib/websocket/driver.rb -+++ b/lib/websocket/driver.rb -@@ -42,6 +42,7 @@ def Mask.mask(payload, mask) - end - - MAX_LENGTH = 0x3ffffff -+ PORTS = { 'ws' => 80, 'wss' => 443 } - STATES = [:connecting, :open, :closing, :closed] - - ConnectEvent = Struct.new(nil) -@@ -209,6 +210,14 @@ def self.encode(data, encoding = nil) - data.force_encoding(encoding) - end - -+ def self.host_header(uri) -+ host = uri.host -+ if uri.port and uri.port != PORTS[uri.scheme] -+ host += ":#{uri.port}" -+ end -+ host -+ end -+ - def self.validate_options(options, valid_keys) - options.keys.each do |key| - unless valid_keys.include?(key) ---- a/lib/websocket/driver/client.rb -+++ b/lib/websocket/driver/client.rb -@@ -23,11 +23,10 @@ def initialize(socket, options = {}) - raise URIError, "#{ socket.url } is not a valid WebSocket URL" - end - -- host = uri.host + (uri.port ? ":#{ uri.port }" : '') - path = (uri.path == '') ? '/' : uri.path - @pathname = path + (uri.query ? '?' + uri.query : '') - -- @headers['Host'] = host -+ @headers['Host'] = Driver.host_header(uri) - @headers['Upgrade'] = 'websocket' - @headers['Connection'] = 'Upgrade' - @headers['Sec-WebSocket-Key'] = @key ---- a/lib/websocket/driver/proxy.rb -+++ b/lib/websocket/driver/proxy.rb -@@ -4,8 +4,6 @@ class Driver - class Proxy - include EventEmitter - -- PORTS = { 'ws' => 80, 'wss' => 443 } -- - attr_reader :status, :headers - - def initialize(client, origin, options) -@@ -20,7 +18,7 @@ def initialize(client, origin, options) - @state = 0 - - @headers = Headers.new -- @headers['Host'] = @origin.host + (@origin.port ? ":#{ @origin.port }" : '') -+ @headers['Host'] = Driver.host_header(@origin) - @headers['Connection'] = 'keep-alive' - @headers['Proxy-Connection'] = 'keep-alive' - ---- a/spec/websocket/driver/client_spec.rb -+++ b/spec/websocket/driver/client_spec.rb -@@ -121,6 +121,54 @@ - end - end - -+ describe "with an explicit port" do -+ let(:url) { "ws://www.example.com:3000/socket" } -+ -+ it "includes the port in the Host header" do -+ expect(socket).to receive(:write).with( -+ "GET /socket HTTP/1.1\r\n" + -+ "Host: www.example.com:3000\r\n" + -+ "Upgrade: websocket\r\n" + -+ "Connection: Upgrade\r\n" + -+ "Sec-WebSocket-Key: 2vBVWg4Qyk3ZoM/5d3QD9Q==\r\n" + -+ "Sec-WebSocket-Version: 13\r\n" + -+ "\r\n") -+ driver.start -+ end -+ end -+ -+ describe "with a wss: URL" do -+ let(:url) { "wss://www.example.com/socket" } -+ -+ it "does not include the port in the Host header" do -+ expect(socket).to receive(:write).with( -+ "GET /socket HTTP/1.1\r\n" + -+ "Host: www.example.com\r\n" + -+ "Upgrade: websocket\r\n" + -+ "Connection: Upgrade\r\n" + -+ "Sec-WebSocket-Key: 2vBVWg4Qyk3ZoM/5d3QD9Q==\r\n" + -+ "Sec-WebSocket-Version: 13\r\n" + -+ "\r\n") -+ driver.start -+ end -+ end -+ -+ describe "with a wss: URL and explicit port" do -+ let(:url) { "wss://www.example.com:3000/socket" } -+ -+ it "includes the port in the Host header" do -+ expect(socket).to receive(:write).with( -+ "GET /socket HTTP/1.1\r\n" + -+ "Host: www.example.com:3000\r\n" + -+ "Upgrade: websocket\r\n" + -+ "Connection: Upgrade\r\n" + -+ "Sec-WebSocket-Key: 2vBVWg4Qyk3ZoM/5d3QD9Q==\r\n" + -+ "Sec-WebSocket-Version: 13\r\n" + -+ "\r\n") -+ driver.start -+ end -+ end -+ - describe "with custom headers" do - before do - driver.set_header "User-Agent", "Chrome" - -- cgit v1.2.3