From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1257330-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A706313835A for <garchives@archives.gentoo.org>; Thu, 4 Mar 2021 06:55:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF6E3E0801; Thu, 4 Mar 2021 06:55:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B56E3E0801 for <gentoo-commits@lists.gentoo.org>; Thu, 4 Mar 2021 06:55:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 36D33340F08 for <gentoo-commits@lists.gentoo.org>; Thu, 4 Mar 2021 06:55:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 931E3573 for <gentoo-commits@lists.gentoo.org>; Thu, 4 Mar 2021 06:55:44 +0000 (UTC) From: "Hans de Graaff" <graaff@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" <graaff@gentoo.org> Message-ID: <1614840904.ced18639ae1bbb703577882733b682965de69948.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/puma/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/puma/Manifest www-servers/puma/puma-4.3.4-r1.ebuild www-servers/puma/puma-4.3.7.ebuild www-servers/puma/puma-5.0.4.ebuild X-VCS-Directories: www-servers/puma/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: ced18639ae1bbb703577882733b682965de69948 X-VCS-Branch: master Date: Thu, 4 Mar 2021 06:55:44 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d8860e86-39a9-4f60-8557-a78df61b1c4a X-Archives-Hash: f94766e93fdd8e9fa8bfdff33463bb5e commit: ced18639ae1bbb703577882733b682965de69948 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Thu Mar 4 06:40:09 2021 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Thu Mar 4 06:55:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced18639 www-servers/puma: cleanup Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> www-servers/puma/Manifest | 3 -- www-servers/puma/puma-4.3.4-r1.ebuild | 75 ----------------------------------- www-servers/puma/puma-4.3.7.ebuild | 75 ----------------------------------- www-servers/puma/puma-5.0.4.ebuild | 65 ------------------------------ 4 files changed, 218 deletions(-) diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest index f577bf3f32c..1091b00d074 100644 --- a/www-servers/puma/Manifest +++ b/www-servers/puma/Manifest @@ -1,7 +1,4 @@ DIST puma-3.12.5.tar.gz 219175 BLAKE2B 55e80fba8fd84004090cb8d30b6fd01652f1beb1d1216c5d41ce46c616677504fa867f9701ed2631f4edc956c9377d72c6fd4a1b61e99fdbb50ea371b170a0c0 SHA512 1e6721844cbabab0cfb8b1707625723061821dae3ee06a3330075f787ae580e6836d9cbe436e63dc4602253ad1da3b56135316c923c03bbbae454d9457a44aec -DIST puma-4.3.4.tar.gz 241806 BLAKE2B 5450f14112ad45c48794186c7e9f078feed28a4194a917c949f4058b9d3a115273df6d93260de330047fa59730cb3ad45f31eb05e5880569e95a0b2c9de99a42 SHA512 619bf44c17622233b673dbf6c8f34b0463cd32684df81c20f31045d3106a86e110753b4da80e7b51b46fe18d90ee107d9a84a975dc3116840d9a9b5962178873 -DIST puma-4.3.7.tar.gz 242780 BLAKE2B 22a81839bde50c61147712b85fceb90af8f46ada0b60d1901d0918d75cd7a006a3c71a2c525b83846b3719b44419725fcc38ec7bd32c8bb6acc916ec95ca7aae SHA512 90262ddbb4c9ceceb023538f8f3e4542de6d02763e2dd60dc24fb1bbde45817bb5a6472469da8d384ec25d97f9501c8afbe2c8da3fb690965a38da4d342a8f1c -DIST puma-5.0.4.tar.gz 275942 BLAKE2B 1e607d7ff44ae9b677f6fb41355fe3b660bd880a642e5d3859e177c9327b68c0db729621ef0b3d7a5bb08917249fb7eac688027ceb62f072dabe7ba30086bf79 SHA512 6804ef3bfd4fa3a6695c213e3550244adace91121cb2c45f06fa4c68fb502787c5fdebba41b4754216eab880ca8738ab6f83d0ec9456a86fc6db99a4d4405bd8 DIST puma-5.1.1.tar.gz 284807 BLAKE2B 59ba17129e55e79aa2f8092d60a5643840bd996b7832d421cb72538fc48b0fb302353bedef56cc9b115bdfb15b33b0f453bfbf759b2e9552a9490a8b0cef3090 SHA512 8653c622c21dca2116219702e801d7aa3272f0771fd5c2d5149927edbd504a9838fb0d442bfc5dc523035a94dad25946738a5dda954fdaa74a9a00c85ed9f86e DIST puma-5.2.0.tar.gz 292173 BLAKE2B e09e524ef651a674373e0c5281832fef2e016f58e9623968e11c47135f7bcddb72c6458e74e85f4264c40f49222161d9749c3c29295d5470e47e7b0382e96bab SHA512 3e97f17be3926ff23b03def55dd1c9f015750a5aec74f0fa1551d20c9f386e0ec1a9e676dc0df49ae12129be6768a7d2f7df7a944dd2ec3d44f8243098dc7950 DIST puma-5.2.1.tar.gz 292945 BLAKE2B 1590dd256953578330ffcb4b2e8745c20ea893f62f251813da5b2473694312a9daeccd7cd5f453dbad441619594210fbdac431a6459deea24e1656c4da0ba01c SHA512 8ec1a351badd68ce6559eb99592e3f4d836ca49406749a6c2cd9162c443eadf3b4cf24ceb6c92e0e27057217f6487ff9923888ff4a1590f8cf9061d06ec16e52 diff --git a/www-servers/puma/puma-4.3.4-r1.ebuild b/www-servers/puma/puma-4.3.4-r1.ebuild deleted file mode 100644 index ec3645ec747..00000000000 --- a/www-servers/puma/puma-4.3.4-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby25 ruby26 ruby27" - -RUBY_FAKEGEM_GEMSPEC="puma.gemspec" - -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/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" - -ruby_add_rdepend "dev-ruby/nio4r:2" - -all_ruby_prepare() { - eapply "${FILESDIR}/${P}-cve-2020-11077.patch" - - sed -e '/bundler/ s:^:#:' \ - -e '/prove/ s:^:#:' \ - -i test/helper.rb || die - - # Avoid tests failing inconsistently - sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration_pumactl.rb || die - sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die - - # Loosen timing on flakey test - #sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die - - # Use correct ruby version - sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die - - # Avoid launcher tests since they make assumptions about bundler use - rm -f test/test_launcher.rb || die - - sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || 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-4.3.7.ebuild b/www-servers/puma/puma-4.3.7.ebuild deleted file mode 100644 index 0f9bdaf4875..00000000000 --- a/www-servers/puma/puma-4.3.7.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby25 ruby26 ruby27" - -RUBY_FAKEGEM_GEMSPEC="puma.gemspec" - -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/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" - -ruby_add_rdepend "dev-ruby/nio4r:2" - -all_ruby_prepare() { -# eapply "${FILESDIR}/${P}-cve-2020-11077.patch" - - sed -e '/bundler/ s:^:#:' \ - -e '/prove/ s:^:#:' \ - -i test/helper.rb || die - - # Avoid tests failing inconsistently - sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration_pumactl.rb || die - sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die - - # Loosen timing on flakey test - #sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die - - # Use correct ruby version - sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die - - # Avoid launcher tests since they make assumptions about bundler use - rm -f test/test_launcher.rb || die - - sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || 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-5.0.4.ebuild b/www-servers/puma/puma-5.0.4.ebuild deleted file mode 100644 index 4ae517dd995..00000000000 --- a/www-servers/puma/puma-5.0.4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby25 ruby26 ruby27" - -RUBY_FAKEGEM_GEMSPEC="puma.gemspec" - -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/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 || 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_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 -}