6 files changed, 59 insertions, 73 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index fb9de4bfd8c6..0791781f5957 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 637fcee07786..e00cc275f7ff 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,7 +1,5 @@
-DIST puma-3.11.4.tar.gz 210324 BLAKE2B 16c01182f4a3adad026ab4f214945b1c5e002d2d99ef965947d982b488c3d080f50d41b175cc69181b2c953d32df6dfb63253dbd0312d594a2472f69f01aa30f SHA512 4c32c7587cab7ae0afd1e90d3de00db67fe314a700240d295303549905e3c556cba06ea41fbe6230f50328769d47272c52f9eb6460b0653fa14e336bacd120ea
-DIST puma-3.12.0.tar.gz 215213 BLAKE2B 1b142e6cc135021eccb01b2e8643d8d22f1c535723a943ae996c6607c7e771d8990ae2132fa2aad8ea44eceaf8c8f586fbb3d61a9aa2963a02d9f54c76773f5e SHA512 e8f0383de24e452735dddaf80e997cc428af2de767be31db6b47fdd5d09268fcb7ca139233311dda83c7a70db6646109e04308c076ac2bf2510766791171ddc5
+AUX puma-3.12.1-ruby26-waitpid.patch 1722 BLAKE2B cee9b9e89cf098a387481d754732f54274ce0f9580568e62496513d58d46578f81c13df2aa98d2da218bf9d8ad581e8728ff60be488905493e9acc6b88012a88 SHA512 86f826d7f9ac8a50d62f8cf2b87b0df5f7ce55c1a5e4ac7b928b756ece809e30750bb2a7c3c50dc95f9edcb463e9c453b5d3eb84ffe44952904200b5337351ad
 DIST puma-3.12.1.tar.gz 217543 BLAKE2B 6427c48d17ead515a17fd53ba05baba0ca27b9a3c6b26257e83b21ce099d7ff36666dfe1f1a964d23addd666c5aa83c46e6795ad2e22236de7136e25be689ff5 SHA512 70784ed89403e96d1bdb68f3ee0a5446d98a6f8a1af5ddf369d837e2ae3320118c29c9c33e7a9db7a76b1a80aef66a9b6426140c492721984de50e7cc5fc8300
-EBUILD puma-3.11.4.ebuild 1912 BLAKE2B 3b230f35f65f74e07adaaf85c979e823281920def719d056264e718f823878c7c8cefdf2d08f5146c57067e3c0932379415566730bb5f21dbca5980198503560 SHA512 568ecfb914f2d0ccb3896fe3c3a1d6d1a18413b992f72a2e1b67373194f8ca6072da937d09cdeabfc0f6971cb2b0ebc887922c00554ef7dd526082f2280b5573
-EBUILD puma-3.12.0.ebuild 1910 BLAKE2B ce5c492096c3b163c8f446f5ddac6304b1b67c7a61dddc16fe7e08e264a7fa1767fcbc45708e33bda99015e7d3fb2932a215c95d902aab224d146db4566a1aca SHA512 e267e4f13d75caf2de3c9bf9e9dcb84d07df7233c9c433ad1a35ecce047aa27e33b933957360b955a19dc0b3f17e810880694fdec275419770d1df477fee57a4
-EBUILD puma-3.12.1.ebuild 2021 BLAKE2B 95dacafd408be10f2be5a5baad06e06c2878b19e753362127d076d7914d34e0d168ada453ea9a70cf4e2def9e772ec9fb6d80cf21a54a0bfb74e97c98d7c42d3 SHA512 90aee14d9b0fc5537cbf0382ec0063b949c203e3ef68b7d8f5c87a24f0fae8356c092401c8515bae9453742ce22a916dc57a51b5ff2e03e8b1d1b5be28d5f154
+EBUILD puma-3.12.1-r1.ebuild 2046 BLAKE2B 3eb760987f2c8df37e0d1acacf17181295c9be79f17f00ef7d4155b85f9cfc3c9628127c772f7a9f20c341d4a2b0a9da4560df1322547dc79240bbb3a7650e9c SHA512 44af179ce965d60d43a1fbb2acf6d09bc7f60547691fb9928c6055b38f7d240b0037655cdc55e5749b6ef757e317b449eb1b19ccd86e7a9929d73307ff83b31a
+EBUILD puma-3.12.1.ebuild 2020 BLAKE2B 8cfe583c94dd6cd3f8ae694c0512790163659de0875bf0be99995202c1c77c6b84b308cbecc7227846dc6a89f209d52a5153d00191e96850564b458d600e75a7 SHA512 6448152060f9b83c02e4a0c7e586941f3dac7f7498eaad5828df6ed0b3df4a87aa9fc7e258638186cb3ec5fdbac3b549042460fc5a6e5ca8c6c02051be6b80c4
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
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
new file mode 100644
index 000000000000..b28c69fa4d4b
--- /dev/null
+++ b/www-servers/puma/files/puma-3.12.1-ruby26-waitpid.patch
@@ -0,0 +1,47 @@
+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/puma-3.11.4.ebuild b/www-servers/puma/puma-3.11.4.ebuild
deleted file mode 100644
index 6d2b52c564be..000000000000
--- a/www-servers/puma/puma-3.11.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
-
-	# Avoid test failing inconsistently
-	sed -i -e '/phased_restart_via_pumactl/,/^  end/ s:^:#:' test/test_integration.rb || die
-
-	# Avoid test that trigger a bug in ruby very easily and lead to
-	# failure. This affects all current puma versions in combination
-	# with the latest ruby versions, so we add this new version anyway
-	# while allowing these tests to fail.
-	# https://github.com/puma/puma/pull/1345
-	rm -f test/test_{persistent,puma_server,puma_server_ssl}.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
-		-e 's/localhost/127.0.0.1/' test/shell/* || die
-	sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/puma_http11 extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/puma_http11
-	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-
-	einfo "Running integration tests"
-	pushd test/shell
-	#sh run.sh || die
-	popd
-}
diff --git a/www-servers/puma/puma-3.12.0.ebuild b/www-servers/puma/puma-3.12.1-r1.ebuild
index 1c30abe77f9a..4c27201eb9dd 100644
--- a/www-servers/puma/puma-3.12.0.ebuild
+++ b/www-servers/puma/puma-3.12.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -25,6 +25,8 @@ ruby_add_bdepend "virtual/ruby-ssl
 	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
 
 all_ruby_prepare() {
+	eapply "${FILESDIR}/${P}-ruby26-waitpid.patch"
+
 	sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
 
 	# Avoid test failing inconsistently
@@ -35,7 +37,10 @@ all_ruby_prepare() {
 	# with the latest ruby versions, so we add this new version anyway
 	# while allowing these tests to fail.
 	# https://github.com/puma/puma/pull/1345
-	rm -f test/test_{persistent,puma_server,puma_server_ssl}.rb || die
+	rm -f test/test_puma_server_ssl.rb || die
+
+	# Use correct ruby version
+	sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die
 }
 
 each_ruby_prepare() {
diff --git a/www-servers/puma/puma-3.12.1.ebuild b/www-servers/puma/puma-3.12.1.ebuild
index 091df024abde..d3cb0a1a16f5 100644
--- a/www-servers/puma/puma-3.12.1.ebuild
+++ b/www-servers/puma/puma-3.12.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"