gentoo auto-resync : 12:05:2024 - 00:01:15

5 files changed, 22 insertions, 270 deletions

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 09d27c678c3b..f67631491e37 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -5,10 +5,10 @@ AUX apache2.4-hardened.service 933 BLAKE2B 60cbe1a55ded29299ba7fc453a6f13c456bc7
 AUX libxmlv212.patch 1033 BLAKE2B 514879d60f8e8799c298c63a871a589e1982c458a6f99a3b48597af2d4bc91803ff8bfc29c57b076efb100f6c5f7cb396589b2e5cd91269ff834575a41c4a963 SHA512 09ea8df9613bcd1f09f87522145c4dd19c8a17d8f3529a5fdff0b0ee42816d26fe01af97037687bbf95b4e1b6454566be19f27427cafb2aa85bce848cb9a56e3
 DIST gentoo-apache-2.4.58-20231019.tar.bz2 26224 BLAKE2B 370f36dcbe9d10ed0dd415c2e28016c7897246b5c3f830e849e765c18a08be145c8a363f122dff2c4b8d5b1e53ff504a79d7512a58135899a539136b580524ed SHA512 60f68eb4168a86ee33525e7c90cf5af8da586ed31d12cc294ea6bf3bcb9f254ea7e1a4ca5db4846a0e92b97c1326f095aa3a9d5fdb9ed92c1c4726c5a825ab36
 DIST gentoo-apache-2.4.59-20240405.tar.bz2 26196 BLAKE2B 370b0264756c950ed36a0b9abe144742f0638ca616b347ce252fcc8c8cbf326422883771f33f822e03792cf37cb4cea8f95180c989e9a7ed868e2f235c642dca SHA512 cb312c632026d06cdce4e4fc2eb3a51366a8b63782878673781840774b46a72c7e756f9fa3d49aecbfcdbaf939a23a65146358f8523edb5a89ed97fd8b3a79c1
+DIST gentoo-apache-2.4.59-r3-20240511.tar.bz2 31426 BLAKE2B 741b9b76c8fc9a3ae31a5054123e78a47414c5308aefc014ce6ec1ec2cbcf9dea50c5ea0d3b0291132c0b2bd40450ba9480feee279c9f162ef3d8ef75f5025e4 SHA512 b1d4099c2288099493a6baff58127a8b2605bdacf62a66dc5d2ee27368dea81bf8fea2fe878d26c073610ef6bda1c7c0783c1a4af01c0208957abed908cb1df6
 DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
 DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2
-EBUILD apache-2.4.58-r2.ebuild 7790 BLAKE2B 76e92c9e97bb1414ff232c0ef695e6efdd57e00672294ab7fa1f7df0551c38f652a723369428893e6a2d4cd01f3afe6034484f7a9f5fcb3f85cf58acbd91cce8 SHA512 60ba7f8197ee4ce3ece1e3127fea7fe26053eb4f2ff86287fa4f946ee4bddb13766c188ee53df706e2df3bce4bc7f94d1f9a18bda3a2053b8385d9a795693b44
-EBUILD apache-2.4.58.ebuild 8050 BLAKE2B f47fa1f205d112465f6fa15b0f2103ddbfe686a7610090d308c049b49bda48e143b792347aeeb7bc7d86e02b89379ecf2e024a584250d06858a725cdb1b1c745 SHA512 a7b4e397a5d7e58ab1c569b16479b05f4a845fd33dd3de7e36a8f128f9683d542d46257ca165af0d38623882214d7118455709d138f4eeaa15e80560e67af733
-EBUILD apache-2.4.59-r1.ebuild 7804 BLAKE2B 1ad69f060f977a631a65e66c160ae62804d5c56ca074032c4be914607611926a00ff8a4cbd1a85053668f114eed662d1d9fcb426f0b1f71507818a2ea09bc9b4 SHA512 dece3068b79baa68cbc9f1e5911d0e1bacd46e18a30886da025ca7401dd39164ee9f0de8252abc09bd80c5b1ebef7585b65252d08a8859811f1d98cc07946a9a
-EBUILD apache-2.4.59.ebuild 7752 BLAKE2B df206fa47060e27e83e23df16a65ed5f8ae009f6f2bbd0c967a11912fc66114108d3b3dca2343c48571372238ef7cf76674ef48b0291f297640514167dcb75c3 SHA512 14a8296d2f6eda65fa03a24757d45a43326e918ea3f74f9834935748aa31ed353093edcd8af0ada48b6ad4fe0eab7284c3f2b835bd233390fa93b44d9ae635bb
+EBUILD apache-2.4.58-r2.ebuild 7903 BLAKE2B cf571e99bc324f5b37f2d1b2d213eabf0ec30df3b01cce867e8162d47de1ace6a27f60386e0baaeca473602ca816498f08725d0e8b56bd575f860ffef645999d SHA512 d29b384504ec1e918cb1a313d84411cc017f22007b35c66a0b9b4abed45de966b6a6e620cdbb5d15045b4bd908e498b769265dd3ba8fdf600ef32a0e3957f2e8
+EBUILD apache-2.4.59-r1.ebuild 7910 BLAKE2B 51fb61174be88f22b8846c61b0a0215e74023e26e3f52547eedc8addfbe8ae9b9a7505dd06e11584b444c8f75b09a82fdae914666b185f5bc14944a03c50696c SHA512 c77496408a2a0ed322ee0de7d5e6181049c9822ed30171bc9fd334fa04be63ede5b8e0035ab04182c09d77e1d2a3ce80690f1426a075158a44736517b0639f48
+EBUILD apache-2.4.59-r3.ebuild 7845 BLAKE2B b8b5bc4af5ca53ced9b0cde392e74ef9b76c508a5a864742289ab3c4703257ff2683914fdf75468ab6f4ed210f2411a20c0df97083e6a1e34fa5f6c3b2b99e12 SHA512 4d4d5f995782b0a03b3a19d3930a692bb11c13f1efce5b36a04aa50ef0da196402821d1f262f237f8c3e4f1b1db1aecbbaa26b3b193ade94cb90f5289a0cd844
 MISC metadata.xml 978 BLAKE2B 2b2b82339fb2419da3d4e9d77f2c4495235b04a8f5006e61316bf638f307227ea26e2f9eaa26fca5d10118ebdd0bff9fac7319687ae62e2440b49e509e7080e0 SHA512 4a1842f1754473f7168fd38ef4ac2720fddf0f4ad8bfc5df3215b7a50f454cb3fc372e5a84d030a2b84e9744d599f8a38caf3ad5688a93cee7d52bac3d89b43b
diff --git a/www-servers/apache/apache-2.4.58-r2.ebuild b/www-servers/apache/apache-2.4.58-r2.ebuild
index 6e013b4009da..d41733f53db2 100644
--- a/www-servers/apache/apache-2.4.58-r2.ebuild
+++ b/www-servers/apache/apache-2.4.58-r2.ebuild
@@ -148,6 +148,11 @@ 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"
 
+RDEPEND="
+	apache2_modules_tls? ( >=net-libs/rustls-ffi-0.9.2:= <net-libs/rustls-ffi-11 )
+"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/libxmlv212.patch
 )
diff --git a/www-servers/apache/apache-2.4.58.ebuild b/www-servers/apache/apache-2.4.58.ebuild
deleted file mode 100644
index 4924d8ce9518..000000000000
--- a/www-servers/apache/apache-2.4.58.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2024 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"
-
-PATCHES=(
-	"${FILESDIR}"/libxmlv212.patch
-)
-
-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
-}
diff --git a/www-servers/apache/apache-2.4.59-r1.ebuild b/www-servers/apache/apache-2.4.59-r1.ebuild
index 48a82e0ad1c9..874db4b33904 100644
--- a/www-servers/apache/apache-2.4.59-r1.ebuild
+++ b/www-servers/apache/apache-2.4.59-r1.ebuild
@@ -146,7 +146,12 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	apache2_modules_tls? ( >=net-libs/rustls-ffi-0.9.2:= <net-libs/rustls-ffi-11 )
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-dh-regression.patch" )
 
diff --git a/www-servers/apache/apache-2.4.59.ebuild b/www-servers/apache/apache-2.4.59-r3.ebuild
index 455370e133f8..590f7ca57801 100644
--- a/www-servers/apache/apache-2.4.59.ebuild
+++ b/www-servers/apache/apache-2.4.59-r3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20240405"
+GENTOO_PATCHSTAMP="20240511"
 GENTOO_DEVELOPER="graaff"
-GENTOO_PATCHNAME="gentoo-apache-2.4.59"
+GENTOO_PATCHNAME="gentoo-apache-2.4.59-r3"
 
 # IUSE/USE_EXPAND magic
 IUSE_MPMS_FORK="prefork"
@@ -148,6 +148,11 @@ 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"
 
+RDEPEND="
+	apache2_modules_tls? ( >=net-libs/rustls-ffi-0.13.0:= )
+"
+DEPEND="${RDEPEND}"
+
 pkg_setup() {
 	# dependent critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)