mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
www-servers/apache: drop 2.4.54-r8, 2.4.55-r1, 2.4.56
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
This commit is contained in:
Hans de Graaff
@@ -1,5 +1,2 @@
|
||||
DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
|
||||
DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
|
||||
DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b SHA512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb
|
||||
DIST httpd-2.4.56.tar.bz2 7456418 BLAKE2B f9aaf5038543aeec79d5b8615b1b2120fe321966280574c685070f2356f8f1dba1d55a9a25f46cb5ecdd6e3f03785fe7a4e1b965506896cb889720728aa18101 SHA512 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12
|
||||
DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
|
||||
|
||||
@@ -1,259 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# latest gentoo apache files
|
||||
GENTOO_PATCHSTAMP="20210212"
|
||||
GENTOO_DEVELOPER="polynomial-c"
|
||||
GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
|
||||
|
||||
# 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 auth_form
|
||||
authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache 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 lua macro md mime mime_magic negotiation
|
||||
proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
|
||||
proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
|
||||
session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
|
||||
socache_shmcb speling status substitute systemd tls 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="
|
||||
auth_form:session
|
||||
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_hcheck:proxy
|
||||
proxy_hcheck:watchdog
|
||||
proxy_html:proxy
|
||||
proxy_html:xml2enc
|
||||
proxy_http:proxy
|
||||
proxy_http2:proxy
|
||||
proxy_scgi:proxy
|
||||
proxy_uwsgi:proxy
|
||||
proxy_fcgi:proxy
|
||||
proxy_wstunnel:proxy
|
||||
session_cookie:session
|
||||
session_dbd:dbd
|
||||
session_dbd:session
|
||||
socache_memcache:cache
|
||||
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
|
||||
lua:LUA
|
||||
md:SSL
|
||||
proxy:PROXY
|
||||
proxy_ajp:PROXY
|
||||
proxy_balancer:PROXY
|
||||
proxy_connect:PROXY
|
||||
proxy_ftp:PROXY
|
||||
proxy_html:PROXY
|
||||
proxy_http:PROXY
|
||||
proxy_hcheck:PROXY
|
||||
proxy_fcgi:PROXY
|
||||
proxy_scgi:PROXY
|
||||
proxy_wstunnel:PROXY
|
||||
socache_shmcb:SSL
|
||||
socache_memcache:CACHE
|
||||
ssl:SSL
|
||||
status:STATUS
|
||||
suexec:SUEXEC
|
||||
systemd:SYSTEMD
|
||||
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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
|
||||
"${FILESDIR}"/${PN}-2.4.54-libtool.patch # bug #858836
|
||||
)
|
||||
|
||||
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
|
||||
use split-usr && 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.4-hardened.service" "apache2.service"
|
||||
dotmpfiles "${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,259 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# latest gentoo apache files
|
||||
GENTOO_PATCHSTAMP="20210212"
|
||||
GENTOO_DEVELOPER="polynomial-c"
|
||||
GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
|
||||
|
||||
# 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 auth_form
|
||||
authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache 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 lua macro md mime mime_magic negotiation
|
||||
proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
|
||||
proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
|
||||
session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
|
||||
socache_shmcb speling status substitute systemd tls 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="
|
||||
auth_form:session
|
||||
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_hcheck:proxy
|
||||
proxy_hcheck:watchdog
|
||||
proxy_html:proxy
|
||||
proxy_html:xml2enc
|
||||
proxy_http:proxy
|
||||
proxy_http2:proxy
|
||||
proxy_scgi:proxy
|
||||
proxy_uwsgi:proxy
|
||||
proxy_fcgi:proxy
|
||||
proxy_wstunnel:proxy
|
||||
session_cookie:session
|
||||
session_dbd:dbd
|
||||
session_dbd:session
|
||||
socache_memcache:cache
|
||||
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
|
||||
lua:LUA
|
||||
md:SSL
|
||||
proxy:PROXY
|
||||
proxy_ajp:PROXY
|
||||
proxy_balancer:PROXY
|
||||
proxy_connect:PROXY
|
||||
proxy_ftp:PROXY
|
||||
proxy_html:PROXY
|
||||
proxy_http:PROXY
|
||||
proxy_hcheck:PROXY
|
||||
proxy_fcgi:PROXY
|
||||
proxy_scgi:PROXY
|
||||
proxy_wstunnel:PROXY
|
||||
socache_shmcb:SSL
|
||||
socache_memcache:CACHE
|
||||
ssl:SSL
|
||||
status:STATUS
|
||||
suexec:SUEXEC
|
||||
systemd:SYSTEMD
|
||||
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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
|
||||
"${FILESDIR}"/${PN}-2.4.54-libtool.patch # bug #858836
|
||||
)
|
||||
|
||||
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
|
||||
use split-usr && 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.4-hardened.service" "apache2.service"
|
||||
dotmpfiles "${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,259 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# latest gentoo apache files
|
||||
GENTOO_PATCHSTAMP="20210212"
|
||||
GENTOO_DEVELOPER="polynomial-c"
|
||||
GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
|
||||
|
||||
# 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 auth_form
|
||||
authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache 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 lua macro md mime mime_magic negotiation
|
||||
proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
|
||||
proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
|
||||
session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
|
||||
socache_shmcb speling status substitute systemd tls 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="
|
||||
auth_form:session
|
||||
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_hcheck:proxy
|
||||
proxy_hcheck:watchdog
|
||||
proxy_html:proxy
|
||||
proxy_html:xml2enc
|
||||
proxy_http:proxy
|
||||
proxy_http2:proxy
|
||||
proxy_scgi:proxy
|
||||
proxy_uwsgi:proxy
|
||||
proxy_fcgi:proxy
|
||||
proxy_wstunnel:proxy
|
||||
session_cookie:session
|
||||
session_dbd:dbd
|
||||
session_dbd:session
|
||||
socache_memcache:cache
|
||||
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
|
||||
lua:LUA
|
||||
md:SSL
|
||||
proxy:PROXY
|
||||
proxy_ajp:PROXY
|
||||
proxy_balancer:PROXY
|
||||
proxy_connect:PROXY
|
||||
proxy_ftp:PROXY
|
||||
proxy_html:PROXY
|
||||
proxy_http:PROXY
|
||||
proxy_hcheck:PROXY
|
||||
proxy_fcgi:PROXY
|
||||
proxy_scgi:PROXY
|
||||
proxy_wstunnel:PROXY
|
||||
socache_shmcb:SSL
|
||||
socache_memcache:CACHE
|
||||
ssl:SSL
|
||||
status:STATUS
|
||||
suexec:SUEXEC
|
||||
systemd:SYSTEMD
|
||||
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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
|
||||
"${FILESDIR}"/${PN}-2.4.54-libtool.patch # bug #858836
|
||||
)
|
||||
|
||||
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
|
||||
use split-usr && 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.4-hardened.service" "apache2.service"
|
||||
dotmpfiles "${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
|
||||
}
|
||||
Reference in New Issue
Block a user