Gentoo Archives: gentoo-commits

From: "Michael Palimaka (kensington)" <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/apache: apache-2.4.6-r2.ebuild ChangeLog
Date: Thu, 01 Aug 2013 07:16:22
Message-Id: 20130801071618.93D1C2171C@flycatcher.gentoo.org
1 kensington 13/08/01 07:16:18
2
3 Modified: ChangeLog
4 Added: apache-2.4.6-r2.ebuild
5 Log:
6 Explicitly switch to /run everywhere to solve further issues when starting wrt bug #438758.
7
8 (Portage version: 2.1.13.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
9
10 Revision Changes Path
11 1.242 www-servers/apache/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.242&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.242&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.241&r2=1.242
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v
20 retrieving revision 1.241
21 retrieving revision 1.242
22 diff -u -r1.241 -r1.242
23 --- ChangeLog 30 Jul 2013 12:21:01 -0000 1.241
24 +++ ChangeLog 1 Aug 2013 07:16:18 -0000 1.242
25 @@ -1,6 +1,12 @@
26 # ChangeLog for www-servers/apache
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.241 2013/07/30 12:21:01 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.242 2013/08/01 07:16:18 kensington Exp $
30 +
31 +*apache-2.4.6-r2 (01 Aug 2013)
32 +
33 + 01 Aug 2013; Michael Palimaka <kensington@g.o> +apache-2.4.6-r2.ebuild:
34 + Explicitly switch to /run everywhere to solve further issues when starting wrt
35 + bug #438758.
36
37 30 Jul 2013; Agostino Sarubbo <ago@g.o> apache-2.2.25.ebuild:
38 Stable for alpha, wrt bug #476568
39
40
41
42 1.1 www-servers/apache/apache-2.4.6-r2.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild?rev=1.1&content-type=text/plain
46
47 Index: apache-2.4.6-r2.ebuild
48 ===================================================================
49 # Copyright 1999-2013 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.4.6-r2.ebuild,v 1.1 2013/08/01 07:16:18 kensington Exp $
52
53 EAPI="2"
54
55 # latest gentoo apache files
56 GENTOO_PATCHSTAMP="20130801"
57 GENTOO_DEVELOPER="kensington"
58 GENTOO_PATCHNAME="gentoo-apache-2.4.4"
59
60 # IUSE/USE_EXPAND magic
61 IUSE_MPMS_FORK="itk peruser prefork"
62 IUSE_MPMS_THREAD="event worker"
63
64 # << obsolete modules:
65 # authn_default authz_default mem_cache
66 # mem_cache is replaced by cache_disk
67 # ?? buggy modules
68 # proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
69 # >> added modules for reason:
70 # compat: compatibility with 2.2 access control
71 # authz_host: new module for access control
72 # authn_core: functionality provided by authn_alias in previous versions
73 # authz_core: new module, provides core authorization capabilities
74 # cache_disk: replacement for mem_cache
75 # lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
76 # lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
77 # lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
78 # lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
79 # slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
80 # socache_shmcb: shared object cache provider. Default config with ssl needs it
81 # unixd: fixes startup error: Invalid command 'User'
82 IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon
83 authn_core authn_dbd authn_dbm authn_file authz_core authz_dbm
84 authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta
85 charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio
86 env expires ext_filter file_cache filter headers ident imagemap include info
87 lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat
88 log_config log_forensic logio mime mime_magic negotiation proxy
89 proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi proxy_fcgi
90 rewrite ratelimit remoteip reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute
91 unique_id userdir usertrack unixd version vhost_alias"
92 # The following are also in the source as of this version, but are not available
93 # for user selection:
94 # bucketeer case_filter case_filter_in echo http isapi optional_fn_export
95 # optional_fn_import optional_hook_export optional_hook_import
96
97 # inter-module dependencies
98 # TODO: this may still be incomplete
99 MODULE_DEPENDS="
100 dav_fs:dav
101 dav_lock:dav
102 deflate:filter
103 cache_disk:cache
104 ext_filter:filter
105 file_cache:cache
106 lbmethod_byrequests:proxy_balancer
107 lbmethod_byrequests:slotmem_shm
108 lbmethod_bytraffic:proxy_balancer
109 lbmethod_bybusyness:proxy_balancer
110 lbmethod_heartbeat:proxy_balancer
111 log_forensic:log_config
112 logio:log_config
113 cache_disk:cache
114 mime_magic:mime
115 proxy_ajp:proxy
116 proxy_balancer:proxy
117 proxy_connect:proxy
118 proxy_ftp:proxy
119 proxy_http:proxy
120 proxy_scgi:proxy
121 proxy_fcgi:proxy
122 substitute:filter
123 "
124
125 # module<->define mappings
126 MODULE_DEFINES="
127 auth_digest:AUTH_DIGEST
128 authnz_ldap:AUTHNZ_LDAP
129 cache:CACHE
130 cache_disk:CACHE
131 dav:DAV
132 dav_fs:DAV
133 dav_lock:DAV
134 file_cache:CACHE
135 info:INFO
136 ldap:LDAP
137 proxy:PROXY
138 proxy_ajp:PROXY
139 proxy_balancer:PROXY
140 proxy_connect:PROXY
141 proxy_ftp:PROXY
142 proxy_http:PROXY
143 proxy_fcgi:PROXY
144 socache_shmcb:SSL
145 ssl:SSL
146 status:STATUS
147 suexec:SUEXEC
148 userdir:USERDIR
149 "
150
151 # critical modules for the default config
152 MODULE_CRITICAL="
153 authn_core
154 authz_core
155 authz_host
156 dir
157 mime
158 unixd
159 "
160 # dependend criticals
161 use ssl && MODULE_CRITICAL+=" socache_shmcb"
162 use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
163
164 inherit eutils apache-2 systemd
165
166 DESCRIPTION="The Apache Web Server."
167 HOMEPAGE="http://httpd.apache.org/"
168
169 # some helper scripts are Apache-1.1, thus both are here
170 LICENSE="Apache-2.0 Apache-1.1"
171 SLOT="2"
172 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
173 IUSE=""
174
175 DEPEND="${DEPEND}
176 >=dev-libs/openssl-0.9.8m
177 apache2_modules_deflate? ( sys-libs/zlib )"
178
179 # dependency on >=dev-libs/apr-1.4.5 for bug #368651
180 RDEPEND="${RDEPEND}
181 >=dev-libs/apr-1.4.5
182 >=dev-libs/openssl-0.9.8m
183 apache2_modules_mime? ( app-misc/mime-types )"
184
185 # init script fixup - should be rolled into next tarball #389965
186 src_prepare() {
187 # the following patch can be removed once it is included in
188 # GENTOO_PATCHNAME="gentoo-apache-2.4.1" ...
189 if [ -f "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" ]; then
190 cd "${GENTOO_PATCHDIR}" || die "Failed to cd to ${GENTOO_PATCHDIR}"
191 epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" \
192 || die "epatch failed"
193 cd "${S}" || die "Failed to cd to ${S}"
194 fi
195 apache-2_src_prepare
196 sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
197 }
198
199 src_install() {
200 apache-2_src_install
201 for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
202 rm "${D}"/$i || die "Failed to prune apache-tools bits"
203 done
204 for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
205 rm "${D}"/$i || die "Failed to prune apache-tools bits"
206 done
207 for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
208 rm "${D}"/$i || die "Failed to prune apache-tools bits"
209 done
210 for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
211 rm "${D}/"$i || die "Failed to prune apache-tools bits"
212 done
213
214 # well, actually installing things makes them more installed, I guess?
215 cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs"
216 chmod 0755 "${D}"/usr/sbin/apxs
217
218 # Note: wait for mod_systemd to be included in the next release,
219 # then apache2.4.service can be used and systemd support controlled
220 # through --enable-systemd
221 systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
222 systemd_dotmpfilesd "${FILESDIR}/apache.conf"
223 #insinto /etc/apache2/modules.d
224 #doins "${FILESDIR}/00_systemd.conf"
225 }
226
227 pkg_postinst()
228 {
229 apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
230 # warnings that default config might not work out of the box
231 for mod in $MODULE_CRITICAL; do
232 if ! use "apache2_modules_${mod}"; then
233 echo
234 ewarn "Warning: Critical module not installed!"
235 ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
236 ewarn "are highly recomended but might not be in the base profile yet."
237 ewarn "Default config for ssl needs module 'socache_shmcb'."
238 ewarn "Enabling the following flags is highly recommended:"
239 for cmod in $MODULE_CRITICAL; do
240 use "apache2_modules_${cmod}" || \
241 ewarn "+ apache2_modules_${cmod}"
242 done
243 echo
244 break
245 fi
246 done
247 # warning for proxy_balancer and missing load balancing scheduler
248 if use apache2_modules_proxy_balancer; then
249 local lbset=
250 for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
251 if use "apache2_modules_${mod}"; then
252 lbset=1 && break
253 fi
254 done
255 if [ ! $lbset ]; then
256 echo
257 ewarn "Info: Missing load balancing scheduler algorithm module"
258 ewarn "(They were split off from proxy_balancer in 2.3)"
259 ewarn "In order to get the ability of load balancing, at least"
260 ewarn "one of these modules has to be present:"
261 ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
262 echo
263 fi
264 fi
265 }