1 |
commit: a567ee55f15bc419940e072f4008e83f44a744bd |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 23 14:34:40 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 23 15:30:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a567ee55 |
7 |
|
8 |
www-servers/apache: Bump to version 2.4.29 |
9 |
|
10 |
Package-Manager: Portage-2.3.12, Repoman-2.3.3 |
11 |
|
12 |
www-servers/apache/Manifest | 1 + |
13 |
www-servers/apache/apache-2.4.29.ebuild | 238 ++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 239 insertions(+) |
15 |
|
16 |
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest |
17 |
index dbc87977a20..2a8f138b27f 100644 |
18 |
--- a/www-servers/apache/Manifest |
19 |
+++ b/www-servers/apache/Manifest |
20 |
@@ -6,3 +6,4 @@ DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd281 |
21 |
DIST httpd-2.2.34.tar.bz2 5779739 SHA256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 WHIRLPOOL 0bd86b3644fae79c74928c0cd8bc3e4b7d821544a760dbe6459df43210f690d3c4dc74168e029b0b5bbaba6fcd0433aeb4312794455d91b00b7c36c537dfdefd |
22 |
DIST httpd-2.4.27.tar.bz2 6527394 SHA256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c WHIRLPOOL 35aeaa01b2bf5772ad21d1011e619befd75fdaade5aa0ca7c61367e7b7a66af28dccf8729a53418f2598199721b68aac7d8c575797ed218150d00af4e8dd4dba |
23 |
DIST httpd-2.4.28.tar.bz2 6553163 SHA256 c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a WHIRLPOOL a4c8be522d5e900e01cefc0fc6d196e3e49e45e2daffa9ec22b2dc44deace506da5a4cf68afd04b0062b87ffcd27b6e59d0b8ae71cc2304d5080d066174e95ed |
24 |
+DIST httpd-2.4.29.tar.bz2 6567926 SHA256 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a WHIRLPOOL bd91e3baa3c2b25cb6a4e48062c38a97f9c941884be2e44805a3a08e1fdfb13bf18b37b6c7ab9e7656934f2d3b8c2893e79480ee119f073bfbb376b6c3e32a74 |
25 |
|
26 |
diff --git a/www-servers/apache/apache-2.4.29.ebuild b/www-servers/apache/apache-2.4.29.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..b4dc41e3f33 |
29 |
--- /dev/null |
30 |
+++ b/www-servers/apache/apache-2.4.29.ebuild |
31 |
@@ -0,0 +1,238 @@ |
32 |
+# Copyright 1999-2017 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=6 |
36 |
+ |
37 |
+# latest gentoo apache files |
38 |
+GENTOO_PATCHSTAMP="20160303" |
39 |
+GENTOO_DEVELOPER="polynomial-c" |
40 |
+GENTOO_PATCHNAME="gentoo-apache-2.4.18-r1" |
41 |
+ |
42 |
+# IUSE/USE_EXPAND magic |
43 |
+IUSE_MPMS_FORK="prefork" |
44 |
+IUSE_MPMS_THREAD="event worker" |
45 |
+ |
46 |
+# << obsolete modules: |
47 |
+# authn_default authz_default mem_cache |
48 |
+# mem_cache is replaced by cache_disk |
49 |
+# ?? buggy modules |
50 |
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found |
51 |
+# >> added modules for reason: |
52 |
+# compat: compatibility with 2.2 access control |
53 |
+# authz_host: new module for access control |
54 |
+# authn_core: functionality provided by authn_alias in previous versions |
55 |
+# authz_core: new module, provides core authorization capabilities |
56 |
+# cache_disk: replacement for mem_cache |
57 |
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 |
58 |
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 |
59 |
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 |
60 |
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 |
61 |
+# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). |
62 |
+# socache_shmcb: shared object cache provider. Default config with ssl needs it |
63 |
+# unixd: fixes startup error: Invalid command 'User' |
64 |
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest |
65 |
+authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core |
66 |
+authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex |
67 |
+cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock |
68 |
+dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 |
69 |
+ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness |
70 |
+lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation |
71 |
+proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi |
72 |
+proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif |
73 |
+slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack |
74 |
+unixd version vhost_alias watchdog xml2enc" |
75 |
+# The following are also in the source as of this version, but are not available |
76 |
+# for user selection: |
77 |
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export |
78 |
+# optional_fn_import optional_hook_export optional_hook_import |
79 |
+ |
80 |
+# inter-module dependencies |
81 |
+# TODO: this may still be incomplete |
82 |
+MODULE_DEPENDS=" |
83 |
+ dav_fs:dav |
84 |
+ dav_lock:dav |
85 |
+ deflate:filter |
86 |
+ cache_disk:cache |
87 |
+ ext_filter:filter |
88 |
+ file_cache:cache |
89 |
+ lbmethod_byrequests:proxy_balancer |
90 |
+ lbmethod_byrequests:slotmem_shm |
91 |
+ lbmethod_bytraffic:proxy_balancer |
92 |
+ lbmethod_bybusyness:proxy_balancer |
93 |
+ lbmethod_heartbeat:proxy_balancer |
94 |
+ log_forensic:log_config |
95 |
+ logio:log_config |
96 |
+ cache_disk:cache |
97 |
+ cache_socache:cache |
98 |
+ mime_magic:mime |
99 |
+ proxy_ajp:proxy |
100 |
+ proxy_balancer:proxy |
101 |
+ proxy_balancer:slotmem_shm |
102 |
+ proxy_connect:proxy |
103 |
+ proxy_ftp:proxy |
104 |
+ proxy_html:proxy |
105 |
+ proxy_html:xml2enc |
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 |
+ cache_socache:CACHE |
120 |
+ dav:DAV |
121 |
+ dav_fs:DAV |
122 |
+ dav_lock:DAV |
123 |
+ file_cache:CACHE |
124 |
+ http2:HTTP2 |
125 |
+ info:INFO |
126 |
+ ldap:LDAP |
127 |
+ proxy:PROXY |
128 |
+ proxy_ajp:PROXY |
129 |
+ proxy_balancer:PROXY |
130 |
+ proxy_connect:PROXY |
131 |
+ proxy_ftp:PROXY |
132 |
+ proxy_html:PROXY |
133 |
+ proxy_http:PROXY |
134 |
+ proxy_fcgi:PROXY |
135 |
+ proxy_scgi:PROXY |
136 |
+ proxy_wstunnel:PROXY |
137 |
+ socache_shmcb:SSL |
138 |
+ ssl:SSL |
139 |
+ status:STATUS |
140 |
+ suexec:SUEXEC |
141 |
+ userdir:USERDIR |
142 |
+" |
143 |
+ |
144 |
+# critical modules for the default config |
145 |
+MODULE_CRITICAL=" |
146 |
+ authn_core |
147 |
+ authz_core |
148 |
+ authz_host |
149 |
+ dir |
150 |
+ mime |
151 |
+ unixd |
152 |
+" |
153 |
+inherit eutils apache-2 systemd toolchain-funcs |
154 |
+ |
155 |
+DESCRIPTION="The Apache Web Server" |
156 |
+HOMEPAGE="https://httpd.apache.org/" |
157 |
+ |
158 |
+# some helper scripts are Apache-1.1, thus both are here |
159 |
+LICENSE="Apache-2.0 Apache-1.1" |
160 |
+SLOT="2" |
161 |
+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" |
162 |
+ |
163 |
+DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )" |
164 |
+ |
165 |
+REQUIRED_USE="apache2_modules_http2? ( ssl )" |
166 |
+ |
167 |
+pkg_setup() { |
168 |
+ # dependend critical modules which are not allowed in global scope due |
169 |
+ # to USE flag conditionals (bug #499260) |
170 |
+ use ssl && MODULE_CRITICAL+=" socache_shmcb" |
171 |
+ use doc && MODULE_CRITICAL+=" alias negotiation setenvif" |
172 |
+ apache-2_pkg_setup |
173 |
+} |
174 |
+ |
175 |
+src_configure() { |
176 |
+ # Brain dead check. |
177 |
+ tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
178 |
+ |
179 |
+ apache-2_src_configure |
180 |
+} |
181 |
+ |
182 |
+src_compile() { |
183 |
+ if tc-is-cross-compiler; then |
184 |
+ # This header is the same across targets, so use the build compiler. |
185 |
+ pushd server >/dev/null |
186 |
+ emake gen_test_char |
187 |
+ tc-export_build_env BUILD_CC |
188 |
+ ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
189 |
+ gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die |
190 |
+ popd >/dev/null |
191 |
+ fi |
192 |
+ |
193 |
+ default |
194 |
+} |
195 |
+ |
196 |
+src_install() { |
197 |
+ apache-2_src_install |
198 |
+ for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do |
199 |
+ rm "${ED}"/$i || die "Failed to prune apache-tools bits" |
200 |
+ done |
201 |
+ for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do |
202 |
+ rm "${ED}"/$i || die "Failed to prune apache-tools bits" |
203 |
+ done |
204 |
+ for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do |
205 |
+ rm "${ED}"/$i || die "Failed to prune apache-tools bits" |
206 |
+ done |
207 |
+ for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do |
208 |
+ rm "${ED}/"$i || die "Failed to prune apache-tools bits" |
209 |
+ done |
210 |
+ |
211 |
+ # install apxs in /usr/bin (bug #502384) and put a symlink into the |
212 |
+ # old location until all ebuilds and eclasses have been modified to |
213 |
+ # use the new location. |
214 |
+ local apxs="/usr/bin/apxs" |
215 |
+ cp "${S}"/support/apxs "${ED%/}/${apxs}" || die "Failed to install apxs" |
216 |
+ ln -s ../bin/apxs "${ED%/}/usr/sbin/apxs" || die |
217 |
+ chmod 0755 "${ED%/}${apxs}" || die |
218 |
+ |
219 |
+ # Note: wait for mod_systemd to be included in some forthcoming release, |
220 |
+ # Then apache2.4.service can be used and systemd support controlled |
221 |
+ # through --enable-systemd |
222 |
+ systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service" |
223 |
+ systemd_dotmpfilesd "${FILESDIR}/apache.conf" |
224 |
+ #insinto /etc/apache2/modules.d |
225 |
+ #doins "${FILESDIR}/00_systemd.conf" |
226 |
+ |
227 |
+ # Install http2 module config |
228 |
+ insinto /etc/apache2/modules.d |
229 |
+ doins "${FILESDIR}"/41_mod_http2.conf |
230 |
+} |
231 |
+ |
232 |
+pkg_postinst() { |
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 |
+} |