mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-10 06:57:08 -08:00
www-servers/apache: Bump to version 2.4.17 (bug #563042)
Package-Manager: portage-2.2.23 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
@@ -4,3 +4,4 @@ DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce38
|
||||
DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
|
||||
DIST httpd-2.4.12.tar.bz2 5054838 SHA256 ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 SHA512 f69db14b421f0e1e4861fe4d8b652688d50ca9eb41c622242d11ae55687eb6c2142a8505a8c3fb6f2bd53167be535bc0a77ca1af97e0720930fc7f20f4c1f8e8 WHIRLPOOL 56512066e8978c4a3d47d0cc2bb92093fd468a9b2f46b8b07fe4db366f55fa5e74ae58bbebe2377cbe0c66f1585759115c786f62f18ac1abc534fb257689d250
|
||||
DIST httpd-2.4.16.tar.bz2 5101005 SHA256 ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 SHA512 039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628 WHIRLPOOL f67a4449409cd1a50fcdf4d192a3a0c90e6e3483269d19e9f0454557cbfbda7fb3535063e1738de60d6f524e22eac7fc159d2abe5a60952219c1b01ee143ae05
|
||||
DIST httpd-2.4.17.tar.bz2 5157721 SHA256 331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798 SHA512 d818dbd4b138db592a98fecdf5ae13dfadc19f9553e98bdafbdadd4693ae19bb44c96c8c279e9546978bbce55b9286ce3c4ae69cf701a9812be134a3a517b1f6 WHIRLPOOL f18dd92091e0d7f051f55276dc99656b299f3aaff5375d2fe286e18c33cfeb6887db9c792a426e88655dc0523e66008b2fc534ee1a5ae5b2ae5000bef1509aa8
|
||||
|
||||
@@ -0,0 +1,229 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
# latest gentoo apache files
|
||||
GENTOO_PATCHSTAMP="20140731"
|
||||
GENTOO_DEVELOPER="polynomial-c"
|
||||
GENTOO_PATCHNAME="gentoo-apache-2.4.10-r1"
|
||||
|
||||
# IUSE/USE_EXPAND magic
|
||||
IUSE_MPMS_FORK="peruser prefork"
|
||||
IUSE_MPMS_THREAD="event worker"
|
||||
|
||||
# << obsolete modules:
|
||||
# authn_default authz_default mem_cache
|
||||
# mem_cache is replaced by cache_disk
|
||||
# ?? buggy modules
|
||||
# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
|
||||
# >> added modules for reason:
|
||||
# compat: compatibility with 2.2 access control
|
||||
# authz_host: new module for access control
|
||||
# authn_core: functionality provided by authn_alias in previous versions
|
||||
# authz_core: new module, provides core authorization capabilities
|
||||
# cache_disk: replacement for mem_cache
|
||||
# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
|
||||
# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
|
||||
# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
|
||||
# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
|
||||
# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
|
||||
# socache_shmcb: shared object cache provider. Default config with ssl needs it
|
||||
# unixd: fixes startup error: Invalid command 'User'
|
||||
IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
|
||||
authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
|
||||
authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
|
||||
cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate
|
||||
dir dumpio env expires ext_filter file_cache filter headers http2 ident imagemap
|
||||
include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
|
||||
lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation
|
||||
proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi
|
||||
proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
|
||||
slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
|
||||
unixd version vhost_alias"
|
||||
# The following are also in the source as of this version, but are not available
|
||||
# for user selection:
|
||||
# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
|
||||
# optional_fn_import optional_hook_export optional_hook_import
|
||||
|
||||
# inter-module dependencies
|
||||
# TODO: this may still be incomplete
|
||||
MODULE_DEPENDS="
|
||||
dav_fs:dav
|
||||
dav_lock:dav
|
||||
deflate:filter
|
||||
cache_disk:cache
|
||||
ext_filter:filter
|
||||
file_cache:cache
|
||||
lbmethod_byrequests:proxy_balancer
|
||||
lbmethod_byrequests:slotmem_shm
|
||||
lbmethod_bytraffic:proxy_balancer
|
||||
lbmethod_bybusyness:proxy_balancer
|
||||
lbmethod_heartbeat:proxy_balancer
|
||||
log_forensic:log_config
|
||||
logio:log_config
|
||||
cache_disk:cache
|
||||
mime_magic:mime
|
||||
proxy_ajp:proxy
|
||||
proxy_balancer:proxy
|
||||
proxy_balancer:slotmem_shm
|
||||
proxy_connect:proxy
|
||||
proxy_ftp:proxy
|
||||
proxy_http:proxy
|
||||
proxy_scgi:proxy
|
||||
proxy_fcgi:proxy
|
||||
proxy_wstunnel:proxy
|
||||
substitute:filter
|
||||
"
|
||||
|
||||
# module<->define mappings
|
||||
MODULE_DEFINES="
|
||||
auth_digest:AUTH_DIGEST
|
||||
authnz_ldap:AUTHNZ_LDAP
|
||||
cache:CACHE
|
||||
cache_disk:CACHE
|
||||
dav:DAV
|
||||
dav_fs:DAV
|
||||
dav_lock:DAV
|
||||
file_cache:CACHE
|
||||
http2:HTTP2
|
||||
info:INFO
|
||||
ldap:LDAP
|
||||
proxy:PROXY
|
||||
proxy_ajp:PROXY
|
||||
proxy_balancer:PROXY
|
||||
proxy_connect:PROXY
|
||||
proxy_ftp:PROXY
|
||||
proxy_http:PROXY
|
||||
proxy_fcgi:PROXY
|
||||
proxy_scgi:PROXY
|
||||
proxy_wstunnel:PROXY
|
||||
socache_shmcb:SSL
|
||||
ssl:SSL
|
||||
status:STATUS
|
||||
suexec:SUEXEC
|
||||
userdir:USERDIR
|
||||
"
|
||||
|
||||
# critical modules for the default config
|
||||
MODULE_CRITICAL="
|
||||
authn_core
|
||||
authz_core
|
||||
authz_host
|
||||
dir
|
||||
mime
|
||||
unixd
|
||||
"
|
||||
inherit eutils apache-2 systemd toolchain-funcs
|
||||
|
||||
DESCRIPTION="The Apache Web Server"
|
||||
HOMEPAGE="http://httpd.apache.org/"
|
||||
|
||||
# some helper scripts are Apache-1.1, thus both are here
|
||||
LICENSE="Apache-2.0 Apache-1.1"
|
||||
SLOT="2"
|
||||
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"
|
||||
|
||||
DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.0.0 )"
|
||||
|
||||
pkg_setup() {
|
||||
# dependend critical modules which are not allowed in global scope due
|
||||
# to USE flag conditionals (bug #499260)
|
||||
use ssl && MODULE_CRITICAL+=" socache_shmcb"
|
||||
use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
|
||||
apache-2_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Brain dead check.
|
||||
tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
|
||||
|
||||
apache-2_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if tc-is-cross-compiler; then
|
||||
# This header is the same across targets, so use the build compiler.
|
||||
pushd server >/dev/null
|
||||
emake gen_test_char
|
||||
tc-export_build_env BUILD_CC
|
||||
${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
|
||||
gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
|
||||
popd >/dev/null
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
apache-2_src_install
|
||||
for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
|
||||
rm "${ED}"/$i || die "Failed to prune apache-tools bits"
|
||||
done
|
||||
for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
|
||||
rm "${ED}"/$i || die "Failed to prune apache-tools bits"
|
||||
done
|
||||
for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
|
||||
rm "${ED}"/$i || die "Failed to prune apache-tools bits"
|
||||
done
|
||||
for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
|
||||
rm "${ED}/"$i || die "Failed to prune apache-tools bits"
|
||||
done
|
||||
|
||||
# install apxs in /usr/bin (bug #502384) and put a symlink into the
|
||||
# old location until all ebuilds and eclasses have been modified to
|
||||
# use the new location.
|
||||
local apxs="/usr/bin/apxs"
|
||||
cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs"
|
||||
ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die
|
||||
chmod 0755 "${ED}"${apxs} || die
|
||||
|
||||
# Note: wait for mod_systemd to be included in the next release,
|
||||
# then apache2.4.service can be used and systemd support controlled
|
||||
# through --enable-systemd
|
||||
systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
|
||||
systemd_dotmpfilesd "${FILESDIR}/apache.conf"
|
||||
#insinto /etc/apache2/modules.d
|
||||
#doins "${FILESDIR}/00_systemd.conf"
|
||||
}
|
||||
|
||||
pkg_postinst()
|
||||
{
|
||||
apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
|
||||
# warnings that default config might not work out of the box
|
||||
for mod in $MODULE_CRITICAL; do
|
||||
if ! use "apache2_modules_${mod}"; then
|
||||
echo
|
||||
ewarn "Warning: Critical module not installed!"
|
||||
ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
|
||||
ewarn "are highly recomended but might not be in the base profile yet."
|
||||
ewarn "Default config for ssl needs module 'socache_shmcb'."
|
||||
ewarn "Enabling the following flags is highly recommended:"
|
||||
for cmod in $MODULE_CRITICAL; do
|
||||
use "apache2_modules_${cmod}" || \
|
||||
ewarn "+ apache2_modules_${cmod}"
|
||||
done
|
||||
echo
|
||||
break
|
||||
fi
|
||||
done
|
||||
# warning for proxy_balancer and missing load balancing scheduler
|
||||
if use apache2_modules_proxy_balancer; then
|
||||
local lbset=
|
||||
for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
|
||||
if use "apache2_modules_${mod}"; then
|
||||
lbset=1 && break
|
||||
fi
|
||||
done
|
||||
if [ ! $lbset ]; then
|
||||
echo
|
||||
ewarn "Info: Missing load balancing scheduler algorithm module"
|
||||
ewarn "(They were split off from proxy_balancer in 2.3)"
|
||||
ewarn "In order to get the ability of load balancing, at least"
|
||||
ewarn "one of these modules has to be present:"
|
||||
ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
|
||||
echo
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -20,6 +20,7 @@
|
||||
<flag name='apache2_modules_authz_core'>Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.</flag>
|
||||
<flag name='apache2_modules_authz_dbd'>Provides authorization capabilities via SQL database so that authenticated users can be allowed or denied access to portions of the web site by group membership.</flag>
|
||||
<flag name='apache2_modules_cache_disk'>Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</flag>
|
||||
<flag name='apache2_modules_http2'>Enable http2/alpn module</flag>
|
||||
<flag name='apache2_modules_lbmethod_byrequests'>Request counting load balancer scheduler algorithm for proxy_balancer.</flag>
|
||||
<flag name='apache2_modules_lbmethod_bytraffic'>Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
|
||||
<flag name='apache2_modules_lbmethod_bybusyness'>Pending request counting load balancer scheduler algorithm for proxy_balancer.</flag>
|
||||
|
||||
Reference in New Issue
Block a user