CVS commit: pkgsrc/www/hiawatha

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri May  1 19:28:09 UTC 2026

Modified Files:
        pkgsrc/www/hiawatha: Makefile PLIST distinfo
        pkgsrc/www/hiawatha/patches: patch-CMakeLists.txt patch-src_hiawatha.c
Removed Files:
        pkgsrc/www/hiawatha/patches:
            patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c

Log Message:
www/hiawatha: Update to v12.1

>From upstream's changelog:

hiawatha (12.1) stable; urgency=low

  * Added support for HTTP/2 via nghttp2. Credits to Heiko Zimmerman.
    Test carefully before enabling on production servers.
  * mbed TLS updated to 4.1.0.
  * Removed ssi-cgi. Check out Hiawatha's XSLT support for a more
    advanced alternative.
  * Small bugfixes and improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/www/hiawatha/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/hiawatha/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/hiawatha/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/www/hiawatha/patches/patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/hiawatha/patches/patch-src_hiawatha.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/hiawatha/Makefile
diff -u pkgsrc/www/hiawatha/Makefile:1.55 pkgsrc/www/hiawatha/Makefile:1.56
--- pkgsrc/www/hiawatha/Makefile:1.55   Sat Mar 14 13:05:36 2026
+++ pkgsrc/www/hiawatha/Makefile        Fri May  1 19:28:09 2026
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2026/03/14 13:05:36 hauke Exp $
+# $NetBSD: Makefile,v 1.56 2026/05/01 19:28:09 hauke Exp $
 
 PKGNAME=       hiawatha-${PKGVER}
 DISTNAME=      hiawatha-v${PKGVER}
-PKGVER=                12.0
-PKGREVISION=   1
+PKGVER=                12.1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=hsleisink/hiawatha/-/archive/v${PKGVER}/}
 EXTRACT_SUFX=  .tar.gz
@@ -15,7 +14,6 @@ HOMEPAGE=     https://hiawatha.leisink.net/
 COMMENT=       Advanced and secure webserver
 LICENSE=       gnu-gpl-v2
 
-HIAWATHA_CGIDIR=       libexec/ssi-cgi
 HIAWATHA_DATADIR=      ${VARBASE}/db/hiawatha
 HIAWATHA_LOGDIR=       ${VARBASE}/log/hiawatha
 HIAWATHA_PIDDIR=       ${VARBASE}/run
@@ -28,7 +26,6 @@ LDFLAGS.SunOS+=               -lsocket -lnsl
 # Config file processing
 CMAKE_BUILD_DIR=       .
 
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_BINDIR=${PREFIX}/${HIAWATHA_CGIDIR}
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LOCALSTATEDIR=${VARBASE}
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
 CMAKE_CONFIGURE_ARGS+= -DWORK_DIR=${VARBASE}/db/${PKGBASE}
@@ -61,7 +58,6 @@ EGDIR=                        share/examples/hiawatha
 CONFIG_FILES=          hiawatha.conf mimetype.conf cgi-wrapper.conf
 
 INSTALLATION_DIRS+=    sbin ${PKGMANDIR}/man8
-INSTALLATION_DIRS+=    ${HIAWATHA_CGIDIR}
 INSTALLATION_DIRS+=    share/examples/hiawatha/conf
 INSTALLATION_DIRS+=    share/examples/hiawatha/html
 

Index: pkgsrc/www/hiawatha/PLIST
diff -u pkgsrc/www/hiawatha/PLIST:1.7 pkgsrc/www/hiawatha/PLIST:1.8
--- pkgsrc/www/hiawatha/PLIST:1.7       Mon Apr 15 14:52:33 2024
+++ pkgsrc/www/hiawatha/PLIST   Fri May  1 19:28:09 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2024/04/15 14:52:33 hauke Exp $
+@comment $NetBSD: PLIST,v 1.8 2026/05/01 19:28:09 hauke Exp $
 ${PLIST.letsencrypt}lib/hiawatha/letsencrypt/acmev2.php
 ${PLIST.letsencrypt}lib/hiawatha/letsencrypt/config.php
 ${PLIST.letsencrypt}lib/hiawatha/letsencrypt/hiawatha_config.php
@@ -9,11 +9,9 @@ ${PLIST.letsencrypt}lib/hiawatha/letsenc
 ${PLIST.letsencrypt}lib/hiawatha/letsencrypt/logfile.php
 ${PLIST.letsencrypt}lib/hiawatha/letsencrypt/openssl.conf
 ${PLIST.letsencrypt}lib/hiawatha/letsencrypt/rsa.php
-libexec/ssi-cgi/ssi-cgi
 man/man1/cgi-wrapper.1
 man/man1/hiawatha.1
 ${PLIST.letsencrypt}man/man1/lefh.1
-man/man1/ssi-cgi.1
 man/man1/wigwam.1
 sbin/cgi-wrapper
 sbin/hiawatha

Index: pkgsrc/www/hiawatha/distinfo
diff -u pkgsrc/www/hiawatha/distinfo:1.19 pkgsrc/www/hiawatha/distinfo:1.20
--- pkgsrc/www/hiawatha/distinfo:1.19   Sat Mar 14 13:03:20 2026
+++ pkgsrc/www/hiawatha/distinfo        Fri May  1 19:28:09 2026
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.19 2026/03/14 13:03:20 hauke Exp $
+$NetBSD: distinfo,v 1.20 2026/05/01 19:28:09 hauke Exp $
 
-BLAKE2s (hiawatha-v12.0.tar.gz) = 279523f35cb81184bb7babd579c4aee0de35e528967ebd30aeeed1c3879ba95d
-SHA512 (hiawatha-v12.0.tar.gz) = 6a1e6a26546240706d2fb92026ef12bca549c916156c698b0e60eefe796821bbf5653a14833294f6466ce5d8514b8f99988f8b35cd8873693c019a8d9ace0775
-Size (hiawatha-v12.0.tar.gz) = 2334978 bytes
-BLAKE2s (mbedtls-4.0.0.tar.bz2) = d7a973c6eefab652e590f680612b644a6d0c6f1c0d0f7d0d69dc01278620dc66
-SHA512 (mbedtls-4.0.0.tar.bz2) = cc62c99a82f2f85ee4caa6488804648e81358e59f1498b6a97b034114e531bf44b05ae3d50db797ada939b6d4ac90bde29cd2363a36631af9e5fdfef57bfb267
-Size (mbedtls-4.0.0.tar.bz2) = 6342607 bytes
-SHA1 (patch-CMakeLists.txt) = a96e51545ab31e5ceb4a520bb4757787088c8174
+BLAKE2s (hiawatha-v12.1.tar.gz) = d5fc7f91c9a9c612a5fc2c67c88c18a54e8c013f4c0c164b34c15a8f8ab7e540
+SHA512 (hiawatha-v12.1.tar.gz) = fede4dd569838fa0afc379342b38a47811213cfed13334505cb1a8a941dd63674d4d8fa2585fd72a050c3eb0a0a56552533555246801e50f59fe2b255e04f546
+Size (hiawatha-v12.1.tar.gz) = 2943626 bytes
+SHA1 (patch-CMakeLists.txt) = 3e319e4d12a45903e3a6b1cc8c523bfebe482d76
 SHA1 (patch-config_hiawatha.conf.in) = 8a58402b0201ec6cd661f5d949e127edfe4b693a
 SHA1 (patch-extra_letsencrypt_letsencrypt.conf.in) = 718d44e883f8206fd88480c5503d962198992347
-SHA1 (patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c) = 07c2b982b89df1ff2b0673593b07e4c7f5c1d7d1
-SHA1 (patch-src_hiawatha.c) = 4302f7f959799fc79bda6eda63901fb5b0fc3993
+SHA1 (patch-src_hiawatha.c) = 8e8498ce5287c319adfab0eebbcff273acc6031a

Index: pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt
diff -u pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt:1.3 pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt:1.3        Fri Apr 26 09:18:00 2024
+++ pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt    Fri May  1 19:28:09 2026
@@ -1,27 +1,25 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2024/04/26 09:18:00 hauke Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2026/05/01 19:28:09 hauke Exp $
 
 setuid binaries should not be writable by anyone.
 
 Keep build system from installing to PKG_SYSCONFDIR - we handle
 preference files ourselves.
 
---- CMakeLists.txt.orig        2023-10-13 13:21:31.000000000 +0000
+--- CMakeLists.txt.orig        2026-04-04 17:21:19.000000000 +0000
 +++ CMakeLists.txt
-@@ -154,16 +154,9 @@ endif()
+@@ -182,14 +182,7 @@ endif()
  # Installation
  install(TARGETS hiawatha wigwam DESTINATION ${CMAKE_INSTALL_SBINDIR})
  install(TARGETS cgi-wrapper DESTINATION ${CMAKE_INSTALL_SBINDIR}
 -      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
-+      PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
- install(TARGETS ssi-cgi DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
+-
 -foreach(configfile ${config_files})
 -      install(CODE "copy_if_not_exists(\"${CMAKE_SOURCE_DIR}/${configfile}\" \"${CONFIG_DIR}\")")
 -endforeach()
 -foreach(configfile ${config_files_in})
 -      install(CODE "copy_if_not_exists(\"${CMAKE_CURRENT_BINARY_DIR}/${configfile}\" \"${CONFIG_DIR}\")")
 -endforeach()
--
++      PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
+ 
  install(FILES ${manual_pages} DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
  foreach(manpage ${manual_pages_in})
-       install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${manpage} DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)

Index: pkgsrc/www/hiawatha/patches/patch-src_hiawatha.c
diff -u pkgsrc/www/hiawatha/patches/patch-src_hiawatha.c:1.1 pkgsrc/www/hiawatha/patches/patch-src_hiawatha.c:1.2
--- pkgsrc/www/hiawatha/patches/patch-src_hiawatha.c:1.1        Wed Dec 18 16:44:36 2024
+++ pkgsrc/www/hiawatha/patches/patch-src_hiawatha.c    Fri May  1 19:28:09 2026
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_hiawatha.c,v 1.1 2024/12/18 16:44:36 hauke Exp $
+$NetBSD: patch-src_hiawatha.c,v 1.2 2026/05/01 19:28:09 hauke Exp $
 
 Solarish are missing RLIMIT_NPROC
 
---- src/hiawatha.c.orig        2024-12-18 16:38:01.001436946 +0000
+--- src/hiawatha.c.orig        2026-04-04 17:21:19.000000000 +0000
 +++ src/hiawatha.c
-@@ -791,10 +791,11 @@ int run_webserver(t_settings *settings) 
-        */
-       if (config->set_rlimits) {
-               resource_limit.rlim_max = resource_limit.rlim_cur = config->total_connections + 3;
+@@ -844,10 +844,11 @@ int run_webserver(t_settings *settings) 
+                       H2_MAX_WORKERS +
+ #endif
+                       config->total_connections + 3;
 +#ifdef RLIMIT_NPROC
                if (setrlimit(RLIMIT_NPROC, &resource_limit) != 0) {
                        fprintf(stderr, "Error setting RLIMIT_NPROC.\n");