ports/179710: port www/mod_fastcgi extra patch to support apache24

Fri Feb 21 18:10:01 UTC 2014

The following reply was made to PR ports/179710; it has been noted by GNATS.

From: "Mikhail T." <mi+thun at aldan.algebra.com>
To: bug-followup at FreeBSD.org, freebsd at omnilan.de
Cc: hollywar at mail.holywar.net, Olli Hauer <ohauer at FreeBSD.org>
Subject: Re: ports/179710: port www/mod_fastcgi extra patch to support apache24
Date: Fri, 21 Feb 2014 13:04:30 -0500

 This is a multi-part message in MIME format.
 --------------080106070909020008010700
 Content-Type: multipart/alternative;
  boundary="------------030502090704080407010503"

 --------------030502090704080407010503
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit

 The attached update adds the same patch as submitted by Harald and a couple of
 others developed since. Together these make the port compilable against both 2.2
 and 2.4 versions of Apache, pick minor nits in code and documentation and add
 new functionality (courtesy of
 https://github.com/ByteInternet/libapache-mod-fastcgi/).

 Please, take a look at your earliest convenience. Thank you! Yours,

     -mi

 P.S. GIven how long this PR is, I'm tempted to claim "maintainer timeout" rather
 soon.

 --------------030502090704080407010503
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit

 <html>
   <head>

     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
   </head>
   <body bgcolor="#FFFFFF" text="#000000">
     The attached update adds the same patch as submitted by Harald and a
     couple of others developed since. Together these make the port
     compilable against both 2.2 and 2.4 versions of Apache, pick minor
     nits in code and documentation and add new functionality (courtesy
     of <a class="moz-txt-link-freetext" href="https://github.com/ByteInternet/libapache-mod-fastcgi/">https://github.com/ByteInternet/libapache-mod-fastcgi/</a>).<br>
     <br>
     Please, take a look at your earliest convenience. Thank you! Yours,<br>
     <blockquote>-mi<br>
     </blockquote>
     P.S. GIven how long this PR is, I'm tempted to claim "maintainer
     timeout" rather soon.<br>
   </body>
 </html>

 --------------030502090704080407010503--

 --------------080106070909020008010700
 Content-Type: text/x-diff;
  name="mod_fastcgi-compat-Apache-2.4.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="mod_fastcgi-compat-Apache-2.4.diff"

 Index: Makefile
 ===================================================================
 --- Makefile	(revision 343675)
 +++ Makefile	(working copy)
 @@ -3,6 +3,7 @@

  PORTNAME=	mod_fastcgi
  PORTVERSION=	2.4.7
 +PORTREVISION=	1
  CATEGORIES=	www
  MASTER_SITES=	http://www.fastcgi.com/dist/ \
  		LOCAL/ohauer
 @@ -9,10 +10,16 @@
  DISTNAME=	mod_fastcgi-SNAP-0910052141
  DIST_SUBDIR=	apache2

 +PATCHFILES=	doc-misc-typo-fix.diff	\
 +		byte-new-packet-type-byte_acc.diff \
 +		byte-compile-against-apache24.diff
 +PATCH_SITES=	https://raw.github.com/ByteInternet/libapache-mod-fastcgi/byte/debian/patches/
 +PATCH_DIST_STRIP=-p1
 +
  MAINTAINER=	apache at FreeBSD.org
  COMMENT=	Apache 2.2 fast-cgi module

 -USE_APACHE=	22
 +USE_APACHE=	22+
  AP_FAST_BUILD=	yes
  AP_GENPLIST=	yes
  SRC_FILE=	*.c
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 343675)
 +++ distinfo	(working copy)
 @@ -1,2 +1,8 @@
  SHA256 (apache2/mod_fastcgi-SNAP-0910052141.tar.gz) = e6564ae206284806c781834e9e89aa4b0a4dd647b45c6da5cc389c65a984bdc7
  SIZE (apache2/mod_fastcgi-SNAP-0910052141.tar.gz) = 103255
 +SHA256 (apache2/doc-misc-typo-fix.diff) = 037f5ca88fa2bb0ce863c8f0c6583d7b9a69350de7968e6ea5660a0c16c8f252
 +SIZE (apache2/doc-misc-typo-fix.diff) = 1133
 +SHA256 (apache2/byte-new-packet-type-byte_acc.diff) = a1aa659d06ecb4d310cc5b9b7f8276173c44ac89e1bd7554bc95027904f08bff
 +SIZE (apache2/byte-new-packet-type-byte_acc.diff) = 9581
 +SHA256 (apache2/byte-compile-against-apache24.diff) = e405f365fac2d80c181a7ddefc9c6332cac7766cb9c67c464c272d595cde1800
 +SIZE (apache2/byte-compile-against-apache24.diff) = 6882
 Index: files/patch-fix-cast-warning-in-fcgi_config
 ===================================================================
 --- files/patch-fix-cast-warning-in-fcgi_config	(revision 0)
 +++ files/patch-fix-cast-warning-in-fcgi_config	(working copy)
 @@ -0,0 +1,9 @@
 +--- fcgi_config.c	2007-10-28 20:22:00.000000000 -0400
 ++++ fcgi_config.c	2013-03-26 14:44:16.000000000 -0400
 +@@ -1205,5 +1205,5 @@
 +         return ap_psprintf(cmd->temp_pool, "%s: unknown option: \"%s\"", cmd->cmd->name, compat);
 + 
 +-    switch((int)cmd->info) {
 ++    switch((intptr_t)cmd->info) {
 +         case FCGI_AUTH_TYPE_AUTHENTICATOR:
 +             dir_config->authenticator = auth_server;

 --------------080106070909020008010700--