Received: by mail.netbsd.org (Postfix, from userid 605) id 679EE85573; Sun, 29 Oct 2017 00:34:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E818984D23 for ; Sun, 29 Oct 2017 00:34:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id i33jcC9r7fVZ for ; Sun, 29 Oct 2017 00:34:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3509784CED for ; Sun, 29 Oct 2017 00:34:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 30202FBDE; Sun, 29 Oct 2017 00:34:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1509237270285780" MIME-Version: 1.0 Date: Sun, 29 Oct 2017 00:34:30 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/www/lighttpd To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20171029003430.30202FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1509237270285780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sun Oct 29 00:34:30 UTC 2017 Modified Files: pkgsrc/www/lighttpd: Makefile PLIST distinfo options.mk Added Files: pkgsrc/www/lighttpd/patches: patch-src_network.c Log Message: Fix building without IPv6 and packaging without SSL. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 pkgsrc/www/lighttpd/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/lighttpd/PLIST cvs rdiff -u -r1.40 -r1.41 pkgsrc/www/lighttpd/distinfo cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/lighttpd/options.mk cvs rdiff -u -r0 -r1.1 pkgsrc/www/lighttpd/patches/patch-src_network.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1509237270285780 Content-Disposition: inline Content-Length: 4204 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/lighttpd/Makefile diff -u pkgsrc/www/lighttpd/Makefile:1.64 pkgsrc/www/lighttpd/Makefile:1.65 --- pkgsrc/www/lighttpd/Makefile:1.64 Tue Oct 24 07:27:34 2017 +++ pkgsrc/www/lighttpd/Makefile Sun Oct 29 00:34:29 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2017/10/24 07:27:34 adam Exp $ +# $NetBSD: Makefile,v 1.65 2017/10/29 00:34:29 schmonz Exp $ DISTNAME= lighttpd-1.4.47 CATEGORIES= www @@ -58,7 +58,7 @@ SUBST_FILES.path= doc/config/lighttpd.co SUBST_VARS.path= LIGHTTPD_LOGDIR LIGHTTPD_STATEDIR LIGHTTPD_USER \ LIGHTTPD_GROUP PKG_SYSCONFDIR -PLIST_VARS+= gdbm geoip gssapi ldap lua mysql +PLIST_VARS+= gdbm geoip gssapi ldap lua mysql ssl post-install: set -e; cd ${WRKSRC}/doc; \ Index: pkgsrc/www/lighttpd/PLIST diff -u pkgsrc/www/lighttpd/PLIST:1.14 pkgsrc/www/lighttpd/PLIST:1.15 --- pkgsrc/www/lighttpd/PLIST:1.14 Tue Oct 24 07:27:34 2017 +++ pkgsrc/www/lighttpd/PLIST Sun Oct 29 00:34:29 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2017/10/24 07:27:34 adam Exp $ +@comment $NetBSD: PLIST,v 1.15 2017/10/29 00:34:29 schmonz Exp $ lib/lighttpd/mod_access.la lib/lighttpd/mod_accesslog.la lib/lighttpd/mod_alias.la @@ -22,7 +22,7 @@ ${PLIST.geoip}lib/lighttpd/mod_geoip.la lib/lighttpd/mod_indexfile.la ${PLIST.lua}lib/lighttpd/mod_magnet.la ${PLIST.mysql}lib/lighttpd/mod_mysql_vhost.la -lib/lighttpd/mod_openssl.la +${PLIST.ssl}lib/lighttpd/mod_openssl.la lib/lighttpd/mod_proxy.la lib/lighttpd/mod_redirect.la lib/lighttpd/mod_rewrite.la Index: pkgsrc/www/lighttpd/distinfo diff -u pkgsrc/www/lighttpd/distinfo:1.40 pkgsrc/www/lighttpd/distinfo:1.41 --- pkgsrc/www/lighttpd/distinfo:1.40 Wed Oct 25 14:27:20 2017 +++ pkgsrc/www/lighttpd/distinfo Sun Oct 29 00:34:29 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.40 2017/10/25 14:27:20 fhajny Exp $ +$NetBSD: distinfo,v 1.41 2017/10/29 00:34:29 schmonz Exp $ SHA1 (lighttpd-1.4.47.tar.xz) = 57dcbdcc42d52f113bd46e09b3fb895e2a076b4f RMD160 (lighttpd-1.4.47.tar.xz) = 8cadb881745f4deae5101c5227c208e4b12f429c @@ -6,3 +6,4 @@ SHA512 (lighttpd-1.4.47.tar.xz) = 9fac3a Size (lighttpd-1.4.47.tar.xz) = 703012 bytes SHA1 (patch-doc_config_lighttpd.conf) = de14fd0aa0ed2cac5846d810b5c89af4036f1b70 SHA1 (patch-src_fdevent__solaris__port.c) = c31f457dd6f25dba01710faf34c45a636519320f +SHA1 (patch-src_network.c) = ad982b124f00f35ed06f6f45f77e4aca17f2e0fb Index: pkgsrc/www/lighttpd/options.mk diff -u pkgsrc/www/lighttpd/options.mk:1.17 pkgsrc/www/lighttpd/options.mk:1.18 --- pkgsrc/www/lighttpd/options.mk:1.17 Thu Jun 22 03:06:26 2017 +++ pkgsrc/www/lighttpd/options.mk Sun Oct 29 00:34:29 2017 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.17 2017/06/22 03:06:26 schmonz Exp $ +# $NetBSD: options.mk,v 1.18 2017/10/29 00:34:29 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lighttpd PKG_SUPPORTED_OPTIONS= bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav @@ -87,6 +87,7 @@ PLIST.mysql= yes .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} +PLIST.ssl= yes .endif ### Added files: Index: pkgsrc/www/lighttpd/patches/patch-src_network.c diff -u /dev/null pkgsrc/www/lighttpd/patches/patch-src_network.c:1.1 --- /dev/null Sun Oct 29 00:34:30 2017 +++ pkgsrc/www/lighttpd/patches/patch-src_network.c Sun Oct 29 00:34:30 2017 @@ -0,0 +1,20 @@ +$NetBSD: patch-src_network.c,v 1.1 2017/10/29 00:34:30 schmonz Exp $ + +Fix build without IPv6 (from https://redmine.lighttpd.net/issues/2832). + +--- src/network.c.orig 2017-10-22 20:09:57.000000000 +0000 ++++ 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); ++ #else ++ unsigned short port = ntohs(addr->ipv4.sin_port); ++ #endif + buffer_append_string_len(host, CONST_STR_LEN(":")); + buffer_append_int(host, (int)port); + } --_----------=_1509237270285780--