From owner-svn-ports-head@freebsd.org Mon Oct 12 12:54:44 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8CB6A11E61; Mon, 12 Oct 2015 12:54:43 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE32616; Mon, 12 Oct 2015 12:54:43 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9CCsg9o092319; Mon, 12 Oct 2015 12:54:42 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9CCsgat092314; Mon, 12 Oct 2015 12:54:42 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201510121254.t9CCsgat092314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 12 Oct 2015 12:54:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399120 - in head/www/mod_scgi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Oct 2015 12:54:44 -0000 Author: junovitch Date: Mon Oct 12 12:54:42 2015 New Revision: 399120 URL: https://svnweb.freebsd.org/changeset/ports/399120 Log: www/mod_scgi: update 1.12 -> 1.14 and various fixes - Pass on MAINTAINER - Change MASTER_SITES from prior maintainer's mirror to upstream - Remove 2.2 in the COMMENT as the module builds/runs on both 2.2 and 2.4 - Add LICENSE - Set USE_APACHE=22+ and add conditional patch for builds on Apache 2.4 - Update WWW in pkg-descr - Fix grammar in pkg-message PR: 203355 Approved by: dryice@dryice.name (outgoing maintainer) Submitted by: Walter Schwarzenfeld Added: head/www/mod_scgi/files/ head/www/mod_scgi/files/apache24-compat-mod__scgi.c (contents, props changed) Modified: head/www/mod_scgi/Makefile head/www/mod_scgi/distinfo head/www/mod_scgi/pkg-descr head/www/mod_scgi/pkg-message Modified: head/www/mod_scgi/Makefile ============================================================================== --- head/www/mod_scgi/Makefile Mon Oct 12 12:26:06 2015 (r399119) +++ head/www/mod_scgi/Makefile Mon Oct 12 12:54:42 2015 (r399120) @@ -2,20 +2,28 @@ # $FreeBSD$ PORTNAME= mod_scgi -PORTVERSION= 1.12 -PORTREVISION= 2 +PORTVERSION= 1.14 CATEGORIES= www -MASTER_SITES= http://dryice.name/computer/FreeBSD/distfiles/ +MASTER_SITES= http://python.ca/scgi/releases/ DISTNAME= scgi-${PORTVERSION:S/.a/a/} -MAINTAINER= dryice@dryice.name -COMMENT= Apache 2.2 module that implements the client side of the SCGI protocol +MAINTAINER= w.schwarzenfeld@aon.at +COMMENT= Apache module that implements the client side of the SCGI protocol + +LICENSE= MIT +LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE.txt SCGI_DIR= apache2 WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR} -USE_APACHE= 22 +USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes -.include +.include + +.if ${APACHE_VERSION} == 24 +EXTRA_PATCHES= ${FILESDIR}/apache24-compat-mod__scgi.c +.endif + +.include Modified: head/www/mod_scgi/distinfo ============================================================================== --- head/www/mod_scgi/distinfo Mon Oct 12 12:26:06 2015 (r399119) +++ head/www/mod_scgi/distinfo Mon Oct 12 12:54:42 2015 (r399120) @@ -1,2 +1,2 @@ -SHA256 (scgi-1.12.tar.gz) = aac7904154c0cdc1b987365a6b9b84719e36af07a7044d6ced12aa5bb099b754 -SIZE (scgi-1.12.tar.gz) = 28132 +SHA256 (scgi-1.14.tar.gz) = 0cde41e4ae58ea666f17f6b1984e8ed8ebaff92cabac4b1b36f86bc47eb18e75 +SIZE (scgi-1.14.tar.gz) = 29406 Added: head/www/mod_scgi/files/apache24-compat-mod__scgi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_scgi/files/apache24-compat-mod__scgi.c Mon Oct 12 12:54:42 2015 (r399120) @@ -0,0 +1,49 @@ +--- mod_scgi.c.orig 2009-11-21 23:02:06 UTC ++++ mod_scgi.c +@@ -135,16 +135,16 @@ static int scgi_map_location(request_rec + 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 @@ send_headers(request_rec *r, struct sock + 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 @@ send_headers(request_rec *r, struct sock + 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); Modified: head/www/mod_scgi/pkg-descr ============================================================================== --- head/www/mod_scgi/pkg-descr Mon Oct 12 12:26:06 2015 (r399119) +++ head/www/mod_scgi/pkg-descr Mon Oct 12 12:54:42 2015 (r399120) @@ -6,4 +6,4 @@ The SCGI protocol is a replacement for t HTTP servers. It is similar to FastCGI but is designed to be easier to implement. -WWW: http://www.mems-exchange.org/software/scgi/ +WWW: http://python.ca/scgi/ Modified: head/www/mod_scgi/pkg-message ============================================================================== --- head/www/mod_scgi/pkg-message Mon Oct 12 12:26:06 2015 (r399119) +++ head/www/mod_scgi/pkg-message Mon Oct 12 12:54:42 2015 (r399120) @@ -1,3 +1,3 @@ ******************************************************************** -* If your mod_scgi seg fault, try disable mod_fastcgi * +* If your mod_scgi seg faults, try disabling mod_fastcgi * ********************************************************************