Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Dec 2016 17:10:09 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429554 - in head/www: fcgi fcgi/files fcgiwrap fcgiwrap/files
Message-ID:  <201612261710.uBQHA97N009731@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Mon Dec 26 17:10:09 2016
New Revision: 429554
URL: https://svnweb.freebsd.org/changeset/ports/429554

Log:
  Clean up and modernize fcgi and fcgiwrap. Unbreak fcgiwrap, for
  which distfiles are readily available, and host the fcgi distfile
  locally.

Modified:
  head/www/fcgi/Makefile
  head/www/fcgi/files/patch-CVE-2012-6687-pool
  head/www/fcgi/files/patch-examples__Makefile.in
  head/www/fcgi/files/patch-include__fcgio.h
  head/www/fcgiwrap/Makefile
  head/www/fcgiwrap/files/patch-fcgiwrap.8
  head/www/fcgiwrap/files/patch-fcgiwrap.c

Modified: head/www/fcgi/Makefile
==============================================================================
--- head/www/fcgi/Makefile	Mon Dec 26 17:05:06 2016	(r429553)
+++ head/www/fcgi/Makefile	Mon Dec 26 17:10:09 2016	(r429554)
@@ -5,7 +5,7 @@ PORTNAME=	fcgi
 PORTVERSION=	2.4.0
 PORTREVISION=	5
 CATEGORIES=	www
-MASTER_SITES=	http://www.fastcgi.com/dist/
+MASTER_SITES=	LOCAL/adamw
 PKGNAMESUFFIX=	-devkit
 
 MAINTAINER=	adamw@FreeBSD.org
@@ -17,24 +17,22 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.TERMS
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cpe libtool
+CPE_VENDOR=	fastcgi
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
-CPE_VENDOR=	fastcgi
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfcgi.so.0.0.0
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfcgi++.so.0.0.0
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${MANPREFIX}/man/man3/
-.if ${PORT_OPTIONS:MDOCS}
+
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	@${RM} ${STAGEDIR}${DOCSDIR}/*.[13]
-.endif
+	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${MANPREFIX}/man/man3
+	(cd ${WRKSRC}/doc && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name *\.[13]")
 
 .include <bsd.port.mk>

Modified: head/www/fcgi/files/patch-CVE-2012-6687-pool
==============================================================================
--- head/www/fcgi/files/patch-CVE-2012-6687-pool	Mon Dec 26 17:05:06 2016	(r429553)
+++ head/www/fcgi/files/patch-CVE-2012-6687-pool	Mon Dec 26 17:10:09 2016	(r429554)
@@ -1,8 +1,6 @@
-diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
-index 73e6a7f..af35aee 100755
---- libfcgi/os_unix.c
+--- libfcgi/os_unix.c.orig	2002-03-05 19:14:49 UTC
 +++ libfcgi/os_unix.c
-@@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_unix.c,v 1.37 2002/03/05 19:14:49 robs Exp
+@@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_uni
  #include <sys/time.h>
  #include <sys/un.h>
  #include <signal.h>
@@ -61,7 +59,7 @@ index 73e6a7f..af35aee 100755
          }
          while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
      }
-@@ -1116,13 +1127,11 @@ static int is_reasonable_accept_errno (const int error)
+@@ -1116,13 +1127,11 @@ static int is_reasonable_accept_errno (c
   */
  static int is_af_unix_keeper(const int fd)
  {

Modified: head/www/fcgi/files/patch-examples__Makefile.in
==============================================================================
--- head/www/fcgi/files/patch-examples__Makefile.in	Mon Dec 26 17:05:06 2016	(r429553)
+++ head/www/fcgi/files/patch-examples__Makefile.in	Mon Dec 26 17:10:09 2016	(r429554)
@@ -1,6 +1,6 @@
---- ./examples/Makefile.in.orig	2003-01-19 18:21:17.000000000 +0100
-+++ ./examples/Makefile.in	2014-07-08 00:25:16.000000000 +0200
-@@ -125,7 +125,7 @@
+--- examples/Makefile.in.orig	2003-01-19 17:21:17 UTC
++++ examples/Makefile.in
+@@ -125,7 +125,7 @@ threaded_CFLAGS = @PTHREAD_CFLAGS@
  threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
  
  echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp

Modified: head/www/fcgi/files/patch-include__fcgio.h
==============================================================================
--- head/www/fcgi/files/patch-include__fcgio.h	Mon Dec 26 17:05:06 2016	(r429553)
+++ head/www/fcgi/files/patch-include__fcgio.h	Mon Dec 26 17:10:09 2016	(r429554)
@@ -1,5 +1,5 @@
---- ./include/fcgio.h.orig	2011-01-21 12:26:36.000000000 +0000
-+++ ./include/fcgio.h	2011-01-21 12:27:29.000000000 +0000
+--- include/fcgio.h.orig	2002-02-25 13:16:11 UTC
++++ include/fcgio.h
 @@ -31,6 +31,7 @@
  #define FCGIO_H
  

Modified: head/www/fcgiwrap/Makefile
==============================================================================
--- head/www/fcgiwrap/Makefile	Mon Dec 26 17:05:06 2016	(r429553)
+++ head/www/fcgiwrap/Makefile	Mon Dec 26 17:10:09 2016	(r429554)
@@ -4,7 +4,6 @@ PORTNAME=	fcgiwrap
 PORTVERSION=	1.1.0
 PORTREVISION=	4
 CATEGORIES=	www
-MASTER_SITES=	http://www.skysmurf.nl/comp/FreeBSD/distfiles/
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Simple FastCGI wrapper for CGI scripts
@@ -13,8 +12,6 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libfcgi.so:www/fcgi
 
-BROKEN=		unfetchable
-
 USES=		autoreconf gmake pkgconfig
 
 USE_GITHUB=	yes
@@ -22,13 +19,17 @@ GH_ACCOUNT=	gnosek
 
 USE_RC_SUBR=	fcgiwrap
 
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	sbin/fcgiwrap man/man8/fcgiwrap.8.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/@prefix@@mandir@/@mandir@/'\
-	-e 's|-m 755 fcgiwrap|-s -m 755 fcgiwrap|' ${WRKSRC}/Makefile.in
+		${WRKSRC}/Makefile.in
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/fcgiwrap
 
 .include <bsd.port.mk>

Modified: head/www/fcgiwrap/files/patch-fcgiwrap.8
==============================================================================
--- head/www/fcgiwrap/files/patch-fcgiwrap.8	Mon Dec 26 17:05:06 2016	(r429553)
+++ head/www/fcgiwrap/files/patch-fcgiwrap.8	Mon Dec 26 17:10:09 2016	(r429554)
@@ -1,6 +1,6 @@
---- fcgiwrap.8.orig	2014-09-22 12:44:32.000000000 +0200
-+++ fcgiwrap.8	2014-09-22 12:51:14.000000000 +0200
-@@ -42,6 +42,9 @@
+--- fcgiwrap.8.orig	2013-02-03 13:25:17 UTC
++++ fcgiwrap.8
+@@ -42,6 +42,9 @@ takes care of opening the socket. Howeve
  tests this option may be used. Valid socket_urls include \fIunix:/path/to/unix/socket\fP,
  \fItcp:dot.ted.qu.ad:port\fP and \fItcp6:[ipv6_addr]:port\fP.
  .TP
@@ -10,7 +10,7 @@
  .B \-h
  Show a help message and exit.
  
-@@ -113,3 +116,8 @@
+@@ -113,3 +116,8 @@ with contributions by W-Mark Kubacki <wm
  This manual page was written by Jordi Mallach <jordi@debian.org>
  (with contributions by Grzegorz Nosek)
  for the Debian project (and may be used by others).

Modified: head/www/fcgiwrap/files/patch-fcgiwrap.c
==============================================================================
--- head/www/fcgiwrap/files/patch-fcgiwrap.c	Mon Dec 26 17:05:06 2016	(r429553)
+++ head/www/fcgiwrap/files/patch-fcgiwrap.c	Mon Dec 26 17:10:09 2016	(r429554)
@@ -1,5 +1,5 @@
---- fcgiwrap.c.orig	2013-02-03 14:25:17.000000000 +0100
-+++ fcgiwrap.c	2014-12-22 13:25:23.000000000 +0100
+--- fcgiwrap.c.orig	2013-02-03 13:25:17 UTC
++++ fcgiwrap.c
 @@ -43,6 +43,7 @@
  #include <ctype.h>
  
@@ -17,7 +17,7 @@
  
  static const char * blacklisted_env_vars[] = {
  	"AUTH_TYPE",
-@@ -485,6 +488,19 @@
+@@ -485,6 +488,19 @@ static void inherit_environment(void)
  	}
  }
  
@@ -37,7 +37,7 @@
  static void cgi_error(const char *message, const char *reason, const char *filename)
  {
  	printf("Status: %s\r\nContent-Type: text/plain\r\n\r\n%s\r\n",
-@@ -541,6 +557,9 @@
+@@ -541,6 +557,9 @@ static void handle_fcgi_request(void)
  			if (!filename)
  				cgi_error("403 Forbidden", "Cannot get script name, are DOCUMENT_ROOT and SCRIPT_NAME (or SCRIPT_FILENAME) set and is the script executable?", NULL);
  
@@ -47,7 +47,7 @@
  			last_slash = strrchr(filename, '/');
  			if (!last_slash)
  				cgi_error("403 Forbidden", "Script name must be a fully qualified path", filename);
-@@ -587,14 +606,29 @@
+@@ -587,14 +606,29 @@ err_pipein:
  	FCGI_puts("System error");
  }
  
@@ -78,7 +78,7 @@
  		handle_fcgi_request();
  	}
  }
-@@ -671,7 +705,7 @@
+@@ -671,7 +705,7 @@ static int listen_on_fd(int fd) {
  	return 0;
  }
  
@@ -87,7 +87,7 @@
  	char *p = url;
  	char *q;
  	int fd;
-@@ -751,6 +785,7 @@
+@@ -751,6 +785,7 @@ invalid_url:
  		return -1;
  	}
  
@@ -95,7 +95,7 @@
  	return listen_on_fd(fd);
  }
  
-@@ -758,9 +793,10 @@
+@@ -758,9 +793,10 @@ int main(int argc, char **argv)
  {
  	int nchildren = 1;
  	char *socket_url = NULL;
@@ -107,7 +107,7 @@
  		switch (c) {
  			case 'f':
  				stderr_to_fastcgi++;
-@@ -773,6 +809,7 @@
+@@ -773,6 +809,7 @@ int main(int argc, char **argv)
  					"  -c <number>\t\tNumber of processes to prefork\n"
  					"  -s <socket_url>\tSocket to bind to (say -s help for help)\n"
  					"  -h\t\t\tShow this help message and exit\n"
@@ -115,7 +115,7 @@
  					"\nReport bugs to Grzegorz Nosek <"PACKAGE_BUGREPORT">.\n"
  					PACKAGE_NAME" home page: <http://nginx.localdomain.pl/wiki/FcgiWrap>\n",
  					argv[0]
-@@ -784,8 +821,14 @@
+@@ -784,8 +821,14 @@ int main(int argc, char **argv)
  			case 's':
  				socket_url = strdup(optarg);
  				break;
@@ -131,7 +131,7 @@
  					fprintf(stderr, "Option -%c requires an argument.\n", optopt);
  				else if (isprint(optopt))
  					fprintf(stderr, "Unknown option `-%c'.\n", optopt);
-@@ -808,13 +851,24 @@
+@@ -808,13 +851,24 @@ int main(int argc, char **argv)
  	} else
  #endif
  	if (socket_url) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612261710.uBQHA97N009731>