summaryrefslogtreecommitdiff
path: root/www-apache
diff options
context:
space:
mode:
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/Manifest.gzbin6263 -> 6255 bytes
-rw-r--r--www-apache/mod_dnssd/Manifest2
-rw-r--r--www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild4
-rw-r--r--www-apache/mod_fcgid/Manifest3
-rw-r--r--www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild30
-rw-r--r--www-apache/mod_fcgid/mod_fcgid-2.3.9-r2.ebuild4
-rw-r--r--www-apache/mod_gnutls/Manifest4
-rw-r--r--www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild4
-rw-r--r--www-apache/mod_gnutls/mod_gnutls-0.8.2-r2.ebuild52
-rw-r--r--www-apache/mod_limitipconn/Manifest3
-rw-r--r--www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild25
-rw-r--r--www-apache/mod_limitipconn/mod_limitipconn-0.24-r4.ebuild4
-rw-r--r--www-apache/mod_log_rotate/Manifest4
-rw-r--r--www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild24
-rw-r--r--www-apache/mod_log_rotate/mod_log_rotate-1.02.ebuild4
-rw-r--r--www-apache/mod_qos/Manifest2
-rw-r--r--www-apache/mod_qos/mod_qos-11.71.ebuild62
-rw-r--r--www-apache/mod_rpaf/Manifest8
-rw-r--r--www-apache/mod_rpaf/files/003_ipv6.patch31
-rw-r--r--www-apache/mod_rpaf/files/010_multiple_proxies.patch37
-rw-r--r--www-apache/mod_rpaf/files/011_apache2.4.patch51
-rw-r--r--www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch17
-rw-r--r--www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild28
-rw-r--r--www-apache/mod_rpaf/mod_rpaf-0.8.4.ebuild4
-rw-r--r--www-apache/mod_security/Manifest3
-rw-r--r--www-apache/mod_security/mod_security-2.9.5-r1.ebuild (renamed from www-apache/mod_security/mod_security-2.9.3-r100.ebuild)11
26 files changed, 89 insertions, 332 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 3360d2552ee5..2def60dddc0c 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
Binary files differ
diff --git a/www-apache/mod_dnssd/Manifest b/www-apache/mod_dnssd/Manifest
index cbf7f79d5125..7cc3396fd15f 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 869 BLAKE2B d12638d179b67d2637842f4dca7f2e8dbf8f88f7860f77161e6ec683479a21ae3143f9d24f6a10632b3cfa6affa996c1e5994bf30245612f5df51357e3aa1a2c SHA512 dd13a7fb9536c6591b2eace4bf617c3128bf1ac6073a37993fde16ad7b1159327dc59809eb11a2be78d7358a9c42d9b7ad4b3fac44014627d02fc049e639049f
+EBUILD mod_dnssd-0.6-r2.ebuild 868 BLAKE2B 609b2c0b6222581c2e742cd4171c78b55235b5800395fd35226c7ae45657b6cb70858c1682048524eefd77d3ec3c5bdf9d219c3c53dadc4d32a8fd23b7db3b21 SHA512 a59d95139282acfafb51edf67150f84334c7a018d3b632e789b88dc42b3cf11982837dd8bfc76a4e124b660336aaee19d9ee124338e1b6c5286ce3f12c50b28d
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 0734bfca4c2d..600600a890b2 100644
--- a/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild
+++ b/www-apache/mod_dnssd/mod_dnssd-0.6-r2.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
@@ -11,7 +11,7 @@ SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
DEPEND="net-dns/avahi[dbus]"
RDEPEND="${DEPEND}"
diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest
index a6e3b6491353..0fe6a21ec46b 100644
--- a/www-apache/mod_fcgid/Manifest
+++ b/www-apache/mod_fcgid/Manifest
@@ -1,5 +1,4 @@
AUX 2.2/20_mod_fcgid.conf 165 BLAKE2B 6d0df61890baa8d84f2a373ced303e86e492bef5b854b3cfad934a686684a3391afcdf9787e6998036c32924307567c88794769f144438bd4cd7633e7ff9af93 SHA512 f534c02703f697e76d4c1e57aa9785d81f58374ad4d4f458299e23d64bf3b80c9c5380a9c60862bcfbfbc0d6bef4f0e5c8c11c53e2f90c3824d3b1afd64bcd7c
DIST mod_fcgid-2.3.9.tar.bz2 80205 BLAKE2B f0320e56f40c90f89d12ecbb91a54a98d49262d01547d743060dfc57c3217f9927a2931d997a003f686d09f4df1c42de45088ce4909aa689f7b7f4ab05b53971 SHA512 c429c14990cc8b492e88db1aa00fc2593bfb1b129b9001be21670d42c8f3e5038acd3f4556b48f3ac7dfc03c8d3656f0d4402122932e5bdc2c2aab1c7c235121
-EBUILD mod_fcgid-2.3.9-r1.ebuild 697 BLAKE2B b3c85797109fb5175dc49ba2daef6eda482f9305bdea4a56df235a4ec54fe5b3e5a0cecf4b9f948f7d9192915b264ed17a792e59f36286b0cec9c2c196d083b0 SHA512 e2f160d4094639f525c2b6c41758fc195e3e1ded8d470fabc32be45b27eb10c6ccedef69d6372f9030137cf56e49038a163087fff2c693d9e1d881c675a95443
-EBUILD mod_fcgid-2.3.9-r2.ebuild 772 BLAKE2B be62aed1deab3e36f8c2adebccb1b427f94a4cc43b6ff2314b27f9d48ac3bacb665f4767270defc3271a059fae8889e19ecdf107ab99bded7796082c97c16e5b SHA512 772bd75c450c7123ba5a9897f0f9bf0a4ec031846a444c6275642be551e6aff290a6f92b4c24d37d868949346cb843c140dd0b666dddaf342fa9d2174bd77723
+EBUILD mod_fcgid-2.3.9-r2.ebuild 769 BLAKE2B 7fd149b41597bcaa67bfa841873e0f0a6a7f6a1b5e5c8c3d1a70d0f854a23aa9fab2a8f86cbd8c6c4222153e6f7694a7f8404b0756838a10b389fab450fe0810 SHA512 4393bfca97e152400c3c43345c72155640effd5b75728dd3d7645e88e86da4a128cf2a9236f2a38d735d0b66799d6f1000a7417e336c8cce6a3393266c82e327
MISC metadata.xml 394 BLAKE2B 6ec8690080234855b34e9bb3be79ffc9e20455b3d21ab4a0119b3e66cbc571588e2a603a725cfd2eb84c6ddb7334069b8a61783a40b8a66573fad9cc5e97943f SHA512 24a4b3452fb8cfa3d1e2bbcdb3355f1ebade286a0f622ae8f630a98ea467d3f4c10a1489b1b889bfefe48e57f77f88fe5f2c57dfb01854f17145899d77ba42c0
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
deleted file mode 100644
index 693cc0c6699d..000000000000
--- a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module multilib
-
-DESCRIPTION="Binary-compatible alternative to mod_fastcgi with better process management"
-HOMEPAGE="https://httpd.apache.org/mod_fcgid/"
-SRC_URI="mirror://apache/httpd/mod_fcgid/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
-IUSE=""
-
-APACHE2_MOD_CONF="2.2/20_${PN}"
-APACHE2_MOD_DEFINE="FCGID"
-
-DOCFILES="CHANGES-FCGID README-FCGID STATUS-FCGID"
-
-need_apache2
-
-src_configure() {
- ./configure.apxs || die "apxs configure failed"
-}
-
-src_compile() {
- emake
- ln -sf modules/fcgid/.libs .libs || die "symlink creation failed"
-}
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r2.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r2.ebuild
index 3057d40345c0..3e9da91b4532 100644
--- a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r2.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r2.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
APACHE2_MOD_CONF="2.2/20_${PN}"
APACHE2_MOD_DEFINE="FCGID"
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index 4c043193587b..827724afbdfe 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,6 +1,4 @@
AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00a64c0c939661ed26ad38563b833bafc1266d0b5c5ea8c2d0e5804547b73d5d2b7d95c5fc3f37411715db SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7
DIST mod_gnutls-0.11.0.tar.bz2 458966 BLAKE2B 6d81be7b7d48255173d028a8e3207badbce0c1ba541124a241b63d4ed4eb36833156e9cd7194318138b6f16667a971d5311d56b9b0036e5b3d9dac8d352a4335 SHA512 090d244823f15a6b23dd2ad9b35db202ebbe96210ec8fd06e06f13e32c327e9d9a449834c899755f1ec8c1a3a71db1b125d436ce661caee1002a8719b4c1320e
-DIST mod_gnutls-0.8.2.tar.bz2 415903 BLAKE2B 98c96479e2419ee511ba802c99823ddaae89ddeb7a2f0660b91e2a371f8249ec4f98b2c0443389168a22dbe133b0bcc6020bfa597447507a8e4f91827b6d1d24 SHA512 b1690aeee4f6d104e4b6a7bd443e289204630b33e00b7b145b11291d8819b5c3d5bd52b535746b8ebdfee7a5f34df527243b743b8c5d716b1d0617e319d43f4d
-EBUILD mod_gnutls-0.11.0.ebuild 2013 BLAKE2B 66af05db7ea52421d7a3b242e1aaa54482a726fb80c70527fe4e69c3210b7eb4ed8108de01b32c37baa07603645bbf87f7b4331a702f017f4d67ed58a969133e SHA512 fef78ef2cfb08f1f6ab83c3ed23d4a378c4a8d4007aab8b916a837928db5e437bc1dae2ecce7b563256ab5e13c7909e15d2f9fb0607bd72de72ad4b05696abc8
-EBUILD mod_gnutls-0.8.2-r2.ebuild 998 BLAKE2B 9da57cdaeb490427e4c9f06041366e532ac40f8f5f7e10d04c07c6c8be26bf797794c7ea10bfadfc17120c74ab94cdc2201f60c8e90b8ab0815dcdd9b26c9a8b SHA512 e6693e13d0406f047f977995b8c36281e2e4b1a397bb06c4edd2dafbf6dcb3d6c75c4de4b20f99c40e1e9aa3bbd9854d97edace2b03bdb673754d9288d82260a
+EBUILD mod_gnutls-0.11.0.ebuild 2011 BLAKE2B 9ba5504d3b8e24f2f6ed1be16a821559799f43e081454b1f45d8a01e263697077fd95b59bb9de74eee22f99246019b529a407081941f1be9a2873c4eab63f445 SHA512 2285ee4e71a949211df2a8251f941f0bad7debb19c9cbbcc0fc615978c3f6a85bc3f89778aba5a1c102108bf8bba5f2864bbcec14c415ba7fe150b4bc183fd47
MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild
index 39c8a0fef405..31e35fdd4786 100644
--- a/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild
+++ b/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# WARNING! Don't switch to EAPI-6 without checking paths of installed files
@@ -15,7 +15,7 @@ SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND=">=net-libs/gnutls-3.3.0:=[pkcs11]"
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.2-r2.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.2-r2.ebuild
deleted file mode 100644
index b0d32ce75e30..000000000000
--- a/www-apache/mod_gnutls/mod_gnutls-0.8.2-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools apache-module
-
-DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
-HOMEPAGE="https://mod.gnutls.org/"
-SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND=">=net-libs/gnutls-3.3.0:=[pkcs11]"
-DEPEND="${CDEPEND}
- test? ( app-crypt/monkeysphere )"
-RDEPEND="${CDEPEND}"
-
-# Fails because gpg-agent cannot be accessed
-RESTRICT="test"
-
-APACHE2_MOD_CONF="47_${PN}"
-APACHE2_MOD_DEFINE="GNUTLS"
-
-DOCFILES="CHANGELOG NOTICE README"
-
-need_apache2_4
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf --with-apxs="${APXS}" \
- --disable-strict \
- --disable-doxygen-dot \
- --disable-doxygen-doc \
- --disable-doxygen-html \
- --disable-doxygen-pdf \
- ac_cv_path_UNSHARE=no
-}
-
-src_compile() {
- emake
-}
-
-src_install() {
- apache-module_src_install
-}
diff --git a/www-apache/mod_limitipconn/Manifest b/www-apache/mod_limitipconn/Manifest
index 6378ca389656..9e88a9ffb269 100644
--- a/www-apache/mod_limitipconn/Manifest
+++ b/www-apache/mod_limitipconn/Manifest
@@ -1,5 +1,4 @@
AUX 27_mod_limitipconn.conf 554 BLAKE2B 2bd5e2224a19d2b5a18b64224db41e232ed2c9028fdcaa751251e29d9990e1006b0ca25d09682f1a108d176a5898d2460bb26dc92816dd79530706434ac1adb6 SHA512 7ded8b48b769529a8fcb6b25855d31ef82cf3de423a75ae5e986974ba2c21643adff235ec9bfcde1955513d10fc3fc9dde172ddb9fb43626eb625bed96936c3d
DIST mod_limitipconn-0.24.tar.bz2 10150 BLAKE2B 0715a0494f6d434217093625f10b5b723de3823c88c82fe2ffa22972b2496abae0924fc7b5d773568af125dc92466e8ab84e3e86acde7756c9535b244e729e88 SHA512 caf1337231ac83ef57938b0f89769afcf309a4a09a0a2c3fb171e49f038d42a5859dfdac06b2c7766f05d9431132b8752aa8ad5164794c89638eb90f392e827f
-EBUILD mod_limitipconn-0.24-r3.ebuild 565 BLAKE2B ce72b3c89d8a92fda493c2c7e8bd35e554a4632af9c28e6dc010394263fd60dafef962864f5e1637d6111aa2c55181e8e72dbe28a754916c26aaf2398c4b9d88 SHA512 bcbaa759c915729b218e229847f0327d95f564c2a22df9473a8aa21472923485a79dc3d8add58fca17c88c4ca705317755cc5f49a85e4f522887ae1baf8dd875
-EBUILD mod_limitipconn-0.24-r4.ebuild 644 BLAKE2B 8f3d10edfed100b00d698b30e48e5c19fe8a3e4b7381296308e62909f4c41f85bcbf7fa696c949bca5e12c29e9bd5f7c9e5ed333705ecdc19d634d828dcf74bf SHA512 da732e91f097d84debb5668ad293f41b6b1f3584158d1fb21648d9994995dbed65b9f37f59151fcdb1b6028de01c056c67d646b3eb5098c590f287d8117d555c
+EBUILD mod_limitipconn-0.24-r4.ebuild 641 BLAKE2B 40125084a8716122136397c91a4193e521e0945ff2a45234deb72e8e98a4d8b054b566a49617095a7bf390f6f33f6efe1a1790d7e1a46779fc1ea6d77b2dcdc7 SHA512 e0f4711acf568aa408c3b3904cfbfce59b408378c3cc18e524be1158c5282f3549e15457f79c26d7bea448d7d826094cb0207494d815b12cfef307a003e219b1
MISC metadata.xml 359 BLAKE2B 781beba800b950a69431983fe6df11451311debde62a7a5715bddb5b9c8b90afa23e9844b67ebc46ea09d240076ecaf201e5ae1a5a51c3dfee3e2edc389bd34a SHA512 77c9fc37752c5bf419057e29e91e22efda93cc9ce3ba025c313947aeffa5a6195c8fbc0553c549ff6f9774613d8d2494128fc1e6079322d132309da8f3193fd3
diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild
deleted file mode 100644
index 3d72dec23584..000000000000
--- a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module
-
-DESCRIPTION="Limit the number of simultaneous apache connections"
-HOMEPAGE="https://dominia.org/djao/limitipconn2.html"
-SRC_URI="https://dominia.org/djao/limit/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="www-servers/apache[apache2_modules_status]"
-need_apache2
-
-RESTRICT="test"
-
-APACHE2_MOD_CONF="27_${PN}"
-APACHE2_MOD_DEFINE="LIMITIPCONN STATUS"
-
-DOCFILES="ChangeLog README"
diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r4.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r4.ebuild
index df72cd42b1c4..e37853b6882d 100644
--- a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r4.ebuild
+++ b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r4.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
@@ -11,7 +11,7 @@ SRC_URI="https://dominia.org/djao/limit/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
RDEPEND="www-servers/apache[apache2_modules_status]"
diff --git a/www-apache/mod_log_rotate/Manifest b/www-apache/mod_log_rotate/Manifest
index 41c7c8ea069e..fe64bddd66f0 100644
--- a/www-apache/mod_log_rotate/Manifest
+++ b/www-apache/mod_log_rotate/Manifest
@@ -1,6 +1,4 @@
AUX 10_mod_log_rotate.conf 132 BLAKE2B a7bb07653e4f31bd5e54f864d06ec62a8ff2cbdc298917b92f2da1b59e0bf7835863caf61461dbff3663eb3c9762cfca6a281166ed0a1da82e815f1215b9938b SHA512 70f973aba76042486bc9ca71365bc2c0e1e78266956418d3804ba4af4a6a491373e62da96b40a7ad1a5f24ab75692419214565e4e579ba75ec5a1259dbdbed27
-DIST mod_log_rotate-1.01.tar.gz 9772 BLAKE2B 87fd9f3d02c2aad3849236c8a7e8713e9f550b6b795fecfe75226e5d429c5abe0f2626754f8a82036e0ee1b90802e46ddd90ac622ba3740c0e3382346bdad534 SHA512 7da606ae8ce5e0f2ade16fdffffc57fa9549b4b5e9529eb3149ff7390caa64f7ec065aa7416b5c8ab751e2b3eaf35cf79c96b8c7e68e1165a46851547781c076
DIST mod_log_rotate-1.02.tar.gz 9805 BLAKE2B c2fc8dd26520443ff1363d193c7fd99576fc319d283789cf4527dcdcbca3e88073ba2458d507f456646657b926721b6865cf4d20f9cabb625b7457b85c62d8f4 SHA512 90673723c971527e5b03e138f9f3c4c3c8dfdf98f54f813ee09e5003e13d07bf0595e1e4e6d06e33b55b65566dece03dc1474e9816292e18eb2164724fa390b7
-EBUILD mod_log_rotate-1.01.ebuild 519 BLAKE2B 62bdce177816e7bfeba39474fa0fd7152cfeb00fbe0913535a478cc558d1bb2d74279a06a796db81d0e1d233e45ab9f179bf20c36a44be5804a1fd16431bece9 SHA512 397a40ad12db88b6f7719860d1e98ed5c4faba5a5af1c5162fd7f9945e82fb2ca8badd2239256f5e5d996038d7bfa418bbdb90381be320fd3dc37a0039f752c4
-EBUILD mod_log_rotate-1.02.ebuild 593 BLAKE2B 0a8071e81ae2c5f6f2a9bc2a8d6a0b47823328ecec7ddc31d3304310b8f70019d7a0596790b7312055a7d5dd3f36b3dcce5880abe8ba576999a8ccccb40c3b87 SHA512 b89dc1e809074e419b876fec79ff8aecde1b9305ee6cd1f39e04042d689633f4dcb318aee71992c636d46a9e8a7e17ba83e885b92da97ede2ef6ce620c95499d
+EBUILD mod_log_rotate-1.02.ebuild 591 BLAKE2B 76e81f27b3288fe1f8240704a69cb1a262b6bfee8219425d2ae10f677b176bf9258b772d0cff972cf883f309ceb631a1a6b017a6de8810bdbccc2dcf3416abcb SHA512 f96be2642778106bb97fc3fe87efd9c0350a936da90296d84a18893a0b327ad68a65107bde91378f04671b0a774fba7ffd4c6a016dddb77f4ba9f9a5a016c24d
MISC metadata.xml 254 BLAKE2B c8404065a92350eff40af580afc4425da1e7409c1cedda84eeb400bdd950d83358b518c4a06362fd6d35292f604d090c83a32a197af1807e8f1826adad88a539 SHA512 329b8e124cfc3d21445afb36ed0dc08cd1769663d81d85ad2e9b7d985c4210e6cbbef006e55d3cb79f260117c8a7bb2726ad61f8f9640b0cb80224c64d73367a
diff --git a/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild b/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild
deleted file mode 100644
index e2f226068c1a..000000000000
--- a/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit apache-module
-
-DESCRIPTION="Log rotation support for mod_log_config based on strftime(3)"
-HOMEPAGE="https://github.com/JBlond/mod_log_rotate"
-SRC_URI="https://github.com/JBlond/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="LOG_ROTATE"
-DOCFILES="README.md"
-
-need_apache2
diff --git a/www-apache/mod_log_rotate/mod_log_rotate-1.02.ebuild b/www-apache/mod_log_rotate/mod_log_rotate-1.02.ebuild
index 3783475358ed..eb83618952bc 100644
--- a/www-apache/mod_log_rotate/mod_log_rotate-1.02.ebuild
+++ b/www-apache/mod_log_rotate/mod_log_rotate-1.02.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JBlond/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
APACHE2_MOD_CONF="10_${PN}"
APACHE2_MOD_DEFINE="LOG_ROTATE"
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 5022fece0780..510844c330bf 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1,6 +1,8 @@
AUX 10_mod_qos.conf 97 BLAKE2B d3dfe5296b89ef35b09e6b9a0d272c3fcfd66ceb54e2405c31d67a703a68f7362f5bd5340d3634d8f2c09cc8b825a8ef715c0b99430df5b9b98355c2ff4e516b SHA512 eafdbc3ae2f33a7e2bb55e59c311e79688c3ecabdd12247a5f68a9c00c46b84c709139f124cdccc5fd7b3d792b23a94ce37a8d27835d70c521ad6212d4e761c2
DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
DIST mod_qos-11.70.tar.gz 1283241 BLAKE2B 516dc8ec0228956c374845e10ed2533291544c496a1eda693da28d551b81f83ab898384a627b87c940782925c5bc84f1140e4e241c964b451acb63fd947a274d SHA512 004898d7993cda82f261d28e4c91b1ff1665465d3ad1da005fae94471824a31f0d30ca4edf700ddb45bfde133218c55d49a396ba03b3ed0ac00b1743c4aaa5be
+DIST mod_qos-11.71.tar.gz 1282858 BLAKE2B 92061497a6f31c009c5dbd7d0bf9042272b679e7b2f1bf5fdf9a52dc3b9cf9ea13fae6a6bd422d652466a5d1ac4355b7cc33f2d183900a64eddce3de97e96e82 SHA512 2550d868a03b7add5a48a4cd43a5287317142c879777e6d38c15270a8bbef1e2a639f938d996645bb2cace40dc6806094fc4a80e2a9b5b4e5ccc60bd35244cc8
EBUILD mod_qos-11.66.ebuild 1141 BLAKE2B 4c08f022489736efcf3833b70c6ae90663ccb34bbed965e14b55e4c028c039e1e438618ebd153eca1e22c2b0f1a541a68c2383d4b80d8cbb7bd549a766bb6f06 SHA512 54ab558430ec323df724e4f4d2a2c0019c94f97d656b1d75107b0e1ac0a905fe4cce2422f28d79342aae2b41f7466461fd6480518a0d6d89c3396f26dedfab4e
EBUILD mod_qos-11.70.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
+EBUILD mod_qos-11.71.ebuild 1142 BLAKE2B 169c4a162118afb590a56a8ad230a273820c2129a9e207843a4565701ba37bf4e46d2f1e7b25db049fcef70a9c106a31cd21437f52954f3d829d185056028d9b SHA512 007b46552dc1f398600ece4d6b6105a4f7ccbd7db88aef19afcf05c64cfa28da4fa7467225d45d325adbec90f6cd3d4a30b7232578b819de97bbb9ca1fc26d1d
MISC metadata.xml 326 BLAKE2B 469e74aa98baf0a4789743501b566d233d6072595c29c91ef4cffb4a9e4a986dde186cef2326e5b1e02d57a69f49b9dcf9fd045c857a5627f68f50787cd6d072 SHA512 bd08a8ffbee3d67a6b5a81e615ad0bf161204027e91ae69bd5a541a2d76f0ec52ca7405647d03d2ed3b51c756fb16d0386c97b1bab8be52a1b3803f0b2c301dc
diff --git a/www-apache/mod_qos/mod_qos-11.71.ebuild b/www-apache/mod_qos/mod_qos-11.71.ebuild
new file mode 100644
index 000000000000..a6cc2a461250
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.71.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/libpcre:3
+ dev-libs/openssl:0=
+ media-libs/libpng:0=
+ sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+pkg_setup() {
+ _init_apache2
+ _init_apache2_late
+}
+src_prepare() {
+ default
+
+ pushd "${S}"/tools &>/dev/null || die
+ eautoreconf
+ popd &>/dev/null || die
+}
+
+src_configure() {
+ pushd "${S}"/tools &>/dev/null || die
+ econf
+ popd &>/dev/null || die
+}
+
+src_compile() {
+ apache-module_src_compile
+ emake -C "${S}"/tools
+}
+
+src_install() {
+ einfo "Installing Apache module ..."
+ pushd "${S}"/tools &>/dev/null || die
+ apache-module_src_install
+ popd &>/dev/null || die
+
+ einfo "Installing module utilities ..."
+ emake -C "${S}"/tools install DESTDIR="${D}"
+}
diff --git a/www-apache/mod_rpaf/Manifest b/www-apache/mod_rpaf/Manifest
index d28553906225..e58848344d47 100644
--- a/www-apache/mod_rpaf/Manifest
+++ b/www-apache/mod_rpaf/Manifest
@@ -1,10 +1,4 @@
-AUX 003_ipv6.patch 1261 BLAKE2B 0a749a08fcea476dc499658fd59e64dab2265fc9f8564bd70cd6d901fb7b6aabe2167c6de5fcdea49e9bef67eda3a8acfcc4f1a9bb9e181f5adcfcce86e948f4 SHA512 e1192403b39e442465f3c024e108014bf0045ea15800175f313acf045d817ea59e9b7e88b0c0177a6dd8069b12bd5c3a036528e7fd85cf74a4e3ad2285f36597
-AUX 010_multiple_proxies.patch 1611 BLAKE2B 8ef8bf142bcb8ecc33322a8cceaae43efb44288c3b2a8e0af695c47d258409762b99d1b8887ee430d393e6f39c58515f7eaa2dd5453ea15422124cff871360ca SHA512 6c78bfa0129fcfd464e19ec4d28fb6960bf4ee662cde1207eeb49461e8a3cae0887b4680388167b97374eeaade0627db43ff5837efa259e5497846993bba232f
-AUX 011_apache2.4.patch 2833 BLAKE2B 9bb24037fb0b1394ef9fcf415626b8a865611d0d77d7103c35b6df9854a3129cb3b0879cbc4f255b0523924a9729806f5631fac84856b2327262bea429d7a3a3 SHA512 a1e0805fe36f50b2f45e58c66fa9afc2f4583a563808560415c63dd46b92b9bcd885f4bd53c6cdad547c6db62d2bd5ee5c219beec123ade37afeb5eb9310607f
-AUX 012_Add-missing-header-for-inet_addr.patch 326 BLAKE2B 603089f9c539bb10bbeffe13e93a4751f152dffcb755e2f014071afe99676a272a93ec5f52d0b13ce46983df977dd11fafcf1f9075a95afd4481de48b0129275 SHA512 ca0153d63ca08a0504313da135c4ef7060f30144d2cf5a6a74ee19be05bfc6a914d50da319f66048cabc88bfdef098730c20bccf45df219bb6629bbae67edb94
AUX 10_mod_rpaf.conf 114 BLAKE2B 803cfbfb28884983e8115c5e0544721e8ff9b8b8be1065b1c555d8c1381d6792e8071d6e8434dd56d1325c8f1b0696bf688ee54a2237313f0bed1cf2300a39bf SHA512 33c7f44fa372644ee8654778a4fac5056830a11c90b4ef8aaac17df1e34644fa07cef7f6db2135dcf047dafb99f302c19e288653028811f4f4306aa53f7c58ec
-DIST mod_rpaf-0.6.tar.gz 7695 BLAKE2B 4aeb7fbaaa9c5fdda139b3f6eeedae842f623382c54d13166117d533c7674ad587be1d2da914a68594be6fc999f40bd60a985f773272f0ea9769cd72f8e25736 SHA512 1ad5af69cfe0e72cc609c081388e20e6a40cff1af7b47581b3d6958e5c7badf6580b2e14e5bd86482fe7cc7b60ca5045a2486c6f3f6e8ece7c142d38df990b4c
DIST mod_rpaf-0.8.4.tar.gz 6458 BLAKE2B 80919bbae3a3fd1dfc343efe669a21bb57e041d79987a7430ef40085576164707995a9b0b4d9f41aeaefead7f1951a08e800ae40cc2141cd27df8a7feeb5bdb8 SHA512 ae3a265bfa829c62721acfed6ed20ecffd48f130e435e14769d65e635aac3e3ac15c57d198ac2a0f3e7479dd4d71f90cc15ab717ed396ca016f8822312ff4305
-EBUILD mod_rpaf-0.6-r1.ebuild 537 BLAKE2B cea5eaccc9d1035e9e09a2c1968093c5a11db0d78f035ac8a22a9949a27820b4b57ca0273cec85b5c8e9648e2eca59ab703f3cdc31642b8c7000020c2817b4aa SHA512 3ebe42367b9c5ac81a9e371e3b512bea95211b208b05fbc98e4a989dbe85dbb34df431cd083abc422ba0dd26125e39895a72b16556eec747d7a0b98f3e7ee027
-EBUILD mod_rpaf-0.8.4.ebuild 531 BLAKE2B 9035b29e77e10c4f2866dbb0504f280c2212c5a905c928270748826150122a79b0b3e5d98f916065dd80d9534e65aa3c0dff1b6358adcba119ac534c1cd32f94 SHA512 d6109f82baf86c0c046e2082f423115c5f62eace6d9423ea79c1cf377986580d4e4c7c7efac9fec1e6fdaed33f7dd22f7ce1d760805edd883930d25d95c4ce97
+EBUILD mod_rpaf-0.8.4.ebuild 529 BLAKE2B 71e8533b13323f486799cb665d4de6235f792050167600a6d3e18bbced443a9cc5fdceeeb2a45d8d2828e0ba9c85bb156efa5dea1f18e2e0031e222b9aab6070 SHA512 28a2e443f01e06dbdba3d0b8cea720229715241ce5dd556007df874dfb2d63cca6ba17b318b2e5c89d8822ad54cb1449aa4d58e1925f008fee16f6e433cebb04
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_rpaf/files/003_ipv6.patch b/www-apache/mod_rpaf/files/003_ipv6.patch
deleted file mode 100644
index 49554efe459a..000000000000
--- a/www-apache/mod_rpaf/files/003_ipv6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: ipv6 fixes
-Author: Piotr Roszatycki <dexter@debian.org>
-Reviewed-by: Sergey B Kirpichev <skirpichev@gmail.com>
-Bug-Debian: http://bugs.debian.org/726529
-
----
- mod_rpaf-2.0.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/mod_rpaf-2.0.c
-+++ b/mod_rpaf-2.0.c
-@@ -72,6 +72,8 @@
- #include "http_vhost.h"
- #include "apr_strings.h"
-
-+#include <arpa/inet.h>
-+
- module AP_MODULE_DECLARE_DATA rpaf_module;
-
- typedef struct {
-@@ -185,6 +187,10 @@
- apr_pool_cleanup_register(r->pool, (void *)rcr, rpaf_cleanup, apr_pool_cleanup_null);
- r->connection->remote_ip = apr_pstrdup(r->connection->pool, ((char **)arr->elts)[((arr->nelts)-1)]);
- r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->remote_ip);
-+ apr_sockaddr_t *tmpsa;
-+ int ret = apr_sockaddr_info_get(&tmpsa, r->connection->remote_ip, APR_UNSPEC, r->connection->remote_addr->port, 0, r->connection->remote_addr->pool);
-+ if (ret == APR_SUCCESS)
-+ memcpy(r->connection->remote_addr, tmpsa, sizeof(apr_sockaddr_t));
- if (cfg->sethostname) {
- const char *hostvalue;
- if (hostvalue = apr_table_get(r->headers_in, "X-Forwarded-Host")) {
diff --git a/www-apache/mod_rpaf/files/010_multiple_proxies.patch b/www-apache/mod_rpaf/files/010_multiple_proxies.patch
deleted file mode 100644
index 2c9fae01bbe3..000000000000
--- a/www-apache/mod_rpaf/files/010_multiple_proxies.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Use the last value from the X-Forwarded-For header, which
- is not in RPAFproxy_ips as the client IP, falling back to the first one
- if they are all known proxies.
-Author: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
-
----
- mod_rpaf-2.0.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
---- a/mod_rpaf-2.0.c
-+++ b/mod_rpaf-2.0.c
-@@ -154,6 +154,16 @@
- return APR_SUCCESS;
- }
-
-+static char* last_not_in_array(apr_array_header_t *forwarded_for,
-+ apr_array_header_t *proxy_ips) {
-+ int i;
-+ for (i = (forwarded_for->nelts)-1; i > 0; i--) {
-+ if (!is_in_array(((char **)forwarded_for->elts)[i], proxy_ips))
-+ break;
-+ }
-+ return ((char **)forwarded_for->elts)[i];
-+}
-+
- static int change_remote_ip(request_rec *r) {
- const char *fwdvalue;
- char *val;
-@@ -185,7 +195,7 @@
- rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->remote_ip);
- rcr->r = r;
- apr_pool_cleanup_register(r->pool, (void *)rcr, rpaf_cleanup, apr_pool_cleanup_null);
-- r->connection->remote_ip = apr_pstrdup(r->connection->pool, ((char **)arr->elts)[((arr->nelts)-1)]);
-+ r->connection->remote_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
- r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->remote_ip);
- apr_sockaddr_t *tmpsa;
- int ret = apr_sockaddr_info_get(&tmpsa, r->connection->remote_ip, APR_UNSPEC, r->connection->remote_addr->port, 0, r->connection->remote_addr->pool);
diff --git a/www-apache/mod_rpaf/files/011_apache2.4.patch b/www-apache/mod_rpaf/files/011_apache2.4.patch
deleted file mode 100644
index 1757e9f30a5a..000000000000
--- a/www-apache/mod_rpaf/files/011_apache2.4.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Apache 2.4 compatibility patch
-Author: Sergey B Kirpichev <skirpichev@gmail.com>
-Bug-Debian: http://bugs.debian.org/666792
-
----
- mod_rpaf-2.0.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
---- a/mod_rpaf-2.0.c
-+++ b/mod_rpaf-2.0.c
-@@ -149,8 +149,8 @@
-
- static apr_status_t rpaf_cleanup(void *data) {
- rpaf_cleanup_rec *rcr = (rpaf_cleanup_rec *)data;
-- rcr->r->connection->remote_ip = apr_pstrdup(rcr->r->connection->pool, rcr->old_ip);
-- rcr->r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(rcr->r->connection->remote_ip);
-+ rcr->r->connection->client_ip = apr_pstrdup(rcr->r->connection->pool, rcr->old_ip);
-+ rcr->r->connection->client_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(rcr->r->connection->client_ip);
- return APR_SUCCESS;
- }
-
-@@ -173,7 +173,7 @@
- if (!cfg->enable)
- return DECLINED;
-
-- if (is_in_array(r->connection->remote_ip, cfg->proxy_ips) == 1) {
-+ if (is_in_array(r->connection->client_ip, cfg->proxy_ips) == 1) {
- /* check if cfg->headername is set and if it is use
- that instead of X-Forwarded-For by default */
- if (cfg->headername && (fwdvalue = apr_table_get(r->headers_in, cfg->headername))) {
-@@ -192,15 +192,15 @@
- if (*fwdvalue != '\0')
- ++fwdvalue;
- }
-- rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->remote_ip);
-+ rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->client_ip);
- rcr->r = r;
- apr_pool_cleanup_register(r->pool, (void *)rcr, rpaf_cleanup, apr_pool_cleanup_null);
-- r->connection->remote_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
-- r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->remote_ip);
-+ r->connection->client_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
-+ r->connection->client_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->client_ip);
- apr_sockaddr_t *tmpsa;
-- int ret = apr_sockaddr_info_get(&tmpsa, r->connection->remote_ip, APR_UNSPEC, r->connection->remote_addr->port, 0, r->connection->remote_addr->pool);
-+ int ret = apr_sockaddr_info_get(&tmpsa, r->connection->client_ip, APR_UNSPEC, r->connection->client_addr->port, 0, r->connection->client_addr->pool);
- if (ret == APR_SUCCESS)
-- memcpy(r->connection->remote_addr, tmpsa, sizeof(apr_sockaddr_t));
-+ memcpy(r->connection->client_addr, tmpsa, sizeof(apr_sockaddr_t));
- if (cfg->sethostname) {
- const char *hostvalue;
- if (hostvalue = apr_table_get(r->headers_in, "X-Forwarded-Host")) {
diff --git a/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch b/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
deleted file mode 100644
index b31f91db29af..000000000000
--- a/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add missing header for inet_addr
-Author: Sergey B Kirpichev <skirpichev@gmail.com>
-
----
- mod_rpaf-2.0.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/mod_rpaf-2.0.c
-+++ b/mod_rpaf-2.0.c
-@@ -64,6 +64,7 @@
- *
- */
-
-+#include <arpa/inet.h>
- #include "httpd.h"
- #include "http_config.h"
- #include "http_core.h"
diff --git a/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild b/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild
deleted file mode 100644
index e0e4e989f91d..000000000000
--- a/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild
+++ /dev/null
@@ -1,28 +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="Reverse proxy add forward module"
-HOMEPAGE="http://stderr.net/apache/rpaf/"
-SRC_URI="http://stderr.net/apache/rpaf/download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="RPAF"
-
-need_apache2_4
-
-src_prepare() {
- # Debian patches
- epatch "${FILESDIR}"/0*.patch
- mv ${PN}-2.0.c ${PN}.c
-}
diff --git a/www-apache/mod_rpaf/mod_rpaf-0.8.4.ebuild b/www-apache/mod_rpaf/mod_rpaf-0.8.4.ebuild
index 101d8e4e0898..6427eb76d2b2 100644
--- a/www-apache/mod_rpaf/mod_rpaf-0.8.4.ebuild
+++ b/www-apache/mod_rpaf/mod_rpaf-0.8.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gnif/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
APACHE2_MOD_CONF="10_${PN}"
APACHE2_MOD_DEFINE="RPAF"
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 870270fc0f7b..58cc5b1c83a3 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,8 +1,7 @@
AUX 79_mod_security.conf 729 BLAKE2B 5a415b7890a6d9553ec6e974825adad596a8f6d5c3b9ca0b7b9c4b2c3a788838d272343037d91cf94e8195510e7e395fc07d6a2ef2c6647695470714a79a7875 SHA512 2b99b28b58795dd45a76046609e7a4a6958ebd28c28c288cb7b732ec99191e218e6dd838a3c288220f267ad8c3b6004d1d6c6addac8df8be4c568a9f2fb54a92
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-r1.ebuild 2936 BLAKE2B d56fab859bc895277502a55215ed73b6ee2e42a3a259b2ced63121e791661746ed4935911e20e069e1090b73584f4fcbfd00d34f646fdfe64840bdb85326d159 SHA512 9f2b70bff4dbc2d1b6d04546ada68bb7295416a3f41ccfef6056e0db10c1dbbd2b4722f20596cf75ccbee62c270696973ed2a9a236255e97e07a7a67c559a003
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.3-r100.ebuild b/www-apache/mod_security/mod_security-2.9.5-r1.ebuild
index ad8579ac88e7..baac45dfeee8 100644
--- a/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.5-r1.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
@@ -11,12 +11,12 @@ MY_PN=modsecurity
MY_P=${MY_PN}-${PV}
DESCRIPTION="Application firewall and intrusion detection for Apache"
-HOMEPAGE="https://www.modsecurity.org/"
-SRC_URI="https://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
+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"
+KEYWORDS="~amd64 ~x86"
IUSE="doc fuzzyhash geoip jit json lua mlogc"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -25,6 +25,7 @@ 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} )
@@ -87,7 +88,7 @@ src_compile() {
src_install() {
apache-module_src_install
- dodoc CHANGES README.md modsecurity.conf-recommended
+ dodoc CHANGES README.md modsecurity.conf-recommended unicode.mapping
if use doc; then
dodoc -r doc/apache/html