gentoo auto-resync : 09:12:2023 - 23:17:54

5 files changed, 261 insertions, 4 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 80039a9ae65f..28064ac89b7d 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 5b0e455d5d0a..2aa53a810743 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -14,8 +14,9 @@ DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb0
 EBUILD apache-2.4.57-r1.ebuild 8121 BLAKE2B 5ad5f3ee5f60665afae6e260e19e44b4cee5b0a60559296b9913479a67cb057ee1314edd64fc367f6e9340e2fb90782ce75293e5568f9c140b75a903f4fd0be3 SHA512 039376f686df1a1aedb3a14e8a4c80b7a7533d5499f14f68b3bb097bc3561ad536ea3137aff5bfe29a594f8458a659c3bd601231f48c51ed3e56735a1a722638
 EBUILD apache-2.4.57-r2.ebuild 8115 BLAKE2B 749a424661168d951bad4aa8b1420a953136f495ceff6ecdc1431579efa426ed1f8e9b4e60696a66196d1dc1a1de3a97b3899a0a2235dd19242ef066916d451a SHA512 6a629af7fdac949c8016ea5290454db2c63da11ee1a8d0f3bfeb3cd41b0bb8a93cb713627dca82222971ae4a609445a0b124052465342f403ad3dcdd0c44ba09
 EBUILD apache-2.4.57-r3.ebuild 7931 BLAKE2B bf08792ae2c7c35e258914c6a59b7f3bf56c4a48921bb1c1ef24070b9276ed1095d7efe30bed36b5b43c10052d1faf455acbf8274e9615c56bb051ff8b352609 SHA512 7f39278c28a688cbc703e286844d244818eef648119cd99cd49df995c499247d2b9990efd95a5eeff8e0abf0a7f30783382235e908e5daade80a8471cdeab62a
-EBUILD apache-2.4.57-r4.ebuild 7969 BLAKE2B 8c04aa28bbddd4ca3516c8ce453286ab951ee7996dab40dc1911643e95749116bf9cb0537d7e7c295b4d270b32b72b2a077b3ddbbcdaeffefd1f52da711438bc SHA512 5f22b8dc7c56237077021e71e959426ff03fe5bed0f988914c580d6b3bd53596b7d479e541fa8b6295e79146594f6ea8ce3c2000c900aa06bf565e23070aade6
-EBUILD apache-2.4.57-r5.ebuild 7969 BLAKE2B 601dbdc5a1f9e07e9c96ad498e346bd41a84eeeb1bdfd41d09fbb7a423a15c5230f9d36c46c626f86331afc568de22b44d96c7f274fe88c69f1f8aceced32b08 SHA512 d93f2dd9782cc17d2a6b3c1cf26e06a2d3bcc2b06e6acafebaabcc1c309dabfd11efabf9aa7362c90f860a3af24aaaf4ba18d2773447f32895c7d797ae6aab7b
+EBUILD apache-2.4.57-r4.ebuild 7969 BLAKE2B 5f36e7b6f44b220bd680d7f043214a9f9ff8381948592f08a9c5a5fffdfe4abd5e0c072d52ba22bda73c52446acb7095520fb2df819563f066eb5ace31729555 SHA512 daa3693ba7e0f92a974e0b92c6c10bc1a0b181ed1028293693e2e4ba54c9a135b04e0beb7120a53b9eb6d3db785c9c75ad9ccdb93bebe77373eaf8fb02f33897
+EBUILD apache-2.4.57-r5.ebuild 7969 BLAKE2B a3d56b9af4d8a26584c791cd1c8c728e705c7a98070620d84eaa369e1bd6b966f5d37f50a3b43ac6ebf9be92fb3ec587376ce58fb1e55478bce9c4e29967755c SHA512 7f7c59db84e7c44da6744b574e73f4e6b3406f79b097472fb0eae85cf9d993ce87e76bf1ff45eabbb816cc06c8aa7246d28db983bff362a6bc48d322a8023260
 EBUILD apache-2.4.57.ebuild 8101 BLAKE2B d9d1bb23152864cb4a70b14fb12efc1e5f16680d1333ed41baf6b8d88ea3650cc9d874c6dbf791fc5b70cecf92d18bb8821769f1bd9f060c97c185266626f698 SHA512 5b47a9076bd91e7625c8edbf4db39e49f40207eec8a5683d23f05ed5bc87dc67951f00713bacc5185c0e705ccdb068ecec4af67d7f9081abefbb1663adbc6ec9
+EBUILD apache-2.4.58-r1.ebuild 7966 BLAKE2B f34ad6526fd2fdeb65dc5c6197a0b3d6690f67d3476878bba30c55426e1476718b37cec8de03ee20c4a93795546e9087afc5bdcf51f575472ca47400f974542b SHA512 f3cd28801096939f3b9db40a94f71e17c3358aa83a95bd31a8c34b3e044fde3c211711331cea0b03ea13e4d5a1d9e0ac300b658dab703ffe1a2605dcc1c4f6c6
 EBUILD apache-2.4.58.ebuild 7964 BLAKE2B 8a624f9743e14ed991541af8768c427a6ec3f61827e51df3199a9aa2149a3a62f609d10da698f688e062c35e92c58bd9130bf0ff385b669c424d47ae79ccd8f2 SHA512 db86612272848b9fd1bee6a9966b95be10f18296be3e9597ec71a21fbe72669c057813c1df8f8234b03374d96de92d6336404b5571e3e31ced614e5bf6e34f4e
 MISC metadata.xml 978 BLAKE2B 2b2b82339fb2419da3d4e9d77f2c4495235b04a8f5006e61316bf638f307227ea26e2f9eaa26fca5d10118ebdd0bff9fac7319687ae62e2440b49e509e7080e0 SHA512 4a1842f1754473f7168fd38ef4ac2720fddf0f4ad8bfc5df3215b7a50f454cb3fc372e5a84d030a2b84e9744d599f8a38caf3ad5688a93cee7d52bac3d89b43b
diff --git a/www-servers/apache/apache-2.4.57-r4.ebuild b/www-servers/apache/apache-2.4.57-r4.ebuild
index fc874c565bd1..95756998cd15 100644
--- a/www-servers/apache/apache-2.4.57-r4.ebuild
+++ b/www-servers/apache/apache-2.4.57-r4.ebuild
@@ -118,7 +118,7 @@ MODULE_DEFINES="
 	proxy_http:PROXY
 	proxy_http2:PROXY
 	proxy_scgi:PROXY
-	proxy_uswgi:PROXY
+	proxy_uwsgi:PROXY
 	proxy_wstunnel:PROXY
 	socache_shmcb:SSL
 	socache_memcache:CACHE
diff --git a/www-servers/apache/apache-2.4.57-r5.ebuild b/www-servers/apache/apache-2.4.57-r5.ebuild
index eed9c9add8b2..649085501170 100644
--- a/www-servers/apache/apache-2.4.57-r5.ebuild
+++ b/www-servers/apache/apache-2.4.57-r5.ebuild
@@ -118,7 +118,7 @@ MODULE_DEFINES="
 	proxy_http:PROXY
 	proxy_http2:PROXY
 	proxy_scgi:PROXY
-	proxy_uswgi:PROXY
+	proxy_uwsgi:PROXY
 	proxy_wstunnel:PROXY
 	socache_shmcb:SSL
 	socache_memcache:CACHE
diff --git a/www-servers/apache/apache-2.4.58-r1.ebuild b/www-servers/apache/apache-2.4.58-r1.ebuild
new file mode 100644
index 000000000000..9ca9e8c742c0
--- /dev/null
+++ b/www-servers/apache/apache-2.4.58-r1.ebuild
@@ -0,0 +1,256 @@
+# 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"
+
+# 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
+}