Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/
Date: Mon, 24 Sep 2018 11:27:43
Message-Id: 1537788440.0abe46315029873780b1cc12b1a86c8ed4fcf224.polynomial-c@gentoo
1 commit: 0abe46315029873780b1cc12b1a86c8ed4fcf224
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 24 11:25:15 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 24 11:27:20 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0abe4631
7
8 www-servers/apache: Bump to version 2.4.35
9
10 Closes: https://bugs.gentoo.org/666936
11 Package-Manager: Portage-2.3.49, Repoman-2.3.11
12
13 www-servers/apache/Manifest | 1 +
14 www-servers/apache/apache-2.4.35.ebuild | 257 ++++++++++++++++++++++++++++++++
15 2 files changed, 258 insertions(+)
16
17 diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
18 index e2d40c382ce..99649aa8bd0 100644
19 --- a/www-servers/apache/Manifest
20 +++ b/www-servers/apache/Manifest
21 @@ -6,3 +6,4 @@ DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b93
22 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
23 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
24 DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8
25 +DIST httpd-2.4.35.tar.bz2 7044336 BLAKE2B b0ec5de56bfdaf7c6cf7f6cd2fedbd8748c16a76bddbde8e3442d2102aa33bc2642cf1dacce7b5e38023ddfceee393cd0059b881cd25dc57c029900385a41f59 SHA512 f5d6a849850ebdf4e38b586c84cc1063d68ac4c6737895c9ac1c8796c22655681c55b4de77ed9f1f807338fdb9f7824faf911361aa31cc46f3c3a2cbabe20543
26
27 diff --git a/www-servers/apache/apache-2.4.35.ebuild b/www-servers/apache/apache-2.4.35.ebuild
28 new file mode 100644
29 index 00000000000..f8f2bdda1f3
30 --- /dev/null
31 +++ b/www-servers/apache/apache-2.4.35.ebuild
32 @@ -0,0 +1,257 @@
33 +# Copyright 1999-2018 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=6
37 +
38 +# latest gentoo apache files
39 +GENTOO_PATCHSTAMP="20180716"
40 +GENTOO_DEVELOPER="polynomial-c"
41 +GENTOO_PATCHNAME="gentoo-apache-2.4.34"
42 +
43 +# IUSE/USE_EXPAND magic
44 +IUSE_MPMS_FORK="prefork"
45 +IUSE_MPMS_THREAD="event worker"
46 +
47 +# << obsolete modules:
48 +# authn_default authz_default mem_cache
49 +# mem_cache is replaced by cache_disk
50 +# ?? buggy modules
51 +# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
52 +# >> added modules for reason:
53 +# compat: compatibility with 2.2 access control
54 +# authz_host: new module for access control
55 +# authn_core: functionality provided by authn_alias in previous versions
56 +# authz_core: new module, provides core authorization capabilities
57 +# cache_disk: replacement for mem_cache
58 +# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
59 +# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
60 +# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
61 +# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
62 +# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
63 +# socache_shmcb: shared object cache provider. Default config with ssl needs it
64 +# unixd: fixes startup error: Invalid command 'User'
65 +IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
66 +authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
67 +authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
68 +brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
69 +dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
70 +ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
71 +lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation
72 +proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
73 +proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
74 +slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
75 +unixd version vhost_alias watchdog xml2enc"
76 +# The following are also in the source as of this version, but are not available
77 +# for user selection:
78 +# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
79 +# optional_fn_import optional_hook_export optional_hook_import
80 +
81 +# inter-module dependencies
82 +# TODO: this may still be incomplete
83 +MODULE_DEPENDS="
84 + brotli:filter
85 + dav_fs:dav
86 + dav_lock:dav
87 + deflate:filter
88 + cache_disk:cache
89 + ext_filter:filter
90 + file_cache:cache
91 + lbmethod_byrequests:proxy_balancer
92 + lbmethod_byrequests:slotmem_shm
93 + lbmethod_bytraffic:proxy_balancer
94 + lbmethod_bybusyness:proxy_balancer
95 + lbmethod_heartbeat:proxy_balancer
96 + log_forensic:log_config
97 + logio:log_config
98 + cache_disk:cache
99 + cache_socache:cache
100 + md:watchdog
101 + mime_magic:mime
102 + proxy_ajp:proxy
103 + proxy_balancer:proxy
104 + proxy_balancer:slotmem_shm
105 + proxy_connect:proxy
106 + proxy_ftp:proxy
107 + proxy_html:proxy
108 + proxy_html:xml2enc
109 + proxy_http:proxy
110 + proxy_scgi:proxy
111 + proxy_fcgi:proxy
112 + proxy_wstunnel:proxy
113 + substitute:filter
114 +"
115 +
116 +# module<->define mappings
117 +MODULE_DEFINES="
118 + auth_digest:AUTH_DIGEST
119 + authnz_ldap:AUTHNZ_LDAP
120 + cache:CACHE
121 + cache_disk:CACHE
122 + cache_socache:CACHE
123 + dav:DAV
124 + dav_fs:DAV
125 + dav_lock:DAV
126 + file_cache:CACHE
127 + http2:HTTP2
128 + info:INFO
129 + ldap:LDAP
130 + md:SSL
131 + proxy:PROXY
132 + proxy_ajp:PROXY
133 + proxy_balancer:PROXY
134 + proxy_connect:PROXY
135 + proxy_ftp:PROXY
136 + proxy_html:PROXY
137 + proxy_http:PROXY
138 + proxy_fcgi:PROXY
139 + proxy_scgi:PROXY
140 + proxy_wstunnel:PROXY
141 + socache_shmcb:SSL
142 + ssl:SSL
143 + status:STATUS
144 + suexec:SUEXEC
145 + userdir:USERDIR
146 +"
147 +
148 +# critical modules for the default config
149 +MODULE_CRITICAL="
150 + authn_core
151 + authz_core
152 + authz_host
153 + dir
154 + mime
155 + unixd
156 +"
157 +inherit apache-2 systemd tmpfiles toolchain-funcs
158 +
159 +DESCRIPTION="The Apache Web Server"
160 +HOMEPAGE="https://httpd.apache.org/"
161 +
162 +# some helper scripts are Apache-1.1, thus both are here
163 +LICENSE="Apache-2.0 Apache-1.1"
164 +SLOT="2"
165 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
166 +
167 +# Enable http2 by default (bug #563452)
168 +# FIXME: Move to apache-2.eclass once this has reached stable.
169 +IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
170 +# New suexec options (since 2.4.34)
171 +IUSE="${IUSE} +suexec-caps suexec-syslog"
172 +
173 +CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
174 + apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
175 + apache2_modules_md? ( >=dev-libs/jansson-2.10 )"
176 +
177 +DEPEND+="${CDEPEND}
178 + suexec? ( suexec-caps? ( sys-libs/libcap ) )"
179 +RDEPEND+="${CDEPEND}"
180 +
181 +REQUIRED_USE="apache2_modules_http2? ( ssl )
182 + apache2_modules_md? ( ssl )"
183 +
184 +pkg_setup() {
185 + # dependend critical modules which are not allowed in global scope due
186 + # to USE flag conditionals (bug #499260)
187 + use ssl && MODULE_CRITICAL+=" socache_shmcb"
188 + use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
189 + apache-2_pkg_setup
190 +}
191 +
192 +src_configure() {
193 + # Brain dead check.
194 + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
195 +
196 + apache-2_src_configure
197 +}
198 +
199 +src_compile() {
200 + if tc-is-cross-compiler; then
201 + # This header is the same across targets, so use the build compiler.
202 + pushd server >/dev/null
203 + emake gen_test_char
204 + tc-export_build_env BUILD_CC
205 + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
206 + gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
207 + popd >/dev/null
208 + fi
209 +
210 + default
211 +}
212 +
213 +src_install() {
214 + apache-2_src_install
215 + local i
216 + local apache_tools_prune_list=(
217 + /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
218 + /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
219 + /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
220 + /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
221 + )
222 + for i in ${apache_tools_prune_list[@]} ; do
223 + rm "${ED%/}"/$i || die "Failed to prune apache-tools bits"
224 + done
225 +
226 + # install apxs in /usr/bin (bug #502384) and put a symlink into the
227 + # old location until all ebuilds and eclasses have been modified to
228 + # use the new location.
229 + dobin support/apxs
230 + dosym ../bin/apxs /usr/sbin/apxs
231 +
232 + # Note: wait for mod_systemd to be included in some forthcoming release,
233 + # Then apache2.4.service can be used and systemd support controlled
234 + # through --enable-systemd
235 + systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
236 + systemd_dotmpfilesd "${FILESDIR}/apache.conf"
237 + #insinto /etc/apache2/modules.d
238 + #doins "${FILESDIR}/00_systemd.conf"
239 +
240 + # Install http2 module config
241 + insinto /etc/apache2/modules.d
242 + doins "${FILESDIR}"/41_mod_http2.conf
243 +
244 + # Fix path to apache libdir
245 + sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
246 +}
247 +
248 +pkg_postinst() {
249 + apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
250 +
251 + tmpfiles_process apache.conf #662544
252 +
253 + # warnings that default config might not work out of the box
254 + local mod cmod
255 + for mod in ${MODULE_CRITICAL} ; do
256 + if ! use "apache2_modules_${mod}"; then
257 + echo
258 + ewarn "Warning: Critical module not installed!"
259 + ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
260 + ewarn "are highly recomended but might not be in the base profile yet."
261 + ewarn "Default config for ssl needs module 'socache_shmcb'."
262 + ewarn "Enabling the following flags is highly recommended:"
263 + for cmod in ${MODULE_CRITICAL} ; do
264 + use "apache2_modules_${cmod}" || \
265 + ewarn "+ apache2_modules_${cmod}"
266 + done
267 + echo
268 + break
269 + fi
270 + done
271 + # warning for proxy_balancer and missing load balancing scheduler
272 + if use apache2_modules_proxy_balancer; then
273 + local lbset=
274 + for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
275 + if use "apache2_modules_${mod}"; then
276 + lbset=1 && break
277 + fi
278 + done
279 + if [ ! ${lbset} ] ; then
280 + echo
281 + ewarn "Info: Missing load balancing scheduler algorithm module"
282 + ewarn "(They were split off from proxy_balancer in 2.3)"
283 + ewarn "In order to get the ability of load balancing, at least"
284 + ewarn "one of these modules has to be present:"
285 + ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
286 + echo
287 + fi
288 + fi
289 +}