Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id A4F0A7A315 for ; Tue, 3 Jan 2017 14:31:15 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 20DD38564E; Tue, 3 Jan 2017 14:31:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A734D855A5 for ; Tue, 3 Jan 2017 14:31:14 +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 wJLDlyuEtt2A for ; Tue, 3 Jan 2017 14:31:13 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5E2D88557E for ; Tue, 3 Jan 2017 14:31:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 58476FBA6; Tue, 3 Jan 2017 14:31:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1483453873132020" MIME-Version: 1.0 Date: Tue, 3 Jan 2017 14:31:13 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/www/lighttpd To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20170103143113.58476FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1483453873132020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Tue Jan 3 14:31:13 UTC 2017 Modified Files: pkgsrc/www/lighttpd: Makefile PLIST distinfo options.mk Removed Files: pkgsrc/www/lighttpd/patches: patch-src_connections.c Log Message: Updated www/lighttpd to 1.4.44 ------------------------------ - 1.4.44 * [mod_scgi] fix segfault (fixes #2762) * [mod_authn_gssapi] fix memory leak * [config] warn if mod_authn_ldap,mysql not listed * [mod_magnet] fix magnet_cgi_set() set of env vars (fixes #2763) * [mod_cgi] FreeBSD 9.3/MacOSX does not have pipe2() (fixes #2765) * [mod_extforward] fix crash on invalid IP (fixes #2766) * [mod_fastcgi] fix segfault if all backends down (fixes #2768) * [mod_cgi] fix out of sockets error for POST to CGI (fixes #2771) * [mod_auth] compile fix for Mac OS X XCode (fixes #2772) * [mod_authn_gssapi] better resource cleanup * [core] compile fix for Mac OS X 10.6 (old) (fixes #2773) * fix race in dynamic handler configs (reentrancy) (fixes #2774) * [mod_authn_mysql] close mysql_conn in cleanup * [mod_webdav] compile fix when locking not enabled * load mod_auth & mod_authn_file in sample/test.conf * comment out auth.backend.ldap.* in tests/*.conf * [mod_fastcgi,mod_scgi] warn if invalid "bin-path" * RAND_pseudo_bytes() is deprecated in openssl 1.1.0 * openssl 1.1.0 init and cleanup * [mod_cgi] remove direct calls to network_backend* * [build] build network_*.c into lighttpd executable * suggest inclusion of mod_geoip... before mod_ssi. * set systemd settings similar to lighttpd2 * [doc] remove reference to Linux rt-signals * [mod_authn_gssapi] fix missing error ret, coverity * [core] rename li_rand() to li_rand_pseudo_bytes() * remove #include "stream.h" where not used * [mod_cml] include lua headers before base.h * [core] combine duplicated connection reset code * [mod_ssi] produce content in subrequest hook * [core] remove srv->entropy[] * [core] defer li_rand_init() until first use * [core] permit connection-level state in modules * [mod_dirlisting] render dirlisting as HTML (fixes #2767) * [mod_proxy] replace HTTP Host sent to backend (fixes #2770) * [mod_ssi] basic recursive SSI include virtual (fixes #536) * [mod_ssi] implement, ignore * [core] consolidate duplicated read-to-close code * [core] fix segfault when parsing a bad config file * [core] support Transfer-Encoding: chunked req body (fixes #2156) * [autobuild] set NO_RDYNAMIC=yes for midipix * [mod_proxy] proxy.balance = "sticky" option (fixes #2117) * [mod_secdownload] warn if SHA used w/o SSL crypto * [build] compile fixes for AIX * [build] check for pipe2() at configure time * [mod_evhost] fix an incorrect error trace * [tests] mark tests/docroot/www/*.pl scripts a+x * [mod_cgi] fall back to pipe() if pipe2() fails * fix SCons fullstatic build with glibc pthreads * [TLS] openssl 1.1.0 makes SSL_OP_NO_SSLv2 no-op (pkgsrc changes) - Add Selection on PLIST depending on options To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 pkgsrc/www/lighttpd/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/lighttpd/PLIST \ pkgsrc/www/lighttpd/options.mk cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/lighttpd/distinfo cvs rdiff -u -r1.1 -r0 pkgsrc/www/lighttpd/patches/patch-src_connections.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1483453873132020 Content-Disposition: inline Content-Length: 5740 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.57 pkgsrc/www/lighttpd/Makefile:1.58 --- pkgsrc/www/lighttpd/Makefile:1.57 Mon Oct 17 22:00:22 2016 +++ pkgsrc/www/lighttpd/Makefile Tue Jan 3 14:31:13 2017 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.57 2016/10/17 22:00:22 nros Exp $ +# $NetBSD: Makefile,v 1.58 2017/01/03 14:31:13 mef Exp $ -DISTNAME= lighttpd-1.4.42 +DISTNAME= lighttpd-1.4.44 CATEGORIES= www MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/ EXTRACT_SUFX= .tar.xz @@ -56,6 +56,8 @@ 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 + post-install: set -e; cd ${WRKSRC}/doc; \ for f in *.css outdated/*.dot outdated/*.txt; do \ Index: pkgsrc/www/lighttpd/PLIST diff -u pkgsrc/www/lighttpd/PLIST:1.12 pkgsrc/www/lighttpd/PLIST:1.13 --- pkgsrc/www/lighttpd/PLIST:1.12 Mon Oct 17 22:00:22 2016 +++ pkgsrc/www/lighttpd/PLIST Tue Jan 3 14:31:13 2017 @@ -1,14 +1,15 @@ -@comment $NetBSD: PLIST,v 1.12 2016/10/17 22:00:22 nros Exp $ +@comment $NetBSD: PLIST,v 1.13 2017/01/03 14:31:13 mef Exp $ lib/lighttpd/mod_access.la lib/lighttpd/mod_accesslog.la lib/lighttpd/mod_alias.la lib/lighttpd/mod_auth.la lib/lighttpd/mod_authn_file.la -lib/lighttpd/mod_authn_gssapi.la -lib/lighttpd/mod_authn_ldap.la -lib/lighttpd/mod_authn_mysql.la +${PLIST.gssapi}lib/lighttpd/mod_authn_gssapi.la +${PLIST.gssapi}lib/lighttpd/mod_authn_gssapi.so +${PLIST.ldap}lib/lighttpd/mod_authn_ldap.la +${PLIST.mysql}lib/lighttpd/mod_authn_mysql.la lib/lighttpd/mod_cgi.la -lib/lighttpd/mod_cml.la +${PLIST.lua}lib/lighttpd/mod_cml.la lib/lighttpd/mod_compress.la lib/lighttpd/mod_deflate.la lib/lighttpd/mod_dirlisting.la @@ -18,10 +19,10 @@ lib/lighttpd/mod_expire.la lib/lighttpd/mod_extforward.la lib/lighttpd/mod_fastcgi.la lib/lighttpd/mod_flv_streaming.la -lib/lighttpd/mod_geoip.la +${PLIST.geoip}lib/lighttpd/mod_geoip.la lib/lighttpd/mod_indexfile.la -lib/lighttpd/mod_magnet.la -lib/lighttpd/mod_mysql_vhost.la +${PLIST.lua}lib/lighttpd/mod_magnet.la +${PLIST.mysql}lib/lighttpd/mod_mysql_vhost.la lib/lighttpd/mod_proxy.la lib/lighttpd/mod_redirect.la lib/lighttpd/mod_rewrite.la @@ -33,11 +34,12 @@ lib/lighttpd/mod_simple_vhost.la lib/lighttpd/mod_ssi.la lib/lighttpd/mod_staticfile.la lib/lighttpd/mod_status.la -lib/lighttpd/mod_trigger_b4_dl.la +${PLIST.gdbm}lib/lighttpd/mod_trigger_b4_dl.la lib/lighttpd/mod_uploadprogress.la lib/lighttpd/mod_userdir.la lib/lighttpd/mod_usertrack.la lib/lighttpd/mod_webdav.la +man/man8/lighttpd-angel.8 man/man8/lighttpd.8 sbin/lighttpd sbin/lighttpd-angel Index: pkgsrc/www/lighttpd/options.mk diff -u pkgsrc/www/lighttpd/options.mk:1.12 pkgsrc/www/lighttpd/options.mk:1.13 --- pkgsrc/www/lighttpd/options.mk:1.12 Mon Oct 17 22:00:22 2016 +++ pkgsrc/www/lighttpd/options.mk Tue Jan 3 14:31:13 2017 @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.12 2016/10/17 22:00:22 nros Exp $ +# $NetBSD: options.mk,v 1.13 2017/01/03 14:31:13 mef Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lighttpd -PKG_SUPPORTED_OPTIONS= bzip2 fam gdbm inet6 ldap lua mysql ssl memcache geoip +PKG_SUPPORTED_OPTIONS= bzip2 fam gdbm inet6 ldap lua mysql ssl memcache geoip gssapi PKG_SUGGESTED_OPTIONS= inet6 ssl .include "../../mk/bsd.options.mk" @@ -47,6 +47,7 @@ CONFIGURE_ARGS+= --disable-ipv6 .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap +PLIST.ldap= yes .endif ### @@ -75,6 +76,7 @@ CONFIGURE_ARGS+= --with-memcache . include "../../mk/mysql.buildlink3.mk" MYSQL_CONFIG?= ${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config CONFIGURE_ARGS+= --with-mysql=${MYSQL_CONFIG:Q} +PLIST.mysql= yes .endif ### @@ -90,5 +92,32 @@ CONFIGURE_ARGS+= --with-openssl=${SSLBAS ### .if !empty(PKG_OPTIONS:Mgeoip) . include "../../net/GeoIP/buildlink3.mk" -CONFIGURE_ARGS+= --with-geoip +CONFIGURE_ARGS+= --with-geoip +PLIST.geoip= yes +.endif + +### +### gssapi +### +.if !empty(PKG_OPTIONS:Mgssapi) +.include "../../security/mit-krb5/buildlink3.mk" +CONFIGURE_ARGS+= --with-krb5 +PLIST.gssapi= yes +.endif + + +### +### gdbm +### +.if !empty(PKG_OPTIONS:Mgdbm) +. include "../../databases/gdbm/buildlink3.mk" +PLIST.gdbm= yes +.endif + +### +### lua +### +.if !empty(PKG_OPTIONS:Mlua) +. include "../../lang/lua/buildlink3.mk" +PLIST.lua= yes .endif Index: pkgsrc/www/lighttpd/distinfo diff -u pkgsrc/www/lighttpd/distinfo:1.35 pkgsrc/www/lighttpd/distinfo:1.36 --- pkgsrc/www/lighttpd/distinfo:1.35 Mon Oct 17 22:00:22 2016 +++ pkgsrc/www/lighttpd/distinfo Tue Jan 3 14:31:13 2017 @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.35 2016/10/17 22:00:22 nros Exp $ +$NetBSD: distinfo,v 1.36 2017/01/03 14:31:13 mef Exp $ -SHA1 (lighttpd-1.4.42.tar.xz) = a434a92d5a2d6cb11922484cba59e684b2c94167 -RMD160 (lighttpd-1.4.42.tar.xz) = 6d8a21f6936c856a1217c7594426a31b77d0eb15 -SHA512 (lighttpd-1.4.42.tar.xz) = eb43a53f1fe7a115d0cf60ed8b79a22472a4fef939937401a475bdfd7244e53efa3aae1f66cd709989e77064aadd40004455b167ea3c4efc07ced261c18bd773 -Size (lighttpd-1.4.42.tar.xz) = 652140 bytes +SHA1 (lighttpd-1.4.44.tar.xz) = 3597b9c71aabada26129e3ebc0838cb10317d72c +RMD160 (lighttpd-1.4.44.tar.xz) = 8c49f8077b48e106384417c8adbb039dc872d8a8 +SHA512 (lighttpd-1.4.44.tar.xz) = b7481482bc130c80f076002b2853e1b0ecb2af5d6c6f5428854ae7a60bda591cf96f23e9f3a24cfb36ada3ba97ebff449e102895f7eb4b0aa50ec275eb44725b +Size (lighttpd-1.4.44.tar.xz) = 660304 bytes SHA1 (patch-doc_config_lighttpd.conf) = de14fd0aa0ed2cac5846d810b5c89af4036f1b70 -SHA1 (patch-src_connections.c) = 5f108e714903b68f11fff19a59ca4cf523a406de --_----------=_1483453873132020--