Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Benedikt Boehm (hollow)" <hollow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/apache: ChangeLog apache-2.2.6-r7.ebuild
Date: Mon, 07 Jan 2008 22:59:28
Message-Id: E1JC0wH-0002dk-CM@stork.gentoo.org
1 hollow 08/01/07 22:59:25
2
3 Modified: ChangeLog
4 Added: apache-2.2.6-r7.ebuild
5 Log:
6 fix #204822, #204408, #204409 and #204410
7 (Portage version: 2.1.4_rc11)
8
9 Revision Changes Path
10 1.46 www-servers/apache/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?rev=1.46&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?rev=1.46&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?r1=1.45&r2=1.46
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v
19 retrieving revision 1.45
20 retrieving revision 1.46
21 diff -u -r1.45 -r1.46
22 --- ChangeLog 19 Dec 2007 21:13:50 -0000 1.45
23 +++ ChangeLog 7 Jan 2008 22:59:24 -0000 1.46
24 @@ -1,6 +1,11 @@
25 # ChangeLog for www-servers/apache
26 -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.45 2007/12/19 21:13:50 hollow Exp $
28 +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.46 2008/01/07 22:59:24 hollow Exp $
30 +
31 +*apache-2.2.6-r7 (07 Jan 2008)
32 +
33 + 07 Jan 2008; Benedikt Böhm <hollow@g.o> +apache-2.2.6-r7.ebuild:
34 + fix #204822, #204408, #204409 and #204410
35
36 19 Dec 2007; Benedikt Böhm <hollow@g.o> -apache-2.2.6.ebuild,
37 apache-2.2.6-r6.ebuild:
38
39
40
41 1.1 www-servers/apache/apache-2.2.6-r7.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/apache-2.2.6-r7.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/apache-2.2.6-r7.ebuild?rev=1.1&content-type=text/plain
45
46 Index: apache-2.2.6-r7.ebuild
47 ===================================================================
48 # Copyright 1999-2008 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.6-r7.ebuild,v 1.1 2008/01/07 22:59:24 hollow Exp $
51
52 # latest gentoo apache files
53 GENTOO_PATCHSTAMP="20080107"
54 GENTOO_DEVELOPER="hollow"
55
56 # IUSE/USE_EXPAND magic
57 IUSE_MPMS_FORK="itk peruser prefork"
58 IUSE_MPMS_THREAD="event worker"
59
60 IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
61 authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
62 authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
63 charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires
64 ext_filter file_cache filter headers ident imagemap include info log_config
65 log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp
66 proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling
67 status unique_id userdir usertrack version vhost_alias"
68
69 # inter-module dependencies
70 # TODO: this may still be incomplete
71 MODULE_DEPENDS="
72 dav_fs:dav
73 dav_lock:dav
74 deflate:filter
75 disk_cache:cache
76 ext_filter:filter
77 file_cache:cache
78 log_forensic:log_config
79 logio:log_config
80 mem_cache:cache
81 mime_magic:mime
82 proxy_ajp:proxy
83 proxy_balancer:proxy
84 proxy_connect:proxy
85 proxy_ftp:proxy
86 proxy_http:proxy
87 usertrack:unique_id
88 "
89
90 # module<->define mappings
91 MODULE_DEFINES="
92 auth_digest:AUTH_DIGEST
93 authnz_ldap:AUTHNZ_LDAP
94 cache:CACHE
95 dav:DAV
96 dav_fs:DAV
97 dav_lock:DAV
98 disk_cache:CACHE
99 file_cache:CACHE
100 info:INFO
101 ldap:LDAP
102 mem_cache:CACHE
103 proxy:PROXY
104 proxy_ajp:PROXY
105 proxy_balancer:PROXY
106 proxy_connect:PROXY
107 proxy_ftp:PROXY
108 proxy_http:PROXY
109 ssl:SSL
110 status:INFO
111 suexec:SUEXEC
112 userdir:USERDIR
113 "
114
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
Report Message
Find on MARC Find on Google Groups