reinit the tree, so we can have metadata

5 files changed, 126 insertions, 0 deletions

diff --git a/www-apache/mod_scgi/Manifest b/www-apache/mod_scgi/Manifest
new file mode 100644
index 000000000000..f476905645e9
--- /dev/null
+++ b/www-apache/mod_scgi/Manifest
@@ -0,0 +1,7 @@
+AUX 20_mod_scgi.conf 673 SHA256 38bd4f772746b5df479a0611dfc617bcd16c68f3d826201afe87459448b8defa SHA512 65d5a1fa064f8f2185be0ce58e58720c8661feacf4728be4a06d1c7a6e7cf390686bd281b88763e4b3d0e2d49111c52d7e05449515623efed654f22ad95fd91a WHIRLPOOL 38be9a5b3b9436971aae8eedaaeb161110c435d889ddb65b5670216f57ed517427c29278be05764461dd8af5fd4f6b9c2907064b2c4f29dd090f1f6785f73a19
+AUX mod_scgi-1.14-apache-2.4.patch 2021 SHA256 ce3a01152543d0d7f9f63528aad89b61ef8ce1b429d24fd1aca323fc2713ee65 SHA512 a9d9815395c82561c0849dfa2c8e7b6aa29c1be597d947800b4be84825d524edf65b4268d45ba6aaa0d949df14bc4362a3d87643fdb8ce0d05f851c2d43737d8 WHIRLPOOL 32c76d67c86acb0e9574964bac0b96d557072e1070d351aafd6334aa16995b3261c9f0a5a9a06f7ff36cc8424fe78e8b38e3521b3e4d84c0bb2cbbde552f522b
+DIST scgi-1.14.tar.gz 29406 SHA256 0cde41e4ae58ea666f17f6b1984e8ed8ebaff92cabac4b1b36f86bc47eb18e75 SHA512 148986aab3a5579b7dd7d15583990844149b799df32221b4d2c354b11361f79727087d63ddd54227d2aae937253997774e521606c7baea6b808b9efef025a01a WHIRLPOOL 969babed626fba1280f46eee7c620c9d42da1ffdabbf7752b849a26704f214773f07aae41849c873ba22f8bdc0c4c7f54455c130ec2992a943accfb328a183c5
+EBUILD mod_scgi-1.14-r1.ebuild 772 SHA256 911e253f7fe803d95712e8d8727490560a5bff0ca22507a02bf40b63ab815e49 SHA512 2ff9307666bd27cb8f7dd39316ed80a898871e896241c27fcc416800a753d1e831d71c042d1a97f573eae5a47b7b0b1b7b8d52efdd21da86f72bdca4b8f14967 WHIRLPOOL 60f17428bcf1893a1a803fafe80f4d2f40bb5717d377f26aee4e8d438ae9c3c6f67de7a69d16613b90fefecaef8a58171042a39fb048dc5448b365c3c988006e
+MISC ChangeLog 2819 SHA256 215cb7f4033edd0bca41b8accad79715d05e1fbad249a8beac6823eeaaa4bdd0 SHA512 ec0de2d632015cfdf76c7d0bf201b0eb2ac8012a9a9ff334bc606c99428cb27e0d533b2d24d3d182d0440106bc1aa9fa0f5e50c655c13dca81de44bb80fecd6b WHIRLPOOL c919cb8b3184a5798ddf4fee3b18f980a8de8f36f2a0e2086a92bbbe3d3d99532b61fb407fe28e23348ad47d334d4b102fe6698f246040e6d26f9d84fa8ddab6
+MISC ChangeLog-2015 4619 SHA256 957e38c5ec19fecf078ed3885ab97ba1a118ca215fc1ecc87bddfd5b6282b140 SHA512 f4229a19dde656fafa38819c04005d2929aefc7d77df2c1eff85cb607d7e659134332dbb86209d715e3ca5fa50930dea8969d6a5e4a1454cc43262b1a45608d9 WHIRLPOOL 0a6ccfad2b9a3422e19aabbb0d5c16a875fefa16beec0dd1d66e115e6a7eb2125d1a47ab4a0950c999a8f7419e98d653166a3a11d45e59b53e30a52780db8a1a
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_scgi/files/20_mod_scgi.conf b/www-apache/mod_scgi/files/20_mod_scgi.conf
new file mode 100644
index 000000000000..1b7b5962748d
--- /dev/null
+++ b/www-apache/mod_scgi/files/20_mod_scgi.conf
@@ -0,0 +1,33 @@
+<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
new file mode 100644
index 000000000000..8c1240b18c31
--- /dev/null
+++ b/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch
@@ -0,0 +1,49 @@
+--- 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
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_scgi/metadata.xml
@@ -0,0 +1,5 @@
+<?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
new file mode 100644
index 000000000000..24560ce5468a
--- /dev/null
+++ b/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
@@ -0,0 +1,32 @@
+# 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.python.org/pypi/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
+}