gentoo auto-resync : 01:06:2024 - 00:07:06

2 files changed, 0 insertions, 135 deletions

diff --git a/dev-ruby/websocket/Manifest b/dev-ruby/websocket/Manifest
index 9aad602634ce..30ab7927c390 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1,4 +1,3 @@
-AUX websocket-1.2.9-default-port.patch 4427 BLAKE2B 90268a5b0686a9a054ee4d0193a0890cdfd5d3e92c5bb502602aa3ba74c858879e1a5eb8a6f5e07e3cae9c53ea64e0c1ebe64bc017a2e395b3f609d43a83df5d SHA512 7a9fbf2a4160d187e6e833ec9ef918a619bc311521c10e6bc88e2d8e249e45dc168912fad05c3a4560aa9a6f2f96b1eaa541735b1f2dcb247410d82bae1f74ad
 DIST websocket-1.2.10.gem 28672 BLAKE2B 352289d39d374032bd8ab11ec1c38f0b3abb3c3ec7cdb05373d5ccdc7419d896088412657b54cbcd93b15d4bab07a3fdf27829a38e35a0c62f09eed1b8302a05 SHA512 c06598a4988b1a4361ba55d807577c756d82295e5c5316fe9f0492a32776599b8ce878615c5c0d4ed2d70d37bfed5ec188398922dd140fd195b894262df63f57
 EBUILD websocket-1.2.10.ebuild 486 BLAKE2B 542223dcea5b0d9e670efa3a056568ec894d7e36dc8208ff2638f9df507fcd0b8236c975af694a8776a9eaa9cca649eda2fedb6fe9123ea50df353bea8e23d97 SHA512 539911984d231bf0a09fc1f0e0cb15b17e0f5208ed506b5178989d34a4fee8a7669a2d5b3163621bd91dd0b387e841453bcb876c142eca31dd94c99db9403773
 MISC metadata.xml 348 BLAKE2B 97c5037c95e1f278b4e7607286707298751b9aef68d81d99448842de0561c9657e191dc72ddb530e0202c6be2c0433482d1e0066bd56dcab3b0edd8daa6195d2 SHA512 7d0a8b7a151834686c239ef6f56d2648701f37512fdd1effd3cca0204e2dc445a586bfad9acfb7b38c094db15154b861a31c6dc9bbeba7559932e87d61742821
diff --git a/dev-ruby/websocket/files/websocket-1.2.9-default-port.patch b/dev-ruby/websocket/files/websocket-1.2.9-default-port.patch
deleted file mode 100644
index 5830036da62e..000000000000
--- a/dev-ruby/websocket/files/websocket-1.2.9-default-port.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://github.com/imanel/websocket-ruby/commit/736a7515aff808a5c268b87066e928b59aed769e
-
-From 736a7515aff808a5c268b87066e928b59aed769e Mon Sep 17 00:00:00 2001
-From: Bernard Potocki <bernard.potocki@imanel.org>
-Date: Thu, 17 Feb 2022 20:02:21 +0100
-Subject: [PATCH] Ensure correct port is always specified (#48)
-
---- a/lib/websocket/handshake/base.rb
-+++ b/lib/websocket/handshake/base.rb
-@@ -7,7 +7,7 @@ class Base
-       include ExceptionHandler
-       include NiceInspect
- 
--      attr_reader :host, :port, :path, :query,
-+      attr_reader :host, :path, :query,
-                   :state, :version, :secure,
-                   :headers, :protocols
- 
-@@ -66,6 +66,20 @@ def leftovers
-         (@leftovers.to_s.split("\n", reserved_leftover_lines + 1)[reserved_leftover_lines] || '').strip
-       end
- 
-+      # Return default port for protocol (80 for ws, 443 for wss)
-+      def default_port
-+        secure ? 443 : 80
-+      end
-+
-+      # Check if provided port is a default one
-+      def default_port?
-+        port == default_port
-+      end
-+
-+      def port
-+        @port || default_port
-+      end
-+
-       # URI of request.
-       # @return [String] Full URI with protocol
-       # @example
-@@ -73,7 +87,7 @@ def leftovers
-       def uri
-         uri =  String.new(secure ? 'wss://' : 'ws://')
-         uri << host
--        uri << ":#{port}" if port
-+        uri << ":#{port}" unless default_port?
-         uri << path
-         uri << "?#{query}" if query
-         uri
---- a/lib/websocket/handshake/client.rb
-+++ b/lib/websocket/handshake/client.rb
-@@ -61,7 +61,7 @@ def initialize(args = {})
-           uri = URI.parse(@url || @uri)
-           @secure ||= (uri.scheme == 'wss')
-           @host ||= uri.host
--          @port ||= uri.port
-+          @port ||= uri.port || default_port
-           @path ||= uri.path
-           @query ||= uri.query
-         end
---- a/lib/websocket/handshake/handler/client04.rb
-+++ b/lib/websocket/handshake/handler/client04.rb
-@@ -21,7 +21,7 @@ def handshake_keys
-             %w[Connection Upgrade]
-           ]
-           host = @handshake.host
--          host += ":#{@handshake.port}" if @handshake.port
-+          host += ":#{@handshake.port}" unless @handshake.default_port?
-           keys << ['Host', host]
-           keys += super
-           keys << ['Sec-WebSocket-Origin', @handshake.origin] if @handshake.origin
---- a/lib/websocket/handshake/handler/client75.rb
-+++ b/lib/websocket/handshake/handler/client75.rb
-@@ -18,7 +18,7 @@ def handshake_keys
-             %w[Connection Upgrade]
-           ]
-           host = @handshake.host
--          host += ":#{@handshake.port}" if @handshake.port
-+          host += ":#{@handshake.port}" unless @handshake.default_port?
-           keys << ['Host', host]
-           keys << ['Origin', @handshake.origin] if @handshake.origin
-           keys << ['WebSocket-Protocol', @handshake.protocols.first] if @handshake.protocols.any?
---- a/lib/websocket/handshake/server.rb
-+++ b/lib/websocket/handshake/server.rb
-@@ -129,13 +129,13 @@ def should_respond?
-       # Host of server according to client header
-       # @return [String] host
-       def host
--        @headers['host'].to_s.split(':')[0].to_s
-+        @host || @headers['host'].to_s.split(':')[0].to_s
-       end
- 
-       # Port of server according to client header
--      # @return [String] port
-+      # @return [Integer] port
-       def port
--        @headers['host'].to_s.split(':')[1]
-+        (@port || @headers['host'].to_s.split(':')[1] || default_port).to_i
-       end
- 
-       private
---- a/spec/support/all_client_drafts.rb
-+++ b/spec/support/all_client_drafts.rb
-@@ -38,6 +38,10 @@ def validate_request
-     expect(handshake.query).to eql('aaa=bbb')
-   end
- 
-+  it 'returns default port' do
-+    expect(handshake.port).to be(80)
-+  end
-+
-   it 'returns valid port' do
-     @request_params = { port: 123 }
-     expect(handshake.port).to be(123)
---- a/spec/support/all_server_drafts.rb
-+++ b/spec/support/all_server_drafts.rb
-@@ -47,11 +47,17 @@ def validate_request
-     expect(handshake.query).to eql('aaa=bbb')
-   end
- 
-+  it 'returns default port' do
-+    handshake << client_request
-+
-+    expect(handshake.port).to be(80)
-+  end
-+
-   it 'returns valid port' do
-     @request_params = { port: 123 }
-     handshake << client_request
- 
--    expect(handshake.port).to eql('123')
-+    expect(handshake.port).to be(123)
-   end
- 
-   it 'returns valid response' do