Attachment #881064 for bug #502384

Lines 1-7 Link Here

(-)a/www-servers/apache/Manifest (-2 lines)
1	DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2	1	DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
2	DIST gentoo-apache-2.4.57-r2-20230903.tar.bz2 25595 BLAKE2B 030d7624293b85d35c02b317e78e0ac8736cfd9b4116b66727262bfd1003e28e604010526a766f0b5fa2bf359e5cfe0e6eee6ffbea05eeb41e51772913692d85 SHA512 334304d4d35e5d9e39b58af4594e3f57f2e4f6f11f5944715b0dd63c92717c1255dd3e4fed96d914487a15b8faf1792914087b7240b0f23ab6d0960972013d1e
3	DIST gentoo-apache-2.4.57-r3-20230903.tar.bz2 27356 BLAKE2B 793c6a94062ea7a68acbe0b739e9b317390c16e57a8ae4cd85bd03ae1663c25050a796c199dc958c9eb7913e677698cba042b3fb0b28dc5c90c5da49c503fbba SHA512 82e2c36fbc14f70f4e4b48eebe83d52082e05994d8ec095aec392adfea71f4b8abee60a320e36c188ee9b1d0113a5880b4780bdbd6230e47909ed115de0de2cb
4	DIST gentoo-apache-2.4.57-r5-20231011.tar.bz2 27081 BLAKE2B 7d98c850cda8b43901b4373e36889e4e951615e2e2769baa564f44e180fba0a74f0af45d2aa552b70ac1609aa3430e240118f2656c5285d31c1dd5edad9f3b6d SHA512 6c445212aaa211a9ad24599763e1d42b5f88394976f8f488175ce3ec3ea7e83b93f87d3c0c4ffc82b4a13ae575e78fba114bc5bacae9324be962eba48d3bc146	2	DIST gentoo-apache-2.4.57-r5-20231011.tar.bz2 27081 BLAKE2B 7d98c850cda8b43901b4373e36889e4e951615e2e2769baa564f44e180fba0a74f0af45d2aa552b70ac1609aa3430e240118f2656c5285d31c1dd5edad9f3b6d SHA512 6c445212aaa211a9ad24599763e1d42b5f88394976f8f488175ce3ec3ea7e83b93f87d3c0c4ffc82b4a13ae575e78fba114bc5bacae9324be962eba48d3bc146
5	DIST gentoo-apache-2.4.58-20231019.tar.bz2 26224 BLAKE2B 370f36dcbe9d10ed0dd415c2e28016c7897246b5c3f830e849e765c18a08be145c8a363f122dff2c4b8d5b1e53ff504a79d7512a58135899a539136b580524ed SHA512 60f68eb4168a86ee33525e7c90cf5af8da586ed31d12cc294ea6bf3bcb9f254ea7e1a4ca5db4846a0e92b97c1326f095aa3a9d5fdb9ed92c1c4726c5a825ab36	3	DIST gentoo-apache-2.4.58-20231019.tar.bz2 26224 BLAKE2B 370f36dcbe9d10ed0dd415c2e28016c7897246b5c3f830e849e765c18a08be145c8a363f122dff2c4b8d5b1e53ff504a79d7512a58135899a539136b580524ed SHA512 60f68eb4168a86ee33525e7c90cf5af8da586ed31d12cc294ea6bf3bcb9f254ea7e1a4ca5db4846a0e92b97c1326f095aa3a9d5fdb9ed92c1c4726c5a825ab36
6	DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155	4	DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
7	DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1	5	DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1




# 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 allowmethods 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
	"${FILESDIR}"/${P}-rustls-ffi-0.10.0.patch # bug #906523
)

pkg_setup() {
	# dependent 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
}




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# latest gentoo apache files
GENTOO_PATCHSTAMP="20230903"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.57-r2"

# 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 allowmethods 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
	"${FILESDIR}"/${P}-rustls-ffi-0.10.0.patch # bug #906523
)

pkg_setup() {
	# dependent 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
}




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# latest gentoo apache files
GENTOO_PATCHSTAMP="20230903"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.57-r3"

# 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 allowmethods 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"

pkg_setup() {
	# dependent 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
}




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# latest gentoo apache files
GENTOO_PATCHSTAMP="20230903"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.57-r3"

# 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 allowmethods 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_fcgi:PROXY
	proxy_ftp:PROXY
	proxy_hcheck:PROXY
	proxy_html:PROXY
	proxy_http:PROXY
	proxy_http2:PROXY
	proxy_scgi:PROXY
	proxy_uwsgi: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"

pkg_setup() {
	# dependent 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
}
- 
--
eclass/apache-2.eclass                     | 2 +-
www-servers/apache/apache-2.4.57-r5.ebuild | 3 +++
www-servers/apache/apache-2.4.57.ebuild    | 3 +++
www-servers/apache/apache-2.4.58-r1.ebuild | 3 +++
www-servers/apache/apache-2.4.58.ebuild    | 3 +++
5 files changed, 13 insertions(+), 1 deletion(-)




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: apache-2.eclass
# @MAINTAINER:
# apache-bugs@gentoo.org
# @AUTHOR:
# polynomial-c@gentoo.org
# @SUPPORTED_EAPIS: 7
# @BLURB: Provides a common set of functions for apache-2.x ebuilds
# @DESCRIPTION:
# This eclass handles apache-2.x ebuild functions such as LoadModule generation
# and inter-module dependency checking.

LUA_COMPAT=( lua5-{1..4} )
inherit autotools flag-o-matic lua-single multilib ssl-cert toolchain-funcs

[[ ${CATEGORY}/${PN} != www-servers/apache ]] \
	&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!"

case ${EAPI} in
	7) ;;
	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac

# settings which are version specific go in here:
case $(ver_cut 1-2) in
	2.4)
		DEFAULT_MPM_THREADED="event" #509922
	;;
	*)
		die "Unknown MAJOR.MINOR apache version."
	;;
esac

# ==============================================================================
# INTERNAL VARIABLES
# ==============================================================================

# @ECLASS_VARIABLE: GENTOO_PATCHNAME
# @DESCRIPTION:
# This internal variable contains the prefix for the patch tarball.
# Defaults to the full name and version (including revision) of the package.
# If you want to override this in an ebuild, use:
# ORIG_PR="(revision of Gentoo stuff you want)"
# GENTOO_PATCHNAME="gentoo-${PN}-${PV}${ORIG_PR:+-${ORIG_PR}}"
[[ -n "${GENTOO_PATCHNAME}" ]] || GENTOO_PATCHNAME="gentoo-${PF}"

# @ECLASS_VARIABLE: GENTOO_PATCHDIR
# @DESCRIPTION:
# This internal variable contains the working directory where patches and config
# files are located.
# Defaults to the patchset name appended to the working directory.
[[ -n "${GENTOO_PATCHDIR}" ]] || GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"

# @VARIABLE: GENTOO_DEVELOPER
# @DESCRIPTION:
# This variable needs to be set in the ebuild and contains the name of the
# gentoo developer who created the patch tarball

# @VARIABLE: GENTOO_PATCHSTAMP
# @DESCRIPTION:
# This variable needs to be set in the ebuild and contains the date the patch
# tarball was created at in YYYYMMDD format

# @VARIABLE: GENTOO_PATCH_A
# @DESCRIPTION:
# This variable should contain the entire filename of patch tarball.
# Defaults to the name of the patchset, with a datestamp.
[[ -n "${GENTOO_PATCH_A}" ]] || GENTOO_PATCH_A="${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"

SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
	https://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCH_A}"

# @VARIABLE: IUSE_MPMS_FORK
# @DESCRIPTION:
# This variable needs to be set in the ebuild and contains a list of forking
# (i.e.  non-threaded) MPMs

# @VARIABLE: IUSE_MPMS_THREAD
# @DESCRIPTION:
# This variable needs to be set in the ebuild and contains a list of threaded
# MPMs

# @VARIABLE: IUSE_MODULES
# @DESCRIPTION:
# This variable needs to be set in the ebuild and contains a list of available
# built-in modules

IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
IUSE="${IUSE} debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog threads"

for module in ${IUSE_MODULES} ; do
	case ${module} in
		# Enable http2 by default (bug #563452)
		http2)
			IUSE+=" +apache2_modules_${module}"
		;;
		systemd)
			IUSE+=" systemd"
		;;
		*)
			IUSE+=" apache2_modules_${module}"
		;;
	esac
done

_apache2_set_mpms() {
	local mpm
	local ompm

	for mpm in ${IUSE_MPMS} ; do
		IUSE="${IUSE} apache2_mpms_${mpm}"

		REQUIRED_USE+=" apache2_mpms_${mpm}? ("
		for ompm in ${IUSE_MPMS} ; do
			if [[ "${mpm}" != "${ompm}" ]] ; then
				REQUIRED_USE+=" !apache2_mpms_${ompm}"
			fi
		done

		if has ${mpm} ${IUSE_MPMS_FORK} ; then
			REQUIRED_USE+=" !threads"
		else
			REQUIRED_USE+=" threads"
		fi
		REQUIRED_USE+=" )"
	done

	REQUIRED_USE+=" apache2_mpms_prefork? ( !apache2_modules_http2 )"
}
_apache2_set_mpms
unset -f _apache2_set_mpms

NGHTTP2_VERSION=1.2.1
if ver_test ${PV} -ge 2.4.55 ; then
	NGHTTP2_VERSION=1.50.0
fi

# Dependencies
RDEPEND="
	acct-group/apache
	acct-user/apache
	dev-lang/perl
	>=dev-libs/apr-1.5.1:=
	=dev-libs/apr-util-1*:=[gdbm=,ldap?]
	dev-libs/libpcre2
	virtual/libcrypt:=
	apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
	apache2_modules_deflate? ( sys-libs/zlib )
	apache2_modules_http2? (
		>=net-libs/nghttp2-${NGHTTP2_VERSION}:=
		kernel_linux? ( sys-apps/util-linux )
	)
	apache2_modules_lua? ( ${LUA_DEPS} )
	apache2_modules_md? ( >=dev-libs/jansson-2.10:= )
	apache2_modules_mime? ( app-misc/mime-types )
	apache2_modules_proxy_http2? (
		>=net-libs/nghttp2-${NGHTTP2_VERSION}:=
		kernel_linux? ( sys-apps/util-linux )
	)
	apache2_modules_session_crypto? (
		dev-libs/apr-util[openssl]
	)
	apache2_modules_tls? ( >=net-libs/rustls-ffi-0.9.2:= )
	gdbm? ( sys-libs/gdbm:= )
	ldap? ( net-nds/openldap:= )
	selinux? ( sec-policy/selinux-apache )
	ssl? (
		>=dev-libs/openssl-1.0.2:=
		kernel_linux? ( sys-apps/util-linux )
	)
	systemd? ( sys-apps/systemd )
"
DEPEND="${RDEPEND}"
BDEPEND="
	virtual/pkgconfig
	suexec? ( suexec-caps? ( sys-libs/libcap ) )
"
PDEPEND="~app-admin/apache-tools-${PV}"

REQUIRED_USE+="
	apache2_modules_http2? ( ssl )
	apache2_modules_lua? ( ${LUA_REQUIRED_USE} )
	apache2_modules_md? ( ssl )
"

S="${WORKDIR}/httpd-${PV}"

# @VARIABLE: MODULE_DEPENDS
# @DESCRIPTION:
# This variable needs to be set in the ebuild and contains a space-separated
# list of dependency tokens each with a module and the module it depends on
# separated by a colon

# now extend REQUIRED_USE to reflect the module dependencies to portage
_apache2_set_module_depends() {
	local dep

	for dep in ${MODULE_DEPENDS} ; do
		REQUIRED_USE+=" apache2_modules_${dep%:*}? ( apache2_modules_${dep#*:} )"
	done
}
_apache2_set_module_depends
unset -f _apache2_set_module_depends

# ==============================================================================
# INTERNAL FUNCTIONS
# ==============================================================================

# @ECLASS_VARIABLE: MY_MPM
# @DESCRIPTION:
# This internal variable contains the selected MPM after a call to setup_mpm()

# @FUNCTION: setup_mpm
# @DESCRIPTION:
# This internal function makes sure that only one of APACHE2_MPMS was selected
# or a default based on USE=threads is selected if APACHE2_MPMS is empty
setup_mpm() {
	MY_MPM=""
	for x in ${IUSE_MPMS} ; do
		if use apache2_mpms_${x} ; then
			# there can at most be one MPM selected because of REQUIRED_USE constraints
			MY_MPM=${x}
			elog
			elog "Selected MPM: ${MY_MPM}"
			elog
			break
		fi
	done

	if [[ -z "${MY_MPM}" ]] ; then
		if use threads ; then
			MY_MPM=${DEFAULT_MPM_THREADED}
			elog
			elog "Selected default threaded MPM: ${MY_MPM}"
			elog
		else
			MY_MPM=prefork
			elog
			elog "Selected default MPM: ${MY_MPM}"
			elog
		fi
	fi
}

# @VARIABLE: MODULE_CRITICAL
# @DESCRIPTION:
# This variable needs to be set in the ebuild and contains a space-separated
# list of modules critical for the default apache. A user may still
# disable these modules for custom minimal installation at their own risk.

# @FUNCTION: check_module_critical
# @DESCRIPTION:
# This internal function warns the user about modules critical for the default
# apache configuration.
check_module_critical() {
	local unsupported=0

	for m in ${MODULE_CRITICAL} ; do
		if ! has ${m} ${MY_MODS[@]} ; then
			ewarn "Module '${m}' is required in the default apache configuration."
			unsupported=1
		fi
	done

	if [[ ${unsupported} -ne 0 ]] ; then
		ewarn
		ewarn "You have disabled one or more required modules"
		ewarn "for the default apache configuration."
		ewarn "Although this is not an error, please be"
		ewarn "aware that this setup is UNSUPPORTED."
		ewarn
	fi
}

# @ECLASS_VARIABLE: MY_CONF
# @DESCRIPTION:
# This internal variable contains the econf options for the current module
# selection after a call to setup_modules()

# @ECLASS_VARIABLE: MY_MODS
# @DESCRIPTION:
# This internal variable contains a sorted, space separated list of currently
# selected modules after a call to setup_modules()

# @FUNCTION: setup_modules
# @DESCRIPTION:
# This internal function selects all built-in modules based on USE flags and
# APACHE2_MODULES USE_EXPAND flags
setup_modules() {
	local mod_type= x=

	if use static ; then
		mod_type="static"
	else
		mod_type="shared"
	fi

	MY_CONF=( --enable-so=static --disable-static )
	MY_MODS=()

	if use ldap ; then
		MY_CONF+=(
			--enable-authnz_ldap=${mod_type}
			--enable-ldap=${mod_type}
		)
		MY_MODS+=( ldap authnz_ldap )
	else
		MY_CONF+=( --disable-authnz_ldap --disable-ldap )
	fi

	if use ssl ; then
		MY_CONF+=( --with-ssl --enable-ssl=${mod_type} )
		MY_MODS+=( ssl )
	else
		MY_CONF+=( --without-ssl --disable-ssl )
	fi

	if use suexec ; then
		elog "You can manipulate several configure options of suexec"
		elog "through the following environment variables:"
		elog
		elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: '${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin')"
		if ! use suexec-syslog ; then
			elog "  SUEXEC_LOGFILE: Path to the suexec logfile (default: '${EPREFIX}/var/log/apache2/suexec_log')"
		fi
		elog "   SUEXEC_CALLER: Name of the user Apache is running as (default: apache)"
		elog "  SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: '${EPREFIX}/var/www')"
		elog "   SUEXEC_MINUID: Minimum UID, which is allowed to run scripts via suexec (default: 1000)"
		elog "   SUEXEC_MINGID: Minimum GID, which is allowed to run scripts via suexec (default: 100)"
		elog "  SUEXEC_USERDIR: User subdirectories (like /home/user/html) (default: public_html)"
		elog "    SUEXEC_UMASK: Umask for the suexec process (default: 077)"
		elog

		MY_CONF+=( --with-suexec-safepath="${SUEXEC_SAFEPATH:-${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin}" )
		MY_CONF+=( $(use_with !suexec-syslog suexec-logfile "${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}") )
		MY_CONF+=( $(use_with suexec-syslog) )
		if use suexec-syslog && use suexec-caps ; then
			MY_CONF+=( --enable-suexec-capabilities )
		fi
		MY_CONF+=( --with-suexec-bin="${EPREFIX}/usr/sbin/suexec" )
		MY_CONF+=( --with-suexec-userdir=${SUEXEC_USERDIR:-public_html} )
		MY_CONF+=( --with-suexec-caller=${SUEXEC_CALLER:-apache} )
		MY_CONF+=( --with-suexec-docroot="${SUEXEC_DOCROOT:-${EPREFIX}/var/www}" )
		MY_CONF+=( --with-suexec-uidmin=${SUEXEC_MINUID:-1000} )
		MY_CONF+=( --with-suexec-gidmin=${SUEXEC_MINGID:-100} )
		MY_CONF+=( --with-suexec-umask=${SUEXEC_UMASK:-077} )
		MY_CONF+=( --enable-suexec=${mod_type} )
		MY_MODS+=( suexec )
	else
		MY_CONF+=( --disable-suexec )
	fi

	if use systemd ; then
		MY_CONF+=( --enable-systemd=${mod_type} )
		MY_MODS+=( systemd )
	fi

	for x in ${IUSE_MODULES/ systemd} ; do
		if use apache2_modules_${x} ; then
			MY_CONF+=( --enable-${x}=${mod_type} )
			MY_MODS+=( ${x} )
		else
			MY_CONF+=( --disable-${x} )
		fi
	done

	# sort and uniquify MY_MODS
	MY_MODS=( $(echo ${MY_MODS[@]} | tr ' ' '\n' | sort -u) )
	check_module_critical
}

# @VARIABLE: MODULE_DEFINES
# @DESCRIPTION:
# This variable needs to be set in the ebuild and contains a space-separated
# list of tokens each mapping a module to a runtime define which can be
# specified in APACHE2_OPTS in /etc/conf.d/apache2 to enable this particular
# module.

# @FUNCTION: generate_load_module
# @DESCRIPTION:
# This internal function generates the LoadModule lines for httpd.conf based on
# the current module selection and MODULE_DEFINES
generate_load_module() {
	local def= endit=0 m= mod_lines= mod_dir="${ED}/usr/$(get_libdir)/apache2/modules"

	if use static; then
		sed -i -e "/%%LOAD_MODULE%%/d" \
			"${GENTOO_PATCHDIR}"/conf/httpd.conf
		return
	fi

	for m in ${MY_MODS[@]} ; do
		if [[ -e "${mod_dir}/mod_${m}.so" ]] ; then
			for def in ${MODULE_DEFINES} ; do
				if [[ "${m}" == "${def%:*}" ]] ; then
					mod_lines="${mod_lines}\n<IfDefine ${def#*:}>"
					endit=1
				fi
			done

			mod_lines="${mod_lines}\nLoadModule ${m}_module modules/mod_${m}.so"

			if [[ ${endit} -ne 0 ]] ; then
				mod_lines="${mod_lines}\n</IfDefine>"
				endit=0
			fi
		fi
	done

	sed -i -e "s:%%LOAD_MODULE%%:${mod_lines}:" \
		"${GENTOO_PATCHDIR}"/conf/httpd.conf
}

# @FUNCTION: check_upgrade
# @DESCRIPTION:
# This internal function checks if the previous configuration file for built-in
# modules exists in ROOT and prevents upgrade in this case. Users are supposed
# to convert this file to the new APACHE2_MODULES USE_EXPAND variable and remove
# it afterwards.
check_upgrade() {
	if [[ -e "${EROOT}"etc/apache2/apache2-builtin-mods ]]; then
		eerror "The previous configuration file for built-in modules"
		eerror "(${EROOT}etc/apache2/apache2-builtin-mods) exists on your"
		eerror "system."
		eerror
		eerror "Please read https://wiki.gentoo.org/wiki/Project:Apache/Upgrading"
		eerror "for detailed information how to convert this file to the new"
		eerror "APACHE2_MODULES USE_EXPAND variable."
		eerror
		die "upgrade not possible with existing ${ROOT}etc/apache2/apache2-builtin-mods"
	fi
}

# ==============================================================================
# EXPORTED FUNCTIONS
# ==============================================================================

# @FUNCTION: apache-2_pkg_setup
# @DESCRIPTION:
# This function selects built-in modules, the MPM and other configure options,
# creates the apache user and group and informs about CONFIG_SYSVIPC being
# needed (we don't depend on kernel sources and therefore cannot check).
apache-2_pkg_setup() {
	check_upgrade

	setup_mpm
	setup_modules

	if use debug; then
		MY_CONF+=( --enable-exception-hook )
	fi

	elog "Please note that you need SysV IPC support in your kernel."
	elog "Make sure CONFIG_SYSVIPC=y is set."
	elog

	if use apache2_modules_lua ; then
		lua-single_pkg_setup
	fi
}

# @FUNCTION: apache-2_src_prepare
# @DESCRIPTION:
# This function applies patches, configures a custom file-system layout and
# rebuilds the configure scripts.
apache-2_src_prepare() {
	#fix prefix in conf files etc (bug #433736)
	use !prefix || sed -e "s@/\(usr\|var\|etc\|run\)/@${EPREFIX}&@g" \
		-i "${GENTOO_PATCHDIR}"/conf/httpd.conf "${GENTOO_PATCHDIR}"/scripts/* \
		"${GENTOO_PATCHDIR}"/docs/*.example "${GENTOO_PATCHDIR}"/patches/*.layout \
		"${GENTOO_PATCHDIR}"/init/* "${GENTOO_PATCHDIR}"/conf/vhosts.d/* \
		"${GENTOO_PATCHDIR}"/conf/modules.d/* || die

	# 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
	# idea for everyone
	case ${CHOST} in
		*-linux-gnu|*-solaris*)
			# do nothing, these use GNU binutils
			:
		;;
		*-darwin*)
			sed -i -e 's/-Wl,-z,now/-Wl,-bind_at_load/g' \
				"${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch \
				|| die
		;;
		*)
			# patch it out to be like upstream
			sed -i -e 's/-Wl,-z,now//g' \
				"${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch \
				|| die
		;;
	esac

	# Use correct multilib libdir in gentoo patches
	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
		"${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \
		|| die "libdir sed failed"

	eapply "${GENTOO_PATCHDIR}"/patches/*.patch
	default

	# Don't rename configure.in _before_ any possible user patches!
	if [[ -f "configure.in" ]] ; then
		einfo "Renaming configure.in to configure.ac"
		mv configure.{in,ac} || die
	fi

	# setup the filesystem layout config
	cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \
		die "Failed preparing config.layout!"
	sed -i -e "s:version:${PF}:g" "${S}"/config.layout || die

	# apache2.8 instead of httpd.8 (bug #194828)
	mv docs/man/{httpd,apache2}.8 || die
	sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in || die

	# patched-in MPMs need the build environment rebuilt
	sed -i -e '/sinclude/d' configure.ac || die
	AT_M4DIR=build eautoreconf

	# ${T} must be not group-writable, else grsec TPE will block it
	chmod g-w "${T}" || die

	# This package really should upgrade to using pcre's .pc file.
	cat <<-\EOF > "${T}"/pcre2-config
	#!/usr/bin/env bash
	flags=()
	for flag; do
		if [[ ${flag} == "--version" ]]; then
			flags+=( --modversion )
		else
			flags+=( "${flag}" )
		fi
	done
	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
	EOF
	chmod a+x "${T}"/pcre2-config || die
}

# @FUNCTION: apache-2_src_configure
# @DESCRIPTION:
# This function adds compiler flags and runs econf and emake based on MY_MPM and
# MY_CONF
apache-2_src_configure() {
	tc-export PKG_CONFIG
	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"

	# Sanity check in case people have bad mounts/TPE settings. #500928
	if ! "${T}"/pcre2-config --help &>/dev/null ; then
		eerror "Could not execute ${T}/pcre2-config; do you have bad mount"
		eerror "permissions in ${T} or have TPE turned on in your kernel?"
		die "check your runtime settings #500928"
	fi

	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
	# Thanks to Harald van Dijk
	append-ldflags $(no-as-needed)

	# peruser MPM debugging with -X is nearly impossible
	if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
		use debug && append-flags -DMPM_PERUSER_DEBUG
	fi

	# econf overwrites the stuff from config.layout, so we have to put them into
	# our myconf line too
	MY_CONF+=(
		--includedir="${EPREFIX}"/usr/include/apache2
		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
		--datadir="${EPREFIX}"/var/www/localhost
		--sysconfdir="${EPREFIX}"/etc/apache2
		--localstatedir="${EPREFIX}"/var
		--with-mpm=${MY_MPM}
		--with-apr="${SYSROOT}${EPREFIX}"/usr
		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
		--with-z="${EPREFIX}"/usr
		--with-port=80
		--with-program-name=apache2
		--enable-layout=Gentoo
	)

	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config

	MY_CONF+=(
		--without-pcre
		--with-pcre2="${T}"/pcre2-config
	)

	econf "${MY_CONF[@]}"

	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h || die
}

# @FUNCTION: apache-2_src_install
# @DESCRIPTION:
# This function runs `emake install' and generates, installs and adapts the gentoo
# specific configuration files found in the tarball
apache-2_src_install() {
	emake DESTDIR="${D}" MKINSTALLDIRS="mkdir -p" install

	# install our configuration files
	keepdir /etc/apache2/vhosts.d
	keepdir /etc/apache2/modules.d

	generate_load_module
	insinto /etc/apache2
	doins -r "${GENTOO_PATCHDIR}"/conf/*
	use apache2_modules_mime_magic && doins docs/conf/magic

	insinto /etc/logrotate.d
	newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2

	# generate a sane default APACHE2_OPTS
	APACHE2_OPTS="-D DEFAULT_VHOST -D INFO"
	use doc && APACHE2_OPTS+=" -D MANUAL"
	use ssl && APACHE2_OPTS+=" -D SSL -D SSL_DEFAULT_VHOST"
	use suexec && APACHE2_OPTS+=" -D SUEXEC"
	if has negotiation ${APACHE2_MODULES} && use apache2_modules_negotiation; then
		APACHE2_OPTS+=" -D LANGUAGE"
	fi

	sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
		"${GENTOO_PATCHDIR}"/init/apache2.confd || die

	newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
	newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2

	# install apache2ctl wrapper for our init script if available
	if test -e "${GENTOO_PATCHDIR}"/scripts/apache2ctl; then
		exeinto /usr/sbin
		doexe "${GENTOO_PATCHDIR}"/scripts/apache2ctl
	else
		dosym /etc/init.d/apache2 /usr/sbin/apache2ctl
	fi

	# provide legacy symlink for apxs, bug 177697
	dosym apxs /usr/sbin/apxs2

	# install some documentation
	dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
	dodoc "${GENTOO_PATCHDIR}"/docs/*

	# drop in a convenient link to the manual
	if use doc ; then
		sed -i -e "s:VERSION:${PVR}:" \
			"${ED}/etc/apache2/modules.d/00_apache_manual.conf" \
			|| die
		docompress -x /usr/share/doc/${PF}/manual # 503640
	else
		rm -f "${ED}/etc/apache2/modules.d/00_apache_manual.conf" \
			|| die
		rm -rf "${ED}/usr/share/doc/${PF}/manual" || die
	fi

	# the default icons and error pages get stored in
	# /usr/share/apache2/{error,icons}
	dodir /usr/share/apache2
	mv -f "${ED}/var/www/localhost/error" \
		"${ED}/usr/share/apache2/error" || die
	mv -f "${ED}/var/www/localhost/icons" \
		"${ED}/usr/share/apache2/icons" || die
	rm -rf "${ED}/var/www/localhost/" || die

	# set some sane permissions for suexec
	if use suexec ; then
		if ! use suexec-syslog || ! use suexec-caps ; then
			fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec
			fperms 4710 /usr/sbin/suexec
			# provide legacy symlink for suexec, bug 177697
			dosym /usr/sbin/suexec /usr/sbin/suexec2
		fi
	fi

	# empty dirs
	local i
	for i in /var/lib/dav /var/log/apache2 ; do
		keepdir ${i}
		fowners apache:apache ${i}
		fperms 0750 ${i}
	done
}

# @FUNCTION: apache-2_pkg_postinst
# @DESCRIPTION:
# This function creates test certificates if SSL is enabled and installs the
# default index.html to /var/www/localhost if it does not exist. We do this here
# because the default webroot is a copy of the files that exist elsewhere and we
# don't want them to be managed/removed by portage when apache is upgraded.
apache-2_pkg_postinst() {
	if use ssl && [[ ! -e "${EROOT}/etc/ssl/apache2/server.pem" ]]; then
		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}"
		install_cert /etc/ssl/apache2/server
		ewarn
		ewarn "The location of SSL certificates has changed. If you are"
		ewarn "upgrading from ${CATEGORY}/${PN}-2.2.13 or earlier (or remerged"
		ewarn "*any* apache version), you might want to move your old"
		ewarn "certificates from /etc/apache2/ssl/ to /etc/ssl/apache2/ and"
		ewarn "update your config files."
		ewarn
	fi

	if [[ ! -e "${EROOT}/var/www/localhost" ]] ; then
		mkdir -p "${EROOT}/var/www/localhost/htdocs"
		echo "<html><body><h1>It works!</h1></body></html>" > "${EROOT}/var/www/localhost/htdocs/index.html"
	fi

	echo
	elog "Attention: cgi and cgid modules are now handled via APACHE2_MODULES flags"
	elog "in make.conf. Make sure to enable those in order to compile them."
	elog "In general, you should use 'cgid' with threaded MPMs and 'cgi' otherwise."
	echo

}

EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# latest gentoo apache files
GENTOO_PATCHSTAMP="20231011"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.57-r5"

# ancient hack: bug #502384
IUSE="split-usr"

# 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 allowmethods 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_fcgi:PROXY
	proxy_ftp:PROXY
	proxy_hcheck:PROXY
	proxy_html:PROXY
	proxy_http:PROXY
	proxy_http2:PROXY
	proxy_scgi:PROXY
	proxy_uwsgi: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"

pkg_setup() {
	# dependent 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
}




# 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"

# ancient hack: bug #502384
IUSE="split-usr"

# 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
	"${FILESDIR}"/${P}-rustls-ffi-0.10.0.patch # bug #906523
)

pkg_setup() {
	# dependent 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
}




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# latest gentoo apache files
GENTOO_PATCHSTAMP="20231019"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.58"

# ancient hack: bug #502384
IUSE="split-usr"

# 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 allowmethods 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_fcgi:PROXY
	proxy_ftp:PROXY
	proxy_hcheck:PROXY
	proxy_html:PROXY
	proxy_http:PROXY
	proxy_http2:PROXY
	proxy_scgi:PROXY
	proxy_uwsgi: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"

pkg_setup() {
	# dependent 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
}




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# latest gentoo apache files
GENTOO_PATCHSTAMP="20231019"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.58"

# ancient hack: bug #502384
IUSE="split-usr"

# 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 allowmethods 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_fcgi:PROXY
	proxy_ftp:PROXY
	proxy_hcheck:PROXY
	proxy_html:PROXY
	proxy_http:PROXY
	proxy_http2:PROXY
	proxy_scgi:PROXY
	proxy_uswgi: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"

pkg_setup() {
	# dependent 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
}
- 
hack
--
.../{apache-2.4.57-r5.ebuild => apache-2.4.57-r6.ebuild}   | 7 -------
.../{apache-2.4.58-r1.ebuild => apache-2.4.58-r2.ebuild}   | 7 -------
2 files changed, 14 deletions(-)
rename www-servers/apache/{apache-2.4.57-r5.ebuild => apache-2.4.57-r6.ebuild} (96%)
rename www-servers/apache/{apache-2.4.58-r1.ebuild => apache-2.4.58-r2.ebuild} (96%)




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# latest gentoo apache files
GENTOO_PATCHSTAMP="20231011"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.57-r5"

# ancient hack: bug #502384
IUSE="split-usr"

# 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 allowmethods 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_fcgi:PROXY
	proxy_ftp:PROXY
	proxy_hcheck:PROXY
	proxy_html:PROXY
	proxy_http:PROXY
	proxy_http2:PROXY
	proxy_scgi:PROXY
	proxy_uwsgi: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"

pkg_setup() {
	# dependent 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
}




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# latest gentoo apache files
GENTOO_PATCHSTAMP="20231019"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.58"

# ancient hack: bug #502384
IUSE="split-usr"

# 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 allowmethods 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_fcgi:PROXY
	proxy_ftp:PROXY
	proxy_hcheck:PROXY
	proxy_html:PROXY
	proxy_http:PROXY
	proxy_http2:PROXY
	proxy_scgi:PROXY
	proxy_uwsgi: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"

pkg_setup() {
	# dependent 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
}
- 

Return to bug 502384

Lines 1-260 Link Here

(-)a/www-servers/apache/apache-2.4.57-r1.ebuild (-260 lines)
1	# Copyright 1999-2023 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2
3
4	EAPI=7
5
6	# latest gentoo apache files
7	GENTOO_PATCHSTAMP="20210212"
8	GENTOO_DEVELOPER="polynomial-c"
9	GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
10
11	# IUSE/USE_EXPAND magic
12	IUSE_MPMS_FORK="prefork"
13	IUSE_MPMS_THREAD="event worker"
14
15	# << obsolete modules:
16	# authn_default authz_default mem_cache
17	# mem_cache is replaced by cache_disk
18	# ?? buggy modules
19	# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
20	# >> added modules for reason:
21	# compat: compatibility with 2.2 access control
22	# authz_host: new module for access control
23	# authn_core: functionality provided by authn_alias in previous versions
24	# authz_core: new module, provides core authorization capabilities
25	# cache_disk: replacement for mem_cache
26	# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
27	# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
28	# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
29	# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
30	# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
31	# socache_shmcb: shared object cache provider. Default config with ssl needs it
32	# unixd: fixes startup error: Invalid command 'User'
33	IUSE_MODULES="access_compat actions alias allowmethods asis auth_basic auth_digest auth_form
34	authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
35	authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
36	brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
37	dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
38	ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
39	lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
40	proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
41	proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
42	session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
43	socache_shmcb speling status substitute systemd tls unique_id userdir usertrack
44	unixd version vhost_alias watchdog xml2enc"
45	# The following are also in the source as of this version, but are not available
46	# for user selection:
47	# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
48	# optional_fn_import optional_hook_export optional_hook_import
49
50	# inter-module dependencies
51	# TODO: this may still be incomplete
52	MODULE_DEPENDS="
53	auth_form:session
54	brotli:filter
55	dav_fs:dav
56	dav_lock:dav
57	deflate:filter
58	cache_disk:cache
59	ext_filter:filter
60	file_cache:cache
61	lbmethod_byrequests:proxy_balancer
62	lbmethod_byrequests:slotmem_shm
63	lbmethod_bytraffic:proxy_balancer
64	lbmethod_bybusyness:proxy_balancer
65	lbmethod_heartbeat:proxy_balancer
66	log_forensic:log_config
67	logio:log_config
68	cache_disk:cache
69	cache_socache:cache
70	md:watchdog
71	mime_magic:mime
72	proxy_ajp:proxy
73	proxy_balancer:proxy
74	proxy_balancer:slotmem_shm
75	proxy_connect:proxy
76	proxy_ftp:proxy
77	proxy_hcheck:proxy
78	proxy_hcheck:watchdog
79	proxy_html:proxy
80	proxy_html:xml2enc
81	proxy_http:proxy
82	proxy_http2:proxy
83	proxy_scgi:proxy
84	proxy_uwsgi:proxy
85	proxy_fcgi:proxy
86	proxy_wstunnel:proxy
87	session_cookie:session
88	session_dbd:dbd
89	session_dbd:session
90	socache_memcache:cache
91	substitute:filter
92	"
93
94	# module<->define mappings
95	MODULE_DEFINES="
96	auth_digest:AUTH_DIGEST
97	authnz_ldap:AUTHNZ_LDAP
98	cache:CACHE
99	cache_disk:CACHE
100	cache_socache:CACHE
101	dav:DAV
102	dav_fs:DAV
103	dav_lock:DAV
104	file_cache:CACHE
105	http2:HTTP2
106	info:INFO
107	ldap:LDAP
108	lua:LUA
109	md:SSL
110	proxy:PROXY
111	proxy_ajp:PROXY
112	proxy_balancer:PROXY
113	proxy_connect:PROXY
114	proxy_ftp:PROXY
115	proxy_html:PROXY
116	proxy_http:PROXY
117	proxy_hcheck:PROXY
118	proxy_fcgi:PROXY
119	proxy_scgi:PROXY
120	proxy_wstunnel:PROXY
121	socache_shmcb:SSL
122	socache_memcache:CACHE
123	ssl:SSL
124	status:STATUS
125	suexec:SUEXEC
126	systemd:SYSTEMD
127	userdir:USERDIR
128	"
129
130	# critical modules for the default config
131	MODULE_CRITICAL="
132	authn_core
133	authz_core
134	authz_host
135	dir
136	mime
137	unixd
138	"
139	inherit apache-2 systemd tmpfiles toolchain-funcs
140
141	DESCRIPTION="The Apache Web Server"
142	HOMEPAGE="https://httpd.apache.org/"
143
144	# some helper scripts are Apache-1.1, thus both are here
145	LICENSE="Apache-2.0 Apache-1.1"
146	SLOT="2"
147	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
148
149	PATCHES=(
150	"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
151	"${FILESDIR}"/${PN}-2.4.54-libtool.patch # bug #858836
152	"${FILESDIR}"/${P}-rustls-ffi-0.10.0.patch # bug #906523
153	)
154
155	pkg_setup() {
156	# dependent critical modules which are not allowed in global scope due
157	# to USE flag conditionals (bug #499260)
158	use ssl && MODULE_CRITICAL+=" socache_shmcb"
159	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
160	apache-2_pkg_setup
161	}
162
163	src_configure() {
164	# Brain dead check.
165	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
166
167	apache-2_src_configure
168	}
169
170	src_compile() {
171	if tc-is-cross-compiler ; then
172	# This header is the same across targets, so use the build compiler.
173	pushd server >/dev/null
174	emake gen_test_char
175	tc-export_build_env BUILD_CC
176	${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
177	gen_test_char.c -o gen_test_char $(apr-1-config --includes) \|\| die
178	popd >/dev/null
179	fi
180
181	default
182	}
183
184	src_install() {
185	apache-2_src_install
186	local i
187	local apache_tools_prune_list=(
188	/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
189	/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
190	/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
191	/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
192	)
193	for i in ${apache_tools_prune_list[@]} ; do
194	rm "${ED}"/${i} \|\| die "Failed to prune apache-tools bits"
195	done
196
197	# install apxs in /usr/bin (bug #502384) and put a symlink into the
198	# old location until all ebuilds and eclasses have been modified to
199	# use the new location.
200	dobin support/apxs
201	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
202
203	# Note: wait for mod_systemd to be included in some forthcoming release,
204	# Then apache2.4.service can be used and systemd support controlled
205	# through --enable-systemd
206	systemd_newunit "${FILESDIR}/apache2.4-hardened.service" "apache2.service"
207	dotmpfiles "${FILESDIR}/apache.conf"
208	#insinto /etc/apache2/modules.d
209	#doins "${FILESDIR}/00_systemd.conf"
210
211	# Install http2 module config
212	insinto /etc/apache2/modules.d
213	doins "${FILESDIR}"/41_mod_http2.conf
214
215	# Fix path to apache libdir
216	sed "s\|@LIBDIR@\|$(get_libdir)\|" -i "${ED}"/usr/sbin/apache2ctl \|\| die
217	}
218
219	pkg_postinst() {
220	apache-2_pkg_postinst \|\| die "apache-2_pkg_postinst failed"
221
222	tmpfiles_process apache.conf #662544
223
224	# warnings that default config might not work out of the box
225	local mod cmod
226	for mod in ${MODULE_CRITICAL} ; do
227	if ! use "apache2_modules_${mod}"; then
228	echo
229	ewarn "Warning: Critical module not installed!"
230	ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
231	ewarn "are highly recomended but might not be in the base profile yet."
232	ewarn "Default config for ssl needs module 'socache_shmcb'."
233	ewarn "Enabling the following flags is highly recommended:"
234	for cmod in ${MODULE_CRITICAL} ; do
235	use "apache2_modules_${cmod}" \|\| \
236	ewarn "+ apache2_modules_${cmod}"
237	done
238	echo
239	break
240	fi
241	done
242	# warning for proxy_balancer and missing load balancing scheduler
243	if use apache2_modules_proxy_balancer; then
244	local lbset=
245	for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
246	if use "apache2_modules_${mod}"; then
247	lbset=1 && break
248	fi
249	done
250	if [[ ! ${lbset} ]] ; then
251	echo
252	ewarn "Info: Missing load balancing scheduler algorithm module"
253	ewarn "(They were split off from proxy_balancer in 2.3)"
254	ewarn "In order to get the ability of load balancing, at least"
255	ewarn "one of these modules has to be present:"
256	ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
257	echo
258	fi
259	fi
260	}

Lines 1-260 Link Here

(-)a/www-servers/apache/apache-2.4.57-r2.ebuild (-260 lines)
1	# Copyright 1999-2023 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2
3
4	EAPI=7
5
6	# latest gentoo apache files
7	GENTOO_PATCHSTAMP="20230903"
8	GENTOO_DEVELOPER="graaff"
9	GENTOO_PATCHNAME="gentoo-apache-2.4.57-r2"
10
11	# IUSE/USE_EXPAND magic
12	IUSE_MPMS_FORK="prefork"
13	IUSE_MPMS_THREAD="event worker"
14
15	# << obsolete modules:
16	# authn_default authz_default mem_cache
17	# mem_cache is replaced by cache_disk
18	# ?? buggy modules
19	# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
20	# >> added modules for reason:
21	# compat: compatibility with 2.2 access control
22	# authz_host: new module for access control
23	# authn_core: functionality provided by authn_alias in previous versions
24	# authz_core: new module, provides core authorization capabilities
25	# cache_disk: replacement for mem_cache
26	# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
27	# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
28	# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
29	# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
30	# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
31	# socache_shmcb: shared object cache provider. Default config with ssl needs it
32	# unixd: fixes startup error: Invalid command 'User'
33	IUSE_MODULES="access_compat actions alias allowmethods asis auth_basic auth_digest auth_form
34	authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
35	authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
36	brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
37	dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
38	ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
39	lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
40	proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
41	proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
42	session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
43	socache_shmcb speling status substitute systemd tls unique_id userdir usertrack
44	unixd version vhost_alias watchdog xml2enc"
45	# The following are also in the source as of this version, but are not available
46	# for user selection:
47	# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
48	# optional_fn_import optional_hook_export optional_hook_import
49
50	# inter-module dependencies
51	# TODO: this may still be incomplete
52	MODULE_DEPENDS="
53	auth_form:session
54	brotli:filter
55	dav_fs:dav
56	dav_lock:dav
57	deflate:filter
58	cache_disk:cache
59	ext_filter:filter
60	file_cache:cache
61	lbmethod_byrequests:proxy_balancer
62	lbmethod_byrequests:slotmem_shm
63	lbmethod_bytraffic:proxy_balancer
64	lbmethod_bybusyness:proxy_balancer
65	lbmethod_heartbeat:proxy_balancer
66	log_forensic:log_config
67	logio:log_config
68	cache_disk:cache
69	cache_socache:cache
70	md:watchdog
71	mime_magic:mime
72	proxy_ajp:proxy
73	proxy_balancer:proxy
74	proxy_balancer:slotmem_shm
75	proxy_connect:proxy
76	proxy_ftp:proxy
77	proxy_hcheck:proxy
78	proxy_hcheck:watchdog
79	proxy_html:proxy
80	proxy_html:xml2enc
81	proxy_http:proxy
82	proxy_http2:proxy
83	proxy_scgi:proxy
84	proxy_uwsgi:proxy
85	proxy_fcgi:proxy
86	proxy_wstunnel:proxy
87	session_cookie:session
88	session_dbd:dbd
89	session_dbd:session
90	socache_memcache:cache
91	substitute:filter
92	"
93
94	# module<->define mappings
95	MODULE_DEFINES="
96	auth_digest:AUTH_DIGEST
97	authnz_ldap:AUTHNZ_LDAP
98	cache:CACHE
99	cache_disk:CACHE
100	cache_socache:CACHE
101	dav:DAV
102	dav_fs:DAV
103	dav_lock:DAV
104	file_cache:CACHE
105	http2:HTTP2
106	info:INFO
107	ldap:LDAP
108	lua:LUA
109	md:SSL
110	proxy:PROXY
111	proxy_ajp:PROXY
112	proxy_balancer:PROXY
113	proxy_connect:PROXY
114	proxy_ftp:PROXY
115	proxy_html:PROXY
116	proxy_http:PROXY
117	proxy_hcheck:PROXY
118	proxy_fcgi:PROXY
119	proxy_scgi:PROXY
120	proxy_wstunnel:PROXY
121	socache_shmcb:SSL
122	socache_memcache:CACHE
123	ssl:SSL
124	status:STATUS
125	suexec:SUEXEC
126	systemd:SYSTEMD
127	userdir:USERDIR
128	"
129
130	# critical modules for the default config
131	MODULE_CRITICAL="
132	authn_core
133	authz_core
134	authz_host
135	dir
136	mime
137	unixd
138	"
139	inherit apache-2 systemd tmpfiles toolchain-funcs
140
141	DESCRIPTION="The Apache Web Server"
142	HOMEPAGE="https://httpd.apache.org/"
143
144	# some helper scripts are Apache-1.1, thus both are here
145	LICENSE="Apache-2.0 Apache-1.1"
146	SLOT="2"
147	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
148
149	PATCHES=(
150	"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
151	"${FILESDIR}"/${PN}-2.4.54-libtool.patch # bug #858836
152	"${FILESDIR}"/${P}-rustls-ffi-0.10.0.patch # bug #906523
153	)
154
155	pkg_setup() {
156	# dependent critical modules which are not allowed in global scope due
157	# to USE flag conditionals (bug #499260)
158	use ssl && MODULE_CRITICAL+=" socache_shmcb"
159	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
160	apache-2_pkg_setup
161	}
162
163	src_configure() {
164	# Brain dead check.
165	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
166
167	apache-2_src_configure
168	}
169
170	src_compile() {
171	if tc-is-cross-compiler ; then
172	# This header is the same across targets, so use the build compiler.
173	pushd server >/dev/null
174	emake gen_test_char
175	tc-export_build_env BUILD_CC
176	${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
177	gen_test_char.c -o gen_test_char $(apr-1-config --includes) \|\| die
178	popd >/dev/null
179	fi
180
181	default
182	}
183
184	src_install() {
185	apache-2_src_install
186	local i
187	local apache_tools_prune_list=(
188	/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
189	/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
190	/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
191	/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
192	)
193	for i in ${apache_tools_prune_list[@]} ; do
194	rm "${ED}"/${i} \|\| die "Failed to prune apache-tools bits"
195	done
196
197	# install apxs in /usr/bin (bug #502384) and put a symlink into the
198	# old location until all ebuilds and eclasses have been modified to
199	# use the new location.
200	dobin support/apxs
201	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
202
203	# Note: wait for mod_systemd to be included in some forthcoming release,
204	# Then apache2.4.service can be used and systemd support controlled
205	# through --enable-systemd
206	systemd_newunit "${FILESDIR}/apache2.4-hardened.service" "apache2.service"
207	dotmpfiles "${FILESDIR}/apache.conf"
208	#insinto /etc/apache2/modules.d
209	#doins "${FILESDIR}/00_systemd.conf"
210
211	# Install http2 module config
212	insinto /etc/apache2/modules.d
213	doins "${FILESDIR}"/41_mod_http2.conf
214
215	# Fix path to apache libdir
216	sed "s\|@LIBDIR@\|$(get_libdir)\|" -i "${ED}"/usr/sbin/apache2ctl \|\| die
217	}
218
219	pkg_postinst() {
220	apache-2_pkg_postinst \|\| die "apache-2_pkg_postinst failed"
221
222	tmpfiles_process apache.conf #662544
223
224	# warnings that default config might not work out of the box
225	local mod cmod
226	for mod in ${MODULE_CRITICAL} ; do
227	if ! use "apache2_modules_${mod}"; then
228	echo
229	ewarn "Warning: Critical module not installed!"
230	ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
231	ewarn "are highly recomended but might not be in the base profile yet."
232	ewarn "Default config for ssl needs module 'socache_shmcb'."
233	ewarn "Enabling the following flags is highly recommended:"
234	for cmod in ${MODULE_CRITICAL} ; do
235	use "apache2_modules_${cmod}" \|\| \
236	ewarn "+ apache2_modules_${cmod}"
237	done
238	echo
239	break
240	fi
241	done
242	# warning for proxy_balancer and missing load balancing scheduler
243	if use apache2_modules_proxy_balancer; then
244	local lbset=
245	for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
246	if use "apache2_modules_${mod}"; then
247	lbset=1 && break
248	fi
249	done
250	if [[ ! ${lbset} ]] ; then
251	echo
252	ewarn "Info: Missing load balancing scheduler algorithm module"
253	ewarn "(They were split off from proxy_balancer in 2.3)"
254	ewarn "In order to get the ability of load balancing, at least"
255	ewarn "one of these modules has to be present:"
256	ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
257	echo
258	fi
259	fi
260	}

Lines 1-254 Link Here

(-)a/www-servers/apache/apache-2.4.57-r3.ebuild (-254 lines)
1	# Copyright 1999-2023 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2
3
4	EAPI=7
5
6	# latest gentoo apache files
7	GENTOO_PATCHSTAMP="20230903"
8	GENTOO_DEVELOPER="graaff"
9	GENTOO_PATCHNAME="gentoo-apache-2.4.57-r3"
10
11	# IUSE/USE_EXPAND magic
12	IUSE_MPMS_FORK="prefork"
13	IUSE_MPMS_THREAD="event worker"
14
15	# << obsolete modules:
16	# authn_default authz_default mem_cache
17	# mem_cache is replaced by cache_disk
18	# ?? buggy modules
19	# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
20	# >> added modules for reason:
21	# compat: compatibility with 2.2 access control
22	# authz_host: new module for access control
23	# authn_core: functionality provided by authn_alias in previous versions
24	# authz_core: new module, provides core authorization capabilities
25	# cache_disk: replacement for mem_cache
26	# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
27	# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
28	# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
29	# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
30	# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
31	# socache_shmcb: shared object cache provider. Default config with ssl needs it
32	# unixd: fixes startup error: Invalid command 'User'
33	IUSE_MODULES="access_compat actions alias allowmethods asis auth_basic auth_digest auth_form
34	authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
35	authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
36	brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
37	dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
38	ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
39	lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
40	proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
41	proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
42	session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
43	socache_shmcb speling status substitute systemd tls unique_id userdir usertrack
44	unixd version vhost_alias watchdog xml2enc"
45	# The following are also in the source as of this version, but are not available
46	# for user selection:
47	# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
48	# optional_fn_import optional_hook_export optional_hook_import
49
50	# inter-module dependencies
51	# TODO: this may still be incomplete
52	MODULE_DEPENDS="
53	auth_form:session
54	brotli:filter
55	dav_fs:dav
56	dav_lock:dav
57	deflate:filter
58	cache_disk:cache
59	ext_filter:filter
60	file_cache:cache
61	lbmethod_byrequests:proxy_balancer
62	lbmethod_byrequests:slotmem_shm
63	lbmethod_bytraffic:proxy_balancer
64	lbmethod_bybusyness:proxy_balancer
65	lbmethod_heartbeat:proxy_balancer
66	log_forensic:log_config
67	logio:log_config
68	cache_disk:cache
69	cache_socache:cache
70	md:watchdog
71	mime_magic:mime
72	proxy_ajp:proxy
73	proxy_balancer:proxy
74	proxy_balancer:slotmem_shm
75	proxy_connect:proxy
76	proxy_ftp:proxy
77	proxy_hcheck:proxy
78	proxy_hcheck:watchdog
79	proxy_html:proxy
80	proxy_html:xml2enc
81	proxy_http:proxy
82	proxy_http2:proxy
83	proxy_scgi:proxy
84	proxy_uwsgi:proxy
85	proxy_fcgi:proxy
86	proxy_wstunnel:proxy
87	session_cookie:session
88	session_dbd:dbd
89	session_dbd:session
90	socache_memcache:cache
91	substitute:filter
92	"
93
94	# module<->define mappings
95	MODULE_DEFINES="
96	auth_digest:AUTH_DIGEST
97	authnz_ldap:AUTHNZ_LDAP
98	cache:CACHE
99	cache_disk:CACHE
100	cache_socache:CACHE
101	dav:DAV
102	dav_fs:DAV
103	dav_lock:DAV
104	file_cache:CACHE
105	http2:HTTP2
106	info:INFO
107	ldap:LDAP
108	lua:LUA
109	md:SSL
110	proxy:PROXY
111	proxy_ajp:PROXY
112	proxy_balancer:PROXY
113	proxy_connect:PROXY
114	proxy_ftp:PROXY
115	proxy_html:PROXY
116	proxy_http:PROXY
117	proxy_hcheck:PROXY
118	proxy_fcgi:PROXY
119	proxy_scgi:PROXY
120	proxy_wstunnel:PROXY
121	socache_shmcb:SSL
122	socache_memcache:CACHE
123	ssl:SSL
124	status:STATUS
125	suexec:SUEXEC
126	systemd:SYSTEMD
127	userdir:USERDIR
128	"
129
130	# critical modules for the default config
131	MODULE_CRITICAL="
132	authn_core
133	authz_core
134	authz_host
135	dir
136	mime
137	unixd
138	"
139	inherit apache-2 systemd tmpfiles toolchain-funcs
140
141	DESCRIPTION="The Apache Web Server"
142	HOMEPAGE="https://httpd.apache.org/"
143
144	# some helper scripts are Apache-1.1, thus both are here
145	LICENSE="Apache-2.0 Apache-1.1"
146	SLOT="2"
147	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
148
149	pkg_setup() {
150	# dependent critical modules which are not allowed in global scope due
151	# to USE flag conditionals (bug #499260)
152	use ssl && MODULE_CRITICAL+=" socache_shmcb"
153	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
154	apache-2_pkg_setup
155	}
156
157	src_configure() {
158	# Brain dead check.
159	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
160
161	apache-2_src_configure
162	}
163
164	src_compile() {
165	if tc-is-cross-compiler ; then
166	# This header is the same across targets, so use the build compiler.
167	pushd server >/dev/null
168	emake gen_test_char
169	tc-export_build_env BUILD_CC
170	${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
171	gen_test_char.c -o gen_test_char $(apr-1-config --includes) \|\| die
172	popd >/dev/null
173	fi
174
175	default
176	}
177
178	src_install() {
179	apache-2_src_install
180	local i
181	local apache_tools_prune_list=(
182	/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
183	/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
184	/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
185	/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
186	)
187	for i in ${apache_tools_prune_list[@]} ; do
188	rm "${ED}"/${i} \|\| die "Failed to prune apache-tools bits"
189	done
190
191	# install apxs in /usr/bin (bug #502384) and put a symlink into the
192	# old location until all ebuilds and eclasses have been modified to
193	# use the new location.
194	dobin support/apxs
195	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
196
197	# Note: wait for mod_systemd to be included in some forthcoming release,
198	# Then apache2.4.service can be used and systemd support controlled
199	# through --enable-systemd
200	systemd_newunit "${FILESDIR}/apache2.4-hardened.service" "apache2.service"
201	dotmpfiles "${FILESDIR}/apache.conf"
202	#insinto /etc/apache2/modules.d
203	#doins "${FILESDIR}/00_systemd.conf"
204
205	# Install http2 module config
206	insinto /etc/apache2/modules.d
207	doins "${FILESDIR}"/41_mod_http2.conf
208
209	# Fix path to apache libdir
210	sed "s\|@LIBDIR@\|$(get_libdir)\|" -i "${ED}"/usr/sbin/apache2ctl \|\| die
211	}
212
213	pkg_postinst() {
214	apache-2_pkg_postinst \|\| die "apache-2_pkg_postinst failed"
215
216	tmpfiles_process apache.conf #662544
217
218	# warnings that default config might not work out of the box
219	local mod cmod
220	for mod in ${MODULE_CRITICAL} ; do
221	if ! use "apache2_modules_${mod}"; then
222	echo
223	ewarn "Warning: Critical module not installed!"
224	ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
225	ewarn "are highly recomended but might not be in the base profile yet."
226	ewarn "Default config for ssl needs module 'socache_shmcb'."
227	ewarn "Enabling the following flags is highly recommended:"
228	for cmod in ${MODULE_CRITICAL} ; do
229	use "apache2_modules_${cmod}" \|\| \
230	ewarn "+ apache2_modules_${cmod}"
231	done
232	echo
233	break
234	fi
235	done
236	# warning for proxy_balancer and missing load balancing scheduler
237	if use apache2_modules_proxy_balancer; then
238	local lbset=
239	for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
240	if use "apache2_modules_${mod}"; then
241	lbset=1 && break
242	fi
243	done
244	if [[ ! ${lbset} ]] ; then
245	echo
246	ewarn "Info: Missing load balancing scheduler algorithm module"
247	ewarn "(They were split off from proxy_balancer in 2.3)"
248	ewarn "In order to get the ability of load balancing, at least"
249	ewarn "one of these modules has to be present:"
250	ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
251	echo
252	fi
253	fi
254	}

Lines 1-256 Link Here

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

Lines 1-256 Link Here

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

Lines 1-260 Link Here

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

Lines 1-256 Link Here

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

Lines 1-256 Link Here

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