gentoo resync : 04.01.2022

28 files changed, 292 insertions, 315 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 0ab73e9218cd..bb8ce5a9d33b 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_auth_kerb/Manifest b/www-apache/mod_auth_kerb/Manifest
index 588c9a8fc0dc..c0c1e5b3e8e9 100644
--- a/www-apache/mod_auth_kerb/Manifest
+++ b/www-apache/mod_auth_kerb/Manifest
@@ -1,7 +1,8 @@
 AUX 11_mod_auth_kerb.conf 338 BLAKE2B c9093c961dae957f392bde032b20690a9a83c0fcac3b2ca0e8d46da584c040d79967793767371358e38bf3a9de48605b4ee35177d1692b1b9ce71b3ab49f4eeb SHA512 82ea692ed8189bb3255347d5d7829f84c8b3edc66e9d99c974f9c8ed56227a60b8925eee11f027fbd694ef1be8d09ff3f4b92e96cd68a77cea84e6e237048c53
+AUX mod_auth_kerb-5.4-api-change-krb5.patch 2638 BLAKE2B 735a80f6d03e7a71dd5477d8529bc80daaa4e948dd2b374027f3608c7b07c543160328b8744d9d92aa8c493b22e591fb3ead2a4e7dc8a841941a79c77fd1fc44 SHA512 d24d44772f3c615c38d97aca4a6e8f59e53c94d61de95608c88ac17e3e1fc2f800a4e4e96abb8cbf187cacd7a8323dfe6e62b0ea000873177b330c8f3fd17b9a
+AUX mod_auth_kerb-5.4-krb5pwd-double-free.patch 963 BLAKE2B 4967bfa2e12e3ebdb325ddb12846786b05369c2cd2d5544631e98ce1b655de936da6c53567fa4ab31c85813021272543bde63a4509dcf0bd060aec31796a4ad3 SHA512 50e8ddc9c0366055f4b54a00d6b6f2d983e4ed7b49786559b8312b9967bfc838f6e9c653b1aecd9c77370d211c9c35274c64bb38af2a279cdf16d2e25f359a11
 AUX mod_auth_kerb.conf 40 BLAKE2B 76bfe68f7dd32d9f8dffb5a2124628c7971f7f7470182d003fa576ba386239fd946d2eee50b49f2e4f0d6d8061b61c927e212a68fb3e1cfc21d9c2dc01c688a8 SHA512 fd21cb7d6da1ac4ce5becab4e3c72a56245878625990ebddbf1d612a3b9cc273a6b3e87509db59ed67e934b5834c3db10914118982cb77a6b8220b0f65cd6e1d
 DIST mod_auth_kerb-5.4-gentoo-patchset.tar.bz2 8717 BLAKE2B 759ad350bb6c07226c86fa51e22f17023378928abed3fd80ff280bac54a472a8d918cba680b3c75ce93805a7f803bbd370a6bb1b73665f5a8d5fb7cdc6353d1c SHA512 3909c2677b30790cc17c0d8843feaa00d9acd14a012672443a887c0e88473d6b1572ba045e1491bcab53cbacff193c11cfe15e63ef1046cfcdf1f4ab60e0ac57
 DIST mod_auth_kerb-5.4.tar.gz 93033 BLAKE2B 2f5c2c26f0f9fa5919f879680e0b8f29087edd001c166655f8130e8d7efd527b0bb9bbb79fe3e508c14622ecefaa693a96dc7dd16a3298da8ae0ad4b69b48ca6 SHA512 93fdf0e43af1c24e8c8204d09240b708747068ef99dd8d21b45cb4d132d31e6d582d49ea5e23b905f55cb0d4a20b1ecb58de1bcbfdad1d016e536fc622b63214
-EBUILD mod_auth_kerb-5.4-r2.ebuild 1397 BLAKE2B 793f5f2703d63596e4ea97cfb8cda795d4e10238814f7fff08429fbce086cf09c211eedf32ce6e348b868d6f8d2acca35cfefb395ca83c7dc451e19a15bb8fcd SHA512 664917f2de1e463573baba7599f68022270480cc9210b520fbd4d551549a8b02045210722c1f2824ef2914dfcebabf5ee53fca528d0fef85791e246a96d57f00
-EBUILD mod_auth_kerb-5.4-r3.ebuild 1453 BLAKE2B def0046f355054c2f4db256f0e6eba587e2adfb530c2257312a9d8b8f44bd927297250a946a0d01b1d8f934da6bfc0dafec68cf76aab9a828558515a25cb8975 SHA512 05d73f3dadf4e50dd3f6052aa05ea0d943b2cae62843942cc2772720627704fbe4fc5f7c84669342b478c2aef911761e669ee2e74f619c7b3115592768e48b5e
+EBUILD mod_auth_kerb-5.4-r5.ebuild 1571 BLAKE2B b7d3d3d4cc8e5cc1303db29a0cde9391648cbb46b74a5dc8366bfb1ca72f7335c2c29ca60c325a8d2d7665774f51f51eba7628b84ec97cbc1c6b6cfa3f9a3ae6 SHA512 32d8423a9201791d0632158ca268461c43519389f8013fcbf7f961fb658dc8f8394ae16961074c4d3319892c5376d30eeb3b3c8c563bd85023d769731169e6e6
 MISC metadata.xml 249 BLAKE2B fcfd318a3d8fe55ad58570ca24b63d7e0160c65b5a66c0540d53d0f4123b42359a474eb0b9b3ee687686d6d2809b61f4bea13d7130f44c6a1036badfc0bec9cd SHA512 d812a7cc336482b8febeb447231bbc0d4aa105cfc780990627b16dd29f74dbf727ed52cf317def938759aded98d8bc1992f8cbc20bbb6b18575945682c42d26f
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-api-change-krb5.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-api-change-krb5.patch
new file mode 100644
index 000000000000..fb402de44a8d
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-api-change-krb5.patch
@@ -0,0 +1,73 @@
+https://sources.debian.org/data/main/liba/libapache-mod-auth-kerb/5.4-2.5/debian/patches/0011-Always-use-NONE-replay-cache-type.patch
+https://bugs.gentoo.org/830208
+
+From: Sam Hartman <hartmans@debian.org>
+Date: Mon, 23 Nov 2020 09:30:22 -0500
+Subject: Always use NONE replay cache type
+
+It's 2020.  Any MIT Kerberos in the wild supports the none replay
+cache type.  The previous code used an internal function to detect
+that replay cache type; that function is no longer available.
+Instead, assume it is present.
+
+An alternative would be to enable the default replay cache.  It was
+originally disabled because of problems between Microsoft
+authenticators and 2004-era MIT Kerberos 1.3.  That's probably a good
+idea.  It probably closes off security attacks, although analyzing the
+impact of replays in cases where neither channel binding nor
+per-message services are used is difficult.  I believe that a replay
+cache is not strictly necessary in the common configuration where
+mod-auth-kerb is used over a TLS-protected connection where the client
+properly verifies the TLS certificate presented by the server prior to
+sending a GSS token.
+
+I have elected not to enable replay cache to affect a minimal change.
+--- a/src/mod_auth_kerb.c
++++ b/src/mod_auth_kerb.c
+@@ -2061,28 +2061,6 @@
+    return ret;
+ }
+ 
+-static int
+-have_rcache_type(const char *type)
+-{
+-   krb5_error_code ret;
+-   krb5_context context;
+-   krb5_rcache id = NULL;
+-   int found;
+-
+-   ret = krb5_init_context(&context);
+-   if (ret)
+-      return 0;
+-
+-   ret = krb5_rc_resolve_full(context, &id, "none:");
+-   found = (ret == 0);
+-
+-   if (ret == 0)
+-      krb5_rc_destroy(context, id);
+-   krb5_free_context(context);
+-
+-   return found;
+-}
+-
+ /*************************************************************************** 
+  Module Setup/Configuration
+  ***************************************************************************/
+@@ -2143,7 +2121,7 @@
+ #ifndef HEIMDAL
+    /* Suppress the MIT replay cache.  Requires MIT Kerberos 1.4.0 or later.
+       1.3.x are covered by the hack overiding the replay calls */
+-   if (getenv("KRB5RCACHETYPE") == NULL && have_rcache_type("none"))
++   if (getenv("KRB5RCACHETYPE") == NULL)
+       putenv(strdup("KRB5RCACHETYPE=none"));
+ #endif
+ }
+@@ -2185,7 +2163,7 @@
+ #ifndef HEIMDAL
+    /* Suppress the MIT replay cache.  Requires MIT Kerberos 1.4.0 or later.
+       1.3.x are covered by the hack overiding the replay calls */
+-   if (getenv("KRB5RCACHETYPE") == NULL && have_rcache_type("none"))
++   if (getenv("KRB5RCACHETYPE") == NULL)
+       putenv(strdup("KRB5RCACHETYPE=none"));
+ #endif
+ #ifdef STANDARD20_MODULE_STUFF
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-krb5pwd-double-free.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-krb5pwd-double-free.patch
new file mode 100644
index 000000000000..aa8ced49c103
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-krb5pwd-double-free.patch
@@ -0,0 +1,22 @@
+https://sources.debian.org/src/libapache-mod-auth-kerb/5.4-2.5/debian/patches/mod_auth_kerb-krb5_kt_close.patch/
+https://bugs.gentoo.org/673066
+
+Description: fix use after free in authenticate_user_krb5pwd()
+Origin: https://sourceforge.net/p/modauthkerb/bugs/61/attachment/mod_auth_kerb-krb5_kt_close.patch
+Bug: https://sourceforge.net/p/modauthkerb/bugs/61/
+Bug-Debian: https://bugs.debian.org/934043
+Author: Johan Ymerson (https://sourceforge.net/u/ymerson/)
+--- a/src/mod_auth_kerb.c
++++ b/src/mod_auth_kerb.c
+@@ -799,11 +799,9 @@
+ 	            "failed to verify krb5 credentials: %s",
+ 		          krb5_get_err_text(context, ret));
+          krb5_kt_end_seq_get(context, keytab, &cursor);
+-         krb5_kt_close(context, keytab);
+          goto end;
+        }
+        krb5_kt_end_seq_get(context, keytab, &cursor);
+-       krb5_kt_close(context, keytab);
+      }
+      else {
+        if ((ret = verify_krb5_init_creds(r, context, &creds, server, keytab))) {
diff --git a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
deleted file mode 100644
index a83b2926d126..000000000000
--- a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module epatch tmpfiles
-
-DESCRIPTION="An Apache authentication module using Kerberos"
-HOMEPAGE="http://modauthkerb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/modauthkerb/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
-
-LICENSE="BSD openafs-krb5-a HPND"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="virtual/krb5"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_CONF="11_${PN}"
-APACHE2_MOD_DEFINE="AUTH_KERB"
-
-DOCFILES="INSTALL README"
-
-need_apache2
-
-PATCHES=(
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-rcopshack.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-fixes.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-s4u2proxy.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-httpd24.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-delegation.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-cachedir.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-longuser.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-handle-continue.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-heimdal.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	CFLAGS="" APXS="${APXS}" econf --with-krb5=/usr --without-krb4
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	apache-module_src_install
-	dotmpfiles "${FILESDIR}/${PN}.conf"
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r3.ebuild b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild
index 0a59d3214ff2..f06674c34353 100644
--- a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r3.ebuild
+++ b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/modauthkerb/${PN}/${P}/${P}.tar.gz
 
 LICENSE="BSD openafs-krb5-a HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="virtual/krb5"
 RDEPEND="${DEPEND}"
@@ -34,6 +34,11 @@ PATCHES=(
 	"${WORKDIR}/${P}-gentoo-patchset"/${P}-longuser.patch
 	"${WORKDIR}/${P}-gentoo-patchset"/${P}-handle-continue.patch
 	"${WORKDIR}/${P}-gentoo-patchset"/${P}-heimdal.patch
+
+	# bug #830208
+	"${FILESDIR}"/${P}-api-change-krb5.patch
+	# bug #673066
+	"${FILESDIR}"/${P}-krb5pwd-double-free.patch
 )
 
 # Work around Bug #616612
@@ -52,7 +57,8 @@ src_compile() {
 
 src_install() {
 	apache-module_src_install
-	dotmpfiles "${FILESDIR}/${PN}.conf"
+
+	dotmpfiles "${FILESDIR}"/${PN}.conf
 }
 
 pkg_postinst() {
diff --git a/www-apache/mod_dnssd/Manifest b/www-apache/mod_dnssd/Manifest
index 58a6d1118cba..cbf7f79d5125 100644
--- a/www-apache/mod_dnssd/Manifest
+++ b/www-apache/mod_dnssd/Manifest
@@ -2,5 +2,5 @@ AUX 80_mod_dnssd.conf 118 BLAKE2B 821ab460bac4953375244a9da11674fb054f14611f73fb
 AUX mod_dnssd-0.6-httpd24.patch 571 BLAKE2B e0a5d3610a7c26dcbad07bab08d38d872cea1070891e457788525d347408560bd30768c9b3886b5199b49f9b1a2c748824bb0a04a5c218604281c194cac09a99 SHA512 5af320fe038b9db4298874fa68c0de7381ff3f0471802d60972c9694c50616684a30e1986ff3beb95ed963060b792b1e5e3c88b31a199411c20ff15d3bb1fd0c
 AUX mod_dnssd-0.6-ldflags.patch 494 BLAKE2B ac0237603c2062a45ab5ef22a255ebedb8b1f75382dd64717398b1c4bac1289a086870363771f1abd1b8fadb1428a449d8c1c42f3f6ae520e2aa4979eedd8d66 SHA512 bbf43d11b6a52800277fcdf4407b6b46f49468337fa2188485d3a6af990b9fdcb5696b0fa2ec60453c3692e6f985659d73fe72053f5254d3f4c5c7907e851264
 DIST mod_dnssd-0.6.tar.gz 86417 BLAKE2B 01aee3624e413f5a00d6e63e5e74d9dc1667db9e9747b65a7fce9ab762cf0f9a5cd3ef4dcccf9532e9aa70435bd6afd846fdbaafff6667ba1fd9d413ea6fe0d9 SHA512 c3eacd2065f996ace76496b828a5be4b735225782c88ed0fba00c37ffed91af7c81cef755556968880e11e05fbaf65a4326728cb82abcad03ccaf925be1f29d3
-EBUILD mod_dnssd-0.6-r2.ebuild 862 BLAKE2B 2a0ad73d024937434bb71c8e68fa876e8ea148076d06af382b8834dc15c61e0e44ae89c942ab557827d97250156bdb3bcc8c348b3ef0a18b44e7250c7e266478 SHA512 2164c28b93bcf2d940f44853d1e2e0d8a2e1c52f56f286f25e0c1171e245fdee5f19e3880f792c048f9bbdac02d2188e33a0b3dc879637e3d9262cb4561d6346
+EBUILD mod_dnssd-0.6-r2.ebuild 869 BLAKE2B d12638d179b67d2637842f4dca7f2e8dbf8f88f7860f77161e6ec683479a21ae3143f9d24f6a10632b3cfa6affa996c1e5994bf30245612f5df51357e3aa1a2c SHA512 dd13a7fb9536c6591b2eace4bf617c3128bf1ac6073a37993fde16ad7b1159327dc59809eb11a2be78d7358a9c42d9b7ad4b3fac44014627d02fc049e639049f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild b/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild
index d1bbb62e03f7..0734bfca4c2d 100644
--- a/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild
+++ b/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 DEPEND="net-dns/avahi[dbus]"
 RDEPEND="${DEPEND}"
diff --git a/www-apache/mod_evasive/Manifest b/www-apache/mod_evasive/Manifest
deleted file mode 100644
index 1b8f3cfe90cc..000000000000
--- a/www-apache/mod_evasive/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 10_mod_evasive.conf 935 BLAKE2B 4f46bcc0eb08d950e2e3ac6585b003afc8b96df12652933583fc0874d7f3152a1ed698de66111f80ffae3d3824c093f254647d3c9d1c3a152b8fe07216782347 SHA512 4ba4591738df21b624826ca11ed83d6751592c03e1dcd1df44e1dc3ec9ebc5533f51c86a6e91fa650770972f2d242257043d02d0c22800a9a119ee9e79d5148e
-DIST mod_evasive_1.10.1.tar.gz 20454 BLAKE2B 77e8692733bfb2b6bedf17e5e84fcb8efc99af66621579b93c1be6d5b75aa19cc1d6defe729c64b06f3179dda6b090062fd71c44788be6663f9352b2c6f8a30d SHA512 03b276d1a3dc8e853ca7f3791d66383492a7ae8f3b73988f0eefa7e4e31f267da432e811de81c8d721033e152e94139efc99ad80da809f220a1330e9d43d39ba
-EBUILD mod_evasive-1.10.1-r1.ebuild 794 BLAKE2B 83306c42ddc5dbe8d659ab16d1b8942d89aaaffaa8619fff1d31839a6db3fff2f861159fcf79c728bc2390e93016dd9eead25338242e3c0776e48806b33c189f SHA512 533b58f4754d4ac11aa5faa358f060148b1f7f5571225878e3947a688b0e30eb589bf58a80efe037e0b589c8fad1d361ad4f1929f9c6012fe328e911c350fc34
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_evasive/files/10_mod_evasive.conf b/www-apache/mod_evasive/files/10_mod_evasive.conf
deleted file mode 100644
index 31ea08c7bf09..000000000000
--- a/www-apache/mod_evasive/files/10_mod_evasive.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-<IfDefine EVASIVE>
-LoadModule evasive_module modules/mod_evasive.so
-
-DOSHashTableSize 3097
-DOSPageCount 5
-DOSSiteCount 100
-DOSPageInterval 2
-DOSSiteInterval 2
-DOSBlockingPeriod 10
-
-# Set here an email to notify the DoS to someone
-# (here is better to set the server administrator email)
-DOSEmailNotify root
-
-# Uncomment this line if you want to execute a specific command
-# after the DoS detection
-#DOSSystemCommand    "su - someuser -c '/sbin/... %s ...'"
-
-# Specify the desired mod_evasive log location
-DOSLogDir /var/log/apache2/evasive
-
-# WHITELISTING IP ADDRESSES
-# IP addresses of trusted clients can be whitelisted to insure they are never
-# denied.  The purpose of whitelisting is to protect software, scripts, local
-# searchbots, or other automated tools from being denied for requesting large
-# amounts of data from the server.
-#DOSWhitelist    127.0.0.* 
-#DOSWhitelist    172.16.1.*
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_evasive/metadata.xml b/www-apache/mod_evasive/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/www-apache/mod_evasive/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/www-apache/mod_evasive/mod_evasive-1.10.1-r1.ebuild b/www-apache/mod_evasive/mod_evasive-1.10.1-r1.ebuild
deleted file mode 100644
index d9ffcc51580b..000000000000
--- a/www-apache/mod_evasive/mod_evasive-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module eutils
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Evasive maneuvers module for the event of an HTTP DoS"
-HOMEPAGE="https://github.com/jzdziarski/mod_evasive"
-SRC_URI="http://www.zdziarski.com/projects/mod_evasive/${P/-/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="EVASIVE"
-
-need_apache2_4
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	# Apache 2.4
-	sed -i -e 's/connection->remote_ip/connection->client_ip/' mod_evasive20.c || die
-	mv ${PN}20.c ${PN}.c
-	sed -i -e 's:evasive20_module:evasive_module:g' ${PN}.c || die
-}
-
-src_install() {
-	keepdir /var/log/apache2/evasive
-	apache-module_src_install
-}
diff --git a/www-apache/mod_extract_forwarded/Manifest b/www-apache/mod_extract_forwarded/Manifest
deleted file mode 100644
index aa20d27db8bb..000000000000
--- a/www-apache/mod_extract_forwarded/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 98_mod_extract_forwarded.conf 197 BLAKE2B b78103878b2b6a3009474b73ab74799b28edcd7f822fe022347afa10e8981e01d9437c50f39235bf0895bc6466a3c6935a3a96c262eeb543b538c33bd0b5b921 SHA512 197199ea86b5d1c3f50c57c0f9c4b31f14d2138d62e02de33a18e1b04f8c10f27568786a8168b113e5469727fc427005f225dad057a7875f0db737273ea567f3
-DIST mod_extract_forwarded-2.0.3_pre2015052015.tar.xz 13548 BLAKE2B dd156fc09d0074f83e2b06f3faf546a924cfc81c6906ab884832fbfe4526eb70571e6694f557e111496ed2345c7bfc3f14e7e59e9367483d2069ca5053d26bab SHA512 26cfde6343885eea964dcd96ce9bc5952bfb9b5b27b093abd71358a26548c1361e37449d2f38a68aa0bac0bc43e465d65d6fbfaf91598b94ced2e65b861a14db
-EBUILD mod_extract_forwarded-2.0.3_pre2015052015.ebuild 794 BLAKE2B d161f4fb76309194edc4ffb66af9b4e4374c0444af83f02fc621b005e7406027b9ca61321fa6a6ff93a93155fa4440ef5644e218ddd0239e2b8feae5f1a1744c SHA512 dad3112c2cf74c5d352b7b0de60dfe05b1e562d718ccc9d98d79b947ac2e609e6068713ff74bd163379f70ee7df0f7732e68cdd1e5ad200e846a325ff1e222c8
-MISC metadata.xml 256 BLAKE2B e7f03def142efdc2250fc4f72ec3c810d03d61efafa04eac75eef86f906f1c0c280e8c9fb17136c5334253fdca688a9c6a67a2992c8fa3c7390bb90a3e1967e4 SHA512 ca4c8d25283aa5d57ae3ebed93f250133169bc41d24c4081adbf4542d8b85072d931b81ae89a2bb99a0aa688c2482db5c17d2eff7438243838e3b40ad4417dc2
diff --git a/www-apache/mod_extract_forwarded/files/98_mod_extract_forwarded.conf b/www-apache/mod_extract_forwarded/files/98_mod_extract_forwarded.conf
deleted file mode 100644
index 18f7e866dbb3..000000000000
--- a/www-apache/mod_extract_forwarded/files/98_mod_extract_forwarded.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfDefine EXTRACT_FORWARDED>
-LoadModule extract_forwarded_module modules/mod_extract_forwarded.so
-
-MEForder refuse,accept
-MEFrefuse all
-MEFaccept localhost
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_extract_forwarded/metadata.xml b/www-apache/mod_extract_forwarded/metadata.xml
deleted file mode 100644
index a21be76f52be..000000000000
--- a/www-apache/mod_extract_forwarded/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-		<flag name="mod-proxy">Enable support for Apache's internal proxy</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.ebuild b/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.ebuild
deleted file mode 100644
index 24703f93f876..000000000000
--- a/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module
-
-DESCRIPTION="Rewrites X-Forwarded-For to REMOTE_ADDR for reverse proxy configurations"
-HOMEPAGE="http://www.openinfo.co.uk/apache/index.html"
-#SRC_URI="http://www.openinfo.co.uk/apache/extract_forwarded-${PV}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~pacho/maintainer-needed/${P}.tar.xz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mod-proxy"
-
-DEPEND=""
-RDEPEND="mod-proxy? ( www-servers/apache[apache2_modules_proxy_connect] )"
-
-APACHE2_MOD_CONF="98_${PN}"
-APACHE2_MOD_DEFINE="EXTRACT_FORWARDED"
-
-need_apache2_4
-
-src_prepare() {
-	if ! use mod-proxy; then
-		sed -i -e 's:#define USING_proxy_http_module .*::' mod_extract_forwarded.c || die
-	fi
-}
diff --git a/www-apache/mod_ldap_userdir/Manifest b/www-apache/mod_ldap_userdir/Manifest
deleted file mode 100644
index 147ea18a6205..000000000000
--- a/www-apache/mod_ldap_userdir/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 47_mod_ldap_userdir.conf 284 BLAKE2B 4b1ff27eb0de8f9f688d2816643f8f14a3cad3355d3e1fd3601288ee0cb6ac1abf41b007b375a973941dbe6bc952083704d8ca9b035aaa70043ca0ab9aa5524b SHA512 7651fade1a9bda54e6ea1d3c2a8b6853f91c6c43f7d914cbd8e1bfa94ef2c31b0ac1c3798d9430fa62805d4b48eb358ad8e665cb0e9c833fc622c78e4789f747
-DIST mod_ldap_userdir-1.1.19.tar.gz 51483 BLAKE2B 6e88dcafd2dbdec78623665ae66429f833015c7ded8c68e76e081c39b56f9ef75b925955416d8179ec1844527539708104f4dd21b0bb65e759cb764f84c0d1e9 SHA512 57d75ac58ac841641050e1f6e022bd6c7df9192da29439264bbe83e938e84a474952996e53bcba1f490ab24415c98b7e972bc3af14cb46a7bc35016b6533ff28
-EBUILD mod_ldap_userdir-1.1.19.ebuild 928 BLAKE2B 72476320c7717bc7303ee19de3328d486fab2df9e7ca7324c721a5eb1e8baac7805471786896bd7968f23437c3a7d305d3d3c9a639716784657e65c3c8e29634 SHA512 2eeca3378e8100b492653c2f581746f38e17485ddd6933b91d90acbd80eec24eff43fe2832fb110a969af5e159ccc17c8e31e99f9a96fd0632b7e114dbe61d6e
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_ldap_userdir/files/47_mod_ldap_userdir.conf b/www-apache/mod_ldap_userdir/files/47_mod_ldap_userdir.conf
deleted file mode 100644
index 1e14e80e152b..000000000000
--- a/www-apache/mod_ldap_userdir/files/47_mod_ldap_userdir.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfDefine LDAP_USERDIR>
-LoadModule ldap_userdir_module modules/mod_ldap_userdir.so
-
-LDAPUserDir             public_html
-LDAPUserDirDNInfo       cn=root,dc=yourcompany,dc=com yourpassword
-LDAPUserDirBaseDN       ou=People,dc=yourcompany,dc=com
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_ldap_userdir/metadata.xml b/www-apache/mod_ldap_userdir/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/www-apache/mod_ldap_userdir/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild
deleted file mode 100644
index 69d4627e46f0..000000000000
--- a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit apache-module depend.apache
-
-DESCRIPTION="Look up Apache ~user directories in an LDAP directory"
-HOMEPAGE="https://www.horde.net/~jwm/software/mod_ldap_userdir/"
-SRC_URI="https://horde.net/~jwm/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ssl"
-
-DEPEND="net-nds/openldap
-	ssl? ( dev-libs/openssl )"
-
-# The module will compile fine without apache[ldap], but Apache will
-# crash if you try to load ${PN} without mod_ldap loaded. The funny-
-# looking atom was taken from depend.apache.eclass (need_apache2).
-RDEPEND="${DEPEND}
-	=www-servers/apache-2*[ldap]"
-
-APACHE2_MOD_CONF="47_${PN}"
-APACHE2_MOD_DEFINE="LDAP LDAP_USERDIR"
-
-DOCFILES="DIRECTIVES README user-ldif"
-
-# Don't try to get away without this, even though it causes some deps to
-# be repeated.
-need_apache2
diff --git a/www-apache/mod_vhost_ldap/Manifest b/www-apache/mod_vhost_ldap/Manifest
deleted file mode 100644
index 5def571687a8..000000000000
--- a/www-apache/mod_vhost_ldap/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 99_mod_vhost_ldap.conf 274 BLAKE2B c5449edc94d927247078ad34a58abecc3dc857e6ea475e8c79da2ff9d1dfe62f9b673cf8975736df88cd037d975fcf6ff7df5ea525c14cf413318e0e86003e08 SHA512 597fe675c63118477d8883cc53a7c21c287c0a6446392b2b96243256ebc0a9e30f758b0af5254d0be10cce91aea04bfe030cd6d8793121bebee2c445964e9885
-DIST mod_vhost_ldap-2.4.0.tar.xz 9628 BLAKE2B 8a8fc0718905f43c153a7ae5c7e551a15bb10b1aa77e24010edaff42adffc9d5d9a4f9c6d1a2b4a0d64bf27014c001ce45e4e564ac7624651d688c828f03e0bd SHA512 b9715881ca704207fd852dfa2370dd71993bc85f390b353201aaf40c4252978e720abeda8b29b6c676f3cac66e50b67989825d7a6d3992829fbbfed725c75330
-EBUILD mod_vhost_ldap-2.4.0-r1.ebuild 1139 BLAKE2B 0ba3405ae81e1df05057a7efab0303e4445a7d01e449893513087bba802672a5db72e228dfcca7eafbd28a640fd762ced150e25efbe2d3abd8ce13d28d86ccec SHA512 9afb258fae166a3e7272f77af6690a967ac3e4ab56ff494d1116725afc3964946add003b5f571ad7e3b5ae9099f75cb7e752e714b2d367fe750777b79fb470e8
-MISC metadata.xml 253 BLAKE2B adc7cf5b23894511a08a27357347d49d1d019e70bb14b7817ef4001148171041d8b9e3f51eb671b0952d98f5b912360bfaa7f40de82b29c28227009a5a1437b6 SHA512 bc03aa2bd661c2369f747334a8ddc3bdc68fd9636419936f8bb7e66ed2470b8593ec380f07f91d145db7cd471b31d15d0c5c530a9b8d43d127eb514fefb740e3
diff --git a/www-apache/mod_vhost_ldap/files/99_mod_vhost_ldap.conf b/www-apache/mod_vhost_ldap/files/99_mod_vhost_ldap.conf
deleted file mode 100644
index dd563150dcbc..000000000000
--- a/www-apache/mod_vhost_ldap/files/99_mod_vhost_ldap.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<IfDefine VHOST_LDAP>
-LoadModule vhost_ldap_module modules/mod_vhost_ldap.so
-
-VhostLDAPEnabled on
-VhostLDAPUrl "ldap://127.0.0.1/ou=vhosts,ou=web,dc=localhost"
-VhostLdapBindDN "cn=admin,dc=localhost"
-VhostLDAPBindPassword "changeme"
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_vhost_ldap/metadata.xml b/www-apache/mod_vhost_ldap/metadata.xml
deleted file mode 100644
index a1781bd06014..000000000000
--- a/www-apache/mod_vhost_ldap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">oerdnj/mod-vhost-ldap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild b/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild
deleted file mode 100644
index 6ecb1a326d4c..000000000000
--- a/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit apache-module
-
-DESCRIPTION="Store and configure Apache virtual hosts using LDAP"
-HOMEPAGE="https://github.com/oerdnj/mod-vhost-ldap"
-SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-APACHE2_MOD_CONF="99_${PN}"
-APACHE2_MOD_DEFINE="VHOST_LDAP LDAP"
-
-DOCFILES="AUTHORS ChangeLog README"
-
-# We need apr-util[ldap] and apache to build, but the ldap module for
-# apache is only needed when we try to run the thing.
-DEPEND="dev-libs/apr-util[ldap]"
-RDEPEND="=www-servers/apache-2.4*[ldap]"
-
-need_apache2_4
-
-src_prepare() {
-	default
-
-	sed -i "s/MOD_VHOST_LDAP_VERSION/\"${PV}\"/g" "${PN}.c" || \
-		die "failed to sed version string"
-}
-
-src_install() {
-	apache-module_src_install
-	insinto /etc/openldap/schema
-	doins mod_vhost_ldap.schema
-}
-
-pkg_postinst() {
-	apache-module_pkg_postinst
-	einfo
-	einfo "Your LDAP server needs to include mod_vhost_ldap.schema and should"
-	einfo "also maintain indices on apacheServerName and apacheServerAlias."
-	einfo
-}
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 0f03e07ce5ab..7115373275b1 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -1,5 +1,8 @@
 AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da22d336c1426c4f8f0379e1958b3599811b2efc3cdb16f9543ad3f72d6139da9be01897bf200c06100 SHA512 6e0310d3f5dd8da4653c8502ad297ffe73c04e04c5fdd87721c407e839ba81ba4060394bcd1f06ef26d2d98cf007b585a382eb5f566345817999cd237adfa833
+AUX mod_wsgi-4.7.1-py310.patch 4484 BLAKE2B c58f1dff4ad997e18aa46f96d4dae6a11891e1e7efd7b0ffb3626d115634105c32b90eb697f950cf820145e569c4f2e285a1d36540ec602ee7b0976816e2d975 SHA512 03d535a85d1d44cc48c501e0e35029383ae95ba4cc54c440b50bb4176b48da61fe6dbd71a948fa510f717cae110f221a3abbf1445a139fde46cd68990f544a1e
 DIST mod_wsgi-4.7.1.tar.gz 696111 BLAKE2B 69fea421077f1ecbf1cef5c9eac4ba296fa676e0bfbb860ca8a7cb701701f405edb3760486b87e8d9dd93efcb4c23385197d770ca32e16a473d5d252d292fb76 SHA512 cbb5ec53d55e47a83f2b0630527c6a52b48ef21d5d2c18adcb875fc455795b39b3c93f4a86dfbf9738c0bd554d86cc4912cc9ff83c428af302ab94a61f66b5b4
-EBUILD mod_wsgi-4.7.1-r1.ebuild 1232 BLAKE2B 1d91d0f6bb3cbade51242299c240547f7fec679eb47673f93ad4e60102df7ad8e7f5fb54e847b98a11e34e1a5460788f87112548c8de403f0afe654386c2c04f SHA512 d2c54f581d2e55d70ee524163abfc19be07eaf28dc67d90f70621ef299da320db4335ce2e19acf948090b979b95cd642a1cc83dbd21111f038e69e50dc6d1bda
+DIST mod_wsgi-4.9.0.tar.gz 699891 BLAKE2B 7ee6ffc28e86baf8ee92973479a26964f7c183c2b113b49a48af02c622f8d8f698abffcd4f522a1ecca5b89325f94856cbe89db5a81d2ac2e87438ee90be97b0 SHA512 9dc34d431171321094a9713444895d9754eff4e69ad1e86c8d3cd77bc1ca0a4c10b697e7f8cf14902d6bfaf205c8842e62fa944bb38f66f1c54fd36af95a09d6
+EBUILD mod_wsgi-4.7.1-r1.ebuild 1275 BLAKE2B d9a5dbad4c0a788bf12df888bb42d9ce4598bc80bcaa317e11ef8ef444e7a0564bd7139df91957a1dc7dc3dec858b24c2f24e1aa6717aee7cacaaf7b219a20e9 SHA512 6e4e8254bfa149cc95045624c5635456a5253ba6d0fa4168a10c8b49ad163ecc6c6bea107821a99079a74580a0f5d677561ec6d9d25e7b51f10c60497d40a375
 EBUILD mod_wsgi-4.7.1.ebuild 1228 BLAKE2B dc5ab6545e2acfe51ee4f77dd6335f3b7ed56170f64a6fc043f57faa7b0d7d00a04d227611565da142e0a2e9bc4bfa5b315c0f54c1c9e519e0fa552030c2f98a SHA512 aaf4516e8304d1312b1ce3977281c86f866baaf9d7b1de3da3dd5b471f59e547b0b002aa966cb72dfbefd22efa26124e15ec4a377b64aa5a2f49196aeb58e1c3
+EBUILD mod_wsgi-4.9.0.ebuild 1111 BLAKE2B 69c4c4584a991bdc542eaa795c1669a29f35755e197d9aaf50705223dd937f78ca9428a1430d92b5e50b2edbbaf32c62284c517fa28a3ad62266afd350a577e2 SHA512 fd135f4833b251a74c8f3e69c0622238f95f07eb83f8921b1032e3a6faefe0dc5b065e014bb8a2fc222026699bbcc6fae203f73d6c0c98d6d22708d1fefe416d
 MISC metadata.xml 381 BLAKE2B 604d6931a9a17c2521e907f719286c798028c6c51788ece43f81a09744eb545f9cc5b530177fbc7580df88855cdfe72d9204e3eeec660daaca7b72d9387fd650 SHA512 b8e16b976555de98f41b1ecee63c1cb2b1c518ae7b70d517024a7f1b03c2b1f89b54cc2f978792bdf79768cdd8d89abc11ee668db2d78786b1455afcf097a085
diff --git a/www-apache/mod_wsgi/files/mod_wsgi-4.7.1-py310.patch b/www-apache/mod_wsgi/files/mod_wsgi-4.7.1-py310.patch
new file mode 100644
index 000000000000..274046d99ca0
--- /dev/null
+++ b/www-apache/mod_wsgi/files/mod_wsgi-4.7.1-py310.patch
@@ -0,0 +1,126 @@
+From b439f1c411a9479ccc03c16465cdff50fede79d3 Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <encukou@gmail.com>
+Date: Thu, 10 Jun 2021 15:45:03 +0200
+Subject: [PATCH] Use Py_CompileString rather than
+ PyParser_SimpleParseFile/PyNode_Compile
+From: https://github.com/GrahamDumpleton/mod_wsgi/commit/b439f1c411a9479ccc03c16465cdff50fede79d3
+
+---
+ src/server/mod_wsgi.c    | 68 +++++++++++++++++++++++++++++++---------
+ src/server/wsgi_python.h |  1 -
+ 2 files changed, 53 insertions(+), 16 deletions(-)
+
+diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c
+index b657a748..4f1d8765 100644
+--- a/src/server/mod_wsgi.c
++++ b/src/server/mod_wsgi.c
+@@ -3645,7 +3645,10 @@ static PyObject *wsgi_load_source(apr_pool_t *pool, request_rec *r,
+     FILE *fp = NULL;
+     PyObject *m = NULL;
+     PyObject *co = NULL;
+-    struct _node *n = NULL;
++    char *source;
++    size_t pos = 0;
++    size_t allocated = 1024;
++    size_t nread;
+ 
+ #if defined(WIN32) && defined(APR_HAS_UNICODE_FS)
+     apr_wchar_t wfilename[APR_PATH_MAX];
+@@ -3730,36 +3733,71 @@ static PyObject *wsgi_load_source(apr_pool_t *pool, request_rec *r,
+         return NULL;
+     }
+ 
+-    n = PyParser_SimpleParseFile(fp, filename, Py_file_input);
+-
++    source = malloc(allocated);
++    if (source != NULL) {
++        do {
++            nread = fread(source + pos, 1, allocated - pos, fp);
++            pos += nread;
++            if (nread == 0) {
++                if (ferror(fp)) {
++                    free(source);
++                    source = NULL;
++                }
++                break;
++            }
++            if (pos == allocated) {
++                allocated *= 2;
++                char *reallocated_source = realloc(source, allocated);
++                if (reallocated_source == NULL) {
++                    free(source);
++                    source = NULL;
++                    break;
++                }
++                source = reallocated_source;
++            }
++        } while (!feof(fp));
++    }
+     fclose(fp);
+-
+-    if (!n) {
++    if (source == NULL) {
+         Py_BEGIN_ALLOW_THREADS
+         if (r) {
+-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++            ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
+                           "mod_wsgi (pid=%d, process='%s', application='%s'): "
+-                          "Failed to parse Python script file '%s'.", getpid(),
++                          "Could not read source file '%s'.", getpid(),
+                           process_group, application_group, filename);
+         }
+         else {
+-            ap_log_error(APLOG_MARK, APLOG_ERR, 0, wsgi_server,
++            ap_log_error(APLOG_MARK, APLOG_ERR, errno, wsgi_server,
+                          "mod_wsgi (pid=%d, process='%s', application='%s'): "
+-                         "Failed to parse Python script file '%s'.", getpid(),
++                         "Could not read source file '%s'.", getpid(),
+                          process_group, application_group, filename);
+         }
+         Py_END_ALLOW_THREADS
++        return NULL;
++    }
+ 
+-        wsgi_log_python_error(r, NULL, filename, 0);
++    co = Py_CompileString(filename, source, 0);
++    free(source);
+ 
++    if (!co) {
++        Py_BEGIN_ALLOW_THREADS
++        if (r) {
++            ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
++                          "mod_wsgi (pid=%d, process='%s', application='%s'): "
++                          "Could not compile source file '%s'.", getpid(),
++                          process_group, application_group, filename);
++        }
++        else {
++            ap_log_error(APLOG_MARK, APLOG_ERR, errno, wsgi_server,
++                         "mod_wsgi (pid=%d, process='%s', application='%s'): "
++                         "Could not compile source file '%s'.", getpid(),
++                         process_group, application_group, filename);
++        }
++        Py_END_ALLOW_THREADS
+         return NULL;
+     }
+ 
+-    co = (PyObject *)PyNode_Compile(n, filename);
+-    PyNode_Free(n);
+-
+-    if (co)
+-        m = PyImport_ExecCodeModuleEx((char *)name, co, (char *)filename);
++    m = PyImport_ExecCodeModuleEx((char *)name, co, (char *)filename);
+ 
+     Py_XDECREF(co);
+ 
+diff --git a/src/server/wsgi_python.h b/src/server/wsgi_python.h
+index fa06e2cb..3b34b731 100644
+--- a/src/server/wsgi_python.h
++++ b/src/server/wsgi_python.h
+@@ -43,7 +43,6 @@
+ 
+ #include "structmember.h"
+ #include "compile.h"
+-#include "node.h"
+ #include "osdefs.h"
+ #include "frameobject.h"
+ 
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
index e5ae886e528e..759f60c5f6d0 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit apache-module python-single-r1
@@ -27,6 +27,10 @@ APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
 
 DOCFILES="README.rst"
 
+PATCHES=(
+	"${FILESDIR}/${P}-py310.patch"
+)
+
 need_apache2
 
 pkg_setup() {
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild
new file mode 100644
index 000000000000..09d2547237d1
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit apache-module python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications"
+HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
+
+DOCFILES="README.rst"
+
+need_apache2
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	# Calling depend.apache_pkg_setup fails because we do not have
+	# "apache2" in IUSE but the function expects this in order to call
+	# _init_apache2_late which sets the APACHE_MODULESDIR variable.
+	_init_apache2
+	_init_apache2_late
+}
+
+src_configure() {
+	econf --with-apxs="${APXS}" --with-python="${PYTHON}"
+}
+
+src_compile() {
+	default
+}