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