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