1 |
patrick 12/04/20 04:22:47 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: apache-2.2.22-r1.ebuild |
5 |
Log: |
6 |
Fix for #412481 |
7 |
|
8 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64, RepoMan options: --force) |
9 |
|
10 |
Revision Changes Path |
11 |
1.192 www-servers/apache/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.192&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.192&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.191&r2=1.192 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v |
20 |
retrieving revision 1.191 |
21 |
retrieving revision 1.192 |
22 |
diff -u -r1.191 -r1.192 |
23 |
--- ChangeLog 20 Apr 2012 03:58:46 -0000 1.191 |
24 |
+++ ChangeLog 20 Apr 2012 04:22:46 -0000 1.192 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for www-servers/apache |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.191 2012/04/20 03:58:46 patrick Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.192 2012/04/20 04:22:46 patrick Exp $ |
30 |
+ |
31 |
+*apache-2.2.22-r1 (20 Apr 2012) |
32 |
+ |
33 |
+ 20 Apr 2012; Patrick Lauer <patrick@g.o> +apache-2.2.22-r1.ebuild, |
34 |
+ +files/2.2.22-envvars-std.in: |
35 |
+ Fix for #412481 |
36 |
|
37 |
*apache-2.4.2 (20 Apr 2012) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 www-servers/apache/apache-2.2.22-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.22-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.22-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: apache-2.2.22-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2012 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.22-r1.ebuild,v 1.1 2012/04/20 04:22:46 patrick Exp $ |
52 |
|
53 |
EAPI="2" |
54 |
|
55 |
# latest gentoo apache files |
56 |
GENTOO_PATCHSTAMP="20120213" |
57 |
GENTOO_DEVELOPER="jmbsvicetto" |
58 |
GENTOO_PATCHNAME="gentoo-apache-2.2.22" |
59 |
|
60 |
# IUSE/USE_EXPAND magic |
61 |
IUSE_MPMS_FORK="itk peruser prefork" |
62 |
IUSE_MPMS_THREAD="event worker" |
63 |
|
64 |
IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon |
65 |
authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default |
66 |
authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta |
67 |
charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio |
68 |
env expires ext_filter file_cache filter headers ident imagemap include info |
69 |
log_config log_forensic logio mem_cache mime mime_magic negotiation proxy |
70 |
proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite |
71 |
reqtimeout setenvif speling status substitute unique_id userdir usertrack |
72 |
version vhost_alias" |
73 |
# The following are also in the source as of this version, but are not available |
74 |
# for user selection: |
75 |
# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
76 |
# optional_fn_import optional_hook_export optional_hook_import |
77 |
|
78 |
# inter-module dependencies |
79 |
# TODO: this may still be incomplete |
80 |
MODULE_DEPENDS=" |
81 |
dav_fs:dav |
82 |
dav_lock:dav |
83 |
deflate:filter |
84 |
disk_cache:cache |
85 |
ext_filter:filter |
86 |
file_cache:cache |
87 |
log_forensic:log_config |
88 |
logio:log_config |
89 |
mem_cache:cache |
90 |
mime_magic:mime |
91 |
proxy_ajp:proxy |
92 |
proxy_balancer:proxy |
93 |
proxy_connect:proxy |
94 |
proxy_ftp:proxy |
95 |
proxy_http:proxy |
96 |
proxy_scgi:proxy |
97 |
substitute:filter |
98 |
" |
99 |
|
100 |
# module<->define mappings |
101 |
MODULE_DEFINES=" |
102 |
auth_digest:AUTH_DIGEST |
103 |
authnz_ldap:AUTHNZ_LDAP |
104 |
cache:CACHE |
105 |
dav:DAV |
106 |
dav_fs:DAV |
107 |
dav_lock:DAV |
108 |
disk_cache:CACHE |
109 |
file_cache:CACHE |
110 |
info:INFO |
111 |
ldap:LDAP |
112 |
mem_cache:CACHE |
113 |
proxy:PROXY |
114 |
proxy_ajp:PROXY |
115 |
proxy_balancer:PROXY |
116 |
proxy_connect:PROXY |
117 |
proxy_ftp:PROXY |
118 |
proxy_http:PROXY |
119 |
ssl:SSL |
120 |
status:STATUS |
121 |
suexec:SUEXEC |
122 |
userdir:USERDIR |
123 |
" |
124 |
|
125 |
# critical modules for the default config |
126 |
MODULE_CRITICAL=" |
127 |
authz_host |
128 |
dir |
129 |
mime |
130 |
" |
131 |
|
132 |
inherit apache-2 |
133 |
|
134 |
DESCRIPTION="The Apache Web Server." |
135 |
HOMEPAGE="http://httpd.apache.org/" |
136 |
|
137 |
# some helper scripts are Apache-1.1, thus both are here |
138 |
LICENSE="Apache-2.0 Apache-1.1" |
139 |
SLOT="2" |
140 |
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" |
141 |
IUSE="" |
142 |
|
143 |
DEPEND="${DEPEND} |
144 |
>=dev-libs/openssl-0.9.8m |
145 |
apache2_modules_deflate? ( sys-libs/zlib )" |
146 |
|
147 |
# dependency on >=dev-libs/apr-1.4.5 for bug #368651 |
148 |
RDEPEND="${RDEPEND} |
149 |
>=dev-libs/apr-1.4.5 |
150 |
>=dev-libs/openssl-0.9.8m |
151 |
apache2_modules_mime? ( app-misc/mime-types )" |
152 |
|
153 |
# init script fixup - should be rolled into next tarball #389965 |
154 |
src_prepare() { |
155 |
apache-2_src_prepare |
156 |
sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script" |
157 |
cp ${FILESDIR}/2.2.22-envvars-std.in ${S}/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix" |
158 |
} |