1 |
commit: 0cba2a579e179af2c7225479422a6aab244889d3 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 4 08:22:28 2021 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 4 08:22:36 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cba2a57 |
7 |
|
8 |
www-servers/puma: cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
12 |
|
13 |
www-servers/puma/Manifest | 1 - |
14 |
www-servers/puma/puma-3.12.5-r1.ebuild | 71 ---------------------------------- |
15 |
2 files changed, 72 deletions(-) |
16 |
|
17 |
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest |
18 |
index 7e5c3e28267..dba3a54e818 100644 |
19 |
--- a/www-servers/puma/Manifest |
20 |
+++ b/www-servers/puma/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST puma-3.12.5.tar.gz 219175 BLAKE2B 55e80fba8fd84004090cb8d30b6fd01652f1beb1d1216c5d41ce46c616677504fa867f9701ed2631f4edc956c9377d72c6fd4a1b61e99fdbb50ea371b170a0c0 SHA512 1e6721844cbabab0cfb8b1707625723061821dae3ee06a3330075f787ae580e6836d9cbe436e63dc4602253ad1da3b56135316c923c03bbbae454d9457a44aec |
23 |
DIST puma-5.1.1.tar.gz 284807 BLAKE2B 59ba17129e55e79aa2f8092d60a5643840bd996b7832d421cb72538fc48b0fb302353bedef56cc9b115bdfb15b33b0f453bfbf759b2e9552a9490a8b0cef3090 SHA512 8653c622c21dca2116219702e801d7aa3272f0771fd5c2d5149927edbd504a9838fb0d442bfc5dc523035a94dad25946738a5dda954fdaa74a9a00c85ed9f86e |
24 |
DIST puma-5.3.2.tar.gz 297673 BLAKE2B e3bfa38347526063587db966d20ea68f32cd88616d89b5f2d9152228d5d420b50c2918e24304c1bc8119af5790a2464f0a055ab92862a56262013ddbba006a1f SHA512 32e80b413184d371d451a35985a371a7655df0f7e81624f2a05e3cf65c2e1b035275a8e25ab03d13c9c1f921ec30cdeb3659e1201baae5940dcb3edcb525ff25 |
25 |
|
26 |
diff --git a/www-servers/puma/puma-3.12.5-r1.ebuild b/www-servers/puma/puma-3.12.5-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 063d1408eda..00000000000 |
29 |
--- a/www-servers/puma/puma-3.12.5-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,71 +0,0 @@ |
32 |
-# Copyright 1999-2020 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-USE_RUBY="ruby25 ruby26 ruby27" |
38 |
- |
39 |
-inherit multilib ruby-fakegem |
40 |
- |
41 |
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack" |
42 |
-HOMEPAGE="https://puma.io/" |
43 |
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="BSD" |
46 |
-SLOT="3" |
47 |
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86" |
48 |
-IUSE="" |
49 |
- |
50 |
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )" |
51 |
-RDEPEND+=" dev-libs/openssl:0" |
52 |
- |
53 |
-ruby_add_bdepend "virtual/ruby-ssl |
54 |
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" |
55 |
- |
56 |
-all_ruby_prepare() { |
57 |
- eapply "${FILESDIR}/${PN}-3.12.1-ruby26-waitpid.patch" |
58 |
- eapply "${FILESDIR}/${PN}-3.12.5-cve-2020-11077.patch" |
59 |
- |
60 |
- sed -i -e '/bundler/ s:^:#:' test/helper.rb || die |
61 |
- |
62 |
- # Avoid test failing inconsistently |
63 |
- sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die |
64 |
- |
65 |
- # Fix FORWARDED_PROTO |
66 |
- sed -i -e '127 s/443/80/' test/test_puma_server.rb || die |
67 |
- |
68 |
- # Avoid test that trigger a bug in ruby very easily and lead to |
69 |
- # failure. This affects all current puma versions in combination |
70 |
- # with the latest ruby versions, so we add this new version anyway |
71 |
- # while allowing these tests to fail. |
72 |
- # https://github.com/puma/puma/pull/1345 |
73 |
- rm -f test/test_puma_server_ssl.rb || die |
74 |
- |
75 |
- # Use correct ruby version |
76 |
- sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die |
77 |
-} |
78 |
- |
79 |
-each_ruby_prepare() { |
80 |
- sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \ |
81 |
- -e 's/localhost/127.0.0.1/' test/shell/* || die |
82 |
- sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die |
83 |
-} |
84 |
- |
85 |
-each_ruby_configure() { |
86 |
- ${RUBY} -Cext/puma_http11 extconf.rb || die |
87 |
-} |
88 |
- |
89 |
-each_ruby_compile() { |
90 |
- emake V=1 -Cext/puma_http11 |
91 |
- cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die |
92 |
-} |
93 |
- |
94 |
-each_ruby_test() { |
95 |
- einfo "Running test suite" |
96 |
- ${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 |
97 |
- |
98 |
- einfo "Running integration tests" |
99 |
- pushd test/shell |
100 |
- #sh run.sh || die |
101 |
- popd |
102 |
-} |