Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/apache: apache-2.2.24.ebuild apache-2.4.6-r2.ebuild apache-2.2.26.ebuild apache-2.4.6-r1.ebuild apache-2.2.25.ebuild apache-2.4.7.ebuild ChangeLog
Date: Fri, 24 Jan 2014 03:39:55
Message-Id: 20140124033951.96E5E2004B@flycatcher.gentoo.org
1 vapier 14/01/24 03:39:51
2
3 Modified: apache-2.2.24.ebuild apache-2.4.6-r2.ebuild
4 apache-2.2.26.ebuild apache-2.4.6-r1.ebuild
5 apache-2.2.25.ebuild apache-2.4.7.ebuild ChangeLog
6 Log:
7 Disable dumb cross-compiling size check.
8
9 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
10
11 Revision Changes Path
12 1.14 www-servers/apache/apache-2.2.24.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild?rev=1.14&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild?rev=1.14&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild?r1=1.13&r2=1.14
17
18 Index: apache-2.2.24.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild,v
21 retrieving revision 1.13
22 retrieving revision 1.14
23 diff -u -r1.13 -r1.14
24 --- apache-2.2.24.ebuild 11 Apr 2013 09:24:14 -0000 1.13
25 +++ apache-2.2.24.ebuild 24 Jan 2014 03:39:51 -0000 1.14
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2013 Gentoo Foundation
28 +# Copyright 1999-2014 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild,v 1.13 2013/04/11 09:24:14 polynomial-c Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild,v 1.14 2014/01/24 03:39:51 vapier Exp $
32
33 EAPI="2"
34
35 @@ -83,7 +83,7 @@
36 mime
37 "
38
39 -inherit apache-2
40 +inherit apache-2 toolchain-funcs
41
42 DESCRIPTION="The Apache Web Server."
43 HOMEPAGE="http://httpd.apache.org/"
44 @@ -110,3 +110,10 @@
45 sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
46 cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
47 }
48 +
49 +src_configure() {
50 + # Brain dead check.
51 + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
52 +
53 + apache-2_src_configure
54 +}
55
56
57
58 1.3 www-servers/apache/apache-2.4.6-r2.ebuild
59
60 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild?rev=1.3&view=markup
61 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild?rev=1.3&content-type=text/plain
62 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild?r1=1.2&r2=1.3
63
64 Index: apache-2.4.6-r2.ebuild
65 ===================================================================
66 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v
67 retrieving revision 1.2
68 retrieving revision 1.3
69 diff -u -r1.2 -r1.3
70 --- apache-2.4.6-r2.ebuild 7 Nov 2013 14:56:35 -0000 1.2
71 +++ apache-2.4.6-r2.ebuild 24 Jan 2014 03:39:51 -0000 1.3
72 @@ -1,6 +1,6 @@
73 -# Copyright 1999-2013 Gentoo Foundation
74 +# Copyright 1999-2014 Gentoo Foundation
75 # Distributed under the terms of the GNU General Public License v2
76 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v 1.2 2013/11/07 14:56:35 polynomial-c Exp $
77 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v 1.3 2014/01/24 03:39:51 vapier Exp $
78
79 EAPI="2"
80
81 @@ -113,7 +113,7 @@
82 use ssl && MODULE_CRITICAL+=" socache_shmcb"
83 use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
84
85 -inherit eutils apache-2 systemd
86 +inherit eutils apache-2 systemd toolchain-funcs
87
88 DESCRIPTION="The Apache Web Server."
89 HOMEPAGE="http://httpd.apache.org/"
90 @@ -150,6 +150,13 @@
91 popd &>/dev/null || die
92 }
93
94 +src_configure() {
95 + # Brain dead check.
96 + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
97 +
98 + apache-2_src_configure
99 +}
100 +
101 src_install() {
102 apache-2_src_install
103 for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
104
105
106
107 1.2 www-servers/apache/apache-2.2.26.ebuild
108
109 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild?rev=1.2&view=markup
110 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild?rev=1.2&content-type=text/plain
111 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild?r1=1.1&r2=1.2
112
113 Index: apache-2.2.26.ebuild
114 ===================================================================
115 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild,v
116 retrieving revision 1.1
117 retrieving revision 1.2
118 diff -u -r1.1 -r1.2
119 --- apache-2.2.26.ebuild 20 Nov 2013 17:50:40 -0000 1.1
120 +++ apache-2.2.26.ebuild 24 Jan 2014 03:39:51 -0000 1.2
121 @@ -1,6 +1,6 @@
122 -# Copyright 1999-2013 Gentoo Foundation
123 +# Copyright 1999-2014 Gentoo Foundation
124 # Distributed under the terms of the GNU General Public License v2
125 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild,v 1.1 2013/11/20 17:50:40 polynomial-c Exp $
126 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild,v 1.2 2014/01/24 03:39:51 vapier Exp $
127
128 EAPI=5
129
130 @@ -83,7 +83,7 @@
131 mime
132 "
133
134 -inherit apache-2 systemd
135 +inherit apache-2 systemd toolchain-funcs
136
137 DESCRIPTION="The Apache Web Server."
138 HOMEPAGE="http://httpd.apache.org/"
139 @@ -113,6 +113,13 @@
140 cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
141 }
142
143 +src_configure() {
144 + # Brain dead check.
145 + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
146 +
147 + apache-2_src_configure
148 +}
149 +
150 src_install() {
151 apache-2_src_install
152
153
154
155
156 1.4 www-servers/apache/apache-2.4.6-r1.ebuild
157
158 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild?rev=1.4&view=markup
159 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild?rev=1.4&content-type=text/plain
160 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild?r1=1.3&r2=1.4
161
162 Index: apache-2.4.6-r1.ebuild
163 ===================================================================
164 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild,v
165 retrieving revision 1.3
166 retrieving revision 1.4
167 diff -u -r1.3 -r1.4
168 --- apache-2.4.6-r1.ebuild 7 Nov 2013 14:56:35 -0000 1.3
169 +++ apache-2.4.6-r1.ebuild 24 Jan 2014 03:39:51 -0000 1.4
170 @@ -1,6 +1,6 @@
171 -# Copyright 1999-2013 Gentoo Foundation
172 +# Copyright 1999-2014 Gentoo Foundation
173 # Distributed under the terms of the GNU General Public License v2
174 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild,v 1.3 2013/11/07 14:56:35 polynomial-c Exp $
175 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild,v 1.4 2014/01/24 03:39:51 vapier Exp $
176
177 EAPI="2"
178
179 @@ -113,7 +113,7 @@
180 use ssl && MODULE_CRITICAL+=" socache_shmcb"
181 use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
182
183 -inherit eutils apache-2 systemd
184 +inherit eutils apache-2 systemd toolchain-funcs
185
186 DESCRIPTION="The Apache Web Server."
187 HOMEPAGE="http://httpd.apache.org/"
188 @@ -150,6 +150,13 @@
189 popd &>/dev/null || die
190 }
191
192 +src_configure() {
193 + # Brain dead check.
194 + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
195 +
196 + apache-2_src_configure
197 +}
198 +
199 src_install() {
200 apache-2_src_install
201 for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
202
203
204
205 1.12 www-servers/apache/apache-2.2.25.ebuild
206
207 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild?rev=1.12&view=markup
208 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild?rev=1.12&content-type=text/plain
209 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild?r1=1.11&r2=1.12
210
211 Index: apache-2.2.25.ebuild
212 ===================================================================
213 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v
214 retrieving revision 1.11
215 retrieving revision 1.12
216 diff -u -r1.11 -r1.12
217 --- apache-2.2.25.ebuild 7 Nov 2013 14:56:35 -0000 1.11
218 +++ apache-2.2.25.ebuild 24 Jan 2014 03:39:51 -0000 1.12
219 @@ -1,6 +1,6 @@
220 -# Copyright 1999-2013 Gentoo Foundation
221 +# Copyright 1999-2014 Gentoo Foundation
222 # Distributed under the terms of the GNU General Public License v2
223 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.11 2013/11/07 14:56:35 polynomial-c Exp $
224 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.12 2014/01/24 03:39:51 vapier Exp $
225
226 EAPI="2"
227
228 @@ -83,7 +83,7 @@
229 mime
230 "
231
232 -inherit apache-2 systemd
233 +inherit apache-2 systemd toolchain-funcs
234
235 DESCRIPTION="The Apache Web Server."
236 HOMEPAGE="http://httpd.apache.org/"
237 @@ -113,6 +113,13 @@
238 cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
239 }
240
241 +src_configure() {
242 + # Brain dead check.
243 + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
244 +
245 + apache-2_src_configure
246 +}
247 +
248 src_install() {
249 apache-2_src_install
250
251
252
253
254 1.4 www-servers/apache/apache-2.4.7.ebuild
255
256 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild?rev=1.4&view=markup
257 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild?rev=1.4&content-type=text/plain
258 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild?r1=1.3&r2=1.4
259
260 Index: apache-2.4.7.ebuild
261 ===================================================================
262 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v
263 retrieving revision 1.3
264 retrieving revision 1.4
265 diff -u -r1.3 -r1.4
266 --- apache-2.4.7.ebuild 15 Jan 2014 22:48:44 -0000 1.3
267 +++ apache-2.4.7.ebuild 24 Jan 2014 03:39:51 -0000 1.4
268 @@ -1,6 +1,6 @@
269 # Copyright 1999-2014 Gentoo Foundation
270 # Distributed under the terms of the GNU General Public License v2
271 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.3 2014/01/15 22:48:44 robbat2 Exp $
272 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.4 2014/01/24 03:39:51 vapier Exp $
273
274 EAPI=5
275
276 @@ -114,7 +114,7 @@
277 use ssl && MODULE_CRITICAL+=" socache_shmcb"
278 use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
279
280 -inherit eutils apache-2 systemd
281 +inherit eutils apache-2 systemd toolchain-funcs
282
283 DESCRIPTION="The Apache Web Server."
284 HOMEPAGE="http://httpd.apache.org/"
285 @@ -150,6 +150,13 @@
286 popd &>/dev/null || die
287 }
288
289 +src_configure() {
290 + # Brain dead check.
291 + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
292 +
293 + apache-2_src_configure
294 +}
295 +
296 src_install() {
297 apache-2_src_install
298 for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
299
300
301
302 1.254 www-servers/apache/ChangeLog
303
304 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.254&view=markup
305 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.254&content-type=text/plain
306 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.253&r2=1.254
307
308 Index: ChangeLog
309 ===================================================================
310 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v
311 retrieving revision 1.253
312 retrieving revision 1.254
313 diff -u -r1.253 -r1.254
314 --- ChangeLog 15 Jan 2014 22:48:44 -0000 1.253
315 +++ ChangeLog 24 Jan 2014 03:39:51 -0000 1.254
316 @@ -1,6 +1,11 @@
317 # ChangeLog for www-servers/apache
318 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
319 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.253 2014/01/15 22:48:44 robbat2 Exp $
320 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.254 2014/01/24 03:39:51 vapier Exp $
321 +
322 + 24 Jan 2014; Mike Frysinger <vapier@g.o> apache-2.2.24.ebuild,
323 + apache-2.2.25.ebuild, apache-2.2.26.ebuild, apache-2.4.6-r1.ebuild,
324 + apache-2.4.6-r2.ebuild, apache-2.4.7.ebuild:
325 + Disable dumb cross-compiling size check.
326
327 15 Jan 2014; Robin H. Johnson <robbat2@g.o> apache-2.4.7.ebuild:
328 proxy_scgi should behind IfDefine PROXY as well, otherwise you get undefined