CVS commit: pkgsrc/www/hiawatha

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Sat Mar 14 13:03:20 UTC 2026

Modified Files:
        pkgsrc/www/hiawatha: Makefile distinfo options.mk

Log Message:
Bring the mbedtls replacement mechanism up to date, just in case it
is needed.

Upstream has fiddled with the git release tags, update the
distribution tarball hashes.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/www/hiawatha/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/hiawatha/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/hiawatha/options.mk

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.53 pkgsrc/www/hiawatha/Makefile:1.54
--- pkgsrc/www/hiawatha/Makefile:1.53   Fri Mar 13 21:02:49 2026
+++ pkgsrc/www/hiawatha/Makefile        Sat Mar 14 13:03:20 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2026/03/13 21:02:49 hauke Exp $
+# $NetBSD: Makefile,v 1.54 2026/03/14 13:03:20 hauke Exp $
 
 PKGNAME=       hiawatha-${PKGVER}
 DISTNAME=      hiawatha-v${PKGVER}
@@ -81,21 +81,6 @@ SUBST_MESSAGE.uid=   Configuring Hiawatha 
 SUBST_FILES.uid=       config/hiawatha.conf.in
 SUBST_VARS.uid=                HIAWATHA_USER HIAWATHA_GROUP
 
-.if !empty(HIAWATHA_REPLACE_MBEDTLS:Myes)
-SUBST_CLASSES+=                mbopt
-SUBST_STAGE.mbopt=     pre-configure
-SUBST_MESSAGE.mbopt=   Setting options for updated mbedtls library.
-SUBST_FILES.mbopt=     mbedtls/include/mbedtls/mbedtls_config.h
-# Enable threading support
-SUBST_SED.mbopt=       -E -e 's,^//(\#define MBEDTLS_THREADING_PTHREAD),\1,g'
-SUBST_SED.mbopt+=      -e 's,^//(\#define MBEDTLS_THREADING_C),\1,g'
-SUBST_SED.mbopt+=      -e 's,^//(\#define MBEDTLS_SSL_PROTO_TLS1_3),\1,g'
-SUBST_SED.mbopt+=      -e 's,^//(\#define MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE),\1,g'
-# Disable secp192r1 and secp192k1
-SUBST_SED.mbopt+=      -e 's,(^\#define MBEDTLS_ECP_DP_SECP192R1_ENABLED),//\1,g'
-SUBST_SED.mbopt+=      -e 's,(^\#define MBEDTLS_ECP_DP_SECP192K1_ENABLED),//\1,g'
-.endif
-
 # mbedtls-private
 PRINT_PLIST_AWK+=      { gsub(/^lib\/hiawatha\/libmbed.+$$/, "$${PLIST.mbedtls-private}&"); }
 # urltoolkit

Index: pkgsrc/www/hiawatha/distinfo
diff -u pkgsrc/www/hiawatha/distinfo:1.18 pkgsrc/www/hiawatha/distinfo:1.19
--- pkgsrc/www/hiawatha/distinfo:1.18   Fri Mar 13 21:09:18 2026
+++ pkgsrc/www/hiawatha/distinfo        Sat Mar 14 13:03:20 2026
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.18 2026/03/13 21:09:18 hauke Exp $
+$NetBSD: distinfo,v 1.19 2026/03/14 13:03:20 hauke Exp $
 
-BLAKE2s (hiawatha-v12.0.tar.gz) = e079ecaedececeb87869ce5f5b8d02a935d594fc405498a52c2d320efe345ac8
-SHA512 (hiawatha-v12.0.tar.gz) = c33a1f3cbe5fedafcfdb2b91507f5bd1add58b1fc73bfcaf8a83885454b75e7d5ef0a37497aefc17c31a1b5992b1263a881c6efe0f3f06b556786f0f86bbf780
-Size (hiawatha-v12.0.tar.gz) = 2334911 bytes
+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
 SHA1 (patch-config_hiawatha.conf.in) = 8a58402b0201ec6cd661f5d949e127edfe4b693a
 SHA1 (patch-extra_letsencrypt_letsencrypt.conf.in) = 718d44e883f8206fd88480c5503d962198992347

Index: pkgsrc/www/hiawatha/options.mk
diff -u pkgsrc/www/hiawatha/options.mk:1.7 pkgsrc/www/hiawatha/options.mk:1.8
--- pkgsrc/www/hiawatha/options.mk:1.7  Fri Mar 13 21:24:38 2026
+++ pkgsrc/www/hiawatha/options.mk      Sat Mar 14 13:03:20 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2026/03/13 21:24:38 hauke Exp $
+# $NetBSD: options.mk,v 1.8 2026/03/14 13:03:20 hauke Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.hiawatha
 PKG_SUPPORTED_OPTIONS=         cache letsencrypt monitor rproxy tomahawk
@@ -58,7 +58,7 @@ CONF_FILES+=  ${EGDIR}/letsencrypt.conf $
 # Should the enclosed mbedtls be replaced by an update?
 HIAWATHA_REPLACE_MBEDTLS=      no
 .if !empty(HIAWATHA_REPLACE_MBEDTLS:Myes)
-MTVER=         4.0
+MTVER=         4.0.0
 DISTFILES+=    mbedtls-${MTVER}.tar.bz2
 SITES.mbedtls-${MTVER}.tar.bz2= \
                ${MASTER_SITE_GITHUB:=Mbed-TLS/mbedtls/releases/download/mbedtls-${MTVER}/}