Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1708551133124310"
MIME-Version: 1.0
Date: Wed, 21 Feb 2024 21:32:13 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/www/lighttpd
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20240221213213.936FDF9F4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1708551133124310
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Wed Feb 21 21:32:13 UTC 2024

Modified Files:
	pkgsrc/www/lighttpd: Makefile distinfo
Added Files:
	pkgsrc/www/lighttpd/patches: patch-src_ls-hpack_lshpack.h

Log Message:
lighttpd: update to 1.4.74. Changes:

* [mod_h2] send 500 if backend oversized resp hdrs
* [mod_h2] h2_send_1xx() lowercase field names (fixes #3233)
* [mod_dirlisting] smaller funcs to generate listing
* [mod_dirlisting] dir-listing.sort option (#3235)
* [mod_dirlisting] check for response stream bufmin
* [core] skip SIGUSR1 after clock jump if chroot'ed
* [mod_deflate] move bzip2 to end of priority list
* [mod_deflate] deflate.allowed-encodings default
* [core] cfg "if","elif","elsif","elseif","else if"
* [lemon] refresh LEMON parser to SQLite maint ver
* [core] add newlines to config parsing error trace
* [ls-hpack] sys/queue.h portability
* [scons] remove -std=gnu99 to use modern defaults
* [multiple] share code for upgrade: websocket
* [core] check for SOCK_CLOEXEC earlier in startup
* [autotools] report if ipv6 support disabled (fixes #3237)
* [core] simpler error page header
* [mod_status] simpler status page header
* [h2] quicker server graceful shutdown of idle h2
* [mod_openssl] kTLS: check for kernel tls offload
* [mod_gnutls] kTLS: check for kernel tls offload
* [core] quicker server graceful shutdown of websockets
* [build] -D_LARGEFILE64_SOURCE for musl sendfile64()
* [mod_setenv] code consistency
* [mod_expire] resp tag check
* [mod_expire] comment
* [core] use SF_NODISKIO with sendfile() on FreeBSD
* [core] chunk_file_pread_chunk()
* [mod_deflate] prefer reusable buffer to read file
* [core] reduce blocking I/O sending files to net
* [core] reduce network send file fallback path
* [core] try mmap() if not using sendfile()
* [mod_wolfssl] mod_wolfssl_write_err()
* [multiple] extend chunkqueue_peek_data() w/ nowait
* [core] preadv2 RWF_NOWAIT EOPNOTSUPP on tmpfs (?!)
* [build] type error in configure.ac sendfile probe (fixes #3238)
* [core] update ls-hpack
* [ls-hpack] sys/queue.h STAILQ_FOREACH portability
* [core] chunk_open_file_chunk() in chunk.h
* [multiple] use chunk_open_file_chunk()
* [core] remove chunkqueue_open_file_chunk()
* [core] use sendfile() with iovecs where available
* [scons] remove CheckFunc() incorrect header usage
* [core] spelling in comment in network_write.c
* [cmake] check for sendfile64 only on Linux
* [core] quiet compiler warning for NDEBUG redefined
* [autoconf] config test for mbedtls needs mbedx509
* [mod_h2] add con to job queue when wr alloc used
* [mod_h2] use different flag for disk I/O busy
* [crypto] use evp api for truncated sha-2 with libressl
* [mod_expire] smaller options parse func
* [mod_expire] check modification time to cur time
* [tests] t/test_mod_expire.c
* [tests] add mod_expire tests to tests/request.t
* [core] log trace with priority for syslog() (#3239)
* [core] avoid preprocessor use inside macros
* [core] log_pri() and log_pri_multiline() (#3239)
* [build] remove checks for sendfile64
* [tests] clean up memleak on test exit
* [build] quiet compiler warnings in LEMON parser
* [core] simplify connection_handle_write() err case
* [core] gw_host_get shared code
* [doc] update doc/config/conf.d/mime.conf
* [core] combine *BSD cond handling 0-len FILE_CHUNK
* [meson] portability improvements
* [core] DragonflyBSD portability
* [tests] quiet compiler warning
* [ci] enable github CI
* [ci] adjust .github/workflows/meson.yml
* [ci] quiet msys-clang32 stdcall compiler warning
* [ci] #undef _XOPEN_SOURCE on Solaris
* [core] fix recent solaris typo; compile failure
* [ci] _WIN32 portability
* [cmake,meson] skip tests/* under native Windows
* [tests] support platforms without cp -n
* [ci] cmake did not detect inet_pton on x86 _WIN32
* [ci] use latest GCC and clang
* [ci] adjust .github/workflows/meson.yml
* [ci] further simplify
* [ci] adjust NetBSD,OpenBSD tests .github/workflows
* [ci] add Windows-VisualStudio to .github/workflows
* [ci] add Solaris (disabled) to .github/workflows
* [ci] add Windows-MSYS2 to .github/workflows
* [ci] rename .github/workflows/meson.yml to pr.yml
* [tests] adjust shell syntax in tests/prepare.sh
* [tests] test_mod stub funcs for static builds
* [ci] adjust Windows tests in .github/workflows
* [mod_authn_dbi,mod_vhostdb_dbi] check for <dbi.h>
* [ci] tailor scripts/ci-build.sh for FreeBSD
* [ci] use set -e in .github/workflows run commands
* [debug] debug.log-timeouts for all timeout logging
* [debug] use log_debug_multiline() (#3239)
* [debug] use log_debug() instead of log_error() (#3239)
* [multiple] use log_warn() for config warnings (#3239)
* [core] use log_warn(),log_notice(),log_info() (fixes #3239)
* [ls-hpack] compat include of <sys/queue.h>
* [tests] skip deflate tests if zlib not available
* [core] ignore cc -Wcpp warning for <sys/cdefs.h>
* [ci] mechanism to disable wolfssl in ci-build.sh
* [ci] use Alpine Linux VMs to test additional arch
* [ci] skip 32-bit builds on Windows; save resources
* [tests] skip shutdown(SHUT_WR) in tests on s390x
* [ci] add s390x arch
* [meson] replace deprecated meson.build_root() use
* [ci] x86_64 and x86 featureful builds on ubuntu
* [ci] add x86_64 cmake ASAN build on ubuntu
* [ci] ci-build.sh add some NO_* options
* [ci] add Windows-Cygwin build
* [ci] fail fast if x86 build fails on alpine
* [ci] reduce some builds while maintaining coverage
* [ci] remove config not actually running x86 ubuntu
* [ci] more featureful build on macOS
* [doc] cert-staple.sh check staple newer than cert
* [ci] pr.yml format consistency
* [tests] remove repeated file in prepare.sh cp
* [wolfssl] renamed SSL_OP_NO_TICKET
* [ci] more featureful build on NetBSD
* [mod_authn_gssapi] ifndef GSS_KRB5_NT_PRINCIPAL_NAME
* [build] check 'lua54' before other lua variants
* [ci] OpenBSD CFLAGS LDFLAGS PKG_CONFIG_LIBDIR
* [ci] more featureful build on OpenBSD
* [ci] use bash on DragonflyBSD instead of csh
* [ci] special-cases for running tests under MSYS2
* [ci] basic build and run tests under MSYS2
* [tests] remove stray comment from test_mod_expire
* [ci] ci-build.sh NO_DBI option
* [ci] ci-build.sh NO_UUID option
* [ci] ci-build.sh NO_GNUTLS option
* [ci] ci-build.sh NO_MYSQL option
* [core] _WIN32 define PROT_WRITE to PAGE_READWRITE
* [mod_authn_sasl] use HOSTNAME for fqdn on _WIN32
* [ci] more featureful build on MSYS2
* [mod_authn_sasl] fix typo
* [ci] use cygwin test repos for latest packages
* [ci] vmactions usesh: true
* [ci] fix cmake generator path for MSVC
* [mod_wstunnel] read and discard HTTP/1.1 req body
* [core] use log_notice() for conn limit notice (#3239)
* [core] gw_upgrade_policy() shared code
* [mod_wstunnel] handle large kernel socket recv buf
* [core] stat_cache.c replace assert w/ error codes
* [core] remove dev assert in http_chunk_append_mem
* [core] ck_static_assert()
* [core] remove asserts from gw_status_get_counter()
* [core] configparser.y combine assert, remove debug
* [core] remove assert from sock_addr.c
* [mod_fastcgi] check env w/ cond instead of assert
* [core] shared code chunkqueue_close_tempchunk()
* [core] buffer.c combine asserts
* [core] array require nonnull for insert,replace
* [core] li_tohex*() no longer adds '\0'
* [core] accept 65536 in config for ushort values
* [ci] add missing intermediate dep for Cygwin
* [core] clarify configfile parse comment
* [core] fix crash with invalid lighttpd.conf syntax
* [core] lighttpd.conf detect,err if consecutive str
* [mod_magnet] lighty.r.req_body.unspecified_len
* [mod_proxy] handle HTTP/1.0 unspecified req len
* [core] unset Upgrade if downgrade HTTP/1.1 to 1.0
* [mod_magnet] interface to downgrade HTTP/1.1 to 1.0
* [mod_magnet] expand guidance in error message (#3240)
* [debug] use log_debug() instead of log_error() (#3239)
* [mod_wstunnel] use log_warn(),log_notice(),log_info() (#3239)
* [multiple] gw_backend_error_trace() (fixes #1406)
* [mod_webdav] webdav_uuid_v4() to supplant libuuid (#1056)
* [build] remove libuuid dependency (fixes #1056)
* [mod_wstunnel] quiet coverity warning
* [doc] fix typos in doc/config/lighttpd.conf
* [mod_h2] send 502 if backend oversized resp hdrs


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/www/lighttpd/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/www/lighttpd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1708551133124310
Content-Disposition: inline
Content-Length: 2753
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.126 pkgsrc/www/lighttpd/Makefile:1.127
--- pkgsrc/www/lighttpd/Makefile:1.126	Wed Nov  8 13:21:20 2023
+++ pkgsrc/www/lighttpd/Makefile	Wed Feb 21 21:32:13 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.126 2023/11/08 13:21:20 wiz Exp $
+# $NetBSD: Makefile,v 1.127 2024/02/21 21:32:13 schmonz Exp $
 
-DISTNAME=	lighttpd-1.4.73
-PKGREVISION=	1
+DISTNAME=	lighttpd-1.4.74
 CATEGORIES=	www
 MASTER_SITES=	https://download.lighttpd.net/lighttpd/releases-1.4.x/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/www/lighttpd/distinfo
diff -u pkgsrc/www/lighttpd/distinfo:1.79 pkgsrc/www/lighttpd/distinfo:1.80
--- pkgsrc/www/lighttpd/distinfo:1.79	Tue Oct 31 15:13:12 2023
+++ pkgsrc/www/lighttpd/distinfo	Wed Feb 21 21:32:13 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.79 2023/10/31 15:13:12 schmonz Exp $
+$NetBSD: distinfo,v 1.80 2024/02/21 21:32:13 schmonz Exp $
 
-BLAKE2s (lighttpd-1.4.73.tar.xz) = 45ea148628556cb0b69e5cc89efd01e2ca1d6142b79ea31a6a0ba53c7608702c
-SHA512 (lighttpd-1.4.73.tar.xz) = ee41a72b09614d630174ef832b08c050708f62c0b6299e82b0a5f91a63d62702d31237ae5bb1850f0160b94e36a66af38a2d7abdaa920235265d416d2b0b4015
-Size (lighttpd-1.4.73.tar.xz) = 1086680 bytes
+BLAKE2s (lighttpd-1.4.74.tar.xz) = b674d61d6b12e18d9a78f7e7db5a8b116b62a8d213ef1e808e0d082e4a10883d
+SHA512 (lighttpd-1.4.74.tar.xz) = 96ae90885898ec0a13441f135209a1e7c447b74b1dfbc16e75bdabcba30a4a4dd26878c205feed7f78311bcbc81b54602635cc0a64ea7fb8fe5e081f136fae2d
+Size (lighttpd-1.4.74.tar.xz) = 1098796 bytes
 SHA1 (patch-doc_config_lighttpd.conf) = 50f9529ea7ecfae741ca47f0514175dbf1aa52d9
 SHA1 (patch-doc_lighttpd.8) = e08ac362784aebaca566d0f65380b70a829d6b4e
+SHA1 (patch-src_ls-hpack_lshpack.h) = 1539bd9585a745c93d2dc98b39e1ba592d5a9014

Added files:

Index: pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h
diff -u /dev/null pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h:1.1
--- /dev/null	Wed Feb 21 21:32:13 2024
+++ pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h	Wed Feb 21 21:32:13 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_ls-hpack_lshpack.h,v 1.1 2024/02/21 21:32:13 schmonz Exp $
+
+The compat file isn't present; unconditionally include.
+
+--- src/ls-hpack/lshpack.h.orig	2024-02-21 21:28:48.938352829 +0000
++++ src/ls-hpack/lshpack.h
+@@ -219,15 +219,7 @@ lshpack_dec_set_max_capacity (struct lsh
+  * These structures are not very complicated.
+  */
+ 
+-#ifdef __has_include
+-#if __has_include(<sys/queue.h>)
+ #include <sys/queue.h>
+-#endif
+-#endif
+-
+-#ifndef SIMPLEQ_FOREACH
+-#include "../compat/sys/queue.h"
+-#endif
+ 
+ /* OpenBSD and older MacOSX might not define STAILQ,
+  * but ls-hpack usage could use SIMPLEQ as alternative */


--_----------=_1708551133124310--