gentoo resync : 20.03.2022

7 files changed, 3 insertions, 173 deletions

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"