1 |
commit: fed1cac86a11008071b5561d825d8cae53c0d158 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 18 09:33:51 2021 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 18 09:33:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed1cac8 |
7 |
|
8 |
www-servers/apache: cleanup vulnerable versions |
9 |
|
10 |
Bug: https://bugs.gentoo.org/795231 |
11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
12 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
13 |
|
14 |
www-servers/apache/Manifest | 3 - |
15 |
www-servers/apache/apache-2.4.46-r7.ebuild | 246 ---------------------------- |
16 |
www-servers/apache/apache-2.4.46-r8.ebuild | 253 ----------------------------- |
17 |
www-servers/apache/apache-2.4.47-r1.ebuild | 253 ----------------------------- |
18 |
4 files changed, 755 deletions(-) |
19 |
|
20 |
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest |
21 |
index 99c7847956d..ae7204fa4d0 100644 |
22 |
--- a/www-servers/apache/Manifest |
23 |
+++ b/www-servers/apache/Manifest |
24 |
@@ -1,5 +1,2 @@ |
25 |
-DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4 |
26 |
DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2 |
27 |
-DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13 |
28 |
-DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af |
29 |
DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724 |
30 |
|
31 |
diff --git a/www-servers/apache/apache-2.4.46-r7.ebuild b/www-servers/apache/apache-2.4.46-r7.ebuild |
32 |
deleted file mode 100644 |
33 |
index 95d53cb994d..00000000000 |
34 |
--- a/www-servers/apache/apache-2.4.46-r7.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,246 +0,0 @@ |
37 |
-# Copyright 1999-2021 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=6 |
41 |
- |
42 |
-# latest gentoo apache files |
43 |
-GENTOO_PATCHSTAMP="20190402" |
44 |
-GENTOO_DEVELOPER="polynomial-c" |
45 |
-GENTOO_PATCHNAME="gentoo-apache-2.4.39" |
46 |
- |
47 |
-# IUSE/USE_EXPAND magic |
48 |
-IUSE_MPMS_FORK="prefork" |
49 |
-IUSE_MPMS_THREAD="event worker" |
50 |
- |
51 |
-# << obsolete modules: |
52 |
-# authn_default authz_default mem_cache |
53 |
-# mem_cache is replaced by cache_disk |
54 |
-# ?? buggy modules |
55 |
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found |
56 |
-# >> added modules for reason: |
57 |
-# compat: compatibility with 2.2 access control |
58 |
-# authz_host: new module for access control |
59 |
-# authn_core: functionality provided by authn_alias in previous versions |
60 |
-# authz_core: new module, provides core authorization capabilities |
61 |
-# cache_disk: replacement for mem_cache |
62 |
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 |
63 |
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 |
64 |
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 |
65 |
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 |
66 |
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). |
67 |
-# socache_shmcb: shared object cache provider. Default config with ssl needs it |
68 |
-# unixd: fixes startup error: Invalid command 'User' |
69 |
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form |
70 |
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core |
71 |
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex |
72 |
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock |
73 |
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 |
74 |
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness |
75 |
-lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation |
76 |
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi |
77 |
-proxy_http2 proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout |
78 |
-session session_cookie session_crypto session_dbd setenvif slotmem_shm speling |
79 |
-socache_shmcb status substitute unique_id userdir usertrack unixd version vhost_alias |
80 |
-watchdog xml2enc" |
81 |
-# The following are also in the source as of this version, but are not available |
82 |
-# for user selection: |
83 |
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
84 |
-# optional_fn_import optional_hook_export optional_hook_import |
85 |
- |
86 |
-# inter-module dependencies |
87 |
-# TODO: this may still be incomplete |
88 |
-MODULE_DEPENDS=" |
89 |
- auth_form:session |
90 |
- brotli:filter |
91 |
- dav_fs:dav |
92 |
- dav_lock:dav |
93 |
- deflate:filter |
94 |
- cache_disk:cache |
95 |
- ext_filter:filter |
96 |
- file_cache:cache |
97 |
- lbmethod_byrequests:proxy_balancer |
98 |
- lbmethod_byrequests:slotmem_shm |
99 |
- lbmethod_bytraffic:proxy_balancer |
100 |
- lbmethod_bybusyness:proxy_balancer |
101 |
- lbmethod_heartbeat:proxy_balancer |
102 |
- log_forensic:log_config |
103 |
- logio:log_config |
104 |
- cache_disk:cache |
105 |
- cache_socache:cache |
106 |
- md:watchdog |
107 |
- mime_magic:mime |
108 |
- proxy_ajp:proxy |
109 |
- proxy_balancer:proxy |
110 |
- proxy_balancer:slotmem_shm |
111 |
- proxy_connect:proxy |
112 |
- proxy_ftp:proxy |
113 |
- proxy_html:proxy |
114 |
- proxy_html:xml2enc |
115 |
- proxy_http:proxy |
116 |
- proxy_http2:proxy |
117 |
- proxy_scgi:proxy |
118 |
- proxy_fcgi:proxy |
119 |
- proxy_wstunnel:proxy |
120 |
- session_cookie:session |
121 |
- session_dbd:dbd |
122 |
- session_dbd:session |
123 |
- substitute:filter |
124 |
-" |
125 |
- |
126 |
-# module<->define mappings |
127 |
-MODULE_DEFINES=" |
128 |
- auth_digest:AUTH_DIGEST |
129 |
- authnz_ldap:AUTHNZ_LDAP |
130 |
- cache:CACHE |
131 |
- cache_disk:CACHE |
132 |
- cache_socache:CACHE |
133 |
- dav:DAV |
134 |
- dav_fs:DAV |
135 |
- dav_lock:DAV |
136 |
- file_cache:CACHE |
137 |
- http2:HTTP2 |
138 |
- info:INFO |
139 |
- ldap:LDAP |
140 |
- md:SSL |
141 |
- proxy:PROXY |
142 |
- proxy_ajp:PROXY |
143 |
- proxy_balancer:PROXY |
144 |
- proxy_connect:PROXY |
145 |
- proxy_ftp:PROXY |
146 |
- proxy_html:PROXY |
147 |
- proxy_http:PROXY |
148 |
- proxy_fcgi:PROXY |
149 |
- proxy_scgi:PROXY |
150 |
- proxy_wstunnel:PROXY |
151 |
- socache_shmcb:SSL |
152 |
- ssl:SSL |
153 |
- status:STATUS |
154 |
- suexec:SUEXEC |
155 |
- userdir:USERDIR |
156 |
-" |
157 |
- |
158 |
-# critical modules for the default config |
159 |
-MODULE_CRITICAL=" |
160 |
- authn_core |
161 |
- authz_core |
162 |
- authz_host |
163 |
- dir |
164 |
- mime |
165 |
- unixd |
166 |
-" |
167 |
-inherit apache-2 systemd tmpfiles toolchain-funcs |
168 |
- |
169 |
-DESCRIPTION="The Apache Web Server" |
170 |
-HOMEPAGE="https://httpd.apache.org/" |
171 |
- |
172 |
-# some helper scripts are Apache-1.1, thus both are here |
173 |
-LICENSE="Apache-2.0 Apache-1.1" |
174 |
-SLOT="2" |
175 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris" |
176 |
- |
177 |
-pkg_setup() { |
178 |
- # dependend critical modules which are not allowed in global scope due |
179 |
- # to USE flag conditionals (bug #499260) |
180 |
- use ssl && MODULE_CRITICAL+=" socache_shmcb" |
181 |
- use doc && MODULE_CRITICAL+=" alias negotiation setenvif" |
182 |
- apache-2_pkg_setup |
183 |
-} |
184 |
- |
185 |
-src_configure() { |
186 |
- # Brain dead check. |
187 |
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
188 |
- |
189 |
- apache-2_src_configure |
190 |
-} |
191 |
- |
192 |
-src_compile() { |
193 |
- if tc-is-cross-compiler; then |
194 |
- # This header is the same across targets, so use the build compiler. |
195 |
- pushd server >/dev/null |
196 |
- emake gen_test_char |
197 |
- tc-export_build_env BUILD_CC |
198 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
199 |
- gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die |
200 |
- popd >/dev/null |
201 |
- fi |
202 |
- |
203 |
- default |
204 |
-} |
205 |
- |
206 |
-src_install() { |
207 |
- apache-2_src_install |
208 |
- local i |
209 |
- local apache_tools_prune_list=( |
210 |
- /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm} |
211 |
- /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs} |
212 |
- /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1} |
213 |
- /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} |
214 |
- ) |
215 |
- for i in ${apache_tools_prune_list[@]} ; do |
216 |
- rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits" |
217 |
- done |
218 |
- |
219 |
- # install apxs in /usr/bin (bug #502384) and put a symlink into the |
220 |
- # old location until all ebuilds and eclasses have been modified to |
221 |
- # use the new location. |
222 |
- dobin support/apxs |
223 |
- use split-usr && dosym ../bin/apxs /usr/sbin/apxs |
224 |
- |
225 |
- # Note: wait for mod_systemd to be included in some forthcoming release, |
226 |
- # Then apache2.4.service can be used and systemd support controlled |
227 |
- # through --enable-systemd |
228 |
- systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service" |
229 |
- dotmpfiles "${FILESDIR}/apache.conf" |
230 |
- #insinto /etc/apache2/modules.d |
231 |
- #doins "${FILESDIR}/00_systemd.conf" |
232 |
- |
233 |
- # Install http2 module config |
234 |
- insinto /etc/apache2/modules.d |
235 |
- doins "${FILESDIR}"/41_mod_http2.conf |
236 |
- |
237 |
- # Fix path to apache libdir |
238 |
- sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die |
239 |
-} |
240 |
- |
241 |
-pkg_postinst() { |
242 |
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" |
243 |
- |
244 |
- tmpfiles_process apache.conf #662544 |
245 |
- |
246 |
- # warnings that default config might not work out of the box |
247 |
- local mod cmod |
248 |
- for mod in ${MODULE_CRITICAL} ; do |
249 |
- if ! use "apache2_modules_${mod}"; then |
250 |
- echo |
251 |
- ewarn "Warning: Critical module not installed!" |
252 |
- ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" |
253 |
- ewarn "are highly recomended but might not be in the base profile yet." |
254 |
- ewarn "Default config for ssl needs module 'socache_shmcb'." |
255 |
- ewarn "Enabling the following flags is highly recommended:" |
256 |
- for cmod in ${MODULE_CRITICAL} ; do |
257 |
- use "apache2_modules_${cmod}" || \ |
258 |
- ewarn "+ apache2_modules_${cmod}" |
259 |
- done |
260 |
- echo |
261 |
- break |
262 |
- fi |
263 |
- done |
264 |
- # warning for proxy_balancer and missing load balancing scheduler |
265 |
- if use apache2_modules_proxy_balancer; then |
266 |
- local lbset= |
267 |
- for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do |
268 |
- if use "apache2_modules_${mod}"; then |
269 |
- lbset=1 && break |
270 |
- fi |
271 |
- done |
272 |
- if [ ! ${lbset} ] ; then |
273 |
- echo |
274 |
- ewarn "Info: Missing load balancing scheduler algorithm module" |
275 |
- ewarn "(They were split off from proxy_balancer in 2.3)" |
276 |
- ewarn "In order to get the ability of load balancing, at least" |
277 |
- ewarn "one of these modules has to be present:" |
278 |
- ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" |
279 |
- echo |
280 |
- fi |
281 |
- fi |
282 |
-} |
283 |
|
284 |
diff --git a/www-servers/apache/apache-2.4.46-r8.ebuild b/www-servers/apache/apache-2.4.46-r8.ebuild |
285 |
deleted file mode 100644 |
286 |
index 7343e87cea3..00000000000 |
287 |
--- a/www-servers/apache/apache-2.4.46-r8.ebuild |
288 |
+++ /dev/null |
289 |
@@ -1,253 +0,0 @@ |
290 |
-# Copyright 1999-2021 Gentoo Authors |
291 |
-# Distributed under the terms of the GNU General Public License v2 |
292 |
- |
293 |
-EAPI=7 |
294 |
- |
295 |
-# latest gentoo apache files |
296 |
-GENTOO_PATCHSTAMP="20210212" |
297 |
-GENTOO_DEVELOPER="polynomial-c" |
298 |
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6" |
299 |
- |
300 |
-# IUSE/USE_EXPAND magic |
301 |
-IUSE_MPMS_FORK="prefork" |
302 |
-IUSE_MPMS_THREAD="event worker" |
303 |
- |
304 |
-# << obsolete modules: |
305 |
-# authn_default authz_default mem_cache |
306 |
-# mem_cache is replaced by cache_disk |
307 |
-# ?? buggy modules |
308 |
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found |
309 |
-# >> added modules for reason: |
310 |
-# compat: compatibility with 2.2 access control |
311 |
-# authz_host: new module for access control |
312 |
-# authn_core: functionality provided by authn_alias in previous versions |
313 |
-# authz_core: new module, provides core authorization capabilities |
314 |
-# cache_disk: replacement for mem_cache |
315 |
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 |
316 |
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 |
317 |
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 |
318 |
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 |
319 |
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). |
320 |
-# socache_shmcb: shared object cache provider. Default config with ssl needs it |
321 |
-# unixd: fixes startup error: Invalid command 'User' |
322 |
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form |
323 |
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core |
324 |
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex |
325 |
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock |
326 |
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 |
327 |
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness |
328 |
-lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation |
329 |
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi |
330 |
-proxy_http2 proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout |
331 |
-session session_cookie session_crypto session_dbd setenvif slotmem_shm speling |
332 |
-socache_memcache socache_shmcb status substitute unique_id userdir usertrack |
333 |
-unixd version vhost_alias watchdog xml2enc" |
334 |
-# The following are also in the source as of this version, but are not available |
335 |
-# for user selection: |
336 |
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
337 |
-# optional_fn_import optional_hook_export optional_hook_import |
338 |
- |
339 |
-# inter-module dependencies |
340 |
-# TODO: this may still be incomplete |
341 |
-MODULE_DEPENDS=" |
342 |
- auth_form:session |
343 |
- brotli:filter |
344 |
- dav_fs:dav |
345 |
- dav_lock:dav |
346 |
- deflate:filter |
347 |
- cache_disk:cache |
348 |
- ext_filter:filter |
349 |
- file_cache:cache |
350 |
- lbmethod_byrequests:proxy_balancer |
351 |
- lbmethod_byrequests:slotmem_shm |
352 |
- lbmethod_bytraffic:proxy_balancer |
353 |
- lbmethod_bybusyness:proxy_balancer |
354 |
- lbmethod_heartbeat:proxy_balancer |
355 |
- log_forensic:log_config |
356 |
- logio:log_config |
357 |
- cache_disk:cache |
358 |
- cache_socache:cache |
359 |
- md:watchdog |
360 |
- mime_magic:mime |
361 |
- proxy_ajp:proxy |
362 |
- proxy_balancer:proxy |
363 |
- proxy_balancer:slotmem_shm |
364 |
- proxy_connect:proxy |
365 |
- proxy_ftp:proxy |
366 |
- proxy_html:proxy |
367 |
- proxy_html:xml2enc |
368 |
- proxy_http:proxy |
369 |
- proxy_http2:proxy |
370 |
- proxy_scgi:proxy |
371 |
- proxy_fcgi:proxy |
372 |
- proxy_wstunnel:proxy |
373 |
- session_cookie:session |
374 |
- session_dbd:dbd |
375 |
- session_dbd:session |
376 |
- socache_memcache:cache |
377 |
- substitute:filter |
378 |
-" |
379 |
- |
380 |
-# module<->define mappings |
381 |
-MODULE_DEFINES=" |
382 |
- auth_digest:AUTH_DIGEST |
383 |
- authnz_ldap:AUTHNZ_LDAP |
384 |
- cache:CACHE |
385 |
- cache_disk:CACHE |
386 |
- cache_socache:CACHE |
387 |
- dav:DAV |
388 |
- dav_fs:DAV |
389 |
- dav_lock:DAV |
390 |
- file_cache:CACHE |
391 |
- http2:HTTP2 |
392 |
- info:INFO |
393 |
- ldap:LDAP |
394 |
- lua:LUA |
395 |
- md:SSL |
396 |
- proxy:PROXY |
397 |
- proxy_ajp:PROXY |
398 |
- proxy_balancer:PROXY |
399 |
- proxy_connect:PROXY |
400 |
- proxy_ftp:PROXY |
401 |
- proxy_html:PROXY |
402 |
- proxy_http:PROXY |
403 |
- proxy_fcgi:PROXY |
404 |
- proxy_scgi:PROXY |
405 |
- proxy_wstunnel:PROXY |
406 |
- socache_shmcb:SSL |
407 |
- socache_memcache:CACHE |
408 |
- ssl:SSL |
409 |
- status:STATUS |
410 |
- suexec:SUEXEC |
411 |
- userdir:USERDIR |
412 |
-" |
413 |
- |
414 |
-# critical modules for the default config |
415 |
-MODULE_CRITICAL=" |
416 |
- authn_core |
417 |
- authz_core |
418 |
- authz_host |
419 |
- dir |
420 |
- mime |
421 |
- unixd |
422 |
-" |
423 |
-inherit apache-2 systemd tmpfiles toolchain-funcs |
424 |
- |
425 |
-DESCRIPTION="The Apache Web Server" |
426 |
-HOMEPAGE="https://httpd.apache.org/" |
427 |
- |
428 |
-# some helper scripts are Apache-1.1, thus both are here |
429 |
-LICENSE="Apache-2.0 Apache-1.1" |
430 |
-SLOT="2" |
431 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris" |
432 |
- |
433 |
-# FIXME! Move this to eclass once all ebuilds are EAPI-7 |
434 |
-RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )" |
435 |
-REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )" |
436 |
- |
437 |
-pkg_setup() { |
438 |
- # dependend critical modules which are not allowed in global scope due |
439 |
- # to USE flag conditionals (bug #499260) |
440 |
- use ssl && MODULE_CRITICAL+=" socache_shmcb" |
441 |
- use doc && MODULE_CRITICAL+=" alias negotiation setenvif" |
442 |
- apache-2_pkg_setup |
443 |
-} |
444 |
- |
445 |
-src_configure() { |
446 |
- # Brain dead check. |
447 |
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
448 |
- |
449 |
- apache-2_src_configure |
450 |
-} |
451 |
- |
452 |
-src_compile() { |
453 |
- if tc-is-cross-compiler; then |
454 |
- # This header is the same across targets, so use the build compiler. |
455 |
- pushd server >/dev/null |
456 |
- emake gen_test_char |
457 |
- tc-export_build_env BUILD_CC |
458 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
459 |
- gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die |
460 |
- popd >/dev/null |
461 |
- fi |
462 |
- |
463 |
- default |
464 |
-} |
465 |
- |
466 |
-src_install() { |
467 |
- apache-2_src_install |
468 |
- local i |
469 |
- local apache_tools_prune_list=( |
470 |
- /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm} |
471 |
- /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs} |
472 |
- /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1} |
473 |
- /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} |
474 |
- ) |
475 |
- for i in ${apache_tools_prune_list[@]} ; do |
476 |
- rm "${ED}"/${i} || die "Failed to prune apache-tools bits" |
477 |
- done |
478 |
- |
479 |
- # install apxs in /usr/bin (bug #502384) and put a symlink into the |
480 |
- # old location until all ebuilds and eclasses have been modified to |
481 |
- # use the new location. |
482 |
- dobin support/apxs |
483 |
- use split-usr && dosym ../bin/apxs /usr/sbin/apxs |
484 |
- |
485 |
- # Note: wait for mod_systemd to be included in some forthcoming release, |
486 |
- # Then apache2.4.service can be used and systemd support controlled |
487 |
- # through --enable-systemd |
488 |
- systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service" |
489 |
- dotmpfiles "${FILESDIR}/apache.conf" |
490 |
- #insinto /etc/apache2/modules.d |
491 |
- #doins "${FILESDIR}/00_systemd.conf" |
492 |
- |
493 |
- # Install http2 module config |
494 |
- insinto /etc/apache2/modules.d |
495 |
- doins "${FILESDIR}"/41_mod_http2.conf |
496 |
- |
497 |
- # Fix path to apache libdir |
498 |
- sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die |
499 |
-} |
500 |
- |
501 |
-pkg_postinst() { |
502 |
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" |
503 |
- |
504 |
- tmpfiles_process apache.conf #662544 |
505 |
- |
506 |
- # warnings that default config might not work out of the box |
507 |
- local mod cmod |
508 |
- for mod in ${MODULE_CRITICAL} ; do |
509 |
- if ! use "apache2_modules_${mod}"; then |
510 |
- echo |
511 |
- ewarn "Warning: Critical module not installed!" |
512 |
- ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" |
513 |
- ewarn "are highly recomended but might not be in the base profile yet." |
514 |
- ewarn "Default config for ssl needs module 'socache_shmcb'." |
515 |
- ewarn "Enabling the following flags is highly recommended:" |
516 |
- for cmod in ${MODULE_CRITICAL} ; do |
517 |
- use "apache2_modules_${cmod}" || \ |
518 |
- ewarn "+ apache2_modules_${cmod}" |
519 |
- done |
520 |
- echo |
521 |
- break |
522 |
- fi |
523 |
- done |
524 |
- # warning for proxy_balancer and missing load balancing scheduler |
525 |
- if use apache2_modules_proxy_balancer; then |
526 |
- local lbset= |
527 |
- for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do |
528 |
- if use "apache2_modules_${mod}"; then |
529 |
- lbset=1 && break |
530 |
- fi |
531 |
- done |
532 |
- if [ ! ${lbset} ] ; then |
533 |
- echo |
534 |
- ewarn "Info: Missing load balancing scheduler algorithm module" |
535 |
- ewarn "(They were split off from proxy_balancer in 2.3)" |
536 |
- ewarn "In order to get the ability of load balancing, at least" |
537 |
- ewarn "one of these modules has to be present:" |
538 |
- ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" |
539 |
- echo |
540 |
- fi |
541 |
- fi |
542 |
-} |
543 |
|
544 |
diff --git a/www-servers/apache/apache-2.4.47-r1.ebuild b/www-servers/apache/apache-2.4.47-r1.ebuild |
545 |
deleted file mode 100644 |
546 |
index 7343e87cea3..00000000000 |
547 |
--- a/www-servers/apache/apache-2.4.47-r1.ebuild |
548 |
+++ /dev/null |
549 |
@@ -1,253 +0,0 @@ |
550 |
-# Copyright 1999-2021 Gentoo Authors |
551 |
-# Distributed under the terms of the GNU General Public License v2 |
552 |
- |
553 |
-EAPI=7 |
554 |
- |
555 |
-# latest gentoo apache files |
556 |
-GENTOO_PATCHSTAMP="20210212" |
557 |
-GENTOO_DEVELOPER="polynomial-c" |
558 |
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6" |
559 |
- |
560 |
-# IUSE/USE_EXPAND magic |
561 |
-IUSE_MPMS_FORK="prefork" |
562 |
-IUSE_MPMS_THREAD="event worker" |
563 |
- |
564 |
-# << obsolete modules: |
565 |
-# authn_default authz_default mem_cache |
566 |
-# mem_cache is replaced by cache_disk |
567 |
-# ?? buggy modules |
568 |
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found |
569 |
-# >> added modules for reason: |
570 |
-# compat: compatibility with 2.2 access control |
571 |
-# authz_host: new module for access control |
572 |
-# authn_core: functionality provided by authn_alias in previous versions |
573 |
-# authz_core: new module, provides core authorization capabilities |
574 |
-# cache_disk: replacement for mem_cache |
575 |
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 |
576 |
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 |
577 |
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 |
578 |
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 |
579 |
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). |
580 |
-# socache_shmcb: shared object cache provider. Default config with ssl needs it |
581 |
-# unixd: fixes startup error: Invalid command 'User' |
582 |
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form |
583 |
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core |
584 |
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex |
585 |
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock |
586 |
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 |
587 |
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness |
588 |
-lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation |
589 |
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi |
590 |
-proxy_http2 proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout |
591 |
-session session_cookie session_crypto session_dbd setenvif slotmem_shm speling |
592 |
-socache_memcache socache_shmcb status substitute unique_id userdir usertrack |
593 |
-unixd version vhost_alias watchdog xml2enc" |
594 |
-# The following are also in the source as of this version, but are not available |
595 |
-# for user selection: |
596 |
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
597 |
-# optional_fn_import optional_hook_export optional_hook_import |
598 |
- |
599 |
-# inter-module dependencies |
600 |
-# TODO: this may still be incomplete |
601 |
-MODULE_DEPENDS=" |
602 |
- auth_form:session |
603 |
- brotli:filter |
604 |
- dav_fs:dav |
605 |
- dav_lock:dav |
606 |
- deflate:filter |
607 |
- cache_disk:cache |
608 |
- ext_filter:filter |
609 |
- file_cache:cache |
610 |
- lbmethod_byrequests:proxy_balancer |
611 |
- lbmethod_byrequests:slotmem_shm |
612 |
- lbmethod_bytraffic:proxy_balancer |
613 |
- lbmethod_bybusyness:proxy_balancer |
614 |
- lbmethod_heartbeat:proxy_balancer |
615 |
- log_forensic:log_config |
616 |
- logio:log_config |
617 |
- cache_disk:cache |
618 |
- cache_socache:cache |
619 |
- md:watchdog |
620 |
- mime_magic:mime |
621 |
- proxy_ajp:proxy |
622 |
- proxy_balancer:proxy |
623 |
- proxy_balancer:slotmem_shm |
624 |
- proxy_connect:proxy |
625 |
- proxy_ftp:proxy |
626 |
- proxy_html:proxy |
627 |
- proxy_html:xml2enc |
628 |
- proxy_http:proxy |
629 |
- proxy_http2:proxy |
630 |
- proxy_scgi:proxy |
631 |
- proxy_fcgi:proxy |
632 |
- proxy_wstunnel:proxy |
633 |
- session_cookie:session |
634 |
- session_dbd:dbd |
635 |
- session_dbd:session |
636 |
- socache_memcache:cache |
637 |
- substitute:filter |
638 |
-" |
639 |
- |
640 |
-# module<->define mappings |
641 |
-MODULE_DEFINES=" |
642 |
- auth_digest:AUTH_DIGEST |
643 |
- authnz_ldap:AUTHNZ_LDAP |
644 |
- cache:CACHE |
645 |
- cache_disk:CACHE |
646 |
- cache_socache:CACHE |
647 |
- dav:DAV |
648 |
- dav_fs:DAV |
649 |
- dav_lock:DAV |
650 |
- file_cache:CACHE |
651 |
- http2:HTTP2 |
652 |
- info:INFO |
653 |
- ldap:LDAP |
654 |
- lua:LUA |
655 |
- md:SSL |
656 |
- proxy:PROXY |
657 |
- proxy_ajp:PROXY |
658 |
- proxy_balancer:PROXY |
659 |
- proxy_connect:PROXY |
660 |
- proxy_ftp:PROXY |
661 |
- proxy_html:PROXY |
662 |
- proxy_http:PROXY |
663 |
- proxy_fcgi:PROXY |
664 |
- proxy_scgi:PROXY |
665 |
- proxy_wstunnel:PROXY |
666 |
- socache_shmcb:SSL |
667 |
- socache_memcache:CACHE |
668 |
- ssl:SSL |
669 |
- status:STATUS |
670 |
- suexec:SUEXEC |
671 |
- userdir:USERDIR |
672 |
-" |
673 |
- |
674 |
-# critical modules for the default config |
675 |
-MODULE_CRITICAL=" |
676 |
- authn_core |
677 |
- authz_core |
678 |
- authz_host |
679 |
- dir |
680 |
- mime |
681 |
- unixd |
682 |
-" |
683 |
-inherit apache-2 systemd tmpfiles toolchain-funcs |
684 |
- |
685 |
-DESCRIPTION="The Apache Web Server" |
686 |
-HOMEPAGE="https://httpd.apache.org/" |
687 |
- |
688 |
-# some helper scripts are Apache-1.1, thus both are here |
689 |
-LICENSE="Apache-2.0 Apache-1.1" |
690 |
-SLOT="2" |
691 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris" |
692 |
- |
693 |
-# FIXME! Move this to eclass once all ebuilds are EAPI-7 |
694 |
-RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )" |
695 |
-REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )" |
696 |
- |
697 |
-pkg_setup() { |
698 |
- # dependend critical modules which are not allowed in global scope due |
699 |
- # to USE flag conditionals (bug #499260) |
700 |
- use ssl && MODULE_CRITICAL+=" socache_shmcb" |
701 |
- use doc && MODULE_CRITICAL+=" alias negotiation setenvif" |
702 |
- apache-2_pkg_setup |
703 |
-} |
704 |
- |
705 |
-src_configure() { |
706 |
- # Brain dead check. |
707 |
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
708 |
- |
709 |
- apache-2_src_configure |
710 |
-} |
711 |
- |
712 |
-src_compile() { |
713 |
- if tc-is-cross-compiler; then |
714 |
- # This header is the same across targets, so use the build compiler. |
715 |
- pushd server >/dev/null |
716 |
- emake gen_test_char |
717 |
- tc-export_build_env BUILD_CC |
718 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
719 |
- gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die |
720 |
- popd >/dev/null |
721 |
- fi |
722 |
- |
723 |
- default |
724 |
-} |
725 |
- |
726 |
-src_install() { |
727 |
- apache-2_src_install |
728 |
- local i |
729 |
- local apache_tools_prune_list=( |
730 |
- /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm} |
731 |
- /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs} |
732 |
- /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1} |
733 |
- /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} |
734 |
- ) |
735 |
- for i in ${apache_tools_prune_list[@]} ; do |
736 |
- rm "${ED}"/${i} || die "Failed to prune apache-tools bits" |
737 |
- done |
738 |
- |
739 |
- # install apxs in /usr/bin (bug #502384) and put a symlink into the |
740 |
- # old location until all ebuilds and eclasses have been modified to |
741 |
- # use the new location. |
742 |
- dobin support/apxs |
743 |
- use split-usr && dosym ../bin/apxs /usr/sbin/apxs |
744 |
- |
745 |
- # Note: wait for mod_systemd to be included in some forthcoming release, |
746 |
- # Then apache2.4.service can be used and systemd support controlled |
747 |
- # through --enable-systemd |
748 |
- systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service" |
749 |
- dotmpfiles "${FILESDIR}/apache.conf" |
750 |
- #insinto /etc/apache2/modules.d |
751 |
- #doins "${FILESDIR}/00_systemd.conf" |
752 |
- |
753 |
- # Install http2 module config |
754 |
- insinto /etc/apache2/modules.d |
755 |
- doins "${FILESDIR}"/41_mod_http2.conf |
756 |
- |
757 |
- # Fix path to apache libdir |
758 |
- sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die |
759 |
-} |
760 |
- |
761 |
-pkg_postinst() { |
762 |
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" |
763 |
- |
764 |
- tmpfiles_process apache.conf #662544 |
765 |
- |
766 |
- # warnings that default config might not work out of the box |
767 |
- local mod cmod |
768 |
- for mod in ${MODULE_CRITICAL} ; do |
769 |
- if ! use "apache2_modules_${mod}"; then |
770 |
- echo |
771 |
- ewarn "Warning: Critical module not installed!" |
772 |
- ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" |
773 |
- ewarn "are highly recomended but might not be in the base profile yet." |
774 |
- ewarn "Default config for ssl needs module 'socache_shmcb'." |
775 |
- ewarn "Enabling the following flags is highly recommended:" |
776 |
- for cmod in ${MODULE_CRITICAL} ; do |
777 |
- use "apache2_modules_${cmod}" || \ |
778 |
- ewarn "+ apache2_modules_${cmod}" |
779 |
- done |
780 |
- echo |
781 |
- break |
782 |
- fi |
783 |
- done |
784 |
- # warning for proxy_balancer and missing load balancing scheduler |
785 |
- if use apache2_modules_proxy_balancer; then |
786 |
- local lbset= |
787 |
- for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do |
788 |
- if use "apache2_modules_${mod}"; then |
789 |
- lbset=1 && break |
790 |
- fi |
791 |
- done |
792 |
- if [ ! ${lbset} ] ; then |
793 |
- echo |
794 |
- ewarn "Info: Missing load balancing scheduler algorithm module" |
795 |
- ewarn "(They were split off from proxy_balancer in 2.3)" |
796 |
- ewarn "In order to get the ability of load balancing, at least" |
797 |
- ewarn "one of these modules has to be present:" |
798 |
- ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" |
799 |
- echo |
800 |
- fi |
801 |
- fi |
802 |
-} |