CVS commit: pkgsrc/www/lighttpd

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Dec  3 15:55:55 UTC 2021

Modified Files:
        pkgsrc/www/lighttpd: Makefile distinfo
        pkgsrc/www/lighttpd/patches: patch-doc_config_lighttpd.conf
Removed Files:
        pkgsrc/www/lighttpd/patches: patch-src_mod__alias.c

Log Message:
Update to 1.4.62. From the changelog:

- support pcre2; HTTP Digest auth userhash; bugfixes

pkgsrc changes:

- switch to pcre2


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/www/lighttpd/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/www/lighttpd/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf
cvs rdiff -u -r1.1 -r0 pkgsrc/www/lighttpd/patches/patch-src_mod__alias.c

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

Modified files:

Index: pkgsrc/www/lighttpd/Makefile
diff -u pkgsrc/www/lighttpd/Makefile:1.104 pkgsrc/www/lighttpd/Makefile:1.105
--- pkgsrc/www/lighttpd/Makefile:1.104  Wed Nov  3 15:06:51 2021
+++ pkgsrc/www/lighttpd/Makefile        Fri Dec  3 15:55:54 2021
@@ -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 @@ SHLIBTOOL_OVERRIDE=           # empty
 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 @@ post-install:
        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"

Index: pkgsrc/www/lighttpd/distinfo
diff -u pkgsrc/www/lighttpd/distinfo:1.67 pkgsrc/www/lighttpd/distinfo:1.68
--- pkgsrc/www/lighttpd/distinfo:1.67   Wed Nov  3 15:06:51 2021
+++ pkgsrc/www/lighttpd/distinfo        Fri Dec  3 15:55:54 2021
@@ -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

Index: pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf
diff -u pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf:1.7 pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf:1.8
--- pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf:1.7      Mon Dec  7 15:12:15 2020
+++ pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf  Fri Dec  3 15:55:55 2021
@@ -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 @@ Sane defaults.
  
  ##
  ## 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"