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: Tue, 26 Feb 2019 16:02:15
Message-Id: 1551196921.97ec48bea8c6fb9587b9741a37a25b0cae118589.polynomial-c@gentoo
1 commit: 97ec48bea8c6fb9587b9741a37a25b0cae118589
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 26 16:00:45 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 26 16:02:01 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ec48be
7
8 www-servers/apache: Removed old.
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 www-servers/apache/Manifest | 2 -
14 www-servers/apache/apache-2.4.35.ebuild | 257 -----------------------------
15 www-servers/apache/apache-2.4.37-r1.ebuild | 257 -----------------------------
16 3 files changed, 516 deletions(-)
17
18 diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
19 index 84e72590173..0284c46168f 100644
20 --- a/www-servers/apache/Manifest
21 +++ b/www-servers/apache/Manifest
22 @@ -5,6 +5,4 @@ DIST gentoo-apache-2.4.38-20190226.tar.bz2 24810 BLAKE2B 31dc4363c7bdb3dd49287da
23 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
24 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
25 DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8
26 -DIST httpd-2.4.35.tar.bz2 7044336 BLAKE2B b0ec5de56bfdaf7c6cf7f6cd2fedbd8748c16a76bddbde8e3442d2102aa33bc2642cf1dacce7b5e38023ddfceee393cd0059b881cd25dc57c029900385a41f59 SHA512 f5d6a849850ebdf4e38b586c84cc1063d68ac4c6737895c9ac1c8796c22655681c55b4de77ed9f1f807338fdb9f7824faf911361aa31cc46f3c3a2cbabe20543
27 -DIST httpd-2.4.37.tar.bz2 7031632 BLAKE2B 53eb04e91a909b65107c587348860fbe3aa48474fa8beae5bed875c62655704e3b63f77534b2961e24bf861c9502b7a52de71a1e6099f092476135b8a50cede8 SHA512 e802915801bbe885a65dada04b0116d145b293fabfff734dddb61a79ca1c6d65326f51155d1b864b093c3ec00d0bdfdf1401ab55677bae1ea3da1d199d7bcad4
28 DIST httpd-2.4.38.tar.bz2 7035030 BLAKE2B 52d965b0eae3402c268f1c5f5fb669ad84408699871d0518ba254c6e7c00f2198cba8cb6106114a62f0f6de67e0a8b921b5783af9530d165ed4d435312ce5164 SHA512 8bdc36fa2bd13fd83feee17fdce4a5316ed8f96c1ac32b636ba106572ba257815438c72068d2d0e900783a3fa25c90a5da34c3f83fc2c04a1dbdbf234f7ad448
29
30 diff --git a/www-servers/apache/apache-2.4.35.ebuild b/www-servers/apache/apache-2.4.35.ebuild
31 deleted file mode 100644
32 index f8f2bdda1f3..00000000000
33 --- a/www-servers/apache/apache-2.4.35.ebuild
34 +++ /dev/null
35 @@ -1,257 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -# latest gentoo apache files
42 -GENTOO_PATCHSTAMP="20180716"
43 -GENTOO_DEVELOPER="polynomial-c"
44 -GENTOO_PATCHNAME="gentoo-apache-2.4.34"
45 -
46 -# IUSE/USE_EXPAND magic
47 -IUSE_MPMS_FORK="prefork"
48 -IUSE_MPMS_THREAD="event worker"
49 -
50 -# << obsolete modules:
51 -# authn_default authz_default mem_cache
52 -# mem_cache is replaced by cache_disk
53 -# ?? buggy modules
54 -# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
55 -# >> added modules for reason:
56 -# compat: compatibility with 2.2 access control
57 -# authz_host: new module for access control
58 -# authn_core: functionality provided by authn_alias in previous versions
59 -# authz_core: new module, provides core authorization capabilities
60 -# cache_disk: replacement for mem_cache
61 -# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
62 -# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
63 -# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
64 -# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
65 -# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
66 -# socache_shmcb: shared object cache provider. Default config with ssl needs it
67 -# unixd: fixes startup error: Invalid command 'User'
68 -IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
69 -authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
70 -authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
71 -brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
72 -dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
73 -ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
74 -lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation
75 -proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
76 -proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
77 -slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
78 -unixd version vhost_alias watchdog xml2enc"
79 -# The following are also in the source as of this version, but are not available
80 -# for user selection:
81 -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
82 -# optional_fn_import optional_hook_export optional_hook_import
83 -
84 -# inter-module dependencies
85 -# TODO: this may still be incomplete
86 -MODULE_DEPENDS="
87 - brotli:filter
88 - dav_fs:dav
89 - dav_lock:dav
90 - deflate:filter
91 - cache_disk:cache
92 - ext_filter:filter
93 - file_cache:cache
94 - lbmethod_byrequests:proxy_balancer
95 - lbmethod_byrequests:slotmem_shm
96 - lbmethod_bytraffic:proxy_balancer
97 - lbmethod_bybusyness:proxy_balancer
98 - lbmethod_heartbeat:proxy_balancer
99 - log_forensic:log_config
100 - logio:log_config
101 - cache_disk:cache
102 - cache_socache:cache
103 - md:watchdog
104 - mime_magic:mime
105 - proxy_ajp:proxy
106 - proxy_balancer:proxy
107 - proxy_balancer:slotmem_shm
108 - proxy_connect:proxy
109 - proxy_ftp:proxy
110 - proxy_html:proxy
111 - proxy_html:xml2enc
112 - proxy_http:proxy
113 - proxy_scgi:proxy
114 - proxy_fcgi:proxy
115 - proxy_wstunnel:proxy
116 - substitute:filter
117 -"
118 -
119 -# module<->define mappings
120 -MODULE_DEFINES="
121 - auth_digest:AUTH_DIGEST
122 - authnz_ldap:AUTHNZ_LDAP
123 - cache:CACHE
124 - cache_disk:CACHE
125 - cache_socache:CACHE
126 - dav:DAV
127 - dav_fs:DAV
128 - dav_lock:DAV
129 - file_cache:CACHE
130 - http2:HTTP2
131 - info:INFO
132 - ldap:LDAP
133 - md:SSL
134 - proxy:PROXY
135 - proxy_ajp:PROXY
136 - proxy_balancer:PROXY
137 - proxy_connect:PROXY
138 - proxy_ftp:PROXY
139 - proxy_html:PROXY
140 - proxy_http:PROXY
141 - proxy_fcgi:PROXY
142 - proxy_scgi:PROXY
143 - proxy_wstunnel: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 -inherit apache-2 systemd tmpfiles toolchain-funcs
161 -
162 -DESCRIPTION="The Apache Web Server"
163 -HOMEPAGE="https://httpd.apache.org/"
164 -
165 -# some helper scripts are Apache-1.1, thus both are here
166 -LICENSE="Apache-2.0 Apache-1.1"
167 -SLOT="2"
168 -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"
169 -
170 -# Enable http2 by default (bug #563452)
171 -# FIXME: Move to apache-2.eclass once this has reached stable.
172 -IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
173 -# New suexec options (since 2.4.34)
174 -IUSE="${IUSE} +suexec-caps suexec-syslog"
175 -
176 -CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
177 - apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
178 - apache2_modules_md? ( >=dev-libs/jansson-2.10 )"
179 -
180 -DEPEND+="${CDEPEND}
181 - suexec? ( suexec-caps? ( sys-libs/libcap ) )"
182 -RDEPEND+="${CDEPEND}"
183 -
184 -REQUIRED_USE="apache2_modules_http2? ( ssl )
185 - apache2_modules_md? ( ssl )"
186 -
187 -pkg_setup() {
188 - # dependend critical modules which are not allowed in global scope due
189 - # to USE flag conditionals (bug #499260)
190 - use ssl && MODULE_CRITICAL+=" socache_shmcb"
191 - use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
192 - apache-2_pkg_setup
193 -}
194 -
195 -src_configure() {
196 - # Brain dead check.
197 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
198 -
199 - apache-2_src_configure
200 -}
201 -
202 -src_compile() {
203 - if tc-is-cross-compiler; then
204 - # This header is the same across targets, so use the build compiler.
205 - pushd server >/dev/null
206 - emake gen_test_char
207 - tc-export_build_env BUILD_CC
208 - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
209 - gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
210 - popd >/dev/null
211 - fi
212 -
213 - default
214 -}
215 -
216 -src_install() {
217 - apache-2_src_install
218 - local i
219 - local apache_tools_prune_list=(
220 - /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
221 - /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
222 - /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
223 - /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
224 - )
225 - for i in ${apache_tools_prune_list[@]} ; do
226 - rm "${ED%/}"/$i || die "Failed to prune apache-tools bits"
227 - done
228 -
229 - # install apxs in /usr/bin (bug #502384) and put a symlink into the
230 - # old location until all ebuilds and eclasses have been modified to
231 - # use the new location.
232 - dobin support/apxs
233 - dosym ../bin/apxs /usr/sbin/apxs
234 -
235 - # Note: wait for mod_systemd to be included in some forthcoming release,
236 - # Then apache2.4.service can be used and systemd support controlled
237 - # through --enable-systemd
238 - systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
239 - systemd_dotmpfilesd "${FILESDIR}/apache.conf"
240 - #insinto /etc/apache2/modules.d
241 - #doins "${FILESDIR}/00_systemd.conf"
242 -
243 - # Install http2 module config
244 - insinto /etc/apache2/modules.d
245 - doins "${FILESDIR}"/41_mod_http2.conf
246 -
247 - # Fix path to apache libdir
248 - sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
249 -}
250 -
251 -pkg_postinst() {
252 - apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
253 -
254 - tmpfiles_process apache.conf #662544
255 -
256 - # warnings that default config might not work out of the box
257 - local mod cmod
258 - for mod in ${MODULE_CRITICAL} ; do
259 - if ! use "apache2_modules_${mod}"; then
260 - echo
261 - ewarn "Warning: Critical module not installed!"
262 - ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
263 - ewarn "are highly recomended but might not be in the base profile yet."
264 - ewarn "Default config for ssl needs module 'socache_shmcb'."
265 - ewarn "Enabling the following flags is highly recommended:"
266 - for cmod in ${MODULE_CRITICAL} ; do
267 - use "apache2_modules_${cmod}" || \
268 - ewarn "+ apache2_modules_${cmod}"
269 - done
270 - echo
271 - break
272 - fi
273 - done
274 - # warning for proxy_balancer and missing load balancing scheduler
275 - if use apache2_modules_proxy_balancer; then
276 - local lbset=
277 - for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
278 - if use "apache2_modules_${mod}"; then
279 - lbset=1 && break
280 - fi
281 - done
282 - if [ ! ${lbset} ] ; then
283 - echo
284 - ewarn "Info: Missing load balancing scheduler algorithm module"
285 - ewarn "(They were split off from proxy_balancer in 2.3)"
286 - ewarn "In order to get the ability of load balancing, at least"
287 - ewarn "one of these modules has to be present:"
288 - ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
289 - echo
290 - fi
291 - fi
292 -}
293
294 diff --git a/www-servers/apache/apache-2.4.37-r1.ebuild b/www-servers/apache/apache-2.4.37-r1.ebuild
295 deleted file mode 100644
296 index 0c1a3ee3a83..00000000000
297 --- a/www-servers/apache/apache-2.4.37-r1.ebuild
298 +++ /dev/null
299 @@ -1,257 +0,0 @@
300 -# Copyright 1999-2018 Gentoo Authors
301 -# Distributed under the terms of the GNU General Public License v2
302 -
303 -EAPI=6
304 -
305 -# latest gentoo apache files
306 -GENTOO_PATCHSTAMP="20180716"
307 -GENTOO_DEVELOPER="polynomial-c"
308 -GENTOO_PATCHNAME="gentoo-apache-2.4.34"
309 -
310 -# IUSE/USE_EXPAND magic
311 -IUSE_MPMS_FORK="prefork"
312 -IUSE_MPMS_THREAD="event worker"
313 -
314 -# << obsolete modules:
315 -# authn_default authz_default mem_cache
316 -# mem_cache is replaced by cache_disk
317 -# ?? buggy modules
318 -# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
319 -# >> added modules for reason:
320 -# compat: compatibility with 2.2 access control
321 -# authz_host: new module for access control
322 -# authn_core: functionality provided by authn_alias in previous versions
323 -# authz_core: new module, provides core authorization capabilities
324 -# cache_disk: replacement for mem_cache
325 -# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
326 -# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
327 -# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
328 -# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
329 -# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
330 -# socache_shmcb: shared object cache provider. Default config with ssl needs it
331 -# unixd: fixes startup error: Invalid command 'User'
332 -IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
333 -authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
334 -authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
335 -brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
336 -dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
337 -ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
338 -lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation
339 -proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
340 -proxy_http2 proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
341 -slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
342 -unixd version vhost_alias watchdog xml2enc"
343 -# The following are also in the source as of this version, but are not available
344 -# for user selection:
345 -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
346 -# optional_fn_import optional_hook_export optional_hook_import
347 -
348 -# inter-module dependencies
349 -# TODO: this may still be incomplete
350 -MODULE_DEPENDS="
351 - brotli:filter
352 - dav_fs:dav
353 - dav_lock:dav
354 - deflate:filter
355 - cache_disk:cache
356 - ext_filter:filter
357 - file_cache:cache
358 - lbmethod_byrequests:proxy_balancer
359 - lbmethod_byrequests:slotmem_shm
360 - lbmethod_bytraffic:proxy_balancer
361 - lbmethod_bybusyness:proxy_balancer
362 - lbmethod_heartbeat:proxy_balancer
363 - log_forensic:log_config
364 - logio:log_config
365 - cache_disk:cache
366 - cache_socache:cache
367 - md:watchdog
368 - mime_magic:mime
369 - proxy_ajp:proxy
370 - proxy_balancer:proxy
371 - proxy_balancer:slotmem_shm
372 - proxy_connect:proxy
373 - proxy_ftp:proxy
374 - proxy_html:proxy
375 - proxy_html:xml2enc
376 - proxy_http:proxy
377 - proxy_scgi:proxy
378 - proxy_fcgi:proxy
379 - proxy_wstunnel:proxy
380 - substitute:filter
381 -"
382 -
383 -# module<->define mappings
384 -MODULE_DEFINES="
385 - auth_digest:AUTH_DIGEST
386 - authnz_ldap:AUTHNZ_LDAP
387 - cache:CACHE
388 - cache_disk:CACHE
389 - cache_socache:CACHE
390 - dav:DAV
391 - dav_fs:DAV
392 - dav_lock:DAV
393 - file_cache:CACHE
394 - http2:HTTP2
395 - info:INFO
396 - ldap:LDAP
397 - md:SSL
398 - proxy:PROXY
399 - proxy_ajp:PROXY
400 - proxy_balancer:PROXY
401 - proxy_connect:PROXY
402 - proxy_ftp:PROXY
403 - proxy_html:PROXY
404 - proxy_http:PROXY
405 - proxy_fcgi:PROXY
406 - proxy_scgi:PROXY
407 - proxy_wstunnel:PROXY
408 - socache_shmcb:SSL
409 - ssl:SSL
410 - status:STATUS
411 - suexec:SUEXEC
412 - userdir:USERDIR
413 -"
414 -
415 -# critical modules for the default config
416 -MODULE_CRITICAL="
417 - authn_core
418 - authz_core
419 - authz_host
420 - dir
421 - mime
422 - unixd
423 -"
424 -inherit apache-2 systemd tmpfiles toolchain-funcs
425 -
426 -DESCRIPTION="The Apache Web Server"
427 -HOMEPAGE="https://httpd.apache.org/"
428 -
429 -# some helper scripts are Apache-1.1, thus both are here
430 -LICENSE="Apache-2.0 Apache-1.1"
431 -SLOT="2"
432 -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"
433 -
434 -# Enable http2 by default (bug #563452)
435 -# FIXME: Move to apache-2.eclass once this has reached stable.
436 -IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
437 -# New suexec options (since 2.4.34)
438 -IUSE="${IUSE} +suexec-caps suexec-syslog"
439 -
440 -CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
441 - apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
442 - apache2_modules_md? ( >=dev-libs/jansson-2.10 )"
443 -
444 -DEPEND+="${CDEPEND}
445 - suexec? ( suexec-caps? ( sys-libs/libcap ) )"
446 -RDEPEND+="${CDEPEND}"
447 -
448 -REQUIRED_USE="apache2_modules_http2? ( ssl )
449 - apache2_modules_md? ( ssl )"
450 -
451 -pkg_setup() {
452 - # dependend critical modules which are not allowed in global scope due
453 - # to USE flag conditionals (bug #499260)
454 - use ssl && MODULE_CRITICAL+=" socache_shmcb"
455 - use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
456 - apache-2_pkg_setup
457 -}
458 -
459 -src_configure() {
460 - # Brain dead check.
461 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
462 -
463 - apache-2_src_configure
464 -}
465 -
466 -src_compile() {
467 - if tc-is-cross-compiler; then
468 - # This header is the same across targets, so use the build compiler.
469 - pushd server >/dev/null
470 - emake gen_test_char
471 - tc-export_build_env BUILD_CC
472 - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
473 - gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
474 - popd >/dev/null
475 - fi
476 -
477 - default
478 -}
479 -
480 -src_install() {
481 - apache-2_src_install
482 - local i
483 - local apache_tools_prune_list=(
484 - /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
485 - /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
486 - /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
487 - /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
488 - )
489 - for i in ${apache_tools_prune_list[@]} ; do
490 - rm "${ED%/}"/$i || die "Failed to prune apache-tools bits"
491 - done
492 -
493 - # install apxs in /usr/bin (bug #502384) and put a symlink into the
494 - # old location until all ebuilds and eclasses have been modified to
495 - # use the new location.
496 - dobin support/apxs
497 - dosym ../bin/apxs /usr/sbin/apxs
498 -
499 - # Note: wait for mod_systemd to be included in some forthcoming release,
500 - # Then apache2.4.service can be used and systemd support controlled
501 - # through --enable-systemd
502 - systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
503 - systemd_dotmpfilesd "${FILESDIR}/apache.conf"
504 - #insinto /etc/apache2/modules.d
505 - #doins "${FILESDIR}/00_systemd.conf"
506 -
507 - # Install http2 module config
508 - insinto /etc/apache2/modules.d
509 - doins "${FILESDIR}"/41_mod_http2.conf
510 -
511 - # Fix path to apache libdir
512 - sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
513 -}
514 -
515 -pkg_postinst() {
516 - apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
517 -
518 - tmpfiles_process apache.conf #662544
519 -
520 - # warnings that default config might not work out of the box
521 - local mod cmod
522 - for mod in ${MODULE_CRITICAL} ; do
523 - if ! use "apache2_modules_${mod}"; then
524 - echo
525 - ewarn "Warning: Critical module not installed!"
526 - ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
527 - ewarn "are highly recomended but might not be in the base profile yet."
528 - ewarn "Default config for ssl needs module 'socache_shmcb'."
529 - ewarn "Enabling the following flags is highly recommended:"
530 - for cmod in ${MODULE_CRITICAL} ; do
531 - use "apache2_modules_${cmod}" || \
532 - ewarn "+ apache2_modules_${cmod}"
533 - done
534 - echo
535 - break
536 - fi
537 - done
538 - # warning for proxy_balancer and missing load balancing scheduler
539 - if use apache2_modules_proxy_balancer; then
540 - local lbset=
541 - for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
542 - if use "apache2_modules_${mod}"; then
543 - lbset=1 && break
544 - fi
545 - done
546 - if [ ! ${lbset} ] ; then
547 - echo
548 - ewarn "Info: Missing load balancing scheduler algorithm module"
549 - ewarn "(They were split off from proxy_balancer in 2.3)"
550 - ewarn "In order to get the ability of load balancing, at least"
551 - ewarn "one of these modules has to be present:"
552 - ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
553 - echo
554 - fi
555 - fi
556 -}