From owner-svn-ports-head@freebsd.org Tue Oct 31 15:26:08 2017 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 22FECE5CEDB; Tue, 31 Oct 2017 15:26:08 +0000 (UTC) (envelope-from madpilot@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 279B97E6AC; Tue, 31 Oct 2017 15:26:07 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9VFQ6cc032555; Tue, 31 Oct 2017 15:26:06 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9VFQ6k9032554; Tue, 31 Oct 2017 15:26:06 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201710311526.v9VFQ6k9032554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 31 Oct 2017 15:26:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453242 - head/www/lighttpd/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: head/www/lighttpd/files X-SVN-Commit-Revision: 453242 X-SVN-Commit-Repository: ports 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.23 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: Tue, 31 Oct 2017 15:26:08 -0000 Author: madpilot Date: Tue Oct 31 15:26:06 2017 New Revision: 453242 URL: https://svnweb.freebsd.org/changeset/ports/453242 Log: - Really fix build when IPV6 option is disabled - Correctly rename patch file PR: 223288 Submitted by: Piotr Kubaj (maintainer) Reported by: edgeman@gmail.com Added: head/www/lighttpd/files/patch-src_network.c - copied, changed from r453241, head/www/lighttpd/files/patch-patch-src__network.c Deleted: head/www/lighttpd/files/patch-patch-src__network.c Copied and modified: head/www/lighttpd/files/patch-src_network.c (from r453241, head/www/lighttpd/files/patch-patch-src__network.c) ============================================================================== --- head/www/lighttpd/files/patch-patch-src__network.c Tue Oct 31 15:06:58 2017 (r453241, copy source) +++ head/www/lighttpd/files/patch-src_network.c Tue Oct 31 15:26:06 2017 (r453242) @@ -1,19 +1,16 @@ ---- patch-src_network.c.orig 2017-10-28 15:54:22 UTC -+++ patch-src_network.c -@@ -0,0 +1,16 @@ -+--- src/network.c.orig 2017-10-28 14:00:17 UTC -++++ src/network.c -+@@ -77,9 +77,13 @@ static void network_host_normalize_addr_ -+ if (addr->plain.sa_family == AF_INET6) -+ buffer_append_string_len(host, CONST_STR_LEN("]")); -+ if (addr->plain.sa_family != AF_UNIX) { -++#ifdef HAVE_IPV6 -+ unsigned short port = (addr->plain.sa_family == AF_INET) -+ ? ntohs(addr->ipv4.sin_port) -+ : ntohs(addr->ipv6.sin6_port); -++#elif -++ unsigned short port = ntohs(addr->ipv6.sin6_port); -++#endif -+ buffer_append_string_len(host, CONST_STR_LEN(":")); -+ buffer_append_int(host, (int)port); -+ } +--- src/network.c.orig 2017-10-22 20:09:57 UTC ++++ src/network.c +@@ -77,9 +77,13 @@ static void network_host_normalize_addr_str(buffer *ho + if (addr->plain.sa_family == AF_INET6) + buffer_append_string_len(host, CONST_STR_LEN("]")); + if (addr->plain.sa_family != AF_UNIX) { ++#ifdef HAVE_IPV6 + unsigned short port = (addr->plain.sa_family == AF_INET) + ? ntohs(addr->ipv4.sin_port) + : ntohs(addr->ipv6.sin6_port); ++#else ++ unsigned short port = ntohs(addr->ipv4.sin_port); ++#endif + buffer_append_string_len(host, CONST_STR_LEN(":")); + buffer_append_int(host, (int)port); + }