From owner-svn-ports-all@freebsd.org Sat Mar 28 17:49:47 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3BFB9260D3B; Sat, 28 Mar 2020 17:49:47 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48qR7Z6k6cz4dhF; Sat, 28 Mar 2020 17:49:46 +0000 (UTC) (envelope-from rodrigo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A9E818BB5; Sat, 28 Mar 2020 17:49:37 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02SHnbs7021280; Sat, 28 Mar 2020 17:49:37 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02SHnadY021278; Sat, 28 Mar 2020 17:49:36 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <202003281749.02SHnadY021278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Sat, 28 Mar 2020 17:49:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529749 - in head/www/fcgiwrap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rodrigo X-SVN-Commit-Paths: in head/www/fcgiwrap: . files X-SVN-Commit-Revision: 529749 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 17:49:47 -0000 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: 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 \t\tNumber of processes to prefork\n" " -s \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: \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) {