1 |
commit: 78d16ec499eaaf69025d7ce840b2ce3c68bba140 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 14 09:39:39 2019 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 14 09:39:39 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78d16ec4 |
7 |
|
8 |
www-servers/puma: cleanup vulnerable versions |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.16 |
11 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
12 |
|
13 |
www-servers/puma/Manifest | 3 -- |
14 |
www-servers/puma/puma-3.12.1-r1.ebuild | 69 -------------------------------- |
15 |
www-servers/puma/puma-3.12.1.ebuild | 67 ------------------------------- |
16 |
www-servers/puma/puma-4.2.0.ebuild | 73 ---------------------------------- |
17 |
www-servers/puma/puma-4.2.1.ebuild | 73 ---------------------------------- |
18 |
5 files changed, 285 deletions(-) |
19 |
|
20 |
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest |
21 |
index 0466b49cf6e..f0fd9221c3d 100644 |
22 |
--- a/www-servers/puma/Manifest |
23 |
+++ b/www-servers/puma/Manifest |
24 |
@@ -1,5 +1,2 @@ |
25 |
-DIST puma-3.12.1.tar.gz 217543 BLAKE2B 6427c48d17ead515a17fd53ba05baba0ca27b9a3c6b26257e83b21ce099d7ff36666dfe1f1a964d23addd666c5aa83c46e6795ad2e22236de7136e25be689ff5 SHA512 70784ed89403e96d1bdb68f3ee0a5446d98a6f8a1af5ddf369d837e2ae3320118c29c9c33e7a9db7a76b1a80aef66a9b6426140c492721984de50e7cc5fc8300 |
26 |
DIST puma-3.12.2.tar.gz 218109 BLAKE2B 82224c3a9c1b2c8e903e5f02a8b43effab820581abbaea5bea9c537eb36e39deb34d6f7d62d9fc42e1e5a6f3c153583d8e009c73864a9e57c39e2d31387b2813 SHA512 b0721dc9b380f1932a60a8ac2e1f0ef3869c735359e9a9e1e37bb118ebc3f550a24bd3e544142513ebeb1ee37ae01a41ec67e71e1d182faec0bb6ed4a60bafcf |
27 |
-DIST puma-4.2.0.tar.gz 234724 BLAKE2B 7cf9381261549f545dfbaf4cf60e57b469c50cf25a8e0f72fb6d0ef3b23e1f59ad2e7d3d0aa195e6019525a6d6084511a098e619a13f8be95dc330086463eb49 SHA512 4e314cde1d2ace8f064205c3f36a602847b2314b5987df303dcb1c8e3820cf56d40a8f8cb9883c157de6d2d76cc1062950feef7f901c51a4bfee9ad3255c455b |
28 |
-DIST puma-4.2.1.tar.gz 235399 BLAKE2B 1bc0b9a095298e8838dbf466d53ef171d33477f8bc2d628d14ee33bdd46fd8a0219140f3d789293a3d9c98a2d5893960225bf054a6c8e875c3e4a7507f8467c1 SHA512 9eec638b5e1378d6dd4b49f32dfb719f7ae6976442dab53074ba37340a30c4c79ffffb76587625cc3d7a47b7a5535c8caabb56aba479a50f2d396a1c8480030f |
29 |
DIST puma-4.3.1.tar.gz 239800 BLAKE2B 123dcb71dd310a960555fe801530586a39ef6876d9019549eb66590195ab1f450999d5365cf9ebbf2f057f2c641739f3fcdf743f5de076d7e637b0b17210410c SHA512 cbb5fc187d3aebfa255d3d0f2d897e109f50e18feadedbf02b73a350555dcbcfbfd91c0a810c11d6d3ac2ec26103479a53eed3fae77c96f1ae6cc2814960de46 |
30 |
|
31 |
diff --git a/www-servers/puma/puma-3.12.1-r1.ebuild b/www-servers/puma/puma-3.12.1-r1.ebuild |
32 |
deleted file mode 100644 |
33 |
index 4c27201eb9d..00000000000 |
34 |
--- a/www-servers/puma/puma-3.12.1-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,69 +0,0 @@ |
37 |
-# Copyright 1999-2019 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=6 |
41 |
- |
42 |
-USE_RUBY="ruby24 ruby25 ruby26" |
43 |
- |
44 |
-RUBY_FAKEGEM_RECIPE_DOC="rdoc" |
45 |
- |
46 |
-inherit multilib ruby-fakegem |
47 |
- |
48 |
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack" |
49 |
-HOMEPAGE="https://puma.io/" |
50 |
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
51 |
- |
52 |
-LICENSE="BSD" |
53 |
-SLOT="3" |
54 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
55 |
-IUSE="" |
56 |
- |
57 |
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )" |
58 |
-RDEPEND+=" dev-libs/openssl:0" |
59 |
- |
60 |
-ruby_add_bdepend "virtual/ruby-ssl |
61 |
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" |
62 |
- |
63 |
-all_ruby_prepare() { |
64 |
- eapply "${FILESDIR}/${P}-ruby26-waitpid.patch" |
65 |
- |
66 |
- sed -i -e '/bundler/ s:^:#:' test/helper.rb || die |
67 |
- |
68 |
- # Avoid test failing inconsistently |
69 |
- sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die |
70 |
- |
71 |
- # Avoid test that trigger a bug in ruby very easily and lead to |
72 |
- # failure. This affects all current puma versions in combination |
73 |
- # with the latest ruby versions, so we add this new version anyway |
74 |
- # while allowing these tests to fail. |
75 |
- # https://github.com/puma/puma/pull/1345 |
76 |
- rm -f test/test_puma_server_ssl.rb || die |
77 |
- |
78 |
- # Use correct ruby version |
79 |
- sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die |
80 |
-} |
81 |
- |
82 |
-each_ruby_prepare() { |
83 |
- sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \ |
84 |
- -e 's/localhost/127.0.0.1/' test/shell/* || die |
85 |
- sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die |
86 |
-} |
87 |
- |
88 |
-each_ruby_configure() { |
89 |
- ${RUBY} -Cext/puma_http11 extconf.rb || die |
90 |
-} |
91 |
- |
92 |
-each_ruby_compile() { |
93 |
- emake V=1 -Cext/puma_http11 |
94 |
- cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die |
95 |
-} |
96 |
- |
97 |
-each_ruby_test() { |
98 |
- einfo "Running test suite" |
99 |
- ${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 |
100 |
- |
101 |
- einfo "Running integration tests" |
102 |
- pushd test/shell |
103 |
- #sh run.sh || die |
104 |
- popd |
105 |
-} |
106 |
|
107 |
diff --git a/www-servers/puma/puma-3.12.1.ebuild b/www-servers/puma/puma-3.12.1.ebuild |
108 |
deleted file mode 100644 |
109 |
index d3cb0a1a16f..00000000000 |
110 |
--- a/www-servers/puma/puma-3.12.1.ebuild |
111 |
+++ /dev/null |
112 |
@@ -1,67 +0,0 @@ |
113 |
-# Copyright 1999-2019 Gentoo Authors |
114 |
-# Distributed under the terms of the GNU General Public License v2 |
115 |
- |
116 |
-EAPI=6 |
117 |
- |
118 |
-USE_RUBY="ruby23 ruby24 ruby25" |
119 |
- |
120 |
-RUBY_FAKEGEM_RECIPE_DOC="rdoc" |
121 |
- |
122 |
-inherit multilib ruby-fakegem |
123 |
- |
124 |
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack" |
125 |
-HOMEPAGE="https://puma.io/" |
126 |
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
127 |
- |
128 |
-LICENSE="BSD" |
129 |
-SLOT="3" |
130 |
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86" |
131 |
-IUSE="" |
132 |
- |
133 |
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )" |
134 |
-RDEPEND+=" dev-libs/openssl:0" |
135 |
- |
136 |
-ruby_add_bdepend "virtual/ruby-ssl |
137 |
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" |
138 |
- |
139 |
-all_ruby_prepare() { |
140 |
- sed -i -e '/bundler/ s:^:#:' test/helper.rb || die |
141 |
- |
142 |
- # Avoid test failing inconsistently |
143 |
- sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die |
144 |
- |
145 |
- # Avoid test that trigger a bug in ruby very easily and lead to |
146 |
- # failure. This affects all current puma versions in combination |
147 |
- # with the latest ruby versions, so we add this new version anyway |
148 |
- # while allowing these tests to fail. |
149 |
- # https://github.com/puma/puma/pull/1345 |
150 |
- rm -f test/test_{persistent,puma_server,puma_server_ssl}.rb || die |
151 |
- |
152 |
- # Use correct ruby version |
153 |
- sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die |
154 |
-} |
155 |
- |
156 |
-each_ruby_prepare() { |
157 |
- sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \ |
158 |
- -e 's/localhost/127.0.0.1/' test/shell/* || die |
159 |
- sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die |
160 |
-} |
161 |
- |
162 |
-each_ruby_configure() { |
163 |
- ${RUBY} -Cext/puma_http11 extconf.rb || die |
164 |
-} |
165 |
- |
166 |
-each_ruby_compile() { |
167 |
- emake V=1 -Cext/puma_http11 |
168 |
- cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die |
169 |
-} |
170 |
- |
171 |
-each_ruby_test() { |
172 |
- einfo "Running test suite" |
173 |
- ${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 |
174 |
- |
175 |
- einfo "Running integration tests" |
176 |
- pushd test/shell |
177 |
- #sh run.sh || die |
178 |
- popd |
179 |
-} |
180 |
|
181 |
diff --git a/www-servers/puma/puma-4.2.0.ebuild b/www-servers/puma/puma-4.2.0.ebuild |
182 |
deleted file mode 100644 |
183 |
index ba941f94f9c..00000000000 |
184 |
--- a/www-servers/puma/puma-4.2.0.ebuild |
185 |
+++ /dev/null |
186 |
@@ -1,73 +0,0 @@ |
187 |
-# Copyright 1999-2019 Gentoo Authors |
188 |
-# Distributed under the terms of the GNU General Public License v2 |
189 |
- |
190 |
-EAPI=7 |
191 |
- |
192 |
-USE_RUBY="ruby24 ruby25 ruby26" |
193 |
- |
194 |
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec" |
195 |
- |
196 |
-inherit multilib ruby-fakegem |
197 |
- |
198 |
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack" |
199 |
-HOMEPAGE="https://puma.io/" |
200 |
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
201 |
- |
202 |
-LICENSE="BSD" |
203 |
-SLOT="3" |
204 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
205 |
-IUSE="" |
206 |
- |
207 |
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )" |
208 |
-RDEPEND+=" dev-libs/openssl:0" |
209 |
- |
210 |
-ruby_add_bdepend "virtual/ruby-ssl |
211 |
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" |
212 |
- |
213 |
-ruby_add_rdepend "dev-ruby/nio4r:2" |
214 |
- |
215 |
-all_ruby_prepare() { |
216 |
- sed -e '/bundler/ s:^:#:' \ |
217 |
- -e '/prove/ s:^:#:' \ |
218 |
- -i test/helper.rb || die |
219 |
- |
220 |
- # Avoid tests failing inconsistently |
221 |
- sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration_pumactl.rb || die |
222 |
- sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die |
223 |
- |
224 |
- # Loosen timing on flakey test |
225 |
- #sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die |
226 |
- |
227 |
- # Use correct ruby version |
228 |
- sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die |
229 |
- |
230 |
- # Avoid launcher tests since they make assumptions about bundler use |
231 |
- rm -f test/test_launcher.rb || die |
232 |
- |
233 |
- sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die |
234 |
-} |
235 |
- |
236 |
-each_ruby_prepare() { |
237 |
- sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \ |
238 |
- -e 's/localhost/127.0.0.1/' test/shell/* || die |
239 |
- sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die |
240 |
-} |
241 |
- |
242 |
-each_ruby_configure() { |
243 |
- ${RUBY} -Cext/puma_http11 extconf.rb || die |
244 |
-} |
245 |
- |
246 |
-each_ruby_compile() { |
247 |
- emake V=1 -Cext/puma_http11 |
248 |
- cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die |
249 |
-} |
250 |
- |
251 |
-each_ruby_test() { |
252 |
- einfo "Running test suite" |
253 |
- ${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 |
254 |
- |
255 |
- einfo "Running integration tests" |
256 |
- pushd test/shell |
257 |
- #sh run.sh || die |
258 |
- popd |
259 |
-} |
260 |
|
261 |
diff --git a/www-servers/puma/puma-4.2.1.ebuild b/www-servers/puma/puma-4.2.1.ebuild |
262 |
deleted file mode 100644 |
263 |
index ba941f94f9c..00000000000 |
264 |
--- a/www-servers/puma/puma-4.2.1.ebuild |
265 |
+++ /dev/null |
266 |
@@ -1,73 +0,0 @@ |
267 |
-# Copyright 1999-2019 Gentoo Authors |
268 |
-# Distributed under the terms of the GNU General Public License v2 |
269 |
- |
270 |
-EAPI=7 |
271 |
- |
272 |
-USE_RUBY="ruby24 ruby25 ruby26" |
273 |
- |
274 |
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec" |
275 |
- |
276 |
-inherit multilib ruby-fakegem |
277 |
- |
278 |
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack" |
279 |
-HOMEPAGE="https://puma.io/" |
280 |
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
281 |
- |
282 |
-LICENSE="BSD" |
283 |
-SLOT="3" |
284 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
285 |
-IUSE="" |
286 |
- |
287 |
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )" |
288 |
-RDEPEND+=" dev-libs/openssl:0" |
289 |
- |
290 |
-ruby_add_bdepend "virtual/ruby-ssl |
291 |
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" |
292 |
- |
293 |
-ruby_add_rdepend "dev-ruby/nio4r:2" |
294 |
- |
295 |
-all_ruby_prepare() { |
296 |
- sed -e '/bundler/ s:^:#:' \ |
297 |
- -e '/prove/ s:^:#:' \ |
298 |
- -i test/helper.rb || die |
299 |
- |
300 |
- # Avoid tests failing inconsistently |
301 |
- sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration_pumactl.rb || die |
302 |
- sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die |
303 |
- |
304 |
- # Loosen timing on flakey test |
305 |
- #sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die |
306 |
- |
307 |
- # Use correct ruby version |
308 |
- sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die |
309 |
- |
310 |
- # Avoid launcher tests since they make assumptions about bundler use |
311 |
- rm -f test/test_launcher.rb || die |
312 |
- |
313 |
- sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die |
314 |
-} |
315 |
- |
316 |
-each_ruby_prepare() { |
317 |
- sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \ |
318 |
- -e 's/localhost/127.0.0.1/' test/shell/* || die |
319 |
- sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die |
320 |
-} |
321 |
- |
322 |
-each_ruby_configure() { |
323 |
- ${RUBY} -Cext/puma_http11 extconf.rb || die |
324 |
-} |
325 |
- |
326 |
-each_ruby_compile() { |
327 |
- emake V=1 -Cext/puma_http11 |
328 |
- cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die |
329 |
-} |
330 |
- |
331 |
-each_ruby_test() { |
332 |
- einfo "Running test suite" |
333 |
- ${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 |
334 |
- |
335 |
- einfo "Running integration tests" |
336 |
- pushd test/shell |
337 |
- #sh run.sh || die |
338 |
- popd |
339 |
-} |