gentoo resync : 02.09.2020

6 files changed, 0 insertions, 124 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 65449c9b7edb..f6701a36a9c0 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_scgi/Manifest b/www-apache/mod_scgi/Manifest
deleted file mode 100644
index 514a26f2f862..000000000000
--- a/www-apache/mod_scgi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 20_mod_scgi.conf 673 BLAKE2B 69dda7a9a4d4120acdf24aa2c509dbd38ee9355d4e366b71aa12dad43d036a00bac8fa9a87ea830e00fd7fa7df63d1fbe3eb0aa91c7e2457aee0dfec15273e68 SHA512 65d5a1fa064f8f2185be0ce58e58720c8661feacf4728be4a06d1c7a6e7cf390686bd281b88763e4b3d0e2d49111c52d7e05449515623efed654f22ad95fd91a
-AUX mod_scgi-1.14-apache-2.4.patch 2021 BLAKE2B f9864b9249514756f295dd2d0237a04873ac819a3d9756eb7ca248d7f5654dc6982c1d61e461d1e10c7c39a68fac3205377a3e078b61202e71c70da713878cfe SHA512 a9d9815395c82561c0849dfa2c8e7b6aa29c1be597d947800b4be84825d524edf65b4268d45ba6aaa0d949df14bc4362a3d87643fdb8ce0d05f851c2d43737d8
-DIST scgi-1.14.tar.gz 29406 BLAKE2B 46bf75f9971f8801ae0244bd43ae85730f8c48cc437381937d16f8f7e143302472c4e9e4bf8ce52b1a9732fc77449b95a8f03b785b0c08c48e3a6dc53079ab5a SHA512 148986aab3a5579b7dd7d15583990844149b799df32221b4d2c354b11361f79727087d63ddd54227d2aae937253997774e521606c7baea6b808b9efef025a01a
-EBUILD mod_scgi-1.14-r1.ebuild 769 BLAKE2B 2af3c119d5c3fdb355f74f5c387e572a5fae715da37a59faa1ef6031a1fb8297ad077e2aa70ff75beb48eb4f7648de6d7b233fcc7fd8bef65bfccf9f41319540 SHA512 02b16f3cec92ae6daafc9a5921e2dcdd9afe90d55dbdc8e18655afa81a8923c9213553cd96b8b0f43daf22c91052e13a5e5eef054b61a3ecaaa07e8ec6600cff
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_scgi/files/20_mod_scgi.conf b/www-apache/mod_scgi/files/20_mod_scgi.conf
deleted file mode 100644
index 1b7b5962748d..000000000000
--- a/www-apache/mod_scgi/files/20_mod_scgi.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-<IfDefine SCGI>
-LoadModule scgi_module modules/mod_scgi.so
-
-# Apache2 example
-#<Location "/dynamic">
-#	SetHandler scgi-handler
-#	SCGIServer localhost:4000
-#	SCGIHandler On
-#	Options -Multiviews
-#</Location>
-#<LocationMatch "^/(dynamic|login)($|/)">
-#	SetHandler scgi-handler
-#	SCGIServer localhost:4000
-#	SCGIHandler On
-#	Options -Multiviews
-#</Location>
-#<Location "/foo">
-#	SCGIServer localhost:4000
-#	SCGIHandler On
-#	Options -Multiviews
-#</Location>
-#<Location "/bar">
-#	SCGIServer localhost:4001
-#	SCGIHandler On
-#	SCGIServerTimeout 10
-#	Options -Multiviews
-#</Location>
-#<Location "/bar/images">
-#	SCGIHander Off
-#</Location>
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch b/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch
deleted file mode 100644
index 8c1240b18c31..000000000000
--- a/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/apache2/mod_scgi.c
-+++ b/apache2/mod_scgi.c
-@@ -135,16 +135,16 @@
-     return DECLINED;
- }
- 
--static void log_err(const char *file, int line, request_rec *r,
-+static void log_err(const char *file, int line, int index, request_rec *r,
-                     apr_status_t status, const char *msg)
- {
--    ap_log_rerror(file, line, APLOG_ERR, status, r, "scgi: %s", msg);
-+    ap_log_rerror(file, line, index, APLOG_ERR, status, r, "scgi: %s", msg);
- }
- 
--static void log_debug(const char *file, int line, request_rec *r, const
-+static void log_debug(const char *file, int line, int index, request_rec *r, const
-                       char *msg)
- {
--    ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg);
-+    ap_log_rerror(file, line, index, APLOG_DEBUG, APR_SUCCESS, r, "%s", msg);
- }
- 
- static char *http2env(apr_pool_t *p, const char *name)
-@@ -312,7 +312,7 @@
-     int i;
-     apr_status_t rv = 0;
-     apr_port_t  port = 0;
--    GET_PORT(port, r->connection->remote_addr);
-+    GET_PORT(port, r->useragent_addr);
- 
-     log_debug(APLOG_MARK,r, "sending headers");
-     t = apr_table_make(r->pool, 40);
-@@ -324,14 +324,14 @@
- 	    buf = "0";
-     add_header(t, "CONTENT_LENGTH",  buf);
-     add_header(t, "SCGI", SCGI_PROTOCOL_VERSION);
--    add_header(t, "SERVER_SOFTWARE", ap_get_server_version());
-+    add_header(t, "SERVER_SOFTWARE", ap_get_server_banner());
-     add_header(t, "SERVER_PROTOCOL", r->protocol);
-     add_header(t, "SERVER_NAME", ap_get_server_name(r));
-     add_header(t, "SERVER_ADMIN", r->server->server_admin);
-     add_header(t, "SERVER_ADDR", r->connection->local_ip);
-     add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u",
-                                               ap_get_server_port(r)));
--    add_header(t, "REMOTE_ADDR", r->connection->remote_ip);
-+    add_header(t, "REMOTE_ADDR", r->useragent_ip);
-     add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port));
-     add_header(t, "REMOTE_USER", r->user);
-     add_header(t, "REQUEST_METHOD", r->method);
diff --git a/www-apache/mod_scgi/metadata.xml b/www-apache/mod_scgi/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_scgi/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild b/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
deleted file mode 100644
index ff52bf450860..000000000000
--- a/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module eutils
-
-DESCRIPTION="Apache module for a replacement of the CGI protocol, similar to FastCGI"
-HOMEPAGE="http://python.ca/scgi/ https://pypi.org/project/scgi/"
-SRC_URI="http://python.ca/scgi/releases/scgi-${PV}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE=""
-
-DEPEND="~www-apps/scgi-${PV}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/scgi-${PV}"
-
-APXS2_S="${S}/apache2"
-APACHE2_MOD_FILE="${S}/apache2/.libs/${PN}.so"
-APACHE2_MOD_CONF="20_mod_scgi"
-APACHE2_MOD_DEFINE="SCGI"
-
-DOCFILES="PKG-INFO LICENSE.txt CHANGES.txt apache2/README.txt"
-
-need_apache2_4
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-apache-2.4.patch
-}