1 |
commit: 85b809a16dc69b4f749dcf63805838b9105cff2e |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 30 08:42:41 2017 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 30 08:42:58 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b809a1 |
7 |
|
8 |
www-apache/passenger: drop vulnerable versions, bug 616638 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
www-apache/passenger/Manifest | 2 - |
13 |
www-apache/passenger/passenger-4.0.60.ebuild | 114 -------------------------- |
14 |
www-apache/passenger/passenger-5.0.30.ebuild | 118 --------------------------- |
15 |
3 files changed, 234 deletions(-) |
16 |
|
17 |
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest |
18 |
index 00c8cc8595c..7b9f358ea4c 100644 |
19 |
--- a/www-apache/passenger/Manifest |
20 |
+++ b/www-apache/passenger/Manifest |
21 |
@@ -1,3 +1 @@ |
22 |
-DIST passenger-4.0.60.tar.gz 5271049 SHA256 bbb8c18cc371441ce4ee9a4de4d124b6ec5e6af6e95a472b93a72d0357dc88fe SHA512 144df1e5e3dfbf9f9fa13d959c0324760b01c5e86b3f8e52c3d7d9c32eec916a35cc5c52a8c7a5ab9ed1ccee4d7efc9f77fc9940ad1515937a7bfe964753b219 WHIRLPOOL c8f3993b2745eb577c2eddbca2fd280e7db56adbeb4f72ba4b29770d95b991a8012243d1a9bd19aa59a28cfb9326117d649f70cf6d406a4e53acd1e40deb5b57 |
23 |
-DIST passenger-5.0.30.tar.gz 5588130 SHA256 f367e0c1d808d7356c3749222194a72ea03efe61a3bf1b682bd05d47f087b4e3 SHA512 08de84f63e26260b759240278f905b86a0ae105a332182ba8bb6f47beaf43f28fc22feb6b577c9e185cf0ff8a90c4ee7773bc6380a5066738040f161737d7800 WHIRLPOOL 0c2f4201fd9974cf8b16750beb56d7685cdf1067bf5524e2a12e9ab7b71781bb3daad2a225540847a9f9ce20b321bfb0bc82af65a94501492ff20d0efb61f5d1 |
24 |
DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766 |
25 |
|
26 |
diff --git a/www-apache/passenger/passenger-4.0.60.ebuild b/www-apache/passenger/passenger-4.0.60.ebuild |
27 |
deleted file mode 100644 |
28 |
index 6ac931936d0..00000000000 |
29 |
--- a/www-apache/passenger/passenger-4.0.60.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,114 +0,0 @@ |
32 |
-# Copyright 1999-2015 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=5 |
36 |
-USE_RUBY="ruby20 ruby21 ruby22" |
37 |
- |
38 |
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs |
39 |
- |
40 |
-DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" |
41 |
-HOMEPAGE="http://modrails.com/" |
42 |
-SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="GPL-2" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64 x86" |
47 |
-IUSE="debug" |
48 |
- |
49 |
-ruby_add_bdepend "dev-ruby/rake" |
50 |
- |
51 |
-ruby_add_rdepend " |
52 |
- >=dev-ruby/daemon_controller-1.2.0 |
53 |
- >=dev-ruby/rack-1.0.0:* |
54 |
- >=dev-ruby/rake-0.8.1" |
55 |
- |
56 |
-CDEPEND=">=dev-libs/libev-4.15 net-misc/curl[ssl] |
57 |
- www-servers/apache[apache2_modules_unixd(+)]" |
58 |
- |
59 |
-RDEPEND="${RDEPEND} ${CDEPEND}" |
60 |
-DEPEND="${DEPEND} ${CDEPEND}" |
61 |
- |
62 |
-APACHE2_MOD_CONF="30_mod_${PN}-4.0.0 30_mod_${PN}" |
63 |
-APACHE2_MOD_DEFINE="PASSENGER" |
64 |
- |
65 |
-need_apache2 |
66 |
- |
67 |
-pkg_setup() { |
68 |
- use debug && append-flags -DPASSENGER_DEBUG |
69 |
-} |
70 |
- |
71 |
-all_ruby_prepare() { |
72 |
- epatch "${FILESDIR}"/${PN}-4.0.49-gentoo.patch |
73 |
- |
74 |
- # Change these with sed instead of a patch so that we can easily use |
75 |
- # the toolchain-funcs methods. |
76 |
- sed -i -e "s/gcc/$(tc-getCC)/" \ |
77 |
- -e "s/g++/$(tc-getCXX)/" \ |
78 |
- -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die |
79 |
- |
80 |
- # Avoid fixed debugging CFLAGs. |
81 |
- sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die |
82 |
- |
83 |
- # Use sed here so that we can dynamically set the documentation directory. |
84 |
- sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ |
85 |
- -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ |
86 |
- -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ |
87 |
- lib/phusion_passenger.rb || die |
88 |
- sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die |
89 |
- |
90 |
- # Don't install a tool that won't work in our setup. |
91 |
- sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die |
92 |
- rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." |
93 |
- |
94 |
- # Make sure we use the system-provided version. |
95 |
- rm -rf ext/libev || die "Unable to remove vendored libev." |
96 |
- |
97 |
- # Avoid building documentation to avoid a dependency on mizuho. |
98 |
- #sed -i -e 's/, :doc//' build/packaging.rb || die |
99 |
- touch doc/*.html || die |
100 |
- |
101 |
- # Fix hard-coded use of AR |
102 |
- sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die |
103 |
-} |
104 |
- |
105 |
-all_ruby_compile() { |
106 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
107 |
- APXS2="${APXS}" \ |
108 |
- HTTPD="${APACHE_BIN}" \ |
109 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
110 |
- USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ |
111 |
- ruby -S rake apache2 || die "rake failed" |
112 |
-} |
113 |
- |
114 |
-each_ruby_compile() { |
115 |
- append-flags -fno-strict-aliasing |
116 |
- |
117 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
118 |
- APXS2="${APXS}" \ |
119 |
- HTTPD="${APACHE_BIN}" \ |
120 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
121 |
- USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ |
122 |
- ${RUBY} -S rake native_support || die "rake failed" |
123 |
-} |
124 |
- |
125 |
-all_ruby_install() { |
126 |
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" |
127 |
- apache-module_src_install |
128 |
- |
129 |
- # Patch in the correct libdir |
130 |
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die |
131 |
- |
132 |
- dodoc CHANGELOG README.md |
133 |
-} |
134 |
- |
135 |
-each_ruby_install() { |
136 |
- DISTDIR="${D}" \ |
137 |
- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ |
138 |
- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ |
139 |
- APXS2="${APXS}" \ |
140 |
- HTTPD="${APACHE_BIN}" \ |
141 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
142 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
143 |
- USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ |
144 |
- ${RUBY} -S rake fakeroot || die "rake failed" |
145 |
-} |
146 |
|
147 |
diff --git a/www-apache/passenger/passenger-5.0.30.ebuild b/www-apache/passenger/passenger-5.0.30.ebuild |
148 |
deleted file mode 100644 |
149 |
index a3f1cc60a24..00000000000 |
150 |
--- a/www-apache/passenger/passenger-5.0.30.ebuild |
151 |
+++ /dev/null |
152 |
@@ -1,118 +0,0 @@ |
153 |
-# Copyright 1999-2017 Gentoo Foundation |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
- |
156 |
-EAPI=5 |
157 |
-USE_RUBY="ruby20 ruby21 ruby22 ruby23" |
158 |
- |
159 |
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs |
160 |
- |
161 |
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" |
162 |
-HOMEPAGE="https://www.phusionpassenger.com/" |
163 |
-SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" |
164 |
- |
165 |
-LICENSE="GPL-2" |
166 |
-SLOT="0" |
167 |
-KEYWORDS="amd64 x86" |
168 |
-IUSE="debug" |
169 |
- |
170 |
-ruby_add_bdepend "dev-ruby/rake" |
171 |
- |
172 |
-ruby_add_rdepend " |
173 |
- >=dev-ruby/rack-1.0.0:* |
174 |
- >=dev-ruby/rake-0.8.1" |
175 |
- |
176 |
-# libev is bundled but with adapations that do not seem to be accepted |
177 |
-# upstream, so we must use the bundled version :-( |
178 |
-CDEPEND=" |
179 |
- >=dev-libs/libuv-1.8.0 |
180 |
- net-misc/curl[ssl] |
181 |
- www-servers/apache[apache2_modules_unixd(+)]" |
182 |
- |
183 |
-RDEPEND="${RDEPEND} ${CDEPEND}" |
184 |
-DEPEND="${DEPEND} ${CDEPEND}" |
185 |
- |
186 |
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" |
187 |
-APACHE2_MOD_DEFINE="PASSENGER" |
188 |
- |
189 |
-need_apache2 |
190 |
- |
191 |
-pkg_setup() { |
192 |
- use debug && append-flags -DPASSENGER_DEBUG |
193 |
-} |
194 |
- |
195 |
-all_ruby_prepare() { |
196 |
- epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch |
197 |
- epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch |
198 |
- |
199 |
- # Change these with sed instead of a patch so that we can easily use |
200 |
- # the toolchain-funcs methods. |
201 |
- sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ |
202 |
- -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ |
203 |
- -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die |
204 |
- |
205 |
- # Avoid fixed debugging CFLAGs. |
206 |
- sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die |
207 |
- |
208 |
- # Use sed here so that we can dynamically set the documentation directory. |
209 |
- sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ |
210 |
- -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ |
211 |
- -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ |
212 |
- src/ruby_supportlib/phusion_passenger.rb || die |
213 |
- sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die |
214 |
- |
215 |
- # Don't install a tool that won't work in our setup. |
216 |
- sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die |
217 |
- rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." |
218 |
- |
219 |
- # Make sure we use the system-provided version where possible |
220 |
- rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." |
221 |
- |
222 |
- # Avoid building documentation to avoid a dependency on mizuho. |
223 |
- #sed -i -e 's/, :doc//' build/packaging.rb || die |
224 |
- touch doc/*.html || die |
225 |
- |
226 |
- # Fix hard-coded use of AR |
227 |
- sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die |
228 |
-} |
229 |
- |
230 |
-all_ruby_compile() { |
231 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
232 |
- APXS2="${APXS}" \ |
233 |
- HTTPD="${APACHE_BIN}" \ |
234 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
235 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
236 |
- ruby -S rake apache2 || die "rake failed" |
237 |
-} |
238 |
- |
239 |
-each_ruby_compile() { |
240 |
- append-flags -fno-strict-aliasing |
241 |
- |
242 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
243 |
- APXS2="${APXS}" \ |
244 |
- HTTPD="${APACHE_BIN}" \ |
245 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
246 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
247 |
- ${RUBY} -S rake native_support || die "rake failed" |
248 |
-} |
249 |
- |
250 |
-all_ruby_install() { |
251 |
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" |
252 |
- apache-module_src_install |
253 |
- |
254 |
- # Patch in the correct libdir |
255 |
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die |
256 |
- |
257 |
- dodoc CHANGELOG README.md |
258 |
-} |
259 |
- |
260 |
-each_ruby_install() { |
261 |
- DISTDIR="${D}" \ |
262 |
- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ |
263 |
- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ |
264 |
- APXS2="${APXS}" \ |
265 |
- HTTPD="${APACHE_BIN}" \ |
266 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
267 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
268 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
269 |
- ${RUBY} -S rake fakeroot || die "rake failed" |
270 |
-} |