1 |
hollow 09/07/24 18:38:38 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: apache-2.2.11-r3.ebuild |
5 |
Removed: apache-2.2.11.ebuild apache-2.2.10.ebuild |
6 |
apache-2.2.11-r1.ebuild |
7 |
Log: |
8 |
add support for perusers dc branch; breaks old peruser configuration! |
9 |
(Portage version: 2.2_rc33/cvs/Linux i686) |
10 |
|
11 |
Revision Changes Path |
12 |
1.3 www-servers/apache/metadata.xml |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/metadata.xml?rev=1.3&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/metadata.xml?rev=1.3&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/metadata.xml?r1=1.2&r2=1.3 |
17 |
|
18 |
Index: metadata.xml |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/metadata.xml,v |
21 |
retrieving revision 1.2 |
22 |
retrieving revision 1.3 |
23 |
diff -u -r1.2 -r1.3 |
24 |
--- metadata.xml 22 Aug 2008 22:21:41 -0000 1.2 |
25 |
+++ metadata.xml 24 Jul 2009 18:38:38 -0000 1.3 |
26 |
@@ -12,6 +12,8 @@ |
27 |
provides HTTP services in sync with the current HTTP standards. |
28 |
</longdescription> |
29 |
<use> |
30 |
+ <flag name="peruser_dc">Enable support for the dc branch of peruser. |
31 |
+ EXPERIMENTAL!</flag> |
32 |
<flag name='sni'>Enable TLS Server Name Indication (SNI) - |
33 |
EXPERIMENTAL!</flag> |
34 |
<flag name='suexec'>Install suexec with apache</flag> |
35 |
|
36 |
|
37 |
|
38 |
1.115 www-servers/apache/ChangeLog |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?rev=1.115&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?rev=1.115&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?r1=1.114&r2=1.115 |
43 |
|
44 |
Index: ChangeLog |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v |
47 |
retrieving revision 1.114 |
48 |
retrieving revision 1.115 |
49 |
diff -u -r1.114 -r1.115 |
50 |
--- ChangeLog 11 Jul 2009 19:08:44 -0000 1.114 |
51 |
+++ ChangeLog 24 Jul 2009 18:38:38 -0000 1.115 |
52 |
@@ -1,6 +1,13 @@ |
53 |
# ChangeLog for www-servers/apache |
54 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.114 2009/07/11 19:08:44 armin76 Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.115 2009/07/24 18:38:38 hollow Exp $ |
57 |
+ |
58 |
+*apache-2.2.11-r3 (24 Jul 2009) |
59 |
+ |
60 |
+ 24 Jul 2009; Benedikt Böhm <hollow@g.o> -apache-2.2.10.ebuild, |
61 |
+ -apache-2.2.11.ebuild, -apache-2.2.11-r1.ebuild, +apache-2.2.11-r3.ebuild, |
62 |
+ metadata.xml: |
63 |
+ add support for perusers dc branch; breaks old peruser configuration! |
64 |
|
65 |
11 Jul 2009; Raúl Porcel <armin76@g.o> apache-2.2.11-r2.ebuild: |
66 |
alpha/arm/ia64/s390/sh/sparc stable wrt #276589 |
67 |
|
68 |
|
69 |
|
70 |
1.1 www-servers/apache/apache-2.2.11-r3.ebuild |
71 |
|
72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/apache-2.2.11-r3.ebuild?rev=1.1&view=markup |
73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/apache-2.2.11-r3.ebuild?rev=1.1&content-type=text/plain |
74 |
|
75 |
Index: apache-2.2.11-r3.ebuild |
76 |
=================================================================== |
77 |
# Copyright 1999-2009 Gentoo Foundation |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.11-r3.ebuild,v 1.1 2009/07/24 18:38:38 hollow Exp $ |
80 |
|
81 |
# latest gentoo apache files |
82 |
GENTOO_PATCHSTAMP="20090724" |
83 |
GENTOO_DEVELOPER="hollow" |
84 |
|
85 |
# IUSE/USE_EXPAND magic |
86 |
IUSE_MPMS_FORK="itk peruser prefork" |
87 |
IUSE_MPMS_THREAD="event worker" |
88 |
|
89 |
IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon |
90 |
authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default |
91 |
authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta |
92 |
charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires |
93 |
ext_filter file_cache filter headers ident imagemap include info log_config |
94 |
log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp |
95 |
proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling |
96 |
status substitute unique_id userdir usertrack version vhost_alias" |
97 |
|
98 |
# inter-module dependencies |
99 |
# TODO: this may still be incomplete |
100 |
MODULE_DEPENDS=" |
101 |
dav_fs:dav |
102 |
dav_lock:dav |
103 |
deflate:filter |
104 |
disk_cache:cache |
105 |
ext_filter:filter |
106 |
file_cache:cache |
107 |
log_forensic:log_config |
108 |
logio:log_config |
109 |
mem_cache:cache |
110 |
mime_magic:mime |
111 |
proxy_ajp:proxy |
112 |
proxy_balancer:proxy |
113 |
proxy_connect:proxy |
114 |
proxy_ftp:proxy |
115 |
proxy_http:proxy |
116 |
substitute:filter |
117 |
" |
118 |
|
119 |
# module<->define mappings |
120 |
MODULE_DEFINES=" |
121 |
auth_digest:AUTH_DIGEST |
122 |
authnz_ldap:AUTHNZ_LDAP |
123 |
cache:CACHE |
124 |
dav:DAV |
125 |
dav_fs:DAV |
126 |
dav_lock:DAV |
127 |
disk_cache:CACHE |
128 |
file_cache:CACHE |
129 |
info:INFO |
130 |
ldap:LDAP |
131 |
mem_cache:CACHE |
132 |
proxy:PROXY |
133 |
proxy_ajp:PROXY |
134 |
proxy_balancer:PROXY |
135 |
proxy_connect:PROXY |
136 |
proxy_ftp:PROXY |
137 |
proxy_http:PROXY |
138 |
ssl:SSL |
139 |
status:STATUS |
140 |
suexec:SUEXEC |
141 |
userdir:USERDIR |
142 |
" |
143 |
|
144 |
# critical modules for the default config |
145 |
MODULE_CRITICAL=" |
146 |
authz_host |
147 |
dir |
148 |
mime |
149 |
" |
150 |
|
151 |
inherit apache-2 |
152 |
|
153 |
DESCRIPTION="The Apache Web Server." |
154 |
HOMEPAGE="http://httpd.apache.org/" |
155 |
|
156 |
# some helper scripts are Apache-1.1, thus both are here |
157 |
LICENSE="Apache-2.0 Apache-1.1" |
158 |
SLOT="2" |
159 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
160 |
IUSE="sni peruser_dc" |
161 |
|
162 |
DEPEND="${DEPEND} |
163 |
apache2_modules_deflate? ( sys-libs/zlib )" |
164 |
|
165 |
RDEPEND="${RDEPEND} |
166 |
apache2_modules_mime? ( app-misc/mime-types )" |
167 |
|
168 |
src_unpack() { |
169 |
if ! use sni ; then |
170 |
EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 04_all_mod_ssl_tls_sni.patch" |
171 |
fi |
172 |
|
173 |
if use peruser_dc ; then |
174 |
if ! use apache2_mpms_peruser ; then |
175 |
die "USE=peruser_dc requires APACHE2_MPMS=peruser" |
176 |
fi |
177 |
else |
178 |
EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 22_all_peruser_0.3.0-dc3.patch" |
179 |
fi |
180 |
|
181 |
apache-2_src_unpack |
182 |
} |
183 |
|
184 |
pkg_preinst() { |
185 |
# note regarding IfDefine changes |
186 |
if has_version "<${CATEGORY}/${PN}-2.2.6-r1"; then |
187 |
elog |
188 |
elog "When upgrading from versions 2.2.6 or earlier, please be aware" |
189 |
elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP" |
190 |
elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled" |
191 |
elog "with AUTH_DIGEST now." |
192 |
elog |
193 |
fi |
194 |
} |