1 |
polynomial-c 14/05/22 14:02:43 |
2 |
|
3 |
Modified: ChangeLog metadata.xml |
4 |
Added: apache-2.4.9-r3.ebuild apache-2.2.27-r3.ebuild |
5 |
Removed: apache-2.4.9-r2.ebuild apache-2.2.27-r2.ebuild |
6 |
Log: |
7 |
Revbumps. Cleaned up ebuilds a bit. Moved apxs to /usr/bin (bug #502384). Fixed bugs #489236, #493020, #493360, #503986 and #509772 |
8 |
|
9 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
10 |
|
11 |
Revision Changes Path |
12 |
1.275 www-servers/apache/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.275&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.275&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.274&r2=1.275 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v |
21 |
retrieving revision 1.274 |
22 |
retrieving revision 1.275 |
23 |
diff -u -r1.274 -r1.275 |
24 |
--- ChangeLog 21 May 2014 06:22:13 -0000 1.274 |
25 |
+++ ChangeLog 22 May 2014 14:02:43 -0000 1.275 |
26 |
@@ -1,6 +1,14 @@ |
27 |
# ChangeLog for www-servers/apache |
28 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.274 2014/05/21 06:22:13 polynomial-c Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.275 2014/05/22 14:02:43 polynomial-c Exp $ |
31 |
+ |
32 |
+*apache-2.4.9-r3 (22 May 2014) |
33 |
+*apache-2.2.27-r3 (22 May 2014) |
34 |
+ |
35 |
+ 22 May 2014; Lars Wendler <polynomial-c@g.o> -apache-2.2.27-r2.ebuild, |
36 |
+ +apache-2.2.27-r3.ebuild, -apache-2.4.9-r2.ebuild, +apache-2.4.9-r3.ebuild: |
37 |
+ Revbumps. Cleaned up ebuilds a bit. Moved apxs to /usr/bin (bug #502384). |
38 |
+ Fixed bugs #489236, #493020, #493360, #503986 and #509772. |
39 |
|
40 |
21 May 2014; Lars Wendler <polynomial-c@g.o> -apache-2.2.24.ebuild, |
41 |
-apache-2.2.25.ebuild: |
42 |
|
43 |
|
44 |
|
45 |
1.18 www-servers/apache/metadata.xml |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/metadata.xml?rev=1.18&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/metadata.xml?rev=1.18&content-type=text/plain |
49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/metadata.xml?r1=1.17&r2=1.18 |
50 |
|
51 |
Index: metadata.xml |
52 |
=================================================================== |
53 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/metadata.xml,v |
54 |
retrieving revision 1.17 |
55 |
retrieving revision 1.18 |
56 |
diff -u -r1.17 -r1.18 |
57 |
--- metadata.xml 24 Apr 2014 09:38:26 -0000 1.17 |
58 |
+++ metadata.xml 22 May 2014 14:02:43 -0000 1.18 |
59 |
@@ -17,6 +17,7 @@ |
60 |
<flag name='apache2_modules_access_compat'>Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.</flag> |
61 |
<flag name='apache2_modules_authn_core'>Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).</flag> |
62 |
<flag name='apache2_modules_authz_core'>Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.</flag> |
63 |
+ <flag name='apache2_modules_authz_dbd'>Provides authorization capabilities via SQL database so that authenticated users can be allowed or denied access to portions of the web site by group membership.</flag> |
64 |
<flag name='apache2_modules_cache_disk'>Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</flag> |
65 |
<flag name='apache2_modules_lbmethod_byrequests'>Request counting load balancer scheduler algorithm for proxy_balancer.</flag> |
66 |
<flag name='apache2_modules_lbmethod_bytraffic'>Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.</flag> |
67 |
@@ -26,6 +27,7 @@ |
68 |
<flag name='apache2_modules_socache_shmcb'>A shared object cache provider using a high-performance cyclic buffer inside a shared memory segment.</flag> |
69 |
<flag name='apache2_modules_unixd'>Basic (required) security for Unix-family platforms.</flag> |
70 |
<flag name='apache2_modules_proxy_fcgi'>FCGI support module for mod_proxy.</flag> |
71 |
+ <flag name='apache2_modules_proxy_wstunnel'>Provides support for the tunnelling of web socket connections to a backend websockets server.</flag> |
72 |
<flag name='apache2_modules_ratelimit'>Ratelimit module for transfer rate management</flag> |
73 |
<flag name='apache2_modules_remoteip'>Remotip module for logging</flag> |
74 |
</use> |
75 |
|
76 |
|
77 |
|
78 |
1.1 www-servers/apache/apache-2.4.9-r3.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.9-r3.ebuild?rev=1.1&view=markup |
81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.9-r3.ebuild?rev=1.1&content-type=text/plain |
82 |
|
83 |
Index: apache-2.4.9-r3.ebuild |
84 |
=================================================================== |
85 |
# Copyright 1999-2014 Gentoo Foundation |
86 |
# Distributed under the terms of the GNU General Public License v2 |
87 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.9-r3.ebuild,v 1.1 2014/05/22 14:02:43 polynomial-c Exp $ |
88 |
|
89 |
EAPI=5 |
90 |
|
91 |
# latest gentoo apache files |
92 |
GENTOO_PATCHSTAMP="20140522" |
93 |
GENTOO_DEVELOPER="polynomial-c" |
94 |
GENTOO_PATCHNAME="gentoo-apache-2.4.9-r3" |
95 |
|
96 |
# IUSE/USE_EXPAND magic |
97 |
IUSE_MPMS_FORK="peruser prefork" |
98 |
IUSE_MPMS_THREAD="event worker" |
99 |
|
100 |
# << obsolete modules: |
101 |
# authn_default authz_default mem_cache |
102 |
# mem_cache is replaced by cache_disk |
103 |
# ?? buggy modules |
104 |
# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found |
105 |
# >> added modules for reason: |
106 |
# compat: compatibility with 2.2 access control |
107 |
# authz_host: new module for access control |
108 |
# authn_core: functionality provided by authn_alias in previous versions |
109 |
# authz_core: new module, provides core authorization capabilities |
110 |
# cache_disk: replacement for mem_cache |
111 |
# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 |
112 |
# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 |
113 |
# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 |
114 |
# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 |
115 |
# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). |
116 |
# socache_shmcb: shared object cache provider. Default config with ssl needs it |
117 |
# unixd: fixes startup error: Invalid command 'User' |
118 |
IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest |
119 |
authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core |
120 |
authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex |
121 |
cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate |
122 |
dir dumpio env expires ext_filter file_cache filter headers ident imagemap |
123 |
include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness |
124 |
lbmethod_heartbeat log_config log_forensic logio mime mime_magic negotiation |
125 |
proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi |
126 |
proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif |
127 |
slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack |
128 |
unixd version vhost_alias" |
129 |
# The following are also in the source as of this version, but are not available |
130 |
# for user selection: |
131 |
# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
132 |
# optional_fn_import optional_hook_export optional_hook_import |
133 |
|
134 |
# inter-module dependencies |
135 |
# TODO: this may still be incomplete |
136 |
MODULE_DEPENDS=" |
137 |
dav_fs:dav |
138 |
dav_lock:dav |
139 |
deflate:filter |
140 |
cache_disk:cache |
141 |
ext_filter:filter |
142 |
file_cache:cache |
143 |
lbmethod_byrequests:proxy_balancer |
144 |
lbmethod_byrequests:slotmem_shm |
145 |
lbmethod_bytraffic:proxy_balancer |
146 |
lbmethod_bybusyness:proxy_balancer |
147 |
lbmethod_heartbeat:proxy_balancer |
148 |
log_forensic:log_config |
149 |
logio:log_config |
150 |
cache_disk:cache |
151 |
mime_magic:mime |
152 |
proxy_ajp:proxy |
153 |
proxy_balancer:proxy |
154 |
proxy_balancer:slotmem_shm |
155 |
proxy_connect:proxy |
156 |
proxy_ftp:proxy |
157 |
proxy_http:proxy |
158 |
proxy_scgi:proxy |
159 |
proxy_fcgi:proxy |
160 |
proxy_wstunnel:proxy |
161 |
substitute:filter |
162 |
" |
163 |
|
164 |
# module<->define mappings |
165 |
MODULE_DEFINES=" |
166 |
auth_digest:AUTH_DIGEST |
167 |
authnz_ldap:AUTHNZ_LDAP |
168 |
cache:CACHE |
169 |
cache_disk:CACHE |
170 |
dav:DAV |
171 |
dav_fs:DAV |
172 |
dav_lock:DAV |
173 |
file_cache:CACHE |
174 |
info:INFO |
175 |
ldap:LDAP |
176 |
proxy:PROXY |
177 |
proxy_ajp:PROXY |
178 |
proxy_balancer:PROXY |
179 |
proxy_connect:PROXY |
180 |
proxy_ftp:PROXY |
181 |
proxy_http:PROXY |
182 |
proxy_fcgi:PROXY |
183 |
proxy_scgi:PROXY |
184 |
proxy_wstunnel:PROXY |
185 |
socache_shmcb:SSL |
186 |
ssl:SSL |
187 |
status:STATUS |
188 |
suexec:SUEXEC |
189 |
userdir:USERDIR |
190 |
" |
191 |
|
192 |
# critical modules for the default config |
193 |
MODULE_CRITICAL=" |
194 |
authn_core |
195 |
authz_core |
196 |
authz_host |
197 |
dir |
198 |
mime |
199 |
unixd |
200 |
" |
201 |
inherit eutils apache-2 systemd toolchain-funcs |
202 |
|
203 |
DESCRIPTION="The Apache Web Server." |
204 |
HOMEPAGE="http://httpd.apache.org/" |
205 |
|
206 |
# some helper scripts are Apache-1.1, thus both are here |
207 |
LICENSE="Apache-2.0 Apache-1.1" |
208 |
SLOT="2" |
209 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
210 |
IUSE="" |
211 |
|
212 |
pkg_setup() { |
213 |
# dependend critical modules which are not allowed in global scope due |
214 |
# to USE flag conditionals (bug #499260) |
215 |
use ssl && MODULE_CRITICAL+=" socache_shmcb" |
216 |
use doc && MODULE_CRITICAL+=" alias negotiation setenvif" |
217 |
apache-2_pkg_setup |
218 |
} |
219 |
|
220 |
src_configure() { |
221 |
# Brain dead check. |
222 |
tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
223 |
|
224 |
apache-2_src_configure |
225 |
} |
226 |
|
227 |
src_compile() { |
228 |
if tc-is-cross-compiler; then |
229 |
# This header is the same across targets, so use the build compiler. |
230 |
pushd server >/dev/null |
231 |
emake gen_test_char |
232 |
tc-export_build_env BUILD_CC |
233 |
${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
234 |
gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die |
235 |
popd >/dev/null |
236 |
fi |
237 |
|
238 |
default |
239 |
} |
240 |
|
241 |
src_install() { |
242 |
apache-2_src_install |
243 |
for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do |
244 |
rm "${D}"/$i || die "Failed to prune apache-tools bits" |
245 |
done |
246 |
for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do |
247 |
rm "${D}"/$i || die "Failed to prune apache-tools bits" |
248 |
done |
249 |
for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do |
250 |
rm "${D}"/$i || die "Failed to prune apache-tools bits" |
251 |
done |
252 |
for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do |
253 |
rm "${D}/"$i || die "Failed to prune apache-tools bits" |
254 |
done |
255 |
|
256 |
# install apxs in /usr/bin (bug #502384) and put a symlink into the |
257 |
# old location until all ebuilds and eclasses have been modified to |
258 |
# use the new location. |
259 |
local apxs="/usr/bin/apxs" |
260 |
cp "${S}"/support/apxs "${D}"${apxs} || die "Failed to install apxs" |
261 |
ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die |
262 |
chmod 0755 "${D}"${apxs} || die |
263 |
|
264 |
# Note: wait for mod_systemd to be included in the next release, |
265 |
# then apache2.4.service can be used and systemd support controlled |
266 |
# through --enable-systemd |
267 |
systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service" |
268 |
systemd_dotmpfilesd "${FILESDIR}/apache.conf" |
269 |
#insinto /etc/apache2/modules.d |
270 |
#doins "${FILESDIR}/00_systemd.conf" |
271 |
} |
272 |
|
273 |
pkg_postinst() |
274 |
{ |
275 |
apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" |
276 |
# warnings that default config might not work out of the box |
277 |
for mod in $MODULE_CRITICAL; do |
278 |
if ! use "apache2_modules_${mod}"; then |
279 |
echo |
280 |
ewarn "Warning: Critical module not installed!" |
281 |
ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" |
282 |
ewarn "are highly recomended but might not be in the base profile yet." |
283 |
ewarn "Default config for ssl needs module 'socache_shmcb'." |
284 |
ewarn "Enabling the following flags is highly recommended:" |
285 |
for cmod in $MODULE_CRITICAL; do |
286 |
use "apache2_modules_${cmod}" || \ |
287 |
ewarn "+ apache2_modules_${cmod}" |
288 |
done |
289 |
echo |
290 |
break |
291 |
fi |
292 |
done |
293 |
# warning for proxy_balancer and missing load balancing scheduler |
294 |
if use apache2_modules_proxy_balancer; then |
295 |
local lbset= |
296 |
for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do |
297 |
if use "apache2_modules_${mod}"; then |
298 |
lbset=1 && break |
299 |
fi |
300 |
done |
301 |
if [ ! $lbset ]; then |
302 |
echo |
303 |
ewarn "Info: Missing load balancing scheduler algorithm module" |
304 |
ewarn "(They were split off from proxy_balancer in 2.3)" |
305 |
ewarn "In order to get the ability of load balancing, at least" |
306 |
ewarn "one of these modules has to be present:" |
307 |
ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" |
308 |
echo |
309 |
fi |
310 |
fi |
311 |
} |
312 |
|
313 |
|
314 |
|
315 |
1.1 www-servers/apache/apache-2.2.27-r3.ebuild |
316 |
|
317 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.27-r3.ebuild?rev=1.1&view=markup |
318 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.27-r3.ebuild?rev=1.1&content-type=text/plain |
319 |
|
320 |
Index: apache-2.2.27-r3.ebuild |
321 |
=================================================================== |
322 |
# Copyright 1999-2014 Gentoo Foundation |
323 |
# Distributed under the terms of the GNU General Public License v2 |
324 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.27-r3.ebuild,v 1.1 2014/05/22 14:02:43 polynomial-c Exp $ |
325 |
|
326 |
EAPI=5 |
327 |
|
328 |
# latest gentoo apache files |
329 |
GENTOO_PATCHSTAMP="20140522" |
330 |
GENTOO_DEVELOPER="polynomial-c" |
331 |
GENTOO_PATCHNAME="gentoo-apache-2.2.27-r3" |
332 |
|
333 |
# IUSE/USE_EXPAND magic |
334 |
IUSE_MPMS_FORK="itk peruser prefork" |
335 |
IUSE_MPMS_THREAD="event worker" |
336 |
|
337 |
IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon |
338 |
authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default |
339 |
authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta |
340 |
charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio |
341 |
env expires ext_filter file_cache filter headers ident imagemap include info |
342 |
log_config log_forensic logio mem_cache mime mime_magic negotiation proxy |
343 |
proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite |
344 |
reqtimeout setenvif speling status substitute unique_id userdir usertrack |
345 |
version vhost_alias" |
346 |
# The following are also in the source as of this version, but are not available |
347 |
# for user selection: |
348 |
# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
349 |
# optional_fn_import optional_hook_export optional_hook_import |
350 |
|
351 |
# inter-module dependencies |
352 |
# TODO: this may still be incomplete |
353 |
MODULE_DEPENDS=" |
354 |
dav_fs:dav |
355 |
dav_lock:dav |
356 |
deflate:filter |
357 |
disk_cache:cache |
358 |
ext_filter:filter |
359 |
file_cache:cache |
360 |
log_forensic:log_config |
361 |
logio:log_config |
362 |
mem_cache:cache |
363 |
mime_magic:mime |
364 |
proxy_ajp:proxy |
365 |
proxy_balancer:proxy |
366 |
proxy_connect:proxy |
367 |
proxy_ftp:proxy |
368 |
proxy_http:proxy |
369 |
proxy_scgi:proxy |
370 |
substitute:filter |
371 |
" |
372 |
|
373 |
# module<->define mappings |
374 |
MODULE_DEFINES=" |
375 |
auth_digest:AUTH_DIGEST |
376 |
authnz_ldap:AUTHNZ_LDAP |
377 |
cache:CACHE |
378 |
dav:DAV |
379 |
dav_fs:DAV |
380 |
dav_lock:DAV |
381 |
disk_cache:CACHE |
382 |
file_cache:CACHE |
383 |
info:INFO |
384 |
ldap:LDAP |
385 |
mem_cache:CACHE |
386 |
proxy:PROXY |
387 |
proxy_ajp:PROXY |
388 |
proxy_balancer:PROXY |
389 |
proxy_connect:PROXY |
390 |
proxy_ftp:PROXY |
391 |
proxy_http:PROXY |
392 |
ssl:SSL |
393 |
status:STATUS |
394 |
suexec:SUEXEC |
395 |
userdir:USERDIR |
396 |
" |
397 |
|
398 |
# critical modules for the default config |
399 |
MODULE_CRITICAL=" |
400 |
authz_host |
401 |
dir |
402 |
mime |
403 |
" |
404 |
|
405 |
inherit apache-2 systemd toolchain-funcs |
406 |
|
407 |
DESCRIPTION="The Apache Web Server." |
408 |
HOMEPAGE="http://httpd.apache.org/" |
409 |
|
410 |
# some helper scripts are Apache-1.1, thus both are here |
411 |
LICENSE="Apache-2.0 Apache-1.1" |
412 |
SLOT="2" |
413 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
414 |
IUSE="" |
415 |
|
416 |
src_configure() { |
417 |
# Brain dead check. |
418 |
tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
419 |
|
420 |
apache-2_src_configure |
421 |
} |
422 |
|
423 |
src_install() { |
424 |
apache-2_src_install |
425 |
|
426 |
# install apxs in /usr/bin (bug #502384) and put a symlink into the |
427 |
# old location until all ebuilds and eclasses have been modified to |
428 |
# use the new location. |
429 |
local apxs_dir="/usr/bin" |
430 |
dodir ${apxs_dir} |
431 |
mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die |
432 |
ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die |
433 |
|
434 |
systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service" |
435 |
systemd_dotmpfilesd "${FILESDIR}/apache.conf" |
436 |
} |