1 |
commit: e4dd32995a5f6e668003c24cbaca708480c41c75 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 24 11:25:49 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 24 11:27:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4dd3299 |
7 |
|
8 |
www-servers/apache: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
11 |
|
12 |
www-servers/apache/Manifest | 2 - |
13 |
www-servers/apache/apache-2.4.33-r1.ebuild | 257 ----------------------------- |
14 |
2 files changed, 259 deletions(-) |
15 |
|
16 |
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest |
17 |
index 99649aa8bd0..72b8c37f7dc 100644 |
18 |
--- a/www-servers/apache/Manifest |
19 |
+++ b/www-servers/apache/Manifest |
20 |
@@ -1,9 +1,7 @@ |
21 |
DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a |
22 |
DIST gentoo-apache-2.4.27-20170918.tar.bz2 24850 BLAKE2B a832c2c7a575e167b72214f325cb85922c49969ea8cc4b5821ce97b1d4028ab56852bf416cb32c99f2b2b356545b6fea0af0fa4f6e13bf001393b468357cbcfb SHA512 c58a9a0b171188ff163f6b45c47f243797d4050cf461ba1a642115350285879005be6496cee2031bffaccc0d8beda4c27de87afa2ded17cbe559f792eb7c00e8 |
23 |
-DIST gentoo-apache-2.4.33-r1-20180529.tar.bz2 24856 BLAKE2B 4754336f4302d1e7133481516f2000b91a73cd4c60222a7460dde93aa76b71e503b869f9720760b91c6fc4b4fa87d8feb60d33203669d9d19726b71f953b9eda SHA512 a555da6e9b4fa4bfb761ad42b010abc68ef84f312dbf302385ed8ac52ba0b48c5a33020d5c1300bec303ac22a740108b4abd71fe3887c8486bb25cc7dd79c142 |
24 |
DIST gentoo-apache-2.4.34-20180716.tar.bz2 24773 BLAKE2B 6ff3b711e16a0156f8c5da4c5ee830a6e3d55b1f29c44a81be26decf6611e2680c84ec7779372bc0de775f3aff90fdaec48f5bc7253c8c9317c1308b60bf10e3 SHA512 4b96c2c7cad0aeef070584b64396360acb2ec24139a5af4755fc36b1f3cd2b82b213ebbfc45035f61c49b59ba40870930227b42e0b60042fd1147f34ba5df574 |
25 |
DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 |
26 |
DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c |
27 |
-DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269 |
28 |
DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8 |
29 |
DIST httpd-2.4.35.tar.bz2 7044336 BLAKE2B b0ec5de56bfdaf7c6cf7f6cd2fedbd8748c16a76bddbde8e3442d2102aa33bc2642cf1dacce7b5e38023ddfceee393cd0059b881cd25dc57c029900385a41f59 SHA512 f5d6a849850ebdf4e38b586c84cc1063d68ac4c6737895c9ac1c8796c22655681c55b4de77ed9f1f807338fdb9f7824faf911361aa31cc46f3c3a2cbabe20543 |
30 |
|
31 |
diff --git a/www-servers/apache/apache-2.4.33-r1.ebuild b/www-servers/apache/apache-2.4.33-r1.ebuild |
32 |
deleted file mode 100644 |
33 |
index c51f92db394..00000000000 |
34 |
--- a/www-servers/apache/apache-2.4.33-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,257 +0,0 @@ |
37 |
-# Copyright 1999-2018 Gentoo Foundation |
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="20180529" |
44 |
-GENTOO_DEVELOPER="polynomial-c" |
45 |
-GENTOO_PATCHNAME="gentoo-apache-2.4.33-r1" |
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 |
70 |
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file 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_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif |
78 |
-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack |
79 |
-unixd version vhost_alias watchdog xml2enc" |
80 |
-# The following are also in the source as of this version, but are not available |
81 |
-# for user selection: |
82 |
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
83 |
-# optional_fn_import optional_hook_export optional_hook_import |
84 |
- |
85 |
-# inter-module dependencies |
86 |
-# TODO: this may still be incomplete |
87 |
-MODULE_DEPENDS=" |
88 |
- brotli:filter |
89 |
- dav_fs:dav |
90 |
- dav_lock:dav |
91 |
- deflate:filter |
92 |
- cache_disk:cache |
93 |
- ext_filter:filter |
94 |
- file_cache:cache |
95 |
- lbmethod_byrequests:proxy_balancer |
96 |
- lbmethod_byrequests:slotmem_shm |
97 |
- lbmethod_bytraffic:proxy_balancer |
98 |
- lbmethod_bybusyness:proxy_balancer |
99 |
- lbmethod_heartbeat:proxy_balancer |
100 |
- log_forensic:log_config |
101 |
- logio:log_config |
102 |
- cache_disk:cache |
103 |
- cache_socache:cache |
104 |
- md:watchdog |
105 |
- mime_magic:mime |
106 |
- proxy_ajp:proxy |
107 |
- proxy_balancer:proxy |
108 |
- proxy_balancer:slotmem_shm |
109 |
- proxy_connect:proxy |
110 |
- proxy_ftp:proxy |
111 |
- proxy_html:proxy |
112 |
- proxy_html:xml2enc |
113 |
- proxy_http:proxy |
114 |
- proxy_scgi:proxy |
115 |
- proxy_fcgi:proxy |
116 |
- proxy_wstunnel:proxy |
117 |
- substitute:filter |
118 |
-" |
119 |
- |
120 |
-# module<->define mappings |
121 |
-MODULE_DEFINES=" |
122 |
- auth_digest:AUTH_DIGEST |
123 |
- authnz_ldap:AUTHNZ_LDAP |
124 |
- cache:CACHE |
125 |
- cache_disk:CACHE |
126 |
- cache_socache:CACHE |
127 |
- dav:DAV |
128 |
- dav_fs:DAV |
129 |
- dav_lock:DAV |
130 |
- file_cache:CACHE |
131 |
- http2:HTTP2 |
132 |
- info:INFO |
133 |
- ldap:LDAP |
134 |
- md:SSL |
135 |
- proxy:PROXY |
136 |
- proxy_ajp:PROXY |
137 |
- proxy_balancer:PROXY |
138 |
- proxy_connect:PROXY |
139 |
- proxy_ftp:PROXY |
140 |
- proxy_html:PROXY |
141 |
- proxy_http:PROXY |
142 |
- proxy_fcgi:PROXY |
143 |
- proxy_scgi:PROXY |
144 |
- proxy_wstunnel:PROXY |
145 |
- socache_shmcb:SSL |
146 |
- ssl:SSL |
147 |
- status:STATUS |
148 |
- suexec:SUEXEC |
149 |
- userdir:USERDIR |
150 |
-" |
151 |
- |
152 |
-# critical modules for the default config |
153 |
-MODULE_CRITICAL=" |
154 |
- authn_core |
155 |
- authz_core |
156 |
- authz_host |
157 |
- dir |
158 |
- mime |
159 |
- unixd |
160 |
-" |
161 |
-inherit eutils apache-2 systemd toolchain-funcs |
162 |
- |
163 |
-DESCRIPTION="The Apache Web Server" |
164 |
-HOMEPAGE="https://httpd.apache.org/" |
165 |
- |
166 |
-# some helper scripts are Apache-1.1, thus both are here |
167 |
-LICENSE="Apache-2.0 Apache-1.1" |
168 |
-SLOT="2" |
169 |
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" |
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 |
- |
174 |
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) |
175 |
- apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) |
176 |
- apache2_modules_md? ( >=dev-libs/jansson-2.10 )" |
177 |
- |
178 |
-DEPEND+="${CDEPEND}" |
179 |
-RDEPEND+="${CDEPEND}" |
180 |
- |
181 |
-REQUIRED_USE="apache2_modules_http2? ( ssl ) |
182 |
- apache2_modules_md? ( ssl )" |
183 |
- |
184 |
-PATCHES=( |
185 |
- # this *should* be included from upstream in the next release as it is currently in Git head |
186 |
- "${FILESDIR}/${P}-libressl-compatibility.patch" |
187 |
-) |
188 |
- |
189 |
-pkg_setup() { |
190 |
- # dependend critical modules which are not allowed in global scope due |
191 |
- # to USE flag conditionals (bug #499260) |
192 |
- use ssl && MODULE_CRITICAL+=" socache_shmcb" |
193 |
- use doc && MODULE_CRITICAL+=" alias negotiation setenvif" |
194 |
- apache-2_pkg_setup |
195 |
-} |
196 |
- |
197 |
-src_configure() { |
198 |
- # Brain dead check. |
199 |
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
200 |
- |
201 |
- apache-2_src_configure |
202 |
-} |
203 |
- |
204 |
-src_compile() { |
205 |
- if tc-is-cross-compiler; then |
206 |
- # This header is the same across targets, so use the build compiler. |
207 |
- pushd server >/dev/null |
208 |
- emake gen_test_char |
209 |
- tc-export_build_env BUILD_CC |
210 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
211 |
- gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die |
212 |
- popd >/dev/null |
213 |
- fi |
214 |
- |
215 |
- default |
216 |
-} |
217 |
- |
218 |
-src_install() { |
219 |
- apache-2_src_install |
220 |
- local i |
221 |
- for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do |
222 |
- rm "${ED%/}"/$i || die "Failed to prune apache-tools bits" |
223 |
- done |
224 |
- for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do |
225 |
- rm "${ED%/}"/$i || die "Failed to prune apache-tools bits" |
226 |
- done |
227 |
- for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do |
228 |
- rm "${ED%/}"/$i || die "Failed to prune apache-tools bits" |
229 |
- done |
230 |
- for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do |
231 |
- rm "${ED%/}/"$i || die "Failed to prune apache-tools bits" |
232 |
- done |
233 |
- |
234 |
- # install apxs in /usr/bin (bug #502384) and put a symlink into the |
235 |
- # old location until all ebuilds and eclasses have been modified to |
236 |
- # use the new location. |
237 |
- dobin support/apxs |
238 |
- dosym ../bin/apxs /usr/sbin/apxs |
239 |
- |
240 |
- # Note: wait for mod_systemd to be included in some forthcoming release, |
241 |
- # Then apache2.4.service can be used and systemd support controlled |
242 |
- # through --enable-systemd |
243 |
- systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service" |
244 |
- systemd_dotmpfilesd "${FILESDIR}/apache.conf" |
245 |
- #insinto /etc/apache2/modules.d |
246 |
- #doins "${FILESDIR}/00_systemd.conf" |
247 |
- |
248 |
- # Install http2 module config |
249 |
- insinto /etc/apache2/modules.d |
250 |
- doins "${FILESDIR}"/41_mod_http2.conf |
251 |
- |
252 |
- # Fix path to apache libdir |
253 |
- sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die |
254 |
-} |
255 |
- |
256 |
-pkg_postinst() { |
257 |
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" |
258 |
- # warnings that default config might not work out of the box |
259 |
- for mod in $MODULE_CRITICAL; do |
260 |
- if ! use "apache2_modules_${mod}"; then |
261 |
- echo |
262 |
- ewarn "Warning: Critical module not installed!" |
263 |
- ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" |
264 |
- ewarn "are highly recomended but might not be in the base profile yet." |
265 |
- ewarn "Default config for ssl needs module 'socache_shmcb'." |
266 |
- ewarn "Enabling the following flags is highly recommended:" |
267 |
- for cmod in $MODULE_CRITICAL; do |
268 |
- use "apache2_modules_${cmod}" || \ |
269 |
- ewarn "+ apache2_modules_${cmod}" |
270 |
- done |
271 |
- echo |
272 |
- break |
273 |
- fi |
274 |
- done |
275 |
- # warning for proxy_balancer and missing load balancing scheduler |
276 |
- if use apache2_modules_proxy_balancer; then |
277 |
- local lbset= |
278 |
- for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do |
279 |
- if use "apache2_modules_${mod}"; then |
280 |
- lbset=1 && break |
281 |
- fi |
282 |
- done |
283 |
- if [ ! ${lbset} ] ; then |
284 |
- echo |
285 |
- ewarn "Info: Missing load balancing scheduler algorithm module" |
286 |
- ewarn "(They were split off from proxy_balancer in 2.3)" |
287 |
- ewarn "In order to get the ability of load balancing, at least" |
288 |
- ewarn "one of these modules has to be present:" |
289 |
- ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" |
290 |
- echo |
291 |
- fi |
292 |
- fi |
293 |
-} |