1 |
commit: a4fa77e074b321d4bf55c3eab587daed8227cac6 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 21 02:13:51 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 21 02:13:51 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4fa77e0 |
7 |
|
8 |
www-servers/apache: Security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/682306 |
11 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
www-servers/apache/Manifest | 4 - |
15 |
www-servers/apache/apache-2.4.34-r2.ebuild | 262 --------------------- |
16 |
www-servers/apache/apache-2.4.38-r1.ebuild | 257 -------------------- |
17 |
.../apache/files/apache-2.4.34-PR62557.patch | 216 ----------------- |
18 |
.../apache-2.4.34-suexec_parallel_install.patch | 19 -- |
19 |
5 files changed, 758 deletions(-) |
20 |
|
21 |
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest |
22 |
index 5e988a0e24a..ed95ede81d6 100644 |
23 |
--- a/www-servers/apache/Manifest |
24 |
+++ b/www-servers/apache/Manifest |
25 |
@@ -1,8 +1,4 @@ |
26 |
DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a |
27 |
-DIST gentoo-apache-2.4.34-20180716.tar.bz2 24773 BLAKE2B 6ff3b711e16a0156f8c5da4c5ee830a6e3d55b1f29c44a81be26decf6611e2680c84ec7779372bc0de775f3aff90fdaec48f5bc7253c8c9317c1308b60bf10e3 SHA512 4b96c2c7cad0aeef070584b64396360acb2ec24139a5af4755fc36b1f3cd2b82b213ebbfc45035f61c49b59ba40870930227b42e0b60042fd1147f34ba5df574 |
28 |
-DIST gentoo-apache-2.4.38-20190226.tar.bz2 24810 BLAKE2B 31dc4363c7bdb3dd49287da405541b73e31f251b1b31ecfdffd066a3cd6b838938acf7326a7963a05693e20d6dc34e71223efd1ecd5062a25829d6f6f4721595 SHA512 3dbddedab74e4326b53a9ec3daeb53d727c2789736ae3234d127ccffe873541bd7baa26d5cf9ed064b6e4125fd5a2baee97bccb81e67fdc5674cffe81ca93c40 |
29 |
DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4 |
30 |
DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 |
31 |
-DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8 |
32 |
-DIST httpd-2.4.38.tar.bz2 7035030 BLAKE2B 52d965b0eae3402c268f1c5f5fb669ad84408699871d0518ba254c6e7c00f2198cba8cb6106114a62f0f6de67e0a8b921b5783af9530d165ed4d435312ce5164 SHA512 8bdc36fa2bd13fd83feee17fdce4a5316ed8f96c1ac32b636ba106572ba257815438c72068d2d0e900783a3fa25c90a5da34c3f83fc2c04a1dbdbf234f7ad448 |
33 |
DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7 |
34 |
|
35 |
diff --git a/www-servers/apache/apache-2.4.34-r2.ebuild b/www-servers/apache/apache-2.4.34-r2.ebuild |
36 |
deleted file mode 100644 |
37 |
index 7951d9793d5..00000000000 |
38 |
--- a/www-servers/apache/apache-2.4.34-r2.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,262 +0,0 @@ |
41 |
-# Copyright 1999-2018 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=6 |
45 |
- |
46 |
-# latest gentoo apache files |
47 |
-GENTOO_PATCHSTAMP="20180716" |
48 |
-GENTOO_DEVELOPER="polynomial-c" |
49 |
-GENTOO_PATCHNAME="gentoo-apache-2.4.34" |
50 |
- |
51 |
-# IUSE/USE_EXPAND magic |
52 |
-IUSE_MPMS_FORK="prefork" |
53 |
-IUSE_MPMS_THREAD="event worker" |
54 |
- |
55 |
-# << obsolete modules: |
56 |
-# authn_default authz_default mem_cache |
57 |
-# mem_cache is replaced by cache_disk |
58 |
-# ?? buggy modules |
59 |
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found |
60 |
-# >> added modules for reason: |
61 |
-# compat: compatibility with 2.2 access control |
62 |
-# authz_host: new module for access control |
63 |
-# authn_core: functionality provided by authn_alias in previous versions |
64 |
-# authz_core: new module, provides core authorization capabilities |
65 |
-# cache_disk: replacement for mem_cache |
66 |
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 |
67 |
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 |
68 |
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 |
69 |
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 |
70 |
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). |
71 |
-# socache_shmcb: shared object cache provider. Default config with ssl needs it |
72 |
-# unixd: fixes startup error: Invalid command 'User' |
73 |
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest |
74 |
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core |
75 |
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex |
76 |
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock |
77 |
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 |
78 |
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness |
79 |
-lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation |
80 |
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi |
81 |
-proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif |
82 |
-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack |
83 |
-unixd version vhost_alias watchdog xml2enc" |
84 |
-# The following are also in the source as of this version, but are not available |
85 |
-# for user selection: |
86 |
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
87 |
-# optional_fn_import optional_hook_export optional_hook_import |
88 |
- |
89 |
-# inter-module dependencies |
90 |
-# TODO: this may still be incomplete |
91 |
-MODULE_DEPENDS=" |
92 |
- brotli:filter |
93 |
- dav_fs:dav |
94 |
- dav_lock:dav |
95 |
- deflate:filter |
96 |
- cache_disk:cache |
97 |
- ext_filter:filter |
98 |
- file_cache:cache |
99 |
- lbmethod_byrequests:proxy_balancer |
100 |
- lbmethod_byrequests:slotmem_shm |
101 |
- lbmethod_bytraffic:proxy_balancer |
102 |
- lbmethod_bybusyness:proxy_balancer |
103 |
- lbmethod_heartbeat:proxy_balancer |
104 |
- log_forensic:log_config |
105 |
- logio:log_config |
106 |
- cache_disk:cache |
107 |
- cache_socache:cache |
108 |
- md:watchdog |
109 |
- mime_magic:mime |
110 |
- proxy_ajp:proxy |
111 |
- proxy_balancer:proxy |
112 |
- proxy_balancer:slotmem_shm |
113 |
- proxy_connect:proxy |
114 |
- proxy_ftp:proxy |
115 |
- proxy_html:proxy |
116 |
- proxy_html:xml2enc |
117 |
- proxy_http:proxy |
118 |
- proxy_scgi:proxy |
119 |
- proxy_fcgi:proxy |
120 |
- proxy_wstunnel:proxy |
121 |
- substitute:filter |
122 |
-" |
123 |
- |
124 |
-# module<->define mappings |
125 |
-MODULE_DEFINES=" |
126 |
- auth_digest:AUTH_DIGEST |
127 |
- authnz_ldap:AUTHNZ_LDAP |
128 |
- cache:CACHE |
129 |
- cache_disk:CACHE |
130 |
- cache_socache:CACHE |
131 |
- dav:DAV |
132 |
- dav_fs:DAV |
133 |
- dav_lock:DAV |
134 |
- file_cache:CACHE |
135 |
- http2:HTTP2 |
136 |
- info:INFO |
137 |
- ldap:LDAP |
138 |
- md:SSL |
139 |
- proxy:PROXY |
140 |
- proxy_ajp:PROXY |
141 |
- proxy_balancer:PROXY |
142 |
- proxy_connect:PROXY |
143 |
- proxy_ftp:PROXY |
144 |
- proxy_html:PROXY |
145 |
- proxy_http:PROXY |
146 |
- proxy_fcgi:PROXY |
147 |
- proxy_scgi:PROXY |
148 |
- proxy_wstunnel:PROXY |
149 |
- socache_shmcb:SSL |
150 |
- ssl:SSL |
151 |
- status:STATUS |
152 |
- suexec:SUEXEC |
153 |
- userdir:USERDIR |
154 |
-" |
155 |
- |
156 |
-# critical modules for the default config |
157 |
-MODULE_CRITICAL=" |
158 |
- authn_core |
159 |
- authz_core |
160 |
- authz_host |
161 |
- dir |
162 |
- mime |
163 |
- unixd |
164 |
-" |
165 |
-inherit apache-2 systemd tmpfiles toolchain-funcs |
166 |
- |
167 |
-DESCRIPTION="The Apache Web Server" |
168 |
-HOMEPAGE="https://httpd.apache.org/" |
169 |
- |
170 |
-# some helper scripts are Apache-1.1, thus both are here |
171 |
-LICENSE="Apache-2.0 Apache-1.1" |
172 |
-SLOT="2" |
173 |
-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" |
174 |
- |
175 |
-# Enable http2 by default (bug #563452) |
176 |
-# FIXME: Move to apache-2.eclass once this has reached stable. |
177 |
-IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}" |
178 |
-# New suexec options (since 2.4.34) |
179 |
-IUSE="${IUSE} +suexec-caps suexec-syslog" |
180 |
- |
181 |
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) |
182 |
- apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) |
183 |
- apache2_modules_md? ( >=dev-libs/jansson-2.10 )" |
184 |
- |
185 |
-DEPEND+="${CDEPEND} |
186 |
- suexec? ( suexec-caps? ( sys-libs/libcap ) )" |
187 |
-RDEPEND+="${CDEPEND}" |
188 |
- |
189 |
-REQUIRED_USE="apache2_modules_http2? ( ssl ) |
190 |
- apache2_modules_md? ( ssl )" |
191 |
- |
192 |
-PATCHES=( |
193 |
- "${FILESDIR}/${PN}-2.4.34-suexec_parallel_install.patch" #661358 |
194 |
- "${FILESDIR}"/${P}-PR62557.patch #663312 |
195 |
-) |
196 |
- |
197 |
-pkg_setup() { |
198 |
- # dependend critical modules which are not allowed in global scope due |
199 |
- # to USE flag conditionals (bug #499260) |
200 |
- use ssl && MODULE_CRITICAL+=" socache_shmcb" |
201 |
- use doc && MODULE_CRITICAL+=" alias negotiation setenvif" |
202 |
- apache-2_pkg_setup |
203 |
-} |
204 |
- |
205 |
-src_configure() { |
206 |
- # Brain dead check. |
207 |
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
208 |
- |
209 |
- apache-2_src_configure |
210 |
-} |
211 |
- |
212 |
-src_compile() { |
213 |
- if tc-is-cross-compiler; then |
214 |
- # This header is the same across targets, so use the build compiler. |
215 |
- pushd server >/dev/null |
216 |
- emake gen_test_char |
217 |
- tc-export_build_env BUILD_CC |
218 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
219 |
- gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die |
220 |
- popd >/dev/null |
221 |
- fi |
222 |
- |
223 |
- default |
224 |
-} |
225 |
- |
226 |
-src_install() { |
227 |
- apache-2_src_install |
228 |
- local i |
229 |
- local apache_tools_prune_list=( |
230 |
- /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm} |
231 |
- /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs} |
232 |
- /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1} |
233 |
- /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} |
234 |
- ) |
235 |
- for i in ${apache_tools_prune_list[@]} ; do |
236 |
- rm "${ED%/}"/$i || die "Failed to prune apache-tools bits" |
237 |
- done |
238 |
- |
239 |
- # install apxs in /usr/bin (bug #502384) and put a symlink into the |
240 |
- # old location until all ebuilds and eclasses have been modified to |
241 |
- # use the new location. |
242 |
- dobin support/apxs |
243 |
- dosym ../bin/apxs /usr/sbin/apxs |
244 |
- |
245 |
- # Note: wait for mod_systemd to be included in some forthcoming release, |
246 |
- # Then apache2.4.service can be used and systemd support controlled |
247 |
- # through --enable-systemd |
248 |
- systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service" |
249 |
- systemd_dotmpfilesd "${FILESDIR}/apache.conf" |
250 |
- #insinto /etc/apache2/modules.d |
251 |
- #doins "${FILESDIR}/00_systemd.conf" |
252 |
- |
253 |
- # Install http2 module config |
254 |
- insinto /etc/apache2/modules.d |
255 |
- doins "${FILESDIR}"/41_mod_http2.conf |
256 |
- |
257 |
- # Fix path to apache libdir |
258 |
- sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die |
259 |
-} |
260 |
- |
261 |
-pkg_postinst() { |
262 |
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" |
263 |
- |
264 |
- tmpfiles_process apache.conf #662544 |
265 |
- |
266 |
- # warnings that default config might not work out of the box |
267 |
- local mod cmod |
268 |
- for mod in ${MODULE_CRITICAL} ; do |
269 |
- if ! use "apache2_modules_${mod}"; then |
270 |
- echo |
271 |
- ewarn "Warning: Critical module not installed!" |
272 |
- ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" |
273 |
- ewarn "are highly recomended but might not be in the base profile yet." |
274 |
- ewarn "Default config for ssl needs module 'socache_shmcb'." |
275 |
- ewarn "Enabling the following flags is highly recommended:" |
276 |
- for cmod in ${MODULE_CRITICAL} ; do |
277 |
- use "apache2_modules_${cmod}" || \ |
278 |
- ewarn "+ apache2_modules_${cmod}" |
279 |
- done |
280 |
- echo |
281 |
- break |
282 |
- fi |
283 |
- done |
284 |
- # warning for proxy_balancer and missing load balancing scheduler |
285 |
- if use apache2_modules_proxy_balancer; then |
286 |
- local lbset= |
287 |
- for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do |
288 |
- if use "apache2_modules_${mod}"; then |
289 |
- lbset=1 && break |
290 |
- fi |
291 |
- done |
292 |
- if [ ! ${lbset} ] ; then |
293 |
- echo |
294 |
- ewarn "Info: Missing load balancing scheduler algorithm module" |
295 |
- ewarn "(They were split off from proxy_balancer in 2.3)" |
296 |
- ewarn "In order to get the ability of load balancing, at least" |
297 |
- ewarn "one of these modules has to be present:" |
298 |
- ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" |
299 |
- echo |
300 |
- fi |
301 |
- fi |
302 |
-} |
303 |
|
304 |
diff --git a/www-servers/apache/apache-2.4.38-r1.ebuild b/www-servers/apache/apache-2.4.38-r1.ebuild |
305 |
deleted file mode 100644 |
306 |
index 64fa99892b9..00000000000 |
307 |
--- a/www-servers/apache/apache-2.4.38-r1.ebuild |
308 |
+++ /dev/null |
309 |
@@ -1,257 +0,0 @@ |
310 |
-# Copyright 1999-2019 Gentoo Authors |
311 |
-# Distributed under the terms of the GNU General Public License v2 |
312 |
- |
313 |
-EAPI=6 |
314 |
- |
315 |
-# latest gentoo apache files |
316 |
-GENTOO_PATCHSTAMP="20190226" |
317 |
-GENTOO_DEVELOPER="polynomial-c" |
318 |
-GENTOO_PATCHNAME="gentoo-apache-2.4.38" |
319 |
- |
320 |
-# IUSE/USE_EXPAND magic |
321 |
-IUSE_MPMS_FORK="prefork" |
322 |
-IUSE_MPMS_THREAD="event worker" |
323 |
- |
324 |
-# << obsolete modules: |
325 |
-# authn_default authz_default mem_cache |
326 |
-# mem_cache is replaced by cache_disk |
327 |
-# ?? buggy modules |
328 |
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found |
329 |
-# >> added modules for reason: |
330 |
-# compat: compatibility with 2.2 access control |
331 |
-# authz_host: new module for access control |
332 |
-# authn_core: functionality provided by authn_alias in previous versions |
333 |
-# authz_core: new module, provides core authorization capabilities |
334 |
-# cache_disk: replacement for mem_cache |
335 |
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 |
336 |
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 |
337 |
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 |
338 |
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 |
339 |
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). |
340 |
-# socache_shmcb: shared object cache provider. Default config with ssl needs it |
341 |
-# unixd: fixes startup error: Invalid command 'User' |
342 |
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest |
343 |
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core |
344 |
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex |
345 |
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock |
346 |
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 |
347 |
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness |
348 |
-lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation |
349 |
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi |
350 |
-proxy_http2 proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif |
351 |
-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack |
352 |
-unixd version vhost_alias watchdog xml2enc" |
353 |
-# The following are also in the source as of this version, but are not available |
354 |
-# for user selection: |
355 |
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
356 |
-# optional_fn_import optional_hook_export optional_hook_import |
357 |
- |
358 |
-# inter-module dependencies |
359 |
-# TODO: this may still be incomplete |
360 |
-MODULE_DEPENDS=" |
361 |
- brotli:filter |
362 |
- dav_fs:dav |
363 |
- dav_lock:dav |
364 |
- deflate:filter |
365 |
- cache_disk:cache |
366 |
- ext_filter:filter |
367 |
- file_cache:cache |
368 |
- lbmethod_byrequests:proxy_balancer |
369 |
- lbmethod_byrequests:slotmem_shm |
370 |
- lbmethod_bytraffic:proxy_balancer |
371 |
- lbmethod_bybusyness:proxy_balancer |
372 |
- lbmethod_heartbeat:proxy_balancer |
373 |
- log_forensic:log_config |
374 |
- logio:log_config |
375 |
- cache_disk:cache |
376 |
- cache_socache:cache |
377 |
- md:watchdog |
378 |
- mime_magic:mime |
379 |
- proxy_ajp:proxy |
380 |
- proxy_balancer:proxy |
381 |
- proxy_balancer:slotmem_shm |
382 |
- proxy_connect:proxy |
383 |
- proxy_ftp:proxy |
384 |
- proxy_html:proxy |
385 |
- proxy_html:xml2enc |
386 |
- proxy_http:proxy |
387 |
- proxy_scgi:proxy |
388 |
- proxy_fcgi:proxy |
389 |
- proxy_wstunnel:proxy |
390 |
- substitute:filter |
391 |
-" |
392 |
- |
393 |
-# module<->define mappings |
394 |
-MODULE_DEFINES=" |
395 |
- auth_digest:AUTH_DIGEST |
396 |
- authnz_ldap:AUTHNZ_LDAP |
397 |
- cache:CACHE |
398 |
- cache_disk:CACHE |
399 |
- cache_socache:CACHE |
400 |
- dav:DAV |
401 |
- dav_fs:DAV |
402 |
- dav_lock:DAV |
403 |
- file_cache:CACHE |
404 |
- http2:HTTP2 |
405 |
- info:INFO |
406 |
- ldap:LDAP |
407 |
- md:SSL |
408 |
- proxy:PROXY |
409 |
- proxy_ajp:PROXY |
410 |
- proxy_balancer:PROXY |
411 |
- proxy_connect:PROXY |
412 |
- proxy_ftp:PROXY |
413 |
- proxy_html:PROXY |
414 |
- proxy_http:PROXY |
415 |
- proxy_fcgi:PROXY |
416 |
- proxy_scgi:PROXY |
417 |
- proxy_wstunnel:PROXY |
418 |
- socache_shmcb:SSL |
419 |
- ssl:SSL |
420 |
- status:STATUS |
421 |
- suexec:SUEXEC |
422 |
- userdir:USERDIR |
423 |
-" |
424 |
- |
425 |
-# critical modules for the default config |
426 |
-MODULE_CRITICAL=" |
427 |
- authn_core |
428 |
- authz_core |
429 |
- authz_host |
430 |
- dir |
431 |
- mime |
432 |
- unixd |
433 |
-" |
434 |
-inherit apache-2 systemd tmpfiles toolchain-funcs |
435 |
- |
436 |
-DESCRIPTION="The Apache Web Server" |
437 |
-HOMEPAGE="https://httpd.apache.org/" |
438 |
- |
439 |
-# some helper scripts are Apache-1.1, thus both are here |
440 |
-LICENSE="Apache-2.0 Apache-1.1" |
441 |
-SLOT="2" |
442 |
-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" |
443 |
- |
444 |
-# Enable http2 by default (bug #563452) |
445 |
-# FIXME: Move to apache-2.eclass once this has reached stable. |
446 |
-IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}" |
447 |
-# New suexec options (since 2.4.34) |
448 |
-IUSE="${IUSE} +suexec-caps suexec-syslog" |
449 |
- |
450 |
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) |
451 |
- apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) |
452 |
- apache2_modules_md? ( >=dev-libs/jansson-2.10 )" |
453 |
- |
454 |
-DEPEND+="${CDEPEND} |
455 |
- suexec? ( suexec-caps? ( sys-libs/libcap ) )" |
456 |
-RDEPEND+="${CDEPEND}" |
457 |
- |
458 |
-REQUIRED_USE="apache2_modules_http2? ( ssl ) |
459 |
- apache2_modules_md? ( ssl )" |
460 |
- |
461 |
-pkg_setup() { |
462 |
- # dependend critical modules which are not allowed in global scope due |
463 |
- # to USE flag conditionals (bug #499260) |
464 |
- use ssl && MODULE_CRITICAL+=" socache_shmcb" |
465 |
- use doc && MODULE_CRITICAL+=" alias negotiation setenvif" |
466 |
- apache-2_pkg_setup |
467 |
-} |
468 |
- |
469 |
-src_configure() { |
470 |
- # Brain dead check. |
471 |
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
472 |
- |
473 |
- apache-2_src_configure |
474 |
-} |
475 |
- |
476 |
-src_compile() { |
477 |
- if tc-is-cross-compiler; then |
478 |
- # This header is the same across targets, so use the build compiler. |
479 |
- pushd server >/dev/null |
480 |
- emake gen_test_char |
481 |
- tc-export_build_env BUILD_CC |
482 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
483 |
- gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die |
484 |
- popd >/dev/null |
485 |
- fi |
486 |
- |
487 |
- default |
488 |
-} |
489 |
- |
490 |
-src_install() { |
491 |
- apache-2_src_install |
492 |
- local i |
493 |
- local apache_tools_prune_list=( |
494 |
- /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm} |
495 |
- /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs} |
496 |
- /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1} |
497 |
- /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} |
498 |
- ) |
499 |
- for i in ${apache_tools_prune_list[@]} ; do |
500 |
- rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits" |
501 |
- done |
502 |
- |
503 |
- # install apxs in /usr/bin (bug #502384) and put a symlink into the |
504 |
- # old location until all ebuilds and eclasses have been modified to |
505 |
- # use the new location. |
506 |
- dobin support/apxs |
507 |
- dosym ../bin/apxs /usr/sbin/apxs |
508 |
- |
509 |
- # Note: wait for mod_systemd to be included in some forthcoming release, |
510 |
- # Then apache2.4.service can be used and systemd support controlled |
511 |
- # through --enable-systemd |
512 |
- systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service" |
513 |
- systemd_dotmpfilesd "${FILESDIR}/apache.conf" |
514 |
- #insinto /etc/apache2/modules.d |
515 |
- #doins "${FILESDIR}/00_systemd.conf" |
516 |
- |
517 |
- # Install http2 module config |
518 |
- insinto /etc/apache2/modules.d |
519 |
- doins "${FILESDIR}"/41_mod_http2.conf |
520 |
- |
521 |
- # Fix path to apache libdir |
522 |
- sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die |
523 |
-} |
524 |
- |
525 |
-pkg_postinst() { |
526 |
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" |
527 |
- |
528 |
- tmpfiles_process apache.conf #662544 |
529 |
- |
530 |
- # warnings that default config might not work out of the box |
531 |
- local mod cmod |
532 |
- for mod in ${MODULE_CRITICAL} ; do |
533 |
- if ! use "apache2_modules_${mod}"; then |
534 |
- echo |
535 |
- ewarn "Warning: Critical module not installed!" |
536 |
- ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" |
537 |
- ewarn "are highly recomended but might not be in the base profile yet." |
538 |
- ewarn "Default config for ssl needs module 'socache_shmcb'." |
539 |
- ewarn "Enabling the following flags is highly recommended:" |
540 |
- for cmod in ${MODULE_CRITICAL} ; do |
541 |
- use "apache2_modules_${cmod}" || \ |
542 |
- ewarn "+ apache2_modules_${cmod}" |
543 |
- done |
544 |
- echo |
545 |
- break |
546 |
- fi |
547 |
- done |
548 |
- # warning for proxy_balancer and missing load balancing scheduler |
549 |
- if use apache2_modules_proxy_balancer; then |
550 |
- local lbset= |
551 |
- for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do |
552 |
- if use "apache2_modules_${mod}"; then |
553 |
- lbset=1 && break |
554 |
- fi |
555 |
- done |
556 |
- if [ ! ${lbset} ] ; then |
557 |
- echo |
558 |
- ewarn "Info: Missing load balancing scheduler algorithm module" |
559 |
- ewarn "(They were split off from proxy_balancer in 2.3)" |
560 |
- ewarn "In order to get the ability of load balancing, at least" |
561 |
- ewarn "one of these modules has to be present:" |
562 |
- ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" |
563 |
- echo |
564 |
- fi |
565 |
- fi |
566 |
-} |
567 |
|
568 |
diff --git a/www-servers/apache/files/apache-2.4.34-PR62557.patch b/www-servers/apache/files/apache-2.4.34-PR62557.patch |
569 |
deleted file mode 100644 |
570 |
index d95a9864d1b..00000000000 |
571 |
--- a/www-servers/apache/files/apache-2.4.34-PR62557.patch |
572 |
+++ /dev/null |
573 |
@@ -1,216 +0,0 @@ |
574 |
-From d7713339dbde7cfa4cfc9914f683b4644dcab92e Mon Sep 17 00:00:00 2001 |
575 |
-From: Ruediger Pluem <rpluem@××××××.org> |
576 |
-Date: Fri, 20 Jul 2018 19:27:31 +0000 |
577 |
-Subject: [PATCH] * mod_proxy: Remove load order and link dependency between |
578 |
- mod_lbmethod_* modules and mod_proxy by providing mod_proxy's |
579 |
- ap_proxy_balancer_get_best_worker as an optional function. |
580 |
- |
581 |
-PR: 62557 |
582 |
- |
583 |
- |
584 |
-git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1836381 13f79535-47bb-0310-9956-ffa450edef68 |
585 |
---- |
586 |
- CHANGES | 3 +++ |
587 |
- include/ap_mmn.h | 5 +++- |
588 |
- modules/proxy/balancers/mod_lbmethod_bybusyness.c | 28 ++++++++++++++++++++++- |
589 |
- modules/proxy/balancers/mod_lbmethod_byrequests.c | 28 ++++++++++++++++++++++- |
590 |
- modules/proxy/balancers/mod_lbmethod_bytraffic.c | 28 ++++++++++++++++++++++- |
591 |
- modules/proxy/mod_proxy.h | 8 +++++++ |
592 |
- modules/proxy/proxy_util.c | 1 + |
593 |
- 7 files changed, 97 insertions(+), 4 deletions(-) |
594 |
- |
595 |
---- apache2.orig/modules/proxy/balancers/mod_lbmethod_bybusyness.c |
596 |
-+++ apache2/modules/proxy/balancers/mod_lbmethod_bybusyness.c |
597 |
-@@ -22,6 +22,9 @@ |
598 |
- |
599 |
- module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module; |
600 |
- |
601 |
-+static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker) |
602 |
-+ *ap_proxy_balancer_get_best_worker_fn = NULL; |
603 |
-+ |
604 |
- static int is_best_bybusyness(proxy_worker *current, proxy_worker *prev_best, void *baton) |
605 |
- { |
606 |
- int *total_factor = (int *)baton; |
607 |
-@@ -44,7 +47,7 @@ static proxy_worker *find_best_bybusynes |
608 |
- { |
609 |
- int total_factor = 0; |
610 |
- proxy_worker *worker = |
611 |
-- ap_proxy_balancer_get_best_worker(balancer, r, is_best_bybusyness, |
612 |
-+ ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_bybusyness, |
613 |
- &total_factor); |
614 |
- |
615 |
- if (worker) { |
616 |
-@@ -82,9 +85,32 @@ static const proxy_balancer_method bybus |
617 |
- NULL |
618 |
- }; |
619 |
- |
620 |
-+/* post_config hook: */ |
621 |
-+static int lbmethod_bybusyness_post_config(apr_pool_t *pconf, apr_pool_t *plog, |
622 |
-+ apr_pool_t *ptemp, server_rec *s) |
623 |
-+{ |
624 |
-+ |
625 |
-+ /* lbmethod_bybusyness_post_config() will be called twice during startup. So, don't |
626 |
-+ * set up the static data the 1st time through. */ |
627 |
-+ if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) { |
628 |
-+ return OK; |
629 |
-+ } |
630 |
-+ |
631 |
-+ ap_proxy_balancer_get_best_worker_fn = |
632 |
-+ APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker); |
633 |
-+ if (!ap_proxy_balancer_get_best_worker_fn) { |
634 |
-+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO() |
635 |
-+ "mod_proxy must be loaded for mod_lbmethod_bybusyness"); |
636 |
-+ return !OK; |
637 |
-+ } |
638 |
-+ |
639 |
-+ return OK; |
640 |
-+} |
641 |
-+ |
642 |
- static void register_hook(apr_pool_t *p) |
643 |
- { |
644 |
- ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness); |
645 |
-+ ap_hook_post_config(lbmethod_bybusyness_post_config, NULL, NULL, APR_HOOK_MIDDLE); |
646 |
- } |
647 |
- |
648 |
- AP_DECLARE_MODULE(lbmethod_bybusyness) = { |
649 |
---- apache2.orig/modules/proxy/balancers/mod_lbmethod_byrequests.c |
650 |
-+++ apache2/modules/proxy/balancers/mod_lbmethod_byrequests.c |
651 |
-@@ -22,6 +22,9 @@ |
652 |
- |
653 |
- module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module; |
654 |
- |
655 |
-+static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker) |
656 |
-+ *ap_proxy_balancer_get_best_worker_fn = NULL; |
657 |
-+ |
658 |
- static int is_best_byrequests(proxy_worker *current, proxy_worker *prev_best, void *baton) |
659 |
- { |
660 |
- int *total_factor = (int *)baton; |
661 |
-@@ -81,7 +84,7 @@ static proxy_worker *find_best_byrequest |
662 |
- request_rec *r) |
663 |
- { |
664 |
- int total_factor = 0; |
665 |
-- proxy_worker *worker = ap_proxy_balancer_get_best_worker(balancer, r, is_best_byrequests, &total_factor); |
666 |
-+ proxy_worker *worker = ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_byrequests, &total_factor); |
667 |
- |
668 |
- if (worker) { |
669 |
- worker->s->lbstatus -= total_factor; |
670 |
-@@ -123,6 +126,28 @@ static const proxy_balancer_method byreq |
671 |
- NULL |
672 |
- }; |
673 |
- |
674 |
-+/* post_config hook: */ |
675 |
-+static int lbmethod_byrequests_post_config(apr_pool_t *pconf, apr_pool_t *plog, |
676 |
-+ apr_pool_t *ptemp, server_rec *s) |
677 |
-+{ |
678 |
-+ |
679 |
-+ /* lbmethod_byrequests_post_config() will be called twice during startup. So, don't |
680 |
-+ * set up the static data the 1st time through. */ |
681 |
-+ if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) { |
682 |
-+ return OK; |
683 |
-+ } |
684 |
-+ |
685 |
-+ ap_proxy_balancer_get_best_worker_fn = |
686 |
-+ APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker); |
687 |
-+ if (!ap_proxy_balancer_get_best_worker_fn) { |
688 |
-+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO() |
689 |
-+ "mod_proxy must be loaded for mod_lbmethod_byrequests"); |
690 |
-+ return !OK; |
691 |
-+ } |
692 |
-+ |
693 |
-+ return OK; |
694 |
-+} |
695 |
-+ |
696 |
- static void register_hook(apr_pool_t *p) |
697 |
- { |
698 |
- /* Only the mpm_winnt has child init hook handler. |
699 |
-@@ -130,6 +155,7 @@ static void register_hook(apr_pool_t *p) |
700 |
- * initializes and after the mod_proxy |
701 |
- */ |
702 |
- ap_register_provider(p, PROXY_LBMETHOD, "byrequests", "0", &byrequests); |
703 |
-+ ap_hook_post_config(lbmethod_byrequests_post_config, NULL, NULL, APR_HOOK_MIDDLE); |
704 |
- } |
705 |
- |
706 |
- AP_DECLARE_MODULE(lbmethod_byrequests) = { |
707 |
---- apache2.orig/modules/proxy/balancers/mod_lbmethod_bytraffic.c |
708 |
-+++ apache2/modules/proxy/balancers/mod_lbmethod_bytraffic.c |
709 |
-@@ -22,6 +22,9 @@ |
710 |
- |
711 |
- module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module; |
712 |
- |
713 |
-+static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker) |
714 |
-+ *ap_proxy_balancer_get_best_worker_fn = NULL; |
715 |
-+ |
716 |
- static int is_best_bytraffic(proxy_worker *current, proxy_worker *prev_best, void *baton) |
717 |
- { |
718 |
- apr_off_t *min_traffic = (apr_off_t *)baton; |
719 |
-@@ -59,7 +62,7 @@ static proxy_worker *find_best_bytraffic |
720 |
- { |
721 |
- apr_off_t min_traffic = 0; |
722 |
- |
723 |
-- return ap_proxy_balancer_get_best_worker(balancer, r, is_best_bytraffic, |
724 |
-+ return ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_bytraffic, |
725 |
- &min_traffic); |
726 |
- } |
727 |
- |
728 |
-@@ -93,6 +96,28 @@ static const proxy_balancer_method bytra |
729 |
- NULL |
730 |
- }; |
731 |
- |
732 |
-+/* post_config hook: */ |
733 |
-+static int lbmethod_bytraffic_post_config(apr_pool_t *pconf, apr_pool_t *plog, |
734 |
-+ apr_pool_t *ptemp, server_rec *s) |
735 |
-+{ |
736 |
-+ |
737 |
-+ /* lbmethod_bytraffic_post_config() will be called twice during startup. So, don't |
738 |
-+ * set up the static data the 1st time through. */ |
739 |
-+ if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) { |
740 |
-+ return OK; |
741 |
-+ } |
742 |
-+ |
743 |
-+ ap_proxy_balancer_get_best_worker_fn = |
744 |
-+ APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker); |
745 |
-+ if (!ap_proxy_balancer_get_best_worker_fn) { |
746 |
-+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO() |
747 |
-+ "mod_proxy must be loaded for mod_lbmethod_bytraffic"); |
748 |
-+ return !OK; |
749 |
-+ } |
750 |
-+ |
751 |
-+ return OK; |
752 |
-+} |
753 |
-+ |
754 |
- static void register_hook(apr_pool_t *p) |
755 |
- { |
756 |
- /* Only the mpm_winnt has child init hook handler. |
757 |
-@@ -100,6 +125,7 @@ static void register_hook(apr_pool_t *p) |
758 |
- * initializes and after the mod_proxy |
759 |
- */ |
760 |
- ap_register_provider(p, PROXY_LBMETHOD, "bytraffic", "0", &bytraffic); |
761 |
-+ ap_hook_post_config(lbmethod_bytraffic_post_config, NULL, NULL, APR_HOOK_MIDDLE); |
762 |
- } |
763 |
- |
764 |
- AP_DECLARE_MODULE(lbmethod_bytraffic) = { |
765 |
---- apache2.orig/modules/proxy/mod_proxy.h |
766 |
-+++ apache2/modules/proxy/mod_proxy.h |
767 |
-@@ -846,6 +846,14 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_b |
768 |
- request_rec *r, |
769 |
- proxy_is_best_callback_fn_t *is_best, |
770 |
- void *baton); |
771 |
-+/* |
772 |
-+ * Needed by the lb modules. |
773 |
-+ */ |
774 |
-+APR_DECLARE_OPTIONAL_FN(proxy_worker *, ap_proxy_balancer_get_best_worker, |
775 |
-+ (proxy_balancer *balancer, |
776 |
-+ request_rec *r, |
777 |
-+ proxy_is_best_callback_fn_t *is_best, |
778 |
-+ void *baton)); |
779 |
- |
780 |
- /** |
781 |
- * Find the shm of the worker as needed |
782 |
---- apache2.orig/modules/proxy/proxy_util.c |
783 |
-+++ apache2/modules/proxy/proxy_util.c |
784 |
-@@ -4028,4 +4028,5 @@ void proxy_util_register_hooks(apr_pool_ |
785 |
- { |
786 |
- APR_REGISTER_OPTIONAL_FN(ap_proxy_retry_worker); |
787 |
- APR_REGISTER_OPTIONAL_FN(ap_proxy_clear_connection); |
788 |
-+ APR_REGISTER_OPTIONAL_FN(ap_proxy_balancer_get_best_worker); |
789 |
- } |
790 |
|
791 |
diff --git a/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch b/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch |
792 |
deleted file mode 100644 |
793 |
index d5543f7004b..00000000000 |
794 |
--- a/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch |
795 |
+++ /dev/null |
796 |
@@ -1,19 +0,0 @@ |
797 |
-https://bugs.gentoo.org/661358 |
798 |
- |
799 |
---- httpd-2.4.34/Makefile.in |
800 |
-+++ httpd-2.4.34/Makefile.in |
801 |
-@@ -277,12 +277,12 @@ |
802 |
- $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \ |
803 |
- fi |
804 |
- |
805 |
--install-suexec-setuid: |
806 |
-+install-suexec-setuid: install-suexec-binary |
807 |
- @if test -f $(builddir)/support/suexec; then \ |
808 |
- chmod 4755 $(DESTDIR)$(sbindir)/suexec; \ |
809 |
- fi |
810 |
- |
811 |
--install-suexec-caps: |
812 |
-+install-suexec-caps: install-suexec-binary |
813 |
- @if test -f $(builddir)/support/suexec; then \ |
814 |
- setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \ |
815 |
- fi |