gentoo resync : 12.07.2021

2 files changed, 0 insertions, 161 deletions

diff --git a/www-servers/puma/files/puma-3.12.1-ruby26-waitpid.patch b/www-servers/puma/files/puma-3.12.1-ruby26-waitpid.patch
deleted file mode 100644
index b28c69fa4d4b..000000000000
--- a/www-servers/puma/files/puma-3.12.1-ruby26-waitpid.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b94c3e34faff024a5b1930af36e4d64bd6dde57f Mon Sep 17 00:00:00 2001
-From: MSP-Greg <MSP-Greg@users.noreply.github.com>
-Date: Fri, 15 Mar 2019 17:26:20 -0500
-Subject: [PATCH] Puma::Cluster#stop_workers - use WNOHANG with nil return
- tests
-
-Ruby 2.6 introduced a bug that affects worker shutdown (waitpid).
-
-Added code using Process::WNOHANG along with needed logic. Adds worker status (via $?) and total shutdown time to log.
-
-Co-authored-by: MSP-Greg <greg.mpls@gmail.com>
-Co-authored-by: guilleiguaran <guilleiguaran@gmail.com>
----
- lib/puma/cluster.rb | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/lib/puma/cluster.rb b/lib/puma/cluster.rb
-index 93d65131..0879c96c 100644
---- a/lib/puma/cluster.rb
-+++ b/lib/puma/cluster.rb
-@@ -37,7 +37,25 @@ def stop_workers
-       @workers.each { |x| x.term }
- 
-       begin
--        @workers.each { |w| Process.waitpid(w.pid) }
-+        if RUBY_VERSION < '2.6'
-+          @workers.each { |w| Process.waitpid(w.pid) }
-+        else
-+          # below code is for a bug in Ruby 2.6+, above waitpid call hangs
-+          t_st = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-+          pids = @workers.map(&:pid)
-+          loop do
-+            pids.reject! do |w_pid|
-+              if Process.waitpid(w_pid, Process::WNOHANG)
-+                log "    worker status: #{$?}"
-+                true
-+              end
-+            end
-+            break if pids.empty?
-+            sleep 0.5
-+          end
-+          t_end = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-+          log format("    worker shutdown time: %6.2f", t_end - t_st)
-+        end
-       rescue Interrupt
-         log "! Cancelled waiting for workers"
-       end
diff --git a/www-servers/puma/files/puma-3.12.5-cve-2020-11077.patch b/www-servers/puma/files/puma-3.12.5-cve-2020-11077.patch
deleted file mode 100644
index 4d26da28eee8..000000000000
--- a/www-servers/puma/files/puma-3.12.5-cve-2020-11077.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 089df0727ffab1b3b69f2e6da40597c52e346013 Mon Sep 17 00:00:00 2001
-From: Evan Phoenix <evan@phx.io>
-Date: Tue, 19 May 2020 15:20:10 -0700
-Subject: [PATCH] Reduce ambiguity of headers
-
----
- ext/puma_http11/http11_parser.c  |  4 +++-
- ext/puma_http11/http11_parser.rl |  4 +++-
- lib/puma/server.rb               | 31 +++++++++++++++++++++++++++++++
- 3 files changed, 37 insertions(+), 2 deletions(-)
-
-diff --git a/ext/puma_http11/http11_parser.c b/ext/puma_http11/http11_parser.c
-index 453f8cd40..e8844a37e 100644
---- a/ext/puma_http11/http11_parser.c
-+++ b/ext/puma_http11/http11_parser.c
-@@ -14,12 +14,14 @@
- 
- /*
-  * capitalizes all lower-case ASCII characters,
-- * converts dashes to underscores.
-+ * converts dashes to underscores, and underscores to commas.
-  */
- static void snake_upcase_char(char *c)
- {
-     if (*c >= 'a' && *c <= 'z')
-       *c &= ~0x20;
-+    else if (*c == '_')
-+      *c = ',';
-     else if (*c == '-')
-       *c = '_';
- }
-diff --git a/ext/puma_http11/http11_parser.rl b/ext/puma_http11/http11_parser.rl
-index 880c1d40b..62452ba7c 100644
---- a/ext/puma_http11/http11_parser.rl
-+++ b/ext/puma_http11/http11_parser.rl
-@@ -12,12 +12,14 @@
- 
- /*
-  * capitalizes all lower-case ASCII characters,
-- * converts dashes to underscores.
-+ * converts dashes to underscores, and underscores to commas.
-  */
- static void snake_upcase_char(char *c)
- {
-     if (*c >= 'a' && *c <= 'z')
-       *c &= ~0x20;
-+    else if (*c == '_')
-+      *c = ',';
-     else if (*c == '-')
-       *c = '_';
- }
-diff --git a/lib/puma/server.rb b/lib/puma/server.rb
-index d870b383f..5b2cd94df 100644
---- a/lib/puma/server.rb
-+++ b/lib/puma/server.rb
-@@ -665,6 +665,37 @@ def handle_request(req, lines)
-         }
-       end
- 
-+      # Fixup any headers with , in the name to have _ now. We emit
-+      # headers with , in them during the parse phase to avoid ambiguity
-+      # with the - to _ conversion for critical headers. But here for
-+      # compatibility, we'll convert them back. This code is written to
-+      # avoid allocation in the common case (ie there are no headers
-+      # with , in their names), that's why it has the extra conditionals.
-+
-+      to_delete = nil
-+      to_add = nil
-+
-+      env.each do |k,v|
-+        if k.start_with?("HTTP_") and k.include?(",") and k != "HTTP_TRANSFER,ENCODING"
-+          if to_delete
-+            to_delete << k
-+          else
-+            to_delete = [k]
-+          end
-+
-+          unless to_add
-+            to_add = {}
-+          end
-+
-+          to_add[k.gsub(",", "_")] = v
-+        end
-+      end
-+
-+      if to_delete
-+        to_delete.each { |k| env.delete(k) }
-+        env.merge! to_add
-+      end
-+
-       # A rack extension. If the app writes #call'ables to this
-       # array, we will invoke them when the request is done.
-       #
-From 0a3c09a0603857f088571d0eb69e0b9adee0fed1 Mon Sep 17 00:00:00 2001
-From: Evan Phoenix <evan@phx.io>
-Date: Tue, 19 May 2020 15:34:06 -0700
-Subject: [PATCH] Adjust test to match real world value
-
----
- test/test_puma_server.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/test_puma_server.rb b/test/test_puma_server.rb
-index 9d40cd5f3..375eca399 100644
---- a/test/test_puma_server.rb
-+++ b/test/test_puma_server.rb
-@@ -137,6 +137,7 @@ def test_default_server_port
- 
-     req = Net::HTTP::Get.new("/")
-     req['HOST'] = "example.com"
-+    req['X-FORWARDED-PROTO'] = "https,http"
- 
-     res = Net::HTTP.start @host, @server.connected_port do |http|
-       http.request(req)