Date: Sat, 28 Mar 2020 17:49:36 +0000 (UTC) From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529749 - in head/www/fcgiwrap: . files Message-ID: <202003281749.02SHnadY021278@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rodrigo Date: Sat Mar 28 17:49:36 2020 New Revision: 529749 URL: https://svnweb.freebsd.org/changeset/ports/529749 Log: www/fcgiwrap: fix IPv6 support Extend existing patch to fix IPv6 support. Bump PORTREVISION The fix zero-out the sockaddr structure before using it as a sockaddr_in6 structure as explained by IEEE Std 1003.1. The patch was upstremed : https://github.com/gnosek/fcgiwrap/pull/51 PR: 243721 Reported by: <olaf@zaplinski.de> Modified: head/www/fcgiwrap/Makefile head/www/fcgiwrap/files/fcgiwrap.in head/www/fcgiwrap/files/patch-fcgiwrap.c Modified: head/www/fcgiwrap/Makefile ============================================================================== --- head/www/fcgiwrap/Makefile Sat Mar 28 17:39:13 2020 (r529748) +++ head/www/fcgiwrap/Makefile Sat Mar 28 17:49:36 2020 (r529749) @@ -2,7 +2,7 @@ PORTNAME= fcgiwrap PORTVERSION= 1.1.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= www MAINTAINER= rodrigo@FreeBSD.org Modified: head/www/fcgiwrap/files/fcgiwrap.in ============================================================================== --- head/www/fcgiwrap/files/fcgiwrap.in Sat Mar 28 17:39:13 2020 (r529748) +++ head/www/fcgiwrap/files/fcgiwrap.in Sat Mar 28 17:49:36 2020 (r529749) @@ -39,7 +39,7 @@ # fcgiwrap_myserver_group="mygroup" # fcgiwrap_myotherserver_socket="unix:/var/run/fcgiwrap.myotherserver.socket" # fcgiwrap_myotherserver_user="myotheruser" -# fcgiwrap_myotherserver_grup="myothergroup" +# fcgiwrap_myotherserver_group="myothergroup" # fcgiwrap_myserver_socket_mode="0775" # fcgiwrap_myotherserver_flags="" # No flags for this profile. Modified: head/www/fcgiwrap/files/patch-fcgiwrap.c ============================================================================== --- head/www/fcgiwrap/files/patch-fcgiwrap.c Sat Mar 28 17:39:13 2020 (r529748) +++ head/www/fcgiwrap/files/patch-fcgiwrap.c Sat Mar 28 17:49:36 2020 (r529749) @@ -87,7 +87,15 @@ char *p = url; char *q; int fd; -@@ -751,6 +785,7 @@ invalid_url: +@@ -685,6 +719,7 @@ static int setup_socket(char *url) { + struct sockaddr_in6 sa_in6; + } sa; + ++ memset(&sa, 0, sizeof(sa)); + if (!strncmp(p, "unix:", sizeof("unix:") - 1)) { + p += sizeof("unix:") - 1; + +@@ -751,6 +786,7 @@ invalid_url: return -1; } @@ -95,7 +103,7 @@ return listen_on_fd(fd); } -@@ -758,9 +793,10 @@ int main(int argc, char **argv) +@@ -758,9 +794,10 @@ int main(int argc, char **argv) { int nchildren = 1; char *socket_url = NULL; @@ -107,7 +115,7 @@ switch (c) { case 'f': stderr_to_fastcgi++; -@@ -773,6 +809,7 @@ int main(int argc, char **argv) +@@ -773,6 +810,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 +123,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 @@ int main(int argc, char **argv) +@@ -784,8 +822,14 @@ int main(int argc, char **argv) case 's': socket_url = strdup(optarg); break; @@ -131,7 +139,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 @@ int main(int argc, char **argv) +@@ -808,13 +852,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?202003281749.02SHnadY021278>