Here is an update to lighttpd 1.4.69.
- 1.4.69 - 2023-02-10 * [meson] remove t/test_mod_evasive.c * [doc] remove references to removed modules * [cmake] add doc/CMakeLists.txt to dist tar ball (#3181) * [meson] add meson.build to install man pages (fixes #3181) * [meson] fix typo in sbindir * [core] update ls-hpack * [cmake] remove -I/usr/include/mysql for mysql.h (#3181) * [cmake] add -DWITH_LUA_VERSION= to specify lua ver (#3181) * [cmake] use mysql_config cflags and ldflags (#3181) * [cmake] do not link with fam if inotify or kqueue * [TLS] fix spurious warning trace (fixes #3182) * [multiple] codespell: correct spelling in comments * [multiple] spelling: github action check-spelling * [lemon] upgrade LEMON parser to SQLite maint ver * [build] modify arguments to updated LEMON parser * [core] build configparser.y w/ -Werror workarounds * [lemon] fix -Wpendantic warnings for bad casts * [core] avoid accept4() on ARM unless detected * [cmake] use CMAKE_CURRENT_SOURCE_DIR * [cmake] SERVER_SRC variable * [multiple] quiet some coverity false positives * [cmake] use LIGHTTPD_MODULES_DIR as relative path (fixes #3185) * [core] add missed h2 state transition (fixes #3186) * [core] remove cygwin O_NOFOLLOW workaround * [multiple] clang -Wstrict-prototypes for C2x * [core] reset SIGUSR1 to SIG_DFL before execve() * [mod_webdav] modify OPTIONS response if no db cfg * [mod_webdav] MOD_WEBDAV_BUILD_MINIMAL preproc opt * [core] pass fdn to fdevent_sched_close,_unregister * [core] disable sendfile() on TARGET_OS_IPHONE * [core] iOS does not provide netinet/tcp_fsm.h * [core] move headers to help isolate fdevent layer * [core] avoid select() FD_ISSET repeat on active fds * [core] gw_backend more precise backend env alloc * [core] fdevent_poll_poll avoid potential race * [tests] quickly exit tests/request.t if GET / fail * [tests] adjust outdated opt in tests/lighttpd.conf * [autotools] add mod_evhost to static build list * [autotools] skip modules build if LIGHTTPD_STATIC * [mod_cgi] cygwin supports CGI file I/O redirection * [mod_dirlisting] use fdevent_rename() wrapper * [core] path-info in debug trace may be unset * [core] reset path-info for cgi.local-redir * [autotools] fix typo in -I used --with-pcre2=/path (fixes #3190) * [mod_webdav] send 409 Conflict if PUT miss parent * [core] fix HTTP/2 HEADERS frame parsing bug * [core] remove extra HTTP/2 HEADERS frame len check Index: Makefile =================================================================== RCS file: /home/cvs/ports/www/lighttpd/Makefile,v retrieving revision 1.175 diff -u -p -u -p -r1.175 Makefile --- Makefile 15 Jan 2023 08:06:22 -0000 1.175 +++ Makefile 11 Feb 2023 03:55:02 -0000 @@ -1,7 +1,6 @@ COMMENT= secure, fast, compliant, and very flexible web-server -DISTNAME= lighttpd-1.4.68 -REVISION= 1 +DISTNAME= lighttpd-1.4.69 CATEGORIES= www net MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/ EXTRACT_SUFX= .tar.xz Index: distinfo =================================================================== RCS file: /home/cvs/ports/www/lighttpd/distinfo,v retrieving revision 1.71 diff -u -p -u -p -r1.71 distinfo --- distinfo 7 Jan 2023 11:30:39 -0000 1.71 +++ distinfo 11 Feb 2023 03:51:18 -0000 @@ -1,2 +1,2 @@ -SHA256 (lighttpd-1.4.68.tar.xz) = 5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q= -SIZE (lighttpd-1.4.68.tar.xz) = 1030612 +SHA256 (lighttpd-1.4.69.tar.xz) = FqyNuV5xlim6YZSbmfiib+upRqgdGFIVsoN5u0EWsLQ= +SIZE (lighttpd-1.4.69.tar.xz) = 1045516 Index: patches/patch-doc_CMakeLists_txt =================================================================== RCS file: patches/patch-doc_CMakeLists_txt diff -N patches/patch-doc_CMakeLists_txt --- patches/patch-doc_CMakeLists_txt 7 Jan 2023 11:30:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -[cmake] add doc/CMakeLists.txt to dist tar ball (#3181) -da8abbfad414f2f8078e0b50302d691f8b21bbe0 - -Index: doc/CMakeLists.txt ---- doc/CMakeLists.txt.orig -+++ doc/CMakeLists.txt -@@ -0,0 +1,4 @@ -+install(FILES -+ lighttpd.8 -+ lighttpd-angel.8 -+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) Index: patches/patch-src_CMakeLists_txt =================================================================== RCS file: patches/patch-src_CMakeLists_txt diff -N patches/patch-src_CMakeLists_txt --- patches/patch-src_CMakeLists_txt 15 Jan 2023 08:06:22 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,91 +0,0 @@ -- [cmake] remove -I/usr/include/mysql for mysql.h (#3181) - 6ea696d1113e38ac2639074ba50b72e6a0180959 -- [cmake] add -DWITH_LUA_VERSION= to specify lua ver (#3181) - 84b4ccf89bdfa5817f1ec6328550cc7e3f52cbac -- [cmake] use mysql_config cflags and ldflags (#3181) - cc0bb8aa00c321d86a75a7f8138b4f783bac1bf3 -- [cmake] use LIGHTTPD_MODULES_DIR as relative path (fixes #3185) - 5bb8cbdc110ce9f8c4617c2130234dad206eceab - -Index: src/CMakeLists.txt ---- src/CMakeLists.txt.orig -+++ src/CMakeLists.txt -@@ -37,6 +37,7 @@ option(WITH_KRB5 "with Kerberos5-support for mod_auth - option(WITH_LDAP "with LDAP-support for mod_auth mod_vhostdb_ldap [default: off]") - option(WITH_PAM "with PAM-support for mod_auth [default: off]") - option(WITH_LUA "with lua for mod_magnet [default: off]") -+option(WITH_LUA_VERSION "specify lua version for mod_magnet") - # option(WITH_VALGRIND "with internal support for valgrind [default: off]") - option(WITH_FAM "fam/gamin for reducing number of stat() calls [default: off]") - option(WITH_LIBDEFLATE "with libdeflate-support for mod_deflate [default: off]") -@@ -333,15 +334,10 @@ endif() - - if(WITH_MYSQL) - xconfig(mysql_config MYSQL_LDFLAGS MYSQL_CFLAGS) -- -- set(CMAKE_REQUIRED_INCLUDES /usr/include/mysql) -- check_include_files(mysql.h HAVE_MYSQL_H) -- set(CMAKE_REQUIRED_INCLUDES) -- if(HAVE_MYSQL_H) -- check_library_exists(mysqlclient mysql_real_connect "" HAVE_MYSQL) -+ if(MYSQL_LDFLAGS) -+ set(HAVE_MYSQL TRUE) - endif() - else() -- unset(HAVE_MYSQL_H) - unset(HAVE_MYSQL) - endif() - -@@ -764,7 +760,11 @@ else() - endif() - - if(WITH_LUA) -- pkg_search_module(LUA REQUIRED lua5.4 lua-5.4 lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua) -+ if(WITH_LUA_VERSION) -+ pkg_search_module(LUA REQUIRED ${WITH_LUA_VERSION}) -+ else() -+ pkg_search_module(LUA REQUIRED lua5.4 lua-5.4 lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua) -+ endif() - message(STATUS "found lua at: INCDIR: ${LUA_INCLUDE_DIRS} LIBDIR: ${LUA_LIBRARY_DIRS} LDFLAGS: ${LUA_LDFLAGS} CFLAGS: ${LUA_CFLAGS}") - set(HAVE_LUA_H 1 "Have liblua header") - else() -@@ -805,11 +805,10 @@ set(LIGHTTPD_VERSION_ID 0x104${PROJECT_VERSION_PATCH}) - set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}") - set(PACKAGE_VERSION "${PROJECT_VERSION}") - --if(NOT LIGHTTPD_MODULES_DIR) -- set(LIGHTTPD_MODULES_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/lighttpd") --endif() -- - if(NOT WIN32) -+ if(NOT LIGHTTPD_MODULES_DIR) -+ set(LIGHTTPD_MODULES_DIR "${CMAKE_INSTALL_LIBDIR}/lighttpd") -+ endif() - set(LIGHTTPD_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/${LIGHTTPD_MODULES_DIR}") - else() - ## We use relative path in windows -@@ -1003,10 +1002,10 @@ if(WITH_MAXMINDDB) - target_link_libraries(mod_maxminddb maxminddb) - endif() - --if(HAVE_MYSQL_H AND HAVE_MYSQL) -+if(HAVE_MYSQL) - add_and_install_library(mod_vhostdb_mysql "mod_vhostdb_mysql.c") -- target_link_libraries(mod_vhostdb_mysql mysqlclient) -- include_directories(/usr/include/mysql) -+ target_link_libraries(mod_vhostdb_mysql ${MYSQL_LDFLAGS}) -+ add_target_properties(mod_vhostdb_mysql COMPILE_FLAGS ${MYSQL_CFLAGS}) - endif() - - if(HAVE_PGSQL) -@@ -1218,8 +1217,8 @@ endif() - if(NOT WIN32) - install(TARGETS ${L_INSTALL_TARGETS} - RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} -- LIBRARY DESTINATION ${LIGHTTPD_MODULES_DIR} -- ARCHIVE DESTINATION ${LIGHTTPD_MODULES_DIR}/static) -+ LIBRARY DESTINATION ${LIGHTTPD_LIBRARY_DIR} -+ ARCHIVE DESTINATION ${LIGHTTPD_LIBRARY_DIR}/static) - else() - ## HACK to make win32 to install our libraries in desired directory.. - install(TARGETS lighttpd Index: patches/patch-src_mod_openssl_c =================================================================== RCS file: patches/patch-src_mod_openssl_c diff -N patches/patch-src_mod_openssl_c --- patches/patch-src_mod_openssl_c 7 Jan 2023 11:30:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -[TLS] fix spurious warning trace (fixes #3182) -82a26c1bdb2fda2d19d281abde8d1b0e39bff21b - -Index: src/mod_openssl.c ---- src/mod_openssl.c.orig -+++ src/mod_openssl.c -@@ -2527,8 +2527,8 @@ mod_openssl_set_defaults_sockets(server *srv, plugin_d - memcpy(&conf, &defaults, sizeof(conf)); - config_plugin_value_t *cpv = ps->cvlist + ps->cvlist[i].v.u2[0]; - for (; -1 != cpv->k_id; ++cpv) { -- /* ignore ssl.pemfile (k_id=6); included to process global scope */ -- if (!is_socket_scope && cpv->k_id != 6) { -+ /* ignore ssl.pemfile (k_id=3); included to process global scope */ -+ if (!is_socket_scope && cpv->k_id != 3) { - log_error(srv->errh, __FILE__, __LINE__, - "%s is valid only in global scope or " - "$SERVER[\"socket\"] condition", cpk[cpv->k_id].k); Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/www/lighttpd/pkg/PLIST,v retrieving revision 1.33 diff -u -p -u -p -r1.33 PLIST --- pkg/PLIST 7 Jan 2023 11:30:39 -0000 1.33 +++ pkg/PLIST 11 Feb 2023 03:54:15 -0000 @@ -63,7 +63,6 @@ share/doc/lighttpd/redirect.txt share/doc/lighttpd/rewrite.txt share/doc/lighttpd/rrdtool.txt share/doc/lighttpd/scgi.txt -share/doc/lighttpd/secdownload.txt share/doc/lighttpd/security.txt share/doc/lighttpd/setenv.txt share/doc/lighttpd/simple-vhost.txt
