1 |
commit: a782683bf7fd7c5a1374b23252d9a4104dc75caf |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 3 16:15:38 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 3 16:16:41 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a782683b |
7 |
|
8 |
www-servers/apache: Removed old. |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
www-servers/apache/Manifest | 1 - |
14 |
www-servers/apache/apache-2.4.16.ebuild | 236 -------------------------------- |
15 |
2 files changed, 237 deletions(-) |
16 |
|
17 |
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest |
18 |
index 8bbaf71..f0f5bbd 100644 |
19 |
--- a/www-servers/apache/Manifest |
20 |
+++ b/www-servers/apache/Manifest |
21 |
@@ -2,5 +2,4 @@ DIST gentoo-apache-2.2.29-20140922.tar.bz2 64135 SHA256 8c69c36c2f40fb81ee905b4d |
22 |
DIST gentoo-apache-2.4.10-r1-20140731.tar.bz2 24531 SHA256 8e093a18582c3a20283ed1c09de9acc6832a80b1d5a02962599db0535d38af19 SHA512 c54239df36d7ab30bd14a41241d94b4b49b92c5e50e64857da3e7cde7575d5c0a634d51710bdf75807a57932bf9447906407ae4ef6cb333d7197e82ba5052cd9 WHIRLPOOL 0d184763a033209eaa3c91f7050b24c2a2da24d930ed280a8aa99e32461ac31402e6fd8f57e2122a96e45a8308c4a332144ede7b511ceee352be2f38a6ef7839 |
23 |
DIST gentoo-apache-2.4.18-r1-20160303.tar.bz2 24505 SHA256 d81e32d876594b48a7ff6d9123bf776c5bea5453eddd2fe40f4a9b79c11537aa SHA512 68f0c4de38ae05c45839fe692cbb7de641e331ca133b8aaaf69f3659dec15833cda95e6e074edb3a5b6b6d59b3fc5a4ee3589fff810707fe27417a25cd8a4c4d WHIRLPOOL fb61224b2104e611237e1d09eb4dfb3d2b8f023348c9622f7f19434b6b77d63786c41af17a300d994c14d983676f3753ab6fa52f7a7fcd07b9cea3d7eeacc9b9 |
24 |
DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c |
25 |
-DIST httpd-2.4.16.tar.bz2 5101005 SHA256 ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 SHA512 039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628 WHIRLPOOL f67a4449409cd1a50fcdf4d192a3a0c90e6e3483269d19e9f0454557cbfbda7fb3535063e1738de60d6f524e22eac7fc159d2abe5a60952219c1b01ee143ae05 |
26 |
DIST httpd-2.4.18.tar.bz2 5181291 SHA256 0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c SHA512 8e342cc447313c07275869381c2d6f2314a96547f0c86ee1c617975d0f7ad8efb47113ab5995c733108ae4dec31ad79847e397ecea859b60414ffe1680617a31 WHIRLPOOL e0ae6b8581e2993e0f873d8928e3b54f1df750f29e82d2f1308376af440308c56e89dfb3ec051cdf164a271580ccac71ebc5b038e23ca65a9221fdfc08b47b41 |
27 |
|
28 |
diff --git a/www-servers/apache/apache-2.4.16.ebuild b/www-servers/apache/apache-2.4.16.ebuild |
29 |
deleted file mode 100644 |
30 |
index 8307f48..0000000 |
31 |
--- a/www-servers/apache/apache-2.4.16.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,236 +0,0 @@ |
34 |
-# Copyright 1999-2015 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Id$ |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-# latest gentoo apache files |
41 |
-GENTOO_PATCHSTAMP="20140731" |
42 |
-GENTOO_DEVELOPER="polynomial-c" |
43 |
-GENTOO_PATCHNAME="gentoo-apache-2.4.10-r1" |
44 |
- |
45 |
-# IUSE/USE_EXPAND magic |
46 |
-IUSE_MPMS_FORK="peruser prefork" |
47 |
-IUSE_MPMS_THREAD="event worker" |
48 |
- |
49 |
-# << obsolete modules: |
50 |
-# authn_default authz_default mem_cache |
51 |
-# mem_cache is replaced by cache_disk |
52 |
-# ?? buggy modules |
53 |
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found |
54 |
-# >> added modules for reason: |
55 |
-# compat: compatibility with 2.2 access control |
56 |
-# authz_host: new module for access control |
57 |
-# authn_core: functionality provided by authn_alias in previous versions |
58 |
-# authz_core: new module, provides core authorization capabilities |
59 |
-# cache_disk: replacement for mem_cache |
60 |
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 |
61 |
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 |
62 |
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 |
63 |
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 |
64 |
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). |
65 |
-# socache_shmcb: shared object cache provider. Default config with ssl needs it |
66 |
-# unixd: fixes startup error: Invalid command 'User' |
67 |
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest |
68 |
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core |
69 |
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex |
70 |
-cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate |
71 |
-dir dumpio env expires ext_filter file_cache filter headers ident imagemap |
72 |
-include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness |
73 |
-lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation |
74 |
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi |
75 |
-proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif |
76 |
-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack |
77 |
-unixd version vhost_alias" |
78 |
-# The following are also in the source as of this version, but are not available |
79 |
-# for user selection: |
80 |
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
81 |
-# optional_fn_import optional_hook_export optional_hook_import |
82 |
- |
83 |
-# inter-module dependencies |
84 |
-# TODO: this may still be incomplete |
85 |
-MODULE_DEPENDS=" |
86 |
- dav_fs:dav |
87 |
- dav_lock:dav |
88 |
- deflate:filter |
89 |
- cache_disk:cache |
90 |
- ext_filter:filter |
91 |
- file_cache:cache |
92 |
- lbmethod_byrequests:proxy_balancer |
93 |
- lbmethod_byrequests:slotmem_shm |
94 |
- lbmethod_bytraffic:proxy_balancer |
95 |
- lbmethod_bybusyness:proxy_balancer |
96 |
- lbmethod_heartbeat:proxy_balancer |
97 |
- log_forensic:log_config |
98 |
- logio:log_config |
99 |
- cache_disk:cache |
100 |
- mime_magic:mime |
101 |
- proxy_ajp:proxy |
102 |
- proxy_balancer:proxy |
103 |
- proxy_balancer:slotmem_shm |
104 |
- proxy_connect:proxy |
105 |
- proxy_ftp:proxy |
106 |
- proxy_http:proxy |
107 |
- proxy_scgi:proxy |
108 |
- proxy_fcgi:proxy |
109 |
- proxy_wstunnel:proxy |
110 |
- substitute:filter |
111 |
-" |
112 |
- |
113 |
-# module<->define mappings |
114 |
-MODULE_DEFINES=" |
115 |
- auth_digest:AUTH_DIGEST |
116 |
- authnz_ldap:AUTHNZ_LDAP |
117 |
- cache:CACHE |
118 |
- cache_disk:CACHE |
119 |
- dav:DAV |
120 |
- dav_fs:DAV |
121 |
- dav_lock:DAV |
122 |
- file_cache:CACHE |
123 |
- info:INFO |
124 |
- ldap:LDAP |
125 |
- proxy:PROXY |
126 |
- proxy_ajp:PROXY |
127 |
- proxy_balancer:PROXY |
128 |
- proxy_connect:PROXY |
129 |
- proxy_ftp:PROXY |
130 |
- proxy_http:PROXY |
131 |
- proxy_fcgi:PROXY |
132 |
- proxy_scgi:PROXY |
133 |
- proxy_wstunnel:PROXY |
134 |
- socache_shmcb:SSL |
135 |
- ssl:SSL |
136 |
- status:STATUS |
137 |
- suexec:SUEXEC |
138 |
- userdir:USERDIR |
139 |
-" |
140 |
- |
141 |
-# critical modules for the default config |
142 |
-MODULE_CRITICAL=" |
143 |
- authn_core |
144 |
- authz_core |
145 |
- authz_host |
146 |
- dir |
147 |
- mime |
148 |
- unixd |
149 |
-" |
150 |
-inherit eutils apache-2 systemd toolchain-funcs |
151 |
- |
152 |
-DESCRIPTION="The Apache Web Server" |
153 |
-HOMEPAGE="http://httpd.apache.org/" |
154 |
- |
155 |
-# some helper scripts are Apache-1.1, thus both are here |
156 |
-LICENSE="Apache-2.0 Apache-1.1" |
157 |
-SLOT="2" |
158 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" |
159 |
-IUSE="alpn" |
160 |
-REQUIRED_USE="alpn? ( ssl )" |
161 |
- |
162 |
-DEPEND+="alpn? ( >=dev-libs/openssl-1.0.2:0= )" |
163 |
-RDEPEND+="alpn? ( >=dev-libs/openssl-1.0.2:0= )" |
164 |
- |
165 |
-pkg_setup() { |
166 |
- # dependend critical modules which are not allowed in global scope due |
167 |
- # to USE flag conditionals (bug #499260) |
168 |
- use ssl && MODULE_CRITICAL+=" socache_shmcb" |
169 |
- use doc && MODULE_CRITICAL+=" alias negotiation setenvif" |
170 |
- apache-2_pkg_setup |
171 |
-} |
172 |
- |
173 |
-src_prepare() { |
174 |
- use alpn && epatch "${FILESDIR}"/${PN}-2.4.12-alpn.patch #471512 |
175 |
- apache-2_src_prepare |
176 |
-} |
177 |
- |
178 |
-src_configure() { |
179 |
- # Brain dead check. |
180 |
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
181 |
- |
182 |
- apache-2_src_configure |
183 |
-} |
184 |
- |
185 |
-src_compile() { |
186 |
- if tc-is-cross-compiler; then |
187 |
- # This header is the same across targets, so use the build compiler. |
188 |
- pushd server >/dev/null |
189 |
- emake gen_test_char |
190 |
- tc-export_build_env BUILD_CC |
191 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
192 |
- gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die |
193 |
- popd >/dev/null |
194 |
- fi |
195 |
- |
196 |
- default |
197 |
-} |
198 |
- |
199 |
-src_install() { |
200 |
- apache-2_src_install |
201 |
- for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do |
202 |
- rm "${ED}"/$i || die "Failed to prune apache-tools bits" |
203 |
- done |
204 |
- for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do |
205 |
- rm "${ED}"/$i || die "Failed to prune apache-tools bits" |
206 |
- done |
207 |
- for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do |
208 |
- rm "${ED}"/$i || die "Failed to prune apache-tools bits" |
209 |
- done |
210 |
- for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do |
211 |
- rm "${ED}/"$i || die "Failed to prune apache-tools bits" |
212 |
- done |
213 |
- |
214 |
- # install apxs in /usr/bin (bug #502384) and put a symlink into the |
215 |
- # old location until all ebuilds and eclasses have been modified to |
216 |
- # use the new location. |
217 |
- local apxs="/usr/bin/apxs" |
218 |
- cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs" |
219 |
- ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die |
220 |
- chmod 0755 "${ED}"${apxs} || die |
221 |
- |
222 |
- # Note: wait for mod_systemd to be included in the next release, |
223 |
- # then apache2.4.service can be used and systemd support controlled |
224 |
- # through --enable-systemd |
225 |
- systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service" |
226 |
- systemd_dotmpfilesd "${FILESDIR}/apache.conf" |
227 |
- #insinto /etc/apache2/modules.d |
228 |
- #doins "${FILESDIR}/00_systemd.conf" |
229 |
-} |
230 |
- |
231 |
-pkg_postinst() |
232 |
-{ |
233 |
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" |
234 |
- # warnings that default config might not work out of the box |
235 |
- for mod in $MODULE_CRITICAL; do |
236 |
- if ! use "apache2_modules_${mod}"; then |
237 |
- echo |
238 |
- ewarn "Warning: Critical module not installed!" |
239 |
- ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" |
240 |
- ewarn "are highly recomended but might not be in the base profile yet." |
241 |
- ewarn "Default config for ssl needs module 'socache_shmcb'." |
242 |
- ewarn "Enabling the following flags is highly recommended:" |
243 |
- for cmod in $MODULE_CRITICAL; do |
244 |
- use "apache2_modules_${cmod}" || \ |
245 |
- ewarn "+ apache2_modules_${cmod}" |
246 |
- done |
247 |
- echo |
248 |
- break |
249 |
- fi |
250 |
- done |
251 |
- # warning for proxy_balancer and missing load balancing scheduler |
252 |
- if use apache2_modules_proxy_balancer; then |
253 |
- local lbset= |
254 |
- for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do |
255 |
- if use "apache2_modules_${mod}"; then |
256 |
- lbset=1 && break |
257 |
- fi |
258 |
- done |
259 |
- if [ ! $lbset ]; then |
260 |
- echo |
261 |
- ewarn "Info: Missing load balancing scheduler algorithm module" |
262 |
- ewarn "(They were split off from proxy_balancer in 2.3)" |
263 |
- ewarn "In order to get the ability of load balancing, at least" |
264 |
- ewarn "one of these modules has to be present:" |
265 |
- ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" |
266 |
- echo |
267 |
- fi |
268 |
- fi |
269 |
-} |