From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- www-servers/puma/Manifest | 7 ++- .../puma/files/puma-5.6.4-logwriter-test.patch | 14 +++++ www-servers/puma/puma-5.4.0.ebuild | 59 --------------------- www-servers/puma/puma-5.6.1.ebuild | 59 --------------------- www-servers/puma/puma-5.6.4.ebuild | 61 ++++++++++++++++++++++ 5 files changed, 78 insertions(+), 122 deletions(-) create mode 100644 www-servers/puma/files/puma-5.6.4-logwriter-test.patch delete mode 100644 www-servers/puma/puma-5.4.0.ebuild delete mode 100644 www-servers/puma/puma-5.6.1.ebuild create mode 100644 www-servers/puma/puma-5.6.4.ebuild (limited to 'www-servers/puma') diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest index cb9508049eae..367ba7b2f0cf 100644 --- a/www-servers/puma/Manifest +++ b/www-servers/puma/Manifest @@ -1,9 +1,8 @@ -DIST puma-5.4.0.tar.gz 298525 BLAKE2B d93231582cd83519c258093fd9ac5e2b06398133e82e2d350103e7438a4ed1fd9b36f627739dbbad86e839211850c5387be57d5d114835e7e4d99940e842b128 SHA512 032a507d852c555393f401d4e72c358cf8c49d1c93ff7a559969f3d1f84c0b49180cbcee975bb6fea621d034a00874268ff05ae76f91775cc24089de0b4560da +AUX puma-5.6.4-logwriter-test.patch 528 BLAKE2B de30ccfa68916ef4ea3d460eb96d2b28711e619792848a0fd065eab836c88f03f4ecde8699773f963b745f595dda65df00772f0dcb096102612852687112833c SHA512 d24cb26fd89ec916ceea08eeb75dbcef89fda6babe7cd9a4f3a7f143c0e53dee4ad582a656cc002c054e89c960fd6b41f367ae490442ca1c6b69e6c3d1b8d0b7 DIST puma-5.5.2.tar.gz 302778 BLAKE2B 5911accde19aaed34cffecc71eb2db02f0d9f9ea7b57437ff7cf7580b0b51245ed68b254778cbdc11bea624b9f192aef0bfa7e24acde73b77290d780ab177933 SHA512 9887b465c6ed2a8e551b15fd161f19a9d2baa96b8eb8e247f13c98df9d34f6097bce81a52e8f88d69088d9b5f8477137af9110b7546afabc53767f337ad00ef8 -DIST puma-5.6.1.tar.gz 308896 BLAKE2B 0fa28fee64da577965c16fa564275760fbb3ebd04ed3eff583e53733b2f674ec6d29c20d2734bd16cb83aca8747ff5049e86d692bb5dd70fa5112a7a2c64ebf4 SHA512 262f17343668f5bf68842664eb6445208755385428151354fdb4039411e339c5c686f684bdb32c974516add3ca86af5693d1e169cf2bf74a8614be3cc06eccb0 DIST puma-5.6.2.tar.gz 309057 BLAKE2B 21a8c02f5fdfd23863a525987b55fbdb5c6b42d550cd8bb4580a78faf0206db42ee9b98409ce7b881dfad43bf5d31d202e228e3a62f0327083f043e22de32b3a SHA512 e08ebb968cb139136d11cfb12f7ebef7f4cafcbf3f26cf229c063aa0e55769ba8c4bc1df1dd9e04a4969d6f423cae1a09ce87e154315c9df80d61ec56b6f96e7 -EBUILD puma-5.4.0.ebuild 1853 BLAKE2B 7568cd85ec3925a107a4f4c6dcfff0764eb307bf211b3c0c1fa4b340ef29f8a3a8cf617009ff6382fed5db8d06a3d93fb6d256404649d616b4a655023ea392b6 SHA512 28ea6e783aeacd7f33451b5600fb33921760b2297b236e8f141caa01b8f807d05093ef1b910f260a22e9c2eed293e21d287eb27dd274cff46a99f8bc56b3a8b6 +DIST puma-5.6.4.tar.gz 310770 BLAKE2B 124190a0ca791352d055f833caec470be3be910ec4dbae5dc6860b79f5c678566f9bada3c6cf1066bc12f040ab891e9ea1a1da3188a9715db7643ef8d8f6b26f SHA512 6321a08e99be1023a1216466914416fbc91f5436ecccec4ea4cbfdc9c4ebc4979f93894ae12b72654269b0410d6a3053230806b860cb912c1abdf89766683a27 EBUILD puma-5.5.2.ebuild 1870 BLAKE2B 9bd4d49bd03e49002e556eba71e5ba347f0963f84de9941b96fd70cb834b0b4cd96fd0a32ef5198f2cd51f54910bfc8b9b94164a671d598f9bcee32e1047c2af SHA512 87c9708034606ce77be26340b3f20da38aa5ed0aeb8d1b72d1c1ad296514056170a96e447ebe38311aae54269b77b4fa2947ea62e24c51c01821a0390b35ed4d -EBUILD puma-5.6.1.ebuild 1865 BLAKE2B 127a5cb8ef8094bb53fee94296b13627bfe0ce423dc16c2aef68c87df56da6bd7eb166559f10621e98d0d5d466321fec589bd44e95dd26bf9710f8b5626c8919 SHA512 9789bb869f6c5de66122a547fe4d4dc54ed65dea0d11c0d7ae43b284a5adc11cf2eb99a766facdc78045a6f47eb3d4bfe1658caea285aeab2951fad6ad5a2e0c EBUILD puma-5.6.2.ebuild 1872 BLAKE2B 3ff23c24f53d2de7a71f4e05d48808eb6125534f39c926dcc75a48496211b234562db89a6b713c9f5862004f8fd365d055a0fa425267079a8a2c98f969a81abb SHA512 13230f2638ec4c9c80504b43fa8e0d0de3f533e2edceba6085db16b702839c16c031d678ba8e580a05d6a844043c27f1441ecbba8b27fbaec3987b27dc3678c6 +EBUILD puma-5.6.4.ebuild 1916 BLAKE2B 4c9970fec1d4e60fb5e96c3b7dc8bd5aa4eab77b3871228cdefa57dd11d4a62c52c1e1a4a30a65454e5e28b43e08596e321994f61822828c967b07015f6c2541 SHA512 ac7d38115fe196b02781b7fe6dc6ca0378b2dfab287cfc162b8e3981e1d95e31c686557784058b8ba8bb70da438743a380e5dbf5fcb771ec9792732ea3a85a2d MISC metadata.xml 710 BLAKE2B bf109653812999e453fb414a83bf404786d16df301ba9dff87c123e0f1dbff8e3024109e96b7f36a3d9e1ebe57eb7aecc7acfd923f0de1bc8c4f358a87b32379 SHA512 894c677c61b3c7f8081b1511c64c274497c4ea85171f5b19d9606a19e4dff33df00d169653e3aede3eee07737b1cf9faadb812eebcf67292be68150c026b7f8e diff --git a/www-servers/puma/files/puma-5.6.4-logwriter-test.patch b/www-servers/puma/files/puma-5.6.4-logwriter-test.patch new file mode 100644 index 000000000000..75086f76f027 --- /dev/null +++ b/www-servers/puma/files/puma-5.6.4-logwriter-test.patch @@ -0,0 +1,14 @@ +--- a/test/test_request_invalid.rb.orig 2022-03-31 08:02:24.833118111 +0200 ++++ b/test/test_request_invalid.rb 2022-03-31 08:02:41.897215442 +0200 +@@ -35,9 +35,8 @@ + [200, {}, [body]] + } + +- @log_writer = Puma::LogWriter.strings +- events = Puma::Events.new +- @server = Puma::Server.new app, @log_writer, events ++ events = Puma::Events.new($stdout, $stderr) ++ @server = Puma::Server.new app, events + @port = (@server.add_tcp_listener @host, 0).addr[1] + @server.run + sleep 0.15 if Puma.jruby? diff --git a/www-servers/puma/puma-5.4.0.ebuild b/www-servers/puma/puma-5.4.0.ebuild deleted file mode 100644 index 055f299b4a41..000000000000 --- a/www-servers/puma/puma-5.4.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -USE_RUBY="ruby26 ruby27 ruby30" - -RUBY_FAKEGEM_GEMSPEC="puma.gemspec" - -RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb) -RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma - -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 ~ppc64 ~riscv ~sparc ~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 )" - -ruby_add_rdepend "dev-ruby/nio4r:2" - -all_ruby_prepare() { - sed -e '/bundler/ s:^:#:' \ - -e '/prove/ s:^:#:' \ - -e '/stub_const/ s:^:#:' \ - -i test/helper.rb || die - - # Avoid tests failing inconsistently - sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die - - # Avoid launcher tests since they make assumptions about bundler use - rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die - - # Skip integration tests since they make a lot of assumptions about - # the environment - rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die - - # Avoid test that uses unpackaged stub_const - sed -i -e '/test_shutdown_with_grace/,/^ end/ s:^:#:' test/test_thread_pool.rb || die - - sed -e 's/git ls-files --/find/' \ - -e 's:_relative ": "./:' \ - -i ${RUBY_FAKEGEM_GEMSPEC} || 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 -} diff --git a/www-servers/puma/puma-5.6.1.ebuild b/www-servers/puma/puma-5.6.1.ebuild deleted file mode 100644 index 808b8fced84f..000000000000 --- a/www-servers/puma/puma-5.6.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -USE_RUBY="ruby26 ruby27 ruby30" - -RUBY_FAKEGEM_GEMSPEC="puma.gemspec" - -RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb) -RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma - -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 ~ppc64 ~sparc ~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/localhost dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" - -ruby_add_rdepend "dev-ruby/nio4r:2" - -all_ruby_prepare() { - sed -e '/bundler/ s:^:#:' \ - -e '/prove/ s:^:#:' \ - -e '/stub_const/ s:^:#:' \ - -i test/helper.rb || die - - # Avoid tests failing inconsistently - sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die - - # Avoid launcher tests since they make assumptions about bundler use - rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die - - # Skip integration tests since they make a lot of assumptions about - # the environment - rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die - - # Avoid test that uses unpackaged stub_const - sed -i -e '/test_shutdown_with_grace/,/^ end/ s:^:#:' test/test_thread_pool.rb || die - - sed -e 's/git ls-files --/find/' \ - -e 's:_relative ": "./:' \ - -i ${RUBY_FAKEGEM_GEMSPEC} || 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 -} diff --git a/www-servers/puma/puma-5.6.4.ebuild b/www-servers/puma/puma-5.6.4.ebuild new file mode 100644 index 000000000000..97be04bd98eb --- /dev/null +++ b/www-servers/puma/puma-5.6.4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby26 ruby27 ruby30" + +RUBY_FAKEGEM_GEMSPEC="puma.gemspec" + +RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb) +RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma + +inherit 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 ~ppc64 ~riscv ~sparc ~x86" +IUSE="" + +DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )" +RDEPEND+=" dev-libs/openssl:0=" + +PATCHES=( "${FILESDIR}/${P}-logwriter-test.patch" ) + +ruby_add_bdepend "virtual/ruby-ssl + test? ( dev-ruby/localhost dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" + +ruby_add_rdepend "dev-ruby/nio4r:2" + +all_ruby_prepare() { + sed -e '/bundler/ s:^:#:' \ + -e '/prove/ s:^:#:' \ + -e '/stub_const/ s:^:#:' \ + -i test/helper.rb || die + + # Avoid tests failing inconsistently + sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die + + # Avoid launcher tests since they make assumptions about bundler use + rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die + + # Skip integration tests since they make a lot of assumptions about + # the environment + rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die + + # Avoid test that uses unpackaged stub_const + sed -i -e '/test_shutdown_with_grace/,/^ end/ s:^:#:' test/test_thread_pool.rb || die + + sed -e 's/git ls-files --/find/' \ + -e 's:_relative ": "./:' \ + -i ${RUBY_FAKEGEM_GEMSPEC} || 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 +} -- cgit v1.2.3