Support apache 2.4 (#532866)

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 90 insertions, 2 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/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
+}