[pkgsrc/trunk]: pkgsrc/www/lighttpd Update to 1.4.62. From the changelog:

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53c0a11d9391
branches:  trunk
changeset: 770594:53c0a11d9391
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Dec 03 15:55:54 2021 +0000

description:
Update to 1.4.62. From the changelog:

- support pcre2; HTTP Digest auth userhash; bugfixes

pkgsrc changes:

- switch to pcre2

diffstat:

 www/lighttpd/Makefile                               |   9 ++---
 www/lighttpd/distinfo                               |  11 +++----
 www/lighttpd/patches/patch-doc_config_lighttpd.conf |  17 ++---------
 www/lighttpd/patches/patch-src_mod__alias.c         |  29 ---------------------
 4 files changed, 13 insertions(+), 53 deletions(-)

diffs (118 lines):

diff -r c48e158924fa -r 53c0a11d9391 www/lighttpd/Makefile
--- a/www/lighttpd/Makefile     Fri Dec 03 15:17:14 2021 +0000
+++ b/www/lighttpd/Makefile     Fri Dec 03 15:55:54 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.104 2021/11/03 15:06:51 schmonz Exp $
+# $NetBSD: Makefile,v 1.105 2021/12/03 15:55:54 schmonz Exp $
 
-DISTNAME=      lighttpd-1.4.61
-PKGREVISION=   1
+DISTNAME=      lighttpd-1.4.62
 CATEGORIES=    www
 MASTER_SITES=  https://download.lighttpd.net/lighttpd/releases-1.4.x/
 EXTRACT_SUFX=  .tar.xz
@@ -16,7 +15,7 @@
 USE_TOOLS+=                    pkg-config perl:test
 GNU_CONFIGURE=                 yes
 GNU_CONFIGURE_LIBSUBDIR=       ${PKGBASE}
-CONFIGURE_ARGS+=               --with-pcre
+CONFIGURE_ARGS+=               --with-pcre2
 # used for digest auth when no SSL library is available
 CONFIGURE_ARGS+=               --without-nettle
 TEST_TARGET=                   check
@@ -78,7 +77,7 @@
        done;                                                   \
        ${INSTALL_DATA} config/vhosts.d/*.template ${DESTDIR}${EGDIR}/vhosts.d
 
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c48e158924fa -r 53c0a11d9391 www/lighttpd/distinfo
--- a/www/lighttpd/distinfo     Fri Dec 03 15:17:14 2021 +0000
+++ b/www/lighttpd/distinfo     Fri Dec 03 15:55:54 2021 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.67 2021/11/03 15:06:51 schmonz Exp $
+$NetBSD: distinfo,v 1.68 2021/12/03 15:55:54 schmonz Exp $
 
-BLAKE2s (lighttpd-1.4.61.tar.xz) = 07cfcad072c2e66ea462c5782af85346ebd403318a7235af913d14652eecee2b
-SHA512 (lighttpd-1.4.61.tar.xz) = 30bd93e88714ac263b66266bb47a0b9b80831d73967f1268d5d5e311a5122bf3a5f20915ec351ac02b4f52a74aac10bd3ed35754a31061058733ab6284e3dabf
-Size (lighttpd-1.4.61.tar.xz) = 1010624 bytes
-SHA1 (patch-doc_config_lighttpd.conf) = 32a4b6bd32f88d05dd75f65de6ec57b203c37d8b
+BLAKE2s (lighttpd-1.4.62.tar.xz) = db81df12ebf0a72ef1f741c304e7ff7efb9e31e970239273701c277613416a5e
+SHA512 (lighttpd-1.4.62.tar.xz) = 871c6f5c086d6821cb0eee7658eeb8072f33af875fed81dfdbeb89796ff291b3695a90c44b18d6425ed16cdab95716b6e55162c7d401636d013996d3bedda8fe
+Size (lighttpd-1.4.62.tar.xz) = 1017752 bytes
+SHA1 (patch-doc_config_lighttpd.conf) = 50f9529ea7ecfae741ca47f0514175dbf1aa52d9
 SHA1 (patch-doc_lighttpd.8) = e08ac362784aebaca566d0f65380b70a829d6b4e
-SHA1 (patch-src_mod__alias.c) = dac2bd6ec0d06f1dfe7568193c2289641bb14869
diff -r c48e158924fa -r 53c0a11d9391 www/lighttpd/patches/patch-doc_config_lighttpd.conf
--- a/www/lighttpd/patches/patch-doc_config_lighttpd.conf       Fri Dec 03 15:17:14 2021 +0000
+++ b/www/lighttpd/patches/patch-doc_config_lighttpd.conf       Fri Dec 03 15:55:54 2021 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-doc_config_lighttpd.conf,v 1.7 2020/12/07 15:12:15 schmonz Exp $
+$NetBSD: patch-doc_config_lighttpd.conf,v 1.8 2021/12/03 15:55:55 schmonz Exp $
 
 Sane defaults.
 
---- doc/config/lighttpd.conf.orig      2020-11-29 22:32:01.000000000 +0000
+--- doc/config/lighttpd.conf.orig      2021-12-02 04:53:23.000000000 +0000
 +++ doc/config/lighttpd.conf
 @@ -13,11 +13,11 @@
  ## if you add a variable here. Add the corresponding variable in the
- ## chroot example aswell.
+ ## chroot example as well.
  ##
 -var.log_root    = "/var/log/lighttpd"
 +var.log_root    = "@LIGHTTPD_LOGDIR@"
@@ -40,16 +40,7 @@
  
  ##
  ## Enable lighttpd to serve requests on sockets received from systemd
-@@ -195,7 +195,7 @@ include "conf.d/debug.conf"
- ## sendfile       - is recommended for small files.
- ## writev         - is recommended for sending many large files
- ##
--server.network-backend = "sendfile"
-+#server.network-backend = "sendfile"
- 
- ##
- ## As lighttpd is a single-threaded server, its main resource limit is
-@@ -413,7 +413,7 @@ include "conf.d/dirlisting.conf"
+@@ -410,7 +410,7 @@ include conf_dir + "/conf.d/dirlisting.c
  ##
  ## defaults to /var/tmp as we assume it is a local harddisk
  ## default: "/var/tmp"
diff -r c48e158924fa -r 53c0a11d9391 www/lighttpd/patches/patch-src_mod__alias.c
--- a/www/lighttpd/patches/patch-src_mod__alias.c       Fri Dec 03 15:17:14 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_mod__alias.c,v 1.1 2021/11/03 15:06:51 schmonz Exp $
-
-Apply upstream 584a69c4 to fix use-after-free.
-
-<https://redmine.lighttpd.net/issues/3114>
-
---- src/mod_alias.c.orig       2021-10-28 22:58:31.000000000 +0000
-+++ src/mod_alias.c
-@@ -128,7 +128,7 @@ mod_alias_remap (request_st * const r, c
-     if (0 == path_len || path_len < basedir_len) return HANDLER_GO_ON;
- 
-     const uint32_t uri_len = path_len - basedir_len;
--    const char * const uri_ptr = r->physical.path.ptr + basedir_len;
-+    const char *uri_ptr = r->physical.path.ptr + basedir_len;
-     data_string * const ds = (data_string *)
-       (!r->conf.force_lowercase_filenames
-         ? array_match_key_prefix_klen(aliases, uri_ptr, uri_len)
-@@ -159,8 +159,10 @@ mod_alias_remap (request_st * const r, c
-      * (though resulting r->physical.basedir would not be a dir))*/
-     if (vlen != basedir_len + alias_len) {
-         const uint32_t nlen = vlen + uri_len - alias_len;
--        if (path_len + buffer_string_space(&r->physical.path) < nlen)
-+        if (path_len + buffer_string_space(&r->physical.path) < nlen) {
-             buffer_string_prepare_append(&r->physical.path, nlen - path_len);
-+            uri_ptr = r->physical.path.ptr + basedir_len;/*(refresh if alloc)*/
-+        }
-         memmove(r->physical.path.ptr + vlen,
-                 uri_ptr + alias_len, uri_len - alias_len);
-         buffer_truncate(&r->physical.path, nlen);