Date: Tue, 31 Oct 2017 15:26:06 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453242 - head/www/lighttpd/files Message-ID: <201710311526.v9VFQ6k9032554@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <pkubaj@anongoth.pl> (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); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710311526.v9VFQ6k9032554>