gentoo resync : 22.12.2021

19 files changed, 220 insertions, 147 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 4b738ca22c4c..1e61314c5cc5 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_auth_radius/Manifest b/www-apache/mod_auth_radius/Manifest
index 92126fb9e342..1d98fa5a7d06 100644
--- a/www-apache/mod_auth_radius/Manifest
+++ b/www-apache/mod_auth_radius/Manifest
@@ -1,5 +1,3 @@
-AUX 1.5.8-includes.patch 719 BLAKE2B 2ebf52d30377346e1d7aeb66ee46dec5ef7366748d5d71246cd8215184a08cc8ec32a9879dd468d3d3b02e4c49f31fffc6a1e238d3f8b279b78970274798a303 SHA512 8c9bd0e4a9afd5ab009b956685bc0c94cef1a50dc112f701994804acd8fe821d1c25367c5bede3e95ad190149d1bd482dea90ff8824bb5a2aa20fa9451e81ad2
-AUX 1.5.8-remote_ip-obsolete.patch 1326 BLAKE2B cd788a83eb02e26033c369e8595e6a5e4e4f09d87cb5e32fc81c329c17369cf09b6d2e5368418238a62d9540cb0b5c9fc827799e9f0ca556b3edfe34ea5b3399 SHA512 172b319b90580e08200d787821e28fbd85ffb0dd6fb17566cbad62fd5908be225b7e7b34adc6cb0800f97650de2b0e5bc0cbe7e30f8fdb7ee75674bb7b670db4
 DIST mod_auth_radius-1.6.0.tar.gz 20176 BLAKE2B b004b133a3b8e84533f1e97883436aaec389870c6ca6eb2017bd7f4fac12913c438b9838ff1fce01e5ed26bfeec65f6ac349816ee681f39deea0616c22e2530c SHA512 e128855ab198b35030b798c16538fa33c1698f0f179fccb0d160c2d2cce08f1a7b2ecfaefdc19ae7f21802d38705b7a08414444ac52041b7365a5633e5e66159
 EBUILD mod_auth_radius-1.6.0.ebuild 896 BLAKE2B a53e510c70f452d6fb62b8810dd595724f661caa93c5b64c747105cff9c3116a2254457e084e01536183458c56e8912a4959559202abeb3e777397ac3b935191 SHA512 7a52be61ab97e29012df45a47d3ad64ac9c8416587f43eb094da32f0218edf25902c9a86c04ce1ff9a78fdb0284af98c548282152fb1f097000ffdec9c2c6a60
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/www-apache/mod_auth_radius/files/1.5.8-includes.patch b/www-apache/mod_auth_radius/files/1.5.8-includes.patch
deleted file mode 100644
index b1482c5f9bee..000000000000
--- a/www-apache/mod_auth_radius/files/1.5.8-includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uNr mod_auth_radius-1.5.8.ORIG/mod_auth_radius-2.0.c mod_auth_radius-1.5.8/mod_auth_radius-2.0.c
---- mod_auth_radius-1.5.8.ORIG/mod_auth_radius-2.0.c	2013-05-08 14:26:19.103330264 +0100
-+++ mod_auth_radius-1.5.8/mod_auth_radius-2.0.c	2013-05-08 14:29:40.331333283 +0100
-@@ -287,15 +287,21 @@
- 
-  */
- 
-+#include <arpa/inet.h>
- #include <netdb.h>
- #include <openssl/md5.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- 
- #include "httpd.h"
- #include "http_config.h"
- #include "http_core.h"
- #include "http_log.h"
- #include "http_protocol.h"
-+#include "http_request.h"
- #include "util_md5.h"
- #include "apr_general.h"
- #include "apr_tables.h"
diff --git a/www-apache/mod_auth_radius/files/1.5.8-remote_ip-obsolete.patch b/www-apache/mod_auth_radius/files/1.5.8-remote_ip-obsolete.patch
deleted file mode 100644
index 77d0880e8d97..000000000000
--- a/www-apache/mod_auth_radius/files/1.5.8-remote_ip-obsolete.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr mod_auth_radius-1.5.8.ORIG/mod_auth_radius-2.0.c mod_auth_radius-1.5.8/mod_auth_radius-2.0.c
---- mod_auth_radius-1.5.8.ORIG/mod_auth_radius-2.0.c	2013-05-08 14:18:02.746322816 +0100
-+++ mod_auth_radius-1.5.8/mod_auth_radius-2.0.c	2013-05-08 14:19:03.589323729 +0100
-@@ -683,7 +683,7 @@
-    * benefit here.
-    */  
-   apr_snprintf(one, COOKIE_SIZE, "%s%s%s%s%s%08x", scr->secret,
--	      r->user, passwd, c->remote_ip, hostname, expires);
-+	      r->user, passwd, c->client_ip, hostname, expires);
- 
-   /* if you're REALLY worried about what's going on */
- 
-@@ -691,7 +691,7 @@
-   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," secret     = %s\n", scr->secret);
-   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," user       = %s\n", r->user);
-   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," passwd     = %s\n", passwd);
--  ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," remote ip  = %s\n", c->remote_ip);
-+  ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," remote ip  = %s\n", c->client_ip);
-   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," hostname   = %s\n", hostname);
-   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," expiry     = %08x\n", expires);
- #endif
diff --git a/www-apache/mod_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest
index 551ce4676f2e..3abf3ddddb5a 100644
--- a/www-apache/mod_authnz_external/Manifest
+++ b/www-apache/mod_authnz_external/Manifest
@@ -1,7 +1,5 @@
 AUX 10_mod_authnz_external.conf 993 BLAKE2B 36daed95a23c58abb0749cfd4836f57b7913362f7dd98f18a5e0158b30754392756f9f9e0c3a8158d6e93e40f765ec440fa3f24069746a49ec16db9f2c8ca6b1 SHA512 66de4c74f5f72ee1f0483c8f5bcd0ff461ebcf0a7b2790692a3b6f4c2ac1be8e6510ffcaa7502903d1b5b611a1a8375a845ff14c3147df3614e5d73384a22ce4
-DIST mod_authnz_external-3.3.2.tar.gz 36160 BLAKE2B afc3e4b9b52628479163bf705a473edbb96b5c82ac74c43a0d15512adf59adb4a4122f83e59871a3a91d9094347287b1072e3f12b9689680acd91f4ea534cc6d SHA512 8216744dbaed8dbde0d33658e38594463409e613412bd94f3e5f5a816f5e793a395ddda7c582ff1d1e69e48efdd1efb48c168d4cbc37cc7807a0dcb92eace0be
 DIST mod_authnz_external-3.3.3.tar.gz 38266 BLAKE2B 03bdfe7efdcd832b7662be70e0e38cdfb4f025d3bdd3baf3e98b4d77efd538605db8f625006246515f427989aca3242626a4115e4534ecb75c09adc967227ea6 SHA512 65b643870dcfc5cdc0343bc606ff74697473617ce9f6fe27cae40ae1b2dca904bb71b6ec8347c6b5c5e3819785432798f6e78820cdf66fd17b245371a41322d2
-EBUILD mod_authnz_external-3.3.2.ebuild 547 BLAKE2B cd5805c3dcc67d369caa4c0766c36be0840345444e7c776ab074a522cb6d5c21ed9081d656d60c9a6c7f6362f9a619a3dbefc3dc1b4607f51a54e3a9666aadfa SHA512 3c76edf465edaad8b0103af7f872cf29d57faf44a1e35fbd9cad67fed5e72a1b66c6925b6ebbaad55529214e809198ccc0b801120d148f69f67cbc60a189f2e9
-EBUILD mod_authnz_external-3.3.3.ebuild 807 BLAKE2B 55791df0e64af79430204a412fb48b0e39de500d37db76fba7b2e83133fc4198dd18afd87d83a60f04f311d09169f34bb510511ad0ed14ae87e9ad7eca417e51 SHA512 5edf1c9def9dcaa2ceb1d73c421dfce4d5853ef8622f6146522af715178a7baf8518cc934c58a6567b38862193fd75b8fe29d5a4f080cf5f9f7b3edc243ad8d8
+EBUILD mod_authnz_external-3.3.3.ebuild 805 BLAKE2B fed678608b027aeb9d8694f6b25b1d6df7c4b4e01260dde9abe28e93aa4791ca14ec529598cc96bae88d86e547f9b6162a469360e35cb2e53b5d7b56700ab493 SHA512 5a1fd2b4cbb2359e8b08be3c724f8630f7d885ab9c1828cd7262eb73c3321ba1a2e1694b7d02d50fc6380be8b5eafc5b1580b46fd9a244bdc5bf272fd0d299b3
 EBUILD mod_authnz_external-9999.ebuild 807 BLAKE2B 55791df0e64af79430204a412fb48b0e39de500d37db76fba7b2e83133fc4198dd18afd87d83a60f04f311d09169f34bb510511ad0ed14ae87e9ad7eca417e51 SHA512 5edf1c9def9dcaa2ceb1d73c421dfce4d5853ef8622f6146522af715178a7baf8518cc934c58a6567b38862193fd75b8fe29d5a4f080cf5f9f7b3edc243ad8d8
 MISC metadata.xml 337 BLAKE2B 98dd71f26a860fea5d25a02ec76292898fcb76adbb3018a377383a99170318b0d3fa48f53248a7bc4b138a0c63d575963ebf1f90d5af5a6020260781fbd1d79d SHA512 63e2117dfdcf645e5d966a36dec31fd92f10a17c9efff9f378803060f91f0344ce76b51fa8eec6eef5dbd7fb7368e33d6a668185cf901bd01d1f99438cad120c
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild
deleted file mode 100644
index 1ee5ca6c1276..000000000000
--- a/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module
-
-DESCRIPTION="An Apache2 authentication DSO using external programs"
-HOMEPAGE="https://github.com/phokz/mod-auth-external"
-SRC_URI="https://mod-auth-external.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-need_apache2_4
-
-DOCFILES="AUTHENTICATORS CHANGES INSTALL INSTALL.HARDCODE README TODO UPGRADE"
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="AUTHNZ_EXTERNAL"
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-3.3.3.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-3.3.3.ebuild
index a118abb601a5..705143bd9946 100644
--- a/www-apache/mod_authnz_external/mod_authnz_external-3.3.3.ebuild
+++ b/www-apache/mod_authnz_external/mod_authnz_external-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/mod_authnz_external"
 else
 	SRC_URI="https://github.com/phokz/mod-auth-external/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/mod-auth-external-${P}"
 fi
 
diff --git a/www-apache/mod_bw/Manifest b/www-apache/mod_bw/Manifest
index 54d8f5bc9299..1e99872dca58 100644
--- a/www-apache/mod_bw/Manifest
+++ b/www-apache/mod_bw/Manifest
@@ -1,6 +1,5 @@
 AUX 11_mod_bw.conf 422 BLAKE2B eed5c83ad8e83caca31b659d0dfca21d1b8e8befcde5adc9bd9218144c72161aaea483c04388806e98bb9b1fa5cb31a3e898fba341d937694a599ae7b6ff6877 SHA512 8bbe8c7a2b83a6fe4dfa5849b447193b400de4bea9c3d70c4d4aac0d315eb16a3c48c9c75424a6d01c553c94a2fe500d7e01b8406201dbc34ed459961a2f8a7c
 AUX mod_bw-0.9.2-apache24.patch 1637 BLAKE2B 3f7c430b7db37032e653a0b08853a18095db776ffebcfbf476127446e7f010b5763d49db564b0d2dcda79a2394e088f94302a2acd8f0410803b7ab04670c4ab8 SHA512 93e16714477c8e35a5780db1480aa4ff733ee3e38e8ce43f80a7d4ac63052a98ea003716e37b37ca6fbe5efeb2621576c7efbbbfc835590852fd904a1babfda1
 DIST mod_bw-0.92.tgz 23816 BLAKE2B f8ae08018ab970c4ac5572a1bf8922c621f285711a8d825f0113566b479fd2773967ef2eac690a4f369a2121b4deb1d528881e8d63b1b1871df54abd629e7cf6 SHA512 caa5c0eccb12498ca59428e0ac6b06e6a6c86c1126693071b5df20f32cc5a5673197b2e53e58c9edb0f0f8efd8d1c276cfdc9962cb90b219baf1bd0785ea2443
-EBUILD mod_bw-0.9.2-r1.ebuild 532 BLAKE2B 292462ccb66f4e2b6858fd6577100b6a7edb5833556f302c645503188ec677ad46d5cb749b980ce77fc5f5a741bc1e05501a3613a9cdb768b121bfae74e644f5 SHA512 7bb95c0c2964dd2f058e6095c248f57796cad0feffaa4f2d293e6b204bf26648e9bd0aa9074b9d5efaeffc6c4a2cdf6ae84568d936e6c3a97a48ddd796549e28
-EBUILD mod_bw-0.9.2-r2.ebuild 658 BLAKE2B 9deb150e59bca1fb6137dfc59141d7c00b4ec3a72159bb696d65023f908958c0403b7e460a248f2b76c6bab278ce975c88f9e6c7cb33127b5b18263a1ea5d11f SHA512 4693c706841a66f4cf61ffab125a6f32fa9dc7d1751a91937ad9fe576745fa1c9383c61dd9b293c6e729e4365a99c1da1ab3dd8dffccdcacd56e49f5003ec131
+EBUILD mod_bw-0.9.2-r2.ebuild 655 BLAKE2B 687a301cc213df68442bc60fb741837dcb92762187d0e389f156c62b0d410d49454f61a3779b700715f5357eb59b59ba97e5e23508496d74d3df27f433bcde18 SHA512 caa88d91fa5123bd215b419718f379f0f3b9b0b812c9766f4b1c3e964796245cd4bfedf88ae4584959ed334fa264bcb46329d39f51a5216bea1af39973a10e15
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild b/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild
deleted file mode 100644
index 3bc850583b69..000000000000
--- a/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module epatch
-
-DESCRIPTION="Bandwidth Management Module for Apache2"
-HOMEPAGE="http://www.ivn.cl/apache/"
-
-SRC_URI="http://ivn.cl/files/source/${P/9./9}.tgz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-
-APACHE2_MOD_CONF="11_${PN}"
-APACHE2_MOD_DEFINE="BW"
-
-need_apache2
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-apache24.patch"
-}
diff --git a/www-apache/mod_bw/mod_bw-0.9.2-r2.ebuild b/www-apache/mod_bw/mod_bw-0.9.2-r2.ebuild
index ff0a685229cf..61bd2a4f58a9 100644
--- a/www-apache/mod_bw/mod_bw-0.9.2-r2.ebuild
+++ b/www-apache/mod_bw/mod_bw-0.9.2-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Bandwidth Management Module for Apache2"
 HOMEPAGE="http://wp.ivn.cl/apache-bandwidth-mod/"
 SRC_URI="http://legacy.ivn.cl/files/source/${MY_P}.tgz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/www-apache/mod_dnssd/Manifest b/www-apache/mod_dnssd/Manifest
index a2e49368bf7c..58a6d1118cba 100644
--- a/www-apache/mod_dnssd/Manifest
+++ b/www-apache/mod_dnssd/Manifest
@@ -2,6 +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-r1.ebuild 876 BLAKE2B b27cf5b6b78e8d0bb5e0edc1b9823e769e83032618dae4d0b9748e371ed3c48a02e847367da17f4e44f03bd9c67262992db63cf94b2a85d9f2d6254c4ef20406 SHA512 9b7d00ee5dbd025fd8ac44a9596bdd3cf4577d15bdd19f236e369170cb066782f080d683218917f3b3db5a2dad3e1d47d97223b055e1b98a9749704b5b49485d
-EBUILD mod_dnssd-0.6-r2.ebuild 864 BLAKE2B ac86ebe1fa4ce2b238466dfceaa8f4e4e81dd923c1ae4ae9b185a9ce60b96fec4b135d793375cff0a141c6d36b07892c21e27772ac4e42c9e4c370847d87be32 SHA512 db4fad3e2d2b7111975892c884f54b929ba1e54c0dca8593e151e19c0abe6fc0059679d6692bd8095c92cbe2ea59f91edc2b64c0479f9437537aca96af4f8d29
+EBUILD mod_dnssd-0.6-r2.ebuild 862 BLAKE2B 2a0ad73d024937434bb71c8e68fa876e8ea148076d06af382b8834dc15c61e0e44ae89c942ab557827d97250156bdb3bcc8c348b3ef0a18b44e7250c7e266478 SHA512 2164c28b93bcf2d940f44853d1e2e0d8a2e1c52f56f286f25e0c1171e245fdee5f19e3880f792c048f9bbdac02d2188e33a0b3dc879637e3d9262cb4561d6346
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild b/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
deleted file mode 100644
index 1739b8ff00cc..000000000000
--- a/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module epatch
-
-DESCRIPTION="mod_dnssd is an Apache module which adds Zeroconf support via DNS-SD using Avahi"
-HOMEPAGE="http://0pointer.de/lennart/projects/mod_dnssd/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="net-dns/avahi[dbus]"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_CONF="80_${PN}"
-APACHE2_MOD_DEFINE="DNSSD"
-
-need_apache2
-
-src_prepare() {
-	# Respect LDFLAGS and use LIBS properly.
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-
-	# Fedora patch for apache 2.4
-	epatch "${FILESDIR}/${P}-httpd24.patch"
-}
-
-src_configure() {
-	econf --with-apxs=${APXS} --disable-lynx
-}
-
-# Do not use inherited src_compile since it doesn't do what we want
-src_compile() {
-	emake
-}
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 828e5f62075b..d1bbb62e03f7 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 x86"
 
 DEPEND="net-dns/avahi[dbus]"
 RDEPEND="${DEPEND}"
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index fe69dc2c2367..bed7069f4aaa 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,7 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_h2-2.0.1.tar.gz 664404 BLAKE2B 94ee488f205e4ca0fdeb40e743b5679208698af97a33f965b2828e2b4f66bed4bb4ca99a23113039ed4766c73aa0aaf00377d379cfd52a5f605c197269702303 SHA512 2e2d6fb01abe34549a6ea81f33356ebbc667223d5ccb23f3027685deb9a4482cacf26be8d5cd30738afbf52be4f777f896bb8c0061bbfbbfc4ea5f2ace267468
+DIST mod_h2-2.0.2.tar.gz 665479 BLAKE2B 9f23ffec269925aac6b3d7d336c740acf0c326b3e63a36b390f09f68cdb94ba3304f4144ef81c29b277c3fd6d0de515e205a42c580da1f9b12835dbd6a2cd03b SHA512 06271742bd50dd3b4c910612289d705e2b65df0557d1d34be49dd1fa1b20776384784fbefb8afc9b74ab87a70ecb6fc834ff3c7c8216b01b24f8e9358b9485ae
 EBUILD mod_h2-2.0.1.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
+EBUILD mod_h2-2.0.2.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 EBUILD mod_h2-9999.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 MISC metadata.xml 326 BLAKE2B 200b47b41409bd7167132c55b5e77b5efa2ec18859520ea38d61a625a6e68bbb1cb0095dda3fd7d273e17114e7cc0ff2fe5c1bbb66ea3a90b4796490fc04a2e8 SHA512 6d45faf84382555d53dc9f38f8d7a23454d763025bbb345f51bece78b36287372d86e173c894038839092adce210e444389b8c41644f44bce0c912880d788080
diff --git a/www-apache/mod_h2/mod_h2-2.0.2.ebuild b/www-apache/mod_h2/mod_h2-2.0.2.ebuild
new file mode 100644
index 000000000000..352e2e78dea4
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-2.0.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index f64a07a74f5e..870270fc0f7b 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -2,5 +2,7 @@ AUX 79_mod_security.conf 729 BLAKE2B 5a415b7890a6d9553ec6e974825adad596a8f6d5c3b
 AUX mod_security-2.9.3-autoconf_lua_package_name.patch 350 BLAKE2B 272cb5f4c2fc666423b762d3ceca73f305ba7b280e4ac3e65f45111cea18b4b1edc923c56225f4a422cdeb54b381a40f5152a338d767b037bf1c7806de1bc4a5 SHA512 0abeba7b02cd0aef25f61a811b258bee6025c43ec9c2ebe98542e2e5dab2cb2060055058d4c2f2b235f7b2773ced53ab2173be6c9de3cb46c16d5bdbd7af13c8
 AUX modsecurity-2.7.conf 394 BLAKE2B c9d55e8b4419e5b54a364e03dd02e9d0e5609954d1538c77baa33e0abc46110fa8aaf3207490a80a2fedc13d42558632703ee4552ebbaa99d67d929720008dd2 SHA512 ab8c1ee6372249613f853654f115102c7951ea021f47389510bca6c5d1226e7aa9d90bb47649cf4ca62b8d8f926eba9f5c0b02321851ec2e8452de70dd4c1839
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
+DIST modsecurity-2.9.5.tar.gz 4315037 BLAKE2B f6e607f344038c74fbbacbba6bbeb5953a7ab13b54d140924f4fe586a1506720d383285e7ce68dc9386f3532d298d53de55446f336c4b2f3e359bf8636bba0d0 SHA512 eef10afbce7407038b12d3c94213a17ecadf2db9a39f15006809848717f9a0d53d52f050957e13725e972191106c54eafb8915d564e5f0756a8a93c84048a4df
 EBUILD mod_security-2.9.3-r100.ebuild 2860 BLAKE2B 3c51f2d5c9b947ca8943dc35fbbfb3683c52486d47f308637bdd05d98d0466c5522e58c4e35f654352f4cc75c4faca83be76c99130d17dbc73cd006642b0b4c9 SHA512 8856e0e1bf6ebbc1a0d415056bd42974ba6e167b2154d8a6769d413481439948d2c40f0bd3485a5cbdcfaed3c9d73c65cf35d03bcebe23553b06339709af4b81
+EBUILD mod_security-2.9.5.ebuild 2918 BLAKE2B 8d83eb1f0ff8b009e04134bfd0b87e1aa8b09cd0f244945bb74a884a8659f59e645888280f66aec86c6fc1c02e8e0c3dc8478ae67ba115a4682fab13dbdaec85 SHA512 6decbeaa979a16892ac5f0a0701aa896ee3ddc1b55c679fb0a03b817d298f35ec74f2102a96c400456c929d0a1e52598b726275afa6450a071bfffbbe0ed8430
 MISC metadata.xml 1010 BLAKE2B d8c9d6cb841ebd546aa9ac5c6e5078f846b31f8c499e69bef93777c512cc180068064b5d5c6a65c4cce179b3a5946cf3a6572ae10a2eaf6d25c6e1ac81b964f4 SHA512 0b06a417e39afc6326940eff1ed4da2aaed091b1fe01eabb58c62e5131ae7a4c922ca118799f26c91325187022052a34cd3c7979719e50b1a8837ab23468b13d
diff --git a/www-apache/mod_security/mod_security-2.9.5.ebuild b/www-apache/mod_security/mod_security-2.9.5.ebuild
new file mode 100644
index 000000000000..03b2d414b760
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.9.5.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools apache-module lua-single
+
+MY_PN=modsecurity
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Application firewall and intrusion detection for Apache"
+HOMEPAGE="https://github.com/SpiderLabs/ModSecurity"
+SRC_URI="https://github.com/SpiderLabs/ModSecurity/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc fuzzyhash geoip jit json lua mlogc"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+COMMON_DEPEND="dev-libs/apr
+	dev-libs/apr-util[openssl]
+	dev-libs/libxml2
+	dev-libs/libpcre[jit?]
+	virtual/libcrypt:=
+	fuzzyhash? ( app-crypt/ssdeep )
+	json? ( dev-libs/yajl )
+	lua? ( ${LUA_DEPS} )
+	mlogc? ( net-misc/curl )
+	www-servers/apache[apache2_modules_unique_id]"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	geoip? ( dev-libs/geoip )
+	mlogc? ( dev-lang/perl )"
+PDEPEND=">=www-apache/modsecurity-crs-2.2.6-r1"
+
+S="${WORKDIR}/${MY_P}"
+
+APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
+APACHE2_MOD_CONF="79_${PN}"
+APACHE2_MOD_DEFINE="SECURITY"
+
+# Tests require symbols only defined within the Apache binary.
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.3-autoconf_lua_package_name.patch
+)
+
+need_apache2
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--enable-request-early
+		--with-apxs="${APXS}"
+		--with-pic
+		$(use_with fuzzyhash ssdeep)
+		$(use_with json yajl)
+		$(use_enable mlogc)
+		$(use_with lua)
+		$(use_enable lua lua-cache)
+		$(use_enable jit pcre-jit)
+		$(use_enable doc docs) )
+
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	apache-module_src_install
+
+	dodoc CHANGES README.md modsecurity.conf-recommended
+
+	if use doc; then
+		dodoc -r doc/apache/html
+	fi
+
+	if use mlogc; then
+		insinto /etc/
+		newins mlogc/mlogc-default.conf mlogc.conf
+		dobin mlogc/mlogc
+		dobin mlogc/mlogc-batch-load.pl
+		newdoc mlogc/INSTALL INSTALL-mlogc
+	fi
+
+	# Use /var/lib instead of /var/cache. This stuff is "persistent,"
+	# and isn't a cached copy of something that we can recreate.
+	# Bug 605496.
+	keepdir /var/lib/modsecurity
+	fowners apache:apache /var/lib/modsecurity
+	fperms 0750 /var/lib/modsecurity
+	for dir in data tmp upload; do
+		keepdir "/var/lib/modsecurity/${dir}"
+		fowners apache:apache "/var/lib/modsecurity/${dir}"
+		fperms 0750 "/var/lib/modsecurity/${dir}"
+	done
+}
+
+pkg_postinst() {
+	elog "The base configuration file has been renamed ${APACHE2_MOD_CONF}"
+	elog "so that you can put your own configuration in (for example)"
+	elog "90_modsecurity_local.conf."
+	elog ""
+	elog "That would be the correct place for site-global security rules."
+	elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
+}
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 65b42a557147..e080307d77c2 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,4 +1,6 @@
 AUX 80_mod_security-crs.conf 289 BLAKE2B 441b2f4d46e62ff24886b94dc933b08de8693ad7198cc855a8b0c322ba045e6409b7d3b7b2e2fdc0bd412ee9fdd3761987d59f405de5a84d5e8c96d2dd14ab76 SHA512 e5b86164a68e15d67a294688c993799fca10928c1265cee04555becfb17fb516314471d8c4eaea1205ac1703890cedb4647d93ce75b0a2a1ab9a401a495465dc
 DIST modsecurity-crs-3.3.0.tar.gz 290379 BLAKE2B 557a41e937564698809ecca40d4e76e5c1d3617b62189b7ca230ac7533cba14fdf619bef81c1e40a996dd260d2eb52c27563437dd795c2412bf38715f026f300 SHA512 12043aae12b5e01455e229136411e1fdef3a14318aff191d190b567463b63efb72630a695449b56f1d654ed1cfc0b4eb452a64502c35337d37cce920d5fa4ea4
+DIST modsecurity-crs-3.3.2.tar.gz 290450 BLAKE2B 2935b781af44a206eec881a2c06669db91da98a4d74936299651a77417a2eeaf6d4ab9a1566c08fc4bfb2a60d0b38e71d746d726578ce220b59c9c9cbd800190 SHA512 a5d96fb949da82120a1c4cda4dcf804b06aaae71f25cded5ee998d2c4e766ae2de88e42cd52fc9d63e204415e829af27d80614e58b55509e7bd7ffc20a26cfba
 EBUILD modsecurity-crs-3.3.0.ebuild 864 BLAKE2B 769a64d8e35dee1c0296ad34a60b06382ca765f6ef98fc615a7f476174833c372e1dc3cc09371b231bac4c136af256b0c3fffe491be3dfd64349a6e738a019cd SHA512 ff94015763f77eb7e28d817af420548693ead124c960d97dae1a02cfeed8714b607430364823de0beb0c1d4ce1b81e081368fff8ed6a27f2282bf3305b4ff134
+EBUILD modsecurity-crs-3.3.2.ebuild 864 BLAKE2B e4e27d9568b68fca964da7e72a8a3508a74f349d2a706a2828fc076324285da2debc3d086960ced40d24b0a1d7bb39ed040e20530916d3496f83204345ecc2eb SHA512 e195c92405f68c839d4d3b82b4951d9b19db5d5cc09d798ae66c94f7d684a0bd68c61380af21f03dd105bb09840f0d15e560cfa08b291587f54d201bddf55a61
 MISC metadata.xml 259 BLAKE2B 7b97e74d2d5f6c96f461644fc315a6104c7cfaa5024565b5a9147881a67f554b4cbd1815ebbe851a12fe7d66dceab6f29e7bf69fa621dd2ed744aff5bef865bb SHA512 12674587e5bc3b6f705195a7224be3c6ec8dc51f47bd81c8a47aea232d25b6f6ce127e5ce6e9b1ce32f8ad1216264df84dcf8975c0998a9558c42c1a19cc2127
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.2.ebuild
new file mode 100644
index 000000000000..a16ae9fa633f
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="OWASP ModSecurity Core Rule Set"
+HOMEPAGE="https://coreruleset.org/"
+SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=www-apache/mod_security-2.9.1"
+
+S="${WORKDIR}/coreruleset-${PV}"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r rules
+
+	dodoc CHANGES CONTRIBUTORS.md KNOWN_BUGS README.md crs-setup.conf.example
+
+	# I don't think it's worth pulling in apache-module.eclass just for
+	# this path...
+	insinto /etc/apache2/modules.d
+	doins "${FILESDIR}/80_mod_security-crs.conf"
+}
+
+pkg_postinst() {
+	einfo "The CRS configuration file has been installed to:"
+	einfo "  ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf"
+}