1 |
commit: 3b8c3356ac86e1e5c3f3d99944aff351323ac83e |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 29 09:20:16 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 29 09:20:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b8c3356 |
7 |
|
8 |
www-servers/apache: Removed old |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
www-servers/apache/Manifest | 1 - |
13 |
www-servers/apache/apache-2.4.46-r5.ebuild | 257 ----------------------------- |
14 |
2 files changed, 258 deletions(-) |
15 |
|
16 |
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest |
17 |
index 9fa74a1081b..59173aa8615 100644 |
18 |
--- a/www-servers/apache/Manifest |
19 |
+++ b/www-servers/apache/Manifest |
20 |
@@ -1,5 +1,4 @@ |
21 |
DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4 |
22 |
-DIST gentoo-apache-2.4.46-r4-20201230.tar.bz2 25821 BLAKE2B 3f83b48aa36fa8b9adc75a2cbeaadddad8fb0d69d1602753e0a1978cd6136b1dbf15ad06a837f36c26244e3950bae3ecdfbcdd7668a4d2fc4f0d9f58a909e5b7 SHA512 cea71f3e40ac1409206d906df36c772d7985a79a9e713a3016a9fae67dad032e24ce124789089a4b92454bc98455a70c66515106c8f3c33e05aeaf3037ffabe8 |
23 |
DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2 |
24 |
DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13 |
25 |
DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af |
26 |
|
27 |
diff --git a/www-servers/apache/apache-2.4.46-r5.ebuild b/www-servers/apache/apache-2.4.46-r5.ebuild |
28 |
deleted file mode 100644 |
29 |
index f5c277b6c90..00000000000 |
30 |
--- a/www-servers/apache/apache-2.4.46-r5.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,257 +0,0 @@ |
33 |
-# Copyright 1999-2021 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-# latest gentoo apache files |
39 |
-GENTOO_PATCHSTAMP="20201230" |
40 |
-GENTOO_DEVELOPER="polynomial-c" |
41 |
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r4" |
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 auth_form |
66 |
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache 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 lua macro md mime mime_magic negotiation |
72 |
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi |
73 |
-proxy_http2 proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout |
74 |
-session session_cookie session_crypto session_dbd setenvif slotmem_shm speling |
75 |
-socache_memcache socache_shmcb status substitute unique_id userdir usertrack |
76 |
-unixd version vhost_alias watchdog xml2enc" |
77 |
-# The following are also in the source as of this version, but are not available |
78 |
-# for user selection: |
79 |
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
80 |
-# optional_fn_import optional_hook_export optional_hook_import |
81 |
- |
82 |
-# inter-module dependencies |
83 |
-# TODO: this may still be incomplete |
84 |
-MODULE_DEPENDS=" |
85 |
- auth_form:session |
86 |
- brotli:filter |
87 |
- dav_fs:dav |
88 |
- dav_lock:dav |
89 |
- deflate:filter |
90 |
- cache_disk:cache |
91 |
- ext_filter:filter |
92 |
- file_cache:cache |
93 |
- lbmethod_byrequests:proxy_balancer |
94 |
- lbmethod_byrequests:slotmem_shm |
95 |
- lbmethod_bytraffic:proxy_balancer |
96 |
- lbmethod_bybusyness:proxy_balancer |
97 |
- lbmethod_heartbeat:proxy_balancer |
98 |
- log_forensic:log_config |
99 |
- logio:log_config |
100 |
- cache_disk:cache |
101 |
- cache_socache:cache |
102 |
- md:watchdog |
103 |
- mime_magic:mime |
104 |
- proxy_ajp:proxy |
105 |
- proxy_balancer:proxy |
106 |
- proxy_balancer:slotmem_shm |
107 |
- proxy_connect:proxy |
108 |
- proxy_ftp:proxy |
109 |
- proxy_html:proxy |
110 |
- proxy_html:xml2enc |
111 |
- proxy_http:proxy |
112 |
- proxy_http2:proxy |
113 |
- proxy_scgi:proxy |
114 |
- proxy_fcgi:proxy |
115 |
- proxy_wstunnel:proxy |
116 |
- session_cookie:session |
117 |
- session_dbd:dbd |
118 |
- session_dbd:session |
119 |
- socache_memcache:cache |
120 |
- substitute:filter |
121 |
-" |
122 |
- |
123 |
-# module<->define mappings |
124 |
-MODULE_DEFINES=" |
125 |
- auth_digest:AUTH_DIGEST |
126 |
- authnz_ldap:AUTHNZ_LDAP |
127 |
- cache:CACHE |
128 |
- cache_disk:CACHE |
129 |
- cache_socache:CACHE |
130 |
- dav:DAV |
131 |
- dav_fs:DAV |
132 |
- dav_lock:DAV |
133 |
- file_cache:CACHE |
134 |
- http2:HTTP2 |
135 |
- info:INFO |
136 |
- ldap:LDAP |
137 |
- lua:LUA |
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 |
- socache_memcache:CACHE |
151 |
- ssl:SSL |
152 |
- status:STATUS |
153 |
- suexec:SUEXEC |
154 |
- userdir:USERDIR |
155 |
-" |
156 |
- |
157 |
-# critical modules for the default config |
158 |
-MODULE_CRITICAL=" |
159 |
- authn_core |
160 |
- authz_core |
161 |
- authz_host |
162 |
- dir |
163 |
- mime |
164 |
- unixd |
165 |
-" |
166 |
-inherit apache-2 systemd tmpfiles toolchain-funcs |
167 |
- |
168 |
-DESCRIPTION="The Apache Web Server" |
169 |
-HOMEPAGE="https://httpd.apache.org/" |
170 |
- |
171 |
-# some helper scripts are Apache-1.1, thus both are here |
172 |
-LICENSE="Apache-2.0 Apache-1.1" |
173 |
-SLOT="2" |
174 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris" |
175 |
- |
176 |
-# FIXME! Move this to eclass once all ebuilds are EAPI-7 |
177 |
-RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )" |
178 |
-REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )" |
179 |
- |
180 |
-PATCHES=( |
181 |
- "${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060 |
182 |
-) |
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 |
- use split-usr && 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 |
- dotmpfiles "${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 |
-} |