| 1 |
commit: 039c68f53c589b56572bdf7081b1ce1227d17e96 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 2 08:03:16 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 2 08:03:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039c68f5 |
| 7 |
|
| 8 |
www-apache/mod_scgi: Remove last-rited pkg |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/package.mask | 1 - |
| 13 |
www-apache/mod_scgi/Manifest | 1 - |
| 14 |
www-apache/mod_scgi/files/20_mod_scgi.conf | 33 --------------- |
| 15 |
.../mod_scgi/files/mod_scgi-1.14-apache-2.4.patch | 49 ---------------------- |
| 16 |
www-apache/mod_scgi/metadata.xml | 5 --- |
| 17 |
www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild | 32 -------------- |
| 18 |
6 files changed, 121 deletions(-) |
| 19 |
|
| 20 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 21 |
index 82f3e2af6a2..b8d41fd36d8 100644 |
| 22 |
--- a/profiles/package.mask |
| 23 |
+++ b/profiles/package.mask |
| 24 |
@@ -738,7 +738,6 @@ app-accessibility/sphinxbase |
| 25 |
# Py2 only. Upstream has py3 versions |
| 26 |
# m-n. Removal in 30 days. |
| 27 |
www-apps/scgi |
| 28 |
-www-apache/mod_scgi |
| 29 |
|
| 30 |
# Aaron Bauman <bman@g.o> (2020-08-01) |
| 31 |
# Py2 only. Last upstream release 2013. |
| 32 |
|
| 33 |
diff --git a/www-apache/mod_scgi/Manifest b/www-apache/mod_scgi/Manifest |
| 34 |
deleted file mode 100644 |
| 35 |
index 460c31adcc4..00000000000 |
| 36 |
--- a/www-apache/mod_scgi/Manifest |
| 37 |
+++ /dev/null |
| 38 |
@@ -1 +0,0 @@ |
| 39 |
-DIST scgi-1.14.tar.gz 29406 BLAKE2B 46bf75f9971f8801ae0244bd43ae85730f8c48cc437381937d16f8f7e143302472c4e9e4bf8ce52b1a9732fc77449b95a8f03b785b0c08c48e3a6dc53079ab5a SHA512 148986aab3a5579b7dd7d15583990844149b799df32221b4d2c354b11361f79727087d63ddd54227d2aae937253997774e521606c7baea6b808b9efef025a01a |
| 40 |
|
| 41 |
diff --git a/www-apache/mod_scgi/files/20_mod_scgi.conf b/www-apache/mod_scgi/files/20_mod_scgi.conf |
| 42 |
deleted file mode 100644 |
| 43 |
index 1b7b5962748..00000000000 |
| 44 |
--- a/www-apache/mod_scgi/files/20_mod_scgi.conf |
| 45 |
+++ /dev/null |
| 46 |
@@ -1,33 +0,0 @@ |
| 47 |
-<IfDefine SCGI> |
| 48 |
-LoadModule scgi_module modules/mod_scgi.so |
| 49 |
- |
| 50 |
-# Apache2 example |
| 51 |
-#<Location "/dynamic"> |
| 52 |
-# SetHandler scgi-handler |
| 53 |
-# SCGIServer localhost:4000 |
| 54 |
-# SCGIHandler On |
| 55 |
-# Options -Multiviews |
| 56 |
-#</Location> |
| 57 |
-#<LocationMatch "^/(dynamic|login)($|/)"> |
| 58 |
-# SetHandler scgi-handler |
| 59 |
-# SCGIServer localhost:4000 |
| 60 |
-# SCGIHandler On |
| 61 |
-# Options -Multiviews |
| 62 |
-#</Location> |
| 63 |
-#<Location "/foo"> |
| 64 |
-# SCGIServer localhost:4000 |
| 65 |
-# SCGIHandler On |
| 66 |
-# Options -Multiviews |
| 67 |
-#</Location> |
| 68 |
-#<Location "/bar"> |
| 69 |
-# SCGIServer localhost:4001 |
| 70 |
-# SCGIHandler On |
| 71 |
-# SCGIServerTimeout 10 |
| 72 |
-# Options -Multiviews |
| 73 |
-#</Location> |
| 74 |
-#<Location "/bar/images"> |
| 75 |
-# SCGIHander Off |
| 76 |
-#</Location> |
| 77 |
-</IfDefine> |
| 78 |
- |
| 79 |
-# vim: ts=4 filetype=apache |
| 80 |
|
| 81 |
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 |
| 82 |
deleted file mode 100644 |
| 83 |
index 8c1240b18c3..00000000000 |
| 84 |
--- a/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch |
| 85 |
+++ /dev/null |
| 86 |
@@ -1,49 +0,0 @@ |
| 87 |
---- a/apache2/mod_scgi.c |
| 88 |
-+++ b/apache2/mod_scgi.c |
| 89 |
-@@ -135,16 +135,16 @@ |
| 90 |
- return DECLINED; |
| 91 |
- } |
| 92 |
- |
| 93 |
--static void log_err(const char *file, int line, request_rec *r, |
| 94 |
-+static void log_err(const char *file, int line, int index, request_rec *r, |
| 95 |
- apr_status_t status, const char *msg) |
| 96 |
- { |
| 97 |
-- ap_log_rerror(file, line, APLOG_ERR, status, r, "scgi: %s", msg); |
| 98 |
-+ ap_log_rerror(file, line, index, APLOG_ERR, status, r, "scgi: %s", msg); |
| 99 |
- } |
| 100 |
- |
| 101 |
--static void log_debug(const char *file, int line, request_rec *r, const |
| 102 |
-+static void log_debug(const char *file, int line, int index, request_rec *r, const |
| 103 |
- char *msg) |
| 104 |
- { |
| 105 |
-- ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg); |
| 106 |
-+ ap_log_rerror(file, line, index, APLOG_DEBUG, APR_SUCCESS, r, "%s", msg); |
| 107 |
- } |
| 108 |
- |
| 109 |
- static char *http2env(apr_pool_t *p, const char *name) |
| 110 |
-@@ -312,7 +312,7 @@ |
| 111 |
- int i; |
| 112 |
- apr_status_t rv = 0; |
| 113 |
- apr_port_t port = 0; |
| 114 |
-- GET_PORT(port, r->connection->remote_addr); |
| 115 |
-+ GET_PORT(port, r->useragent_addr); |
| 116 |
- |
| 117 |
- log_debug(APLOG_MARK,r, "sending headers"); |
| 118 |
- t = apr_table_make(r->pool, 40); |
| 119 |
-@@ -324,14 +324,14 @@ |
| 120 |
- buf = "0"; |
| 121 |
- add_header(t, "CONTENT_LENGTH", buf); |
| 122 |
- add_header(t, "SCGI", SCGI_PROTOCOL_VERSION); |
| 123 |
-- add_header(t, "SERVER_SOFTWARE", ap_get_server_version()); |
| 124 |
-+ add_header(t, "SERVER_SOFTWARE", ap_get_server_banner()); |
| 125 |
- add_header(t, "SERVER_PROTOCOL", r->protocol); |
| 126 |
- add_header(t, "SERVER_NAME", ap_get_server_name(r)); |
| 127 |
- add_header(t, "SERVER_ADMIN", r->server->server_admin); |
| 128 |
- add_header(t, "SERVER_ADDR", r->connection->local_ip); |
| 129 |
- add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u", |
| 130 |
- ap_get_server_port(r))); |
| 131 |
-- add_header(t, "REMOTE_ADDR", r->connection->remote_ip); |
| 132 |
-+ add_header(t, "REMOTE_ADDR", r->useragent_ip); |
| 133 |
- add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port)); |
| 134 |
- add_header(t, "REMOTE_USER", r->user); |
| 135 |
- add_header(t, "REQUEST_METHOD", r->method); |
| 136 |
|
| 137 |
diff --git a/www-apache/mod_scgi/metadata.xml b/www-apache/mod_scgi/metadata.xml |
| 138 |
deleted file mode 100644 |
| 139 |
index 6f49eba8f49..00000000000 |
| 140 |
--- a/www-apache/mod_scgi/metadata.xml |
| 141 |
+++ /dev/null |
| 142 |
@@ -1,5 +0,0 @@ |
| 143 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 144 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 145 |
-<pkgmetadata> |
| 146 |
-<!-- maintainer-needed --> |
| 147 |
-</pkgmetadata> |
| 148 |
|
| 149 |
diff --git a/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild b/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild |
| 150 |
deleted file mode 100644 |
| 151 |
index ff52bf45086..00000000000 |
| 152 |
--- a/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild |
| 153 |
+++ /dev/null |
| 154 |
@@ -1,32 +0,0 @@ |
| 155 |
-# Copyright 1999-2017 Gentoo Foundation |
| 156 |
-# Distributed under the terms of the GNU General Public License v2 |
| 157 |
- |
| 158 |
-EAPI=5 |
| 159 |
-inherit apache-module eutils |
| 160 |
- |
| 161 |
-DESCRIPTION="Apache module for a replacement of the CGI protocol, similar to FastCGI" |
| 162 |
-HOMEPAGE="http://python.ca/scgi/ https://pypi.org/project/scgi/" |
| 163 |
-SRC_URI="http://python.ca/scgi/releases/scgi-${PV}.tar.gz" |
| 164 |
- |
| 165 |
-LICENSE="CNRI" |
| 166 |
-SLOT="0" |
| 167 |
-KEYWORDS="amd64 ~hppa ~ppc x86" |
| 168 |
-IUSE="" |
| 169 |
- |
| 170 |
-DEPEND="~www-apps/scgi-${PV}" |
| 171 |
-RDEPEND="${DEPEND}" |
| 172 |
- |
| 173 |
-S="${WORKDIR}/scgi-${PV}" |
| 174 |
- |
| 175 |
-APXS2_S="${S}/apache2" |
| 176 |
-APACHE2_MOD_FILE="${S}/apache2/.libs/${PN}.so" |
| 177 |
-APACHE2_MOD_CONF="20_mod_scgi" |
| 178 |
-APACHE2_MOD_DEFINE="SCGI" |
| 179 |
- |
| 180 |
-DOCFILES="PKG-INFO LICENSE.txt CHANGES.txt apache2/README.txt" |
| 181 |
- |
| 182 |
-need_apache2_4 |
| 183 |
- |
| 184 |
-src_prepare() { |
| 185 |
- epatch "${FILESDIR}"/${P}-apache-2.4.patch |
| 186 |
-} |
Archives