1 |
hollow 08/02/02 14:57:36 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: apache-2.2.8-r1.ebuild |
5 |
Log: |
6 |
remove incremental mod_dir patches, fixes #139451 |
7 |
(Portage version: 2.1.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.61 www-servers/apache/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?rev=1.61&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?rev=1.61&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?r1=1.60&r2=1.61 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v |
19 |
retrieving revision 1.60 |
20 |
retrieving revision 1.61 |
21 |
diff -u -r1.60 -r1.61 |
22 |
--- ChangeLog 31 Jan 2008 20:01:35 -0000 1.60 |
23 |
+++ ChangeLog 2 Feb 2008 14:57:36 -0000 1.61 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for www-servers/apache |
26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.60 2008/01/31 20:01:35 dertobi123 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.61 2008/02/02 14:57:36 hollow Exp $ |
29 |
+ |
30 |
+*apache-2.2.8-r1 (02 Feb 2008) |
31 |
+ |
32 |
+ 02 Feb 2008; Benedikt Böhm <hollow@g.o> +apache-2.2.8-r1.ebuild: |
33 |
+ remove incremental mod_dir patches, fixes #139451 |
34 |
|
35 |
31 Jan 2008; Tobias Scherbaum <dertobi123@g.o> apache-2.2.8.ebuild: |
36 |
ppc stable, bug #205195 |
37 |
|
38 |
|
39 |
|
40 |
1.1 www-servers/apache/apache-2.2.8-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/apache-2.2.8-r1.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/apache-2.2.8-r1.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: apache-2.2.8-r1.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2008 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8-r1.ebuild,v 1.1 2008/02/02 14:57:36 hollow Exp $ |
50 |
|
51 |
# latest gentoo apache files |
52 |
GENTOO_PATCHSTAMP="20080202" |
53 |
GENTOO_DEVELOPER="hollow" |
54 |
|
55 |
# IUSE/USE_EXPAND magic |
56 |
IUSE_MPMS_FORK="itk peruser prefork" |
57 |
IUSE_MPMS_THREAD="event worker" |
58 |
|
59 |
IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon |
60 |
authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default |
61 |
authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta |
62 |
charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires |
63 |
ext_filter file_cache filter headers ident imagemap include info log_config |
64 |
log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp |
65 |
proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling |
66 |
status unique_id userdir usertrack version vhost_alias" |
67 |
|
68 |
# inter-module dependencies |
69 |
# TODO: this may still be incomplete |
70 |
MODULE_DEPENDS=" |
71 |
dav_fs:dav |
72 |
dav_lock:dav |
73 |
deflate:filter |
74 |
disk_cache:cache |
75 |
ext_filter:filter |
76 |
file_cache:cache |
77 |
log_forensic:log_config |
78 |
logio:log_config |
79 |
mem_cache:cache |
80 |
mime_magic:mime |
81 |
proxy_ajp:proxy |
82 |
proxy_balancer:proxy |
83 |
proxy_connect:proxy |
84 |
proxy_ftp:proxy |
85 |
proxy_http:proxy |
86 |
usertrack:unique_id |
87 |
" |
88 |
|
89 |
# module<->define mappings |
90 |
MODULE_DEFINES=" |
91 |
auth_digest:AUTH_DIGEST |
92 |
authnz_ldap:AUTHNZ_LDAP |
93 |
cache:CACHE |
94 |
dav:DAV |
95 |
dav_fs:DAV |
96 |
dav_lock:DAV |
97 |
disk_cache:CACHE |
98 |
file_cache:CACHE |
99 |
info:INFO |
100 |
ldap:LDAP |
101 |
mem_cache:CACHE |
102 |
proxy:PROXY |
103 |
proxy_ajp:PROXY |
104 |
proxy_balancer:PROXY |
105 |
proxy_connect:PROXY |
106 |
proxy_ftp:PROXY |
107 |
proxy_http:PROXY |
108 |
ssl:SSL |
109 |
status:STATUS |
110 |
suexec:SUEXEC |
111 |
userdir:USERDIR |
112 |
" |
113 |
|
114 |
# critical modules for the default config |
115 |
MODULE_CRITICAL=" |
116 |
authz_host |
117 |
dir |
118 |
mime |
119 |
" |
120 |
|
121 |
inherit apache-2 |
122 |
|
123 |
DESCRIPTION="The Apache Web Server." |
124 |
HOMEPAGE="http://httpd.apache.org/" |
125 |
|
126 |
# some helper scripts are apache-1.1, thus both are here |
127 |
LICENSE="Apache-2.0 Apache-1.1" |
128 |
SLOT="2" |
129 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
130 |
IUSE="sni" |
131 |
|
132 |
DEPEND="${DEPEND} |
133 |
apache2_modules_deflate? ( sys-libs/zlib )" |
134 |
|
135 |
RDEPEND="${RDEPEND} |
136 |
apache2_modules_mime? ( app-misc/mime-types )" |
137 |
|
138 |
src_unpack() { |
139 |
if ! use sni ; then |
140 |
EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch" |
141 |
fi |
142 |
|
143 |
apache-2_src_unpack |
144 |
} |
145 |
|
146 |
pkg_postinst() { |
147 |
apache-2_pkg_postinst |
148 |
|
149 |
# previous installations of apache-2.2 installed the upstream configuration |
150 |
# files, which shouldn't even have been installed! |
151 |
if has_version '>=www-servers/apache-2.2.4' ; then |
152 |
if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then |
153 |
rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1 |
154 |
fi |
155 |
|
156 |
for i in extra original ; do |
157 |
if [[ -d "${ROOT}"/etc/apache2/${i} ]] ; then |
158 |
rm -rf "${ROOT}"/etc/apache2/${i} >/dev/null 2>&1 |
159 |
fi |
160 |
done |
161 |
fi |
162 |
|
163 |
# note regarding IfDefine changes |
164 |
if has_version '<www-servers/apache-2.2.6-r1' ; then |
165 |
elog |
166 |
elog "When upgrading from versions 2.2.6 or earlier, please be aware" |
167 |
elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP" |
168 |
elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled" |
169 |
elog "with AUTH_DIGEST now." |
170 |
elog |
171 |
fi |
172 |
|
173 |
# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST |
174 |
if has_version '<www-servers/apache-2.2.4-r7' ; then |
175 |
elog |
176 |
elog "Listen directives have been moved into the default virtual host" |
177 |
elog "configuation. At least DEFAULT_VHOST has been enabled for you" |
178 |
elog "(depending on your USE-flags.)" |
179 |
elog |
180 |
elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there will" |
181 |
elog "be no listening sockets available." |
182 |
elog |
183 |
fi |
184 |
|
185 |
# note the user of the config changes |
186 |
if has_version '<www-servers/apache-2.2.4-r5' ; then |
187 |
elog |
188 |
elog "Please make sure that you update your /etc directory." |
189 |
elog "Between the versions, we had to changes some config files" |
190 |
elog "and move some stuff out of the main httpd.conf file to a seperate" |
191 |
elog "modules.d entry." |
192 |
elog |
193 |
elog "Thus please update your /etc directory either via etc-update," |
194 |
elog "dispatch-conf or conf-update !" |
195 |
elog |
196 |
fi |
197 |
|
198 |
# check for dual/upgrade install |
199 |
if has_version '<www-servers/apache-2.2.0' ; then |
200 |
elog |
201 |
elog "When upgrading from versions below 2.2.0 to this version, you" |
202 |
elog "need to rebuild all your modules. Please do so for your modules" |
203 |
elog "to continue working correctly." |
204 |
elog |
205 |
elog "Also note that some configuration directives have been" |
206 |
elog "split into their own files under ${ROOT}etc/apache2/modules.d/" |
207 |
elog "and that some modules, foremost the authentication related ones," |
208 |
elog "have been renamed." |
209 |
elog |
210 |
elog "Some examples:" |
211 |
elog " - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf." |
212 |
elog |
213 |
elog "For more information on what you may need to change, please" |
214 |
elog "see the overview of changes at:" |
215 |
elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html" |
216 |
elog "and the upgrading guide at:" |
217 |
elog "http://httpd.apache.org/docs/2.2/upgrading.html" |
218 |
elog |
219 |
fi |
220 |
|
221 |
# cleanup the vim backup files, placed in /etc/apache2 by the last |
222 |
# patchtarball (gentoo-apache-2.2.4-r7-20070615) |
223 |
rm -f "${ROOT}etc/apache2/modules.d/*.conf~" |
224 |
} |
225 |
|
226 |
|
227 |
|
228 |
-- |
229 |
gentoo-commits@l.g.o mailing list |