mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
www-servers/apache: Security cleanup
Bug: https://bugs.gentoo.org/682306 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
@@ -1,8 +1,4 @@
|
||||
DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a
|
||||
DIST gentoo-apache-2.4.34-20180716.tar.bz2 24773 BLAKE2B 6ff3b711e16a0156f8c5da4c5ee830a6e3d55b1f29c44a81be26decf6611e2680c84ec7779372bc0de775f3aff90fdaec48f5bc7253c8c9317c1308b60bf10e3 SHA512 4b96c2c7cad0aeef070584b64396360acb2ec24139a5af4755fc36b1f3cd2b82b213ebbfc45035f61c49b59ba40870930227b42e0b60042fd1147f34ba5df574
|
||||
DIST gentoo-apache-2.4.38-20190226.tar.bz2 24810 BLAKE2B 31dc4363c7bdb3dd49287da405541b73e31f251b1b31ecfdffd066a3cd6b838938acf7326a7963a05693e20d6dc34e71223efd1ecd5062a25829d6f6f4721595 SHA512 3dbddedab74e4326b53a9ec3daeb53d727c2789736ae3234d127ccffe873541bd7baa26d5cf9ed064b6e4125fd5a2baee97bccb81e67fdc5674cffe81ca93c40
|
||||
DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
|
||||
DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
|
||||
DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8
|
||||
DIST httpd-2.4.38.tar.bz2 7035030 BLAKE2B 52d965b0eae3402c268f1c5f5fb669ad84408699871d0518ba254c6e7c00f2198cba8cb6106114a62f0f6de67e0a8b921b5783af9530d165ed4d435312ce5164 SHA512 8bdc36fa2bd13fd83feee17fdce4a5316ed8f96c1ac32b636ba106572ba257815438c72068d2d0e900783a3fa25c90a5da34c3f83fc2c04a1dbdbf234f7ad448
|
||||
DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
|
||||
|
||||
@@ -1,262 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
# latest gentoo apache files
|
||||
GENTOO_PATCHSTAMP="20180716"
|
||||
GENTOO_DEVELOPER="polynomial-c"
|
||||
GENTOO_PATCHNAME="gentoo-apache-2.4.34"
|
||||
|
||||
# IUSE/USE_EXPAND magic
|
||||
IUSE_MPMS_FORK="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
|
||||
brotli cache cache_disk cache_socache 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 md mime mime_magic negotiation
|
||||
proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html 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 watchdog xml2enc"
|
||||
# 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="
|
||||
brotli:filter
|
||||
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
|
||||
cache_socache:cache
|
||||
md:watchdog
|
||||
mime_magic:mime
|
||||
proxy_ajp:proxy
|
||||
proxy_balancer:proxy
|
||||
proxy_balancer:slotmem_shm
|
||||
proxy_connect:proxy
|
||||
proxy_ftp:proxy
|
||||
proxy_html:proxy
|
||||
proxy_html:xml2enc
|
||||
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
|
||||
cache_socache:CACHE
|
||||
dav:DAV
|
||||
dav_fs:DAV
|
||||
dav_lock:DAV
|
||||
file_cache:CACHE
|
||||
http2:HTTP2
|
||||
info:INFO
|
||||
ldap:LDAP
|
||||
md:SSL
|
||||
proxy:PROXY
|
||||
proxy_ajp:PROXY
|
||||
proxy_balancer:PROXY
|
||||
proxy_connect:PROXY
|
||||
proxy_ftp:PROXY
|
||||
proxy_html: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 apache-2 systemd tmpfiles toolchain-funcs
|
||||
|
||||
DESCRIPTION="The Apache Web Server"
|
||||
HOMEPAGE="https://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-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
|
||||
|
||||
# Enable http2 by default (bug #563452)
|
||||
# FIXME: Move to apache-2.eclass once this has reached stable.
|
||||
IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
|
||||
# New suexec options (since 2.4.34)
|
||||
IUSE="${IUSE} +suexec-caps suexec-syslog"
|
||||
|
||||
CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
|
||||
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
|
||||
apache2_modules_md? ( >=dev-libs/jansson-2.10 )"
|
||||
|
||||
DEPEND+="${CDEPEND}
|
||||
suexec? ( suexec-caps? ( sys-libs/libcap ) )"
|
||||
RDEPEND+="${CDEPEND}"
|
||||
|
||||
REQUIRED_USE="apache2_modules_http2? ( ssl )
|
||||
apache2_modules_md? ( ssl )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.4.34-suexec_parallel_install.patch" #661358
|
||||
"${FILESDIR}"/${P}-PR62557.patch #663312
|
||||
)
|
||||
|
||||
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
|
||||
local i
|
||||
local apache_tools_prune_list=(
|
||||
/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
|
||||
/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
|
||||
/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
|
||||
/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
|
||||
)
|
||||
for i in ${apache_tools_prune_list[@]} ; 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.
|
||||
dobin support/apxs
|
||||
dosym ../bin/apxs /usr/sbin/apxs
|
||||
|
||||
# Note: wait for mod_systemd to be included in some forthcoming release,
|
||||
# Then apache2.4.service can be used and systemd support controlled
|
||||
# through --enable-systemd
|
||||
systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
|
||||
systemd_dotmpfilesd "${FILESDIR}/apache.conf"
|
||||
#insinto /etc/apache2/modules.d
|
||||
#doins "${FILESDIR}/00_systemd.conf"
|
||||
|
||||
# Install http2 module config
|
||||
insinto /etc/apache2/modules.d
|
||||
doins "${FILESDIR}"/41_mod_http2.conf
|
||||
|
||||
# Fix path to apache libdir
|
||||
sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
|
||||
|
||||
tmpfiles_process apache.conf #662544
|
||||
|
||||
# warnings that default config might not work out of the box
|
||||
local mod cmod
|
||||
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
|
||||
}
|
||||
@@ -1,257 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
# latest gentoo apache files
|
||||
GENTOO_PATCHSTAMP="20190226"
|
||||
GENTOO_DEVELOPER="polynomial-c"
|
||||
GENTOO_PATCHNAME="gentoo-apache-2.4.38"
|
||||
|
||||
# IUSE/USE_EXPAND magic
|
||||
IUSE_MPMS_FORK="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
|
||||
brotli cache cache_disk cache_socache 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 md mime mime_magic negotiation
|
||||
proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
|
||||
proxy_http2 proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
|
||||
slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
|
||||
unixd version vhost_alias watchdog xml2enc"
|
||||
# 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="
|
||||
brotli:filter
|
||||
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
|
||||
cache_socache:cache
|
||||
md:watchdog
|
||||
mime_magic:mime
|
||||
proxy_ajp:proxy
|
||||
proxy_balancer:proxy
|
||||
proxy_balancer:slotmem_shm
|
||||
proxy_connect:proxy
|
||||
proxy_ftp:proxy
|
||||
proxy_html:proxy
|
||||
proxy_html:xml2enc
|
||||
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
|
||||
cache_socache:CACHE
|
||||
dav:DAV
|
||||
dav_fs:DAV
|
||||
dav_lock:DAV
|
||||
file_cache:CACHE
|
||||
http2:HTTP2
|
||||
info:INFO
|
||||
ldap:LDAP
|
||||
md:SSL
|
||||
proxy:PROXY
|
||||
proxy_ajp:PROXY
|
||||
proxy_balancer:PROXY
|
||||
proxy_connect:PROXY
|
||||
proxy_ftp:PROXY
|
||||
proxy_html: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 apache-2 systemd tmpfiles toolchain-funcs
|
||||
|
||||
DESCRIPTION="The Apache Web Server"
|
||||
HOMEPAGE="https://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-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
|
||||
|
||||
# Enable http2 by default (bug #563452)
|
||||
# FIXME: Move to apache-2.eclass once this has reached stable.
|
||||
IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
|
||||
# New suexec options (since 2.4.34)
|
||||
IUSE="${IUSE} +suexec-caps suexec-syslog"
|
||||
|
||||
CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
|
||||
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
|
||||
apache2_modules_md? ( >=dev-libs/jansson-2.10 )"
|
||||
|
||||
DEPEND+="${CDEPEND}
|
||||
suexec? ( suexec-caps? ( sys-libs/libcap ) )"
|
||||
RDEPEND+="${CDEPEND}"
|
||||
|
||||
REQUIRED_USE="apache2_modules_http2? ( ssl )
|
||||
apache2_modules_md? ( ssl )"
|
||||
|
||||
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
|
||||
local i
|
||||
local apache_tools_prune_list=(
|
||||
/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
|
||||
/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
|
||||
/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
|
||||
/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
|
||||
)
|
||||
for i in ${apache_tools_prune_list[@]} ; 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.
|
||||
dobin support/apxs
|
||||
dosym ../bin/apxs /usr/sbin/apxs
|
||||
|
||||
# Note: wait for mod_systemd to be included in some forthcoming release,
|
||||
# Then apache2.4.service can be used and systemd support controlled
|
||||
# through --enable-systemd
|
||||
systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
|
||||
systemd_dotmpfilesd "${FILESDIR}/apache.conf"
|
||||
#insinto /etc/apache2/modules.d
|
||||
#doins "${FILESDIR}/00_systemd.conf"
|
||||
|
||||
# Install http2 module config
|
||||
insinto /etc/apache2/modules.d
|
||||
doins "${FILESDIR}"/41_mod_http2.conf
|
||||
|
||||
# Fix path to apache libdir
|
||||
sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
|
||||
|
||||
tmpfiles_process apache.conf #662544
|
||||
|
||||
# warnings that default config might not work out of the box
|
||||
local mod cmod
|
||||
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
|
||||
}
|
||||
@@ -1,216 +0,0 @@
|
||||
From d7713339dbde7cfa4cfc9914f683b4644dcab92e Mon Sep 17 00:00:00 2001
|
||||
From: Ruediger Pluem <rpluem@apache.org>
|
||||
Date: Fri, 20 Jul 2018 19:27:31 +0000
|
||||
Subject: [PATCH] * mod_proxy: Remove load order and link dependency between
|
||||
mod_lbmethod_* modules and mod_proxy by providing mod_proxy's
|
||||
ap_proxy_balancer_get_best_worker as an optional function.
|
||||
|
||||
PR: 62557
|
||||
|
||||
|
||||
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1836381 13f79535-47bb-0310-9956-ffa450edef68
|
||||
---
|
||||
CHANGES | 3 +++
|
||||
include/ap_mmn.h | 5 +++-
|
||||
modules/proxy/balancers/mod_lbmethod_bybusyness.c | 28 ++++++++++++++++++++++-
|
||||
modules/proxy/balancers/mod_lbmethod_byrequests.c | 28 ++++++++++++++++++++++-
|
||||
modules/proxy/balancers/mod_lbmethod_bytraffic.c | 28 ++++++++++++++++++++++-
|
||||
modules/proxy/mod_proxy.h | 8 +++++++
|
||||
modules/proxy/proxy_util.c | 1 +
|
||||
7 files changed, 97 insertions(+), 4 deletions(-)
|
||||
|
||||
--- apache2.orig/modules/proxy/balancers/mod_lbmethod_bybusyness.c
|
||||
+++ apache2/modules/proxy/balancers/mod_lbmethod_bybusyness.c
|
||||
@@ -22,6 +22,9 @@
|
||||
|
||||
module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module;
|
||||
|
||||
+static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
|
||||
+ *ap_proxy_balancer_get_best_worker_fn = NULL;
|
||||
+
|
||||
static int is_best_bybusyness(proxy_worker *current, proxy_worker *prev_best, void *baton)
|
||||
{
|
||||
int *total_factor = (int *)baton;
|
||||
@@ -44,7 +47,7 @@ static proxy_worker *find_best_bybusynes
|
||||
{
|
||||
int total_factor = 0;
|
||||
proxy_worker *worker =
|
||||
- ap_proxy_balancer_get_best_worker(balancer, r, is_best_bybusyness,
|
||||
+ ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_bybusyness,
|
||||
&total_factor);
|
||||
|
||||
if (worker) {
|
||||
@@ -82,9 +85,32 @@ static const proxy_balancer_method bybus
|
||||
NULL
|
||||
};
|
||||
|
||||
+/* post_config hook: */
|
||||
+static int lbmethod_bybusyness_post_config(apr_pool_t *pconf, apr_pool_t *plog,
|
||||
+ apr_pool_t *ptemp, server_rec *s)
|
||||
+{
|
||||
+
|
||||
+ /* lbmethod_bybusyness_post_config() will be called twice during startup. So, don't
|
||||
+ * set up the static data the 1st time through. */
|
||||
+ if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
|
||||
+ return OK;
|
||||
+ }
|
||||
+
|
||||
+ ap_proxy_balancer_get_best_worker_fn =
|
||||
+ APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
|
||||
+ if (!ap_proxy_balancer_get_best_worker_fn) {
|
||||
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO()
|
||||
+ "mod_proxy must be loaded for mod_lbmethod_bybusyness");
|
||||
+ return !OK;
|
||||
+ }
|
||||
+
|
||||
+ return OK;
|
||||
+}
|
||||
+
|
||||
static void register_hook(apr_pool_t *p)
|
||||
{
|
||||
ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);
|
||||
+ ap_hook_post_config(lbmethod_bybusyness_post_config, NULL, NULL, APR_HOOK_MIDDLE);
|
||||
}
|
||||
|
||||
AP_DECLARE_MODULE(lbmethod_bybusyness) = {
|
||||
--- apache2.orig/modules/proxy/balancers/mod_lbmethod_byrequests.c
|
||||
+++ apache2/modules/proxy/balancers/mod_lbmethod_byrequests.c
|
||||
@@ -22,6 +22,9 @@
|
||||
|
||||
module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module;
|
||||
|
||||
+static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
|
||||
+ *ap_proxy_balancer_get_best_worker_fn = NULL;
|
||||
+
|
||||
static int is_best_byrequests(proxy_worker *current, proxy_worker *prev_best, void *baton)
|
||||
{
|
||||
int *total_factor = (int *)baton;
|
||||
@@ -81,7 +84,7 @@ static proxy_worker *find_best_byrequest
|
||||
request_rec *r)
|
||||
{
|
||||
int total_factor = 0;
|
||||
- proxy_worker *worker = ap_proxy_balancer_get_best_worker(balancer, r, is_best_byrequests, &total_factor);
|
||||
+ proxy_worker *worker = ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_byrequests, &total_factor);
|
||||
|
||||
if (worker) {
|
||||
worker->s->lbstatus -= total_factor;
|
||||
@@ -123,6 +126,28 @@ static const proxy_balancer_method byreq
|
||||
NULL
|
||||
};
|
||||
|
||||
+/* post_config hook: */
|
||||
+static int lbmethod_byrequests_post_config(apr_pool_t *pconf, apr_pool_t *plog,
|
||||
+ apr_pool_t *ptemp, server_rec *s)
|
||||
+{
|
||||
+
|
||||
+ /* lbmethod_byrequests_post_config() will be called twice during startup. So, don't
|
||||
+ * set up the static data the 1st time through. */
|
||||
+ if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
|
||||
+ return OK;
|
||||
+ }
|
||||
+
|
||||
+ ap_proxy_balancer_get_best_worker_fn =
|
||||
+ APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
|
||||
+ if (!ap_proxy_balancer_get_best_worker_fn) {
|
||||
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO()
|
||||
+ "mod_proxy must be loaded for mod_lbmethod_byrequests");
|
||||
+ return !OK;
|
||||
+ }
|
||||
+
|
||||
+ return OK;
|
||||
+}
|
||||
+
|
||||
static void register_hook(apr_pool_t *p)
|
||||
{
|
||||
/* Only the mpm_winnt has child init hook handler.
|
||||
@@ -130,6 +155,7 @@ static void register_hook(apr_pool_t *p)
|
||||
* initializes and after the mod_proxy
|
||||
*/
|
||||
ap_register_provider(p, PROXY_LBMETHOD, "byrequests", "0", &byrequests);
|
||||
+ ap_hook_post_config(lbmethod_byrequests_post_config, NULL, NULL, APR_HOOK_MIDDLE);
|
||||
}
|
||||
|
||||
AP_DECLARE_MODULE(lbmethod_byrequests) = {
|
||||
--- apache2.orig/modules/proxy/balancers/mod_lbmethod_bytraffic.c
|
||||
+++ apache2/modules/proxy/balancers/mod_lbmethod_bytraffic.c
|
||||
@@ -22,6 +22,9 @@
|
||||
|
||||
module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module;
|
||||
|
||||
+static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
|
||||
+ *ap_proxy_balancer_get_best_worker_fn = NULL;
|
||||
+
|
||||
static int is_best_bytraffic(proxy_worker *current, proxy_worker *prev_best, void *baton)
|
||||
{
|
||||
apr_off_t *min_traffic = (apr_off_t *)baton;
|
||||
@@ -59,7 +62,7 @@ static proxy_worker *find_best_bytraffic
|
||||
{
|
||||
apr_off_t min_traffic = 0;
|
||||
|
||||
- return ap_proxy_balancer_get_best_worker(balancer, r, is_best_bytraffic,
|
||||
+ return ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_bytraffic,
|
||||
&min_traffic);
|
||||
}
|
||||
|
||||
@@ -93,6 +96,28 @@ static const proxy_balancer_method bytra
|
||||
NULL
|
||||
};
|
||||
|
||||
+/* post_config hook: */
|
||||
+static int lbmethod_bytraffic_post_config(apr_pool_t *pconf, apr_pool_t *plog,
|
||||
+ apr_pool_t *ptemp, server_rec *s)
|
||||
+{
|
||||
+
|
||||
+ /* lbmethod_bytraffic_post_config() will be called twice during startup. So, don't
|
||||
+ * set up the static data the 1st time through. */
|
||||
+ if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
|
||||
+ return OK;
|
||||
+ }
|
||||
+
|
||||
+ ap_proxy_balancer_get_best_worker_fn =
|
||||
+ APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
|
||||
+ if (!ap_proxy_balancer_get_best_worker_fn) {
|
||||
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO()
|
||||
+ "mod_proxy must be loaded for mod_lbmethod_bytraffic");
|
||||
+ return !OK;
|
||||
+ }
|
||||
+
|
||||
+ return OK;
|
||||
+}
|
||||
+
|
||||
static void register_hook(apr_pool_t *p)
|
||||
{
|
||||
/* Only the mpm_winnt has child init hook handler.
|
||||
@@ -100,6 +125,7 @@ static void register_hook(apr_pool_t *p)
|
||||
* initializes and after the mod_proxy
|
||||
*/
|
||||
ap_register_provider(p, PROXY_LBMETHOD, "bytraffic", "0", &bytraffic);
|
||||
+ ap_hook_post_config(lbmethod_bytraffic_post_config, NULL, NULL, APR_HOOK_MIDDLE);
|
||||
}
|
||||
|
||||
AP_DECLARE_MODULE(lbmethod_bytraffic) = {
|
||||
--- apache2.orig/modules/proxy/mod_proxy.h
|
||||
+++ apache2/modules/proxy/mod_proxy.h
|
||||
@@ -846,6 +846,14 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_b
|
||||
request_rec *r,
|
||||
proxy_is_best_callback_fn_t *is_best,
|
||||
void *baton);
|
||||
+/*
|
||||
+ * Needed by the lb modules.
|
||||
+ */
|
||||
+APR_DECLARE_OPTIONAL_FN(proxy_worker *, ap_proxy_balancer_get_best_worker,
|
||||
+ (proxy_balancer *balancer,
|
||||
+ request_rec *r,
|
||||
+ proxy_is_best_callback_fn_t *is_best,
|
||||
+ void *baton));
|
||||
|
||||
/**
|
||||
* Find the shm of the worker as needed
|
||||
--- apache2.orig/modules/proxy/proxy_util.c
|
||||
+++ apache2/modules/proxy/proxy_util.c
|
||||
@@ -4028,4 +4028,5 @@ void proxy_util_register_hooks(apr_pool_
|
||||
{
|
||||
APR_REGISTER_OPTIONAL_FN(ap_proxy_retry_worker);
|
||||
APR_REGISTER_OPTIONAL_FN(ap_proxy_clear_connection);
|
||||
+ APR_REGISTER_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
https://bugs.gentoo.org/661358
|
||||
|
||||
--- httpd-2.4.34/Makefile.in
|
||||
+++ httpd-2.4.34/Makefile.in
|
||||
@@ -277,12 +277,12 @@
|
||||
$(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \
|
||||
fi
|
||||
|
||||
-install-suexec-setuid:
|
||||
+install-suexec-setuid: install-suexec-binary
|
||||
@if test -f $(builddir)/support/suexec; then \
|
||||
chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
|
||||
fi
|
||||
|
||||
-install-suexec-caps:
|
||||
+install-suexec-caps: install-suexec-binary
|
||||
@if test -f $(builddir)/support/suexec; then \
|
||||
setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \
|
||||
fi
|
||||
Reference in New Issue
Block a user