puma-fixup.diff

diff --git a/rubygem-puma.spec b/rubygem-puma.spec
index c6778f4..c07c37f 100644
--- a/rubygem-puma.spec
+++ b/rubygem-puma.spec
@@ -1,9 +1,6 @@
 # Generated from puma-3.6.0.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name puma
 
-# For testing purposes
-#%%global prerelease 
-
 # Allow to use precompiled version of parser, because Ragel not always
 # behaves correctly.
 %bcond_without ragel
@@ -129,13 +126,13 @@ sed -i '/prove_it!/ s/^/#/' test/helper.rb
 # TimeoutEveryTestCase::TestTookTooLong: execution expired
 sed -i '/::Timeout.timeout/ s/45/300/' test/helper.rb
 
-# Tests use bundler
+# Tests use bundler; test_phased_restart_cluster timeouts in Koje
 mv test/test_preserve_bundler_env.rb{,.disable}
 mv test/test_worker_gem_independence.rb{,.disable}
-sed -i '/^\s*def test_prune_bundler_with_multiple_workers$/a\
+sed -i -e '/^\s*def test_prune_bundler_with_multiple_workers$/a\
+    skip' \
+       -e '/^\s*def test_phased_restart_cluster$/a\
     skip' test/test_integration_pumactl.rb
-sed -i '/^\s*def test_prune_bundler_with_multiple_workers$/a\
-    skip' test/test_integration_cluster.rb
 
 # Tests require systemd (sd_notify gem)
 mv test/test_integration_systemd.rb{,.disable}
@@ -151,7 +148,9 @@ mv test/test_puma_localhost_authority.rb{,.disable}
 # TestIntegrationCluster#test_hot_restart_does_not_drop_connections
 # e.g. Errno::EMFILE: Too many open files - /usr/bin/ruby
 mv test/test_integration_single.rb{,.disable}
-# https://github.com/puma/puma/issues/2209
+# https://github.com/puma/puma/pull/2746
+# https://github.com/puma/puma/issues/2320#issuecomment-769348251
+# https://github.com/puma/puma/issues/2804
 mv test/test_integration_cluster.rb{,.disable}
 
 # Skip an unstable test on Koji.
@@ -174,13 +173,14 @@ sed -i '/^  def test_plugin$/a\
 sed -i '/^  def test_verify_fail_if_client_unknown_ca$/a\
     skip' test/test_puma_server_ssl.rb
 
+
+
 # Make binary exension available in Ruby load path.
 # Enable verbose mode to check unstable tests easily.
 RUBYOPT="-Ilib:$(dirs +1 -l)%{gem_extdir_mri}" \
 CI=1 \
 LC_ALL=C.UTF-8 \
-ruby -e 'Dir.glob "./test/**/test_*.rb", &method(:require)' \
-  -- -v
+ruby -e 'Dir.glob "./test/**/test_*.rb", &method(:require)'
 
 %if %{with help2man}
 # Check `--help` output, using which man page is created
@@ -215,6 +215,7 @@ popd
 * Wed Dec 22 2021 Pavel Valena <pvalena@redhat.com> - 5.5.2-1
 - Update to puma 5.5.2.
   Resolves: rhbz#1880111
+  Resolves: CVE-2021-41136
 
 * Mon Nov 08 2021 Vít Ondruch <vondruch@redhat.com> - 4.3.6-5
 - Fix FTBFS due to updated RPM.