Support apache 2.4 (#532866)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 96 insertions, 6 deletions

diff --git a/www-apache/mod_scgi/ChangeLog b/www-apache/mod_scgi/ChangeLog
index e4c9b32a3438..e41f5f2bc80a 100644
--- a/www-apache/mod_scgi/ChangeLog
+++ b/www-apache/mod_scgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_scgi
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_scgi/ChangeLog,v 1.14 2014/08/10 20:17:43 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_scgi/ChangeLog,v 1.15 2015/05/09 12:00:20 pacho Exp $
+
+*mod_scgi-1.14-r1 (09 May 2015)
+
+  09 May 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/mod_scgi-1.14-apache-2.4.patch, +mod_scgi-1.14-r1.ebuild:
+  Support apache 2.4 (#532866)
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> mod_scgi-1.14.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/www-apache/mod_scgi/Manifest b/www-apache/mod_scgi/Manifest
index ed0c9f00a1d3..6a4e82c49666 100644
--- a/www-apache/mod_scgi/Manifest
+++ b/www-apache/mod_scgi/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 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 890 SHA256 8c4b107080a5cca49eccccb8032748a8637dd8d5c5adb80bd3c8834350b5f343 SHA512 72598d3ff15a0647be94c96eaeacf3ed28694ca4041f9ca6833dacfe92b101e43543b6667ca9d34703c7bfd8c5facd993e7ae71ee14d72a7ac78c4511161b7d7 WHIRLPOOL 530cf07b0738544414f1572287258fb37016b287cfeed8da9bd97d7aab3ca736e0d6670e2b771f3a94e428a5e535a619c78b3f2ca745f8c08dd3a39e0a43b701
 EBUILD mod_scgi-1.14.ebuild 819 SHA256 35fab84922362db9cff04e02f91d7da569ce02b58b36a2544bb4ab4c14e004bb SHA512 1a7979a1bccea89b264a89bf6737469c0b7e57a6bcad1c233bee6c2e8b0e1404f6327a448300c0f26b7824711d5064357e21843d050b2ea7bde9d1fab0c17bc7 WHIRLPOOL 6ece8a8522f39911a32a04690825e36f2fe239e7e3f7f33cba002a54ab327ceb81ab209e964843819b42fca87cefd8a3a21f18aba97a1af8b4df08f1e9929ee2
-MISC ChangeLog 4442 SHA256 f5ba77254c5d65d39f84fc3e36268018b5257eccde4f6238f6faadf65def3e6f SHA512 c1cb0f05c4bd052731bd0291113555b097860206274816077a014d906820a8e0e39efb5caf616faf8c6443c40b2443cd2cedd54d9788b86985b29bf7246cc80c WHIRLPOOL 280d5d395b6113bec369622c785af2d3d200e7c2cd25933f7d2f497b83f49053775092b00a99d6c16ab519a5e1dbadeae74a7cd06e9f5e56ce6462c8e805b032
+MISC ChangeLog 4619 SHA256 957e38c5ec19fecf078ed3885ab97ba1a118ca215fc1ecc87bddfd5b6282b140 SHA512 f4229a19dde656fafa38819c04005d2929aefc7d77df2c1eff85cb607d7e659134332dbb86209d715e3ca5fa50930dea8969d6a5e4a1454cc43262b1a45608d9 WHIRLPOOL 0a6ccfad2b9a3422e19aabbb0d5c16a875fefa16beec0dd1d66e115e6a7eb2125d1a47ab4a0950c999a8f7419e98d653166a3a11d45e59b53e30a52780db8a1a
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn02cACgkQcaHudmEf86qqdwCeNl7dfeqG6BKe6Lp5A0QEzw6p
-v5gAnA2izEpy+3v11b6oPG/tzR0qWxJn
-=/39Q
+iEYEAREIAAYFAlVN9tUACgkQCaWpQKGI+9QjrgCeLydIBaJRdtUWH2R/szNhwJWY
+QDMAn0zcEU5i9G+M4hdJgRZ95r35wUfW
+=LmEB
 -----END PGP SIGNATURE-----
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/mod_scgi-1.14-r1.ebuild b/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
new file mode 100644
index 000000000000..68139cbf43ff
--- /dev/null
+++ b/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild,v 1.1 2015/05/09 12:00:20 pacho Exp $
+
+EAPI=5
+inherit apache-module eutils
+
+DESCRIPTION="Apache module for a replacement of the CGI protocol, similar to FastCGI"
+HOMEPAGE="http://python.ca/scgi/ http://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
+}