CVS commit: pkgsrc/www/hiawatha

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Aug 22 15:59:21 UTC 2024

Modified Files:
        pkgsrc/www/hiawatha: Makefile distinfo
Added Files:
        pkgsrc/www/hiawatha/patches: patch-mbedtls_library_ssl_tls13_generic.c

Log Message:
www/hiawatha: Update to 11.6

Changes:
  * Enabled TLSv1.3.
  * mbed TLS updated to 3.6.0.

Deprecating USE_CMAKE breaks the build:
- library paths botched
- hiawatha.conf not being generated from hiawatha.conf.in

so needs more work.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/hiawatha/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/hiawatha/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/hiawatha/patches/patch-mbedtls_library_ssl_tls13_generic.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.35 pkgsrc/www/hiawatha/Makefile:1.36
--- pkgsrc/www/hiawatha/Makefile:1.35   Wed May 29 16:34:49 2024
+++ pkgsrc/www/hiawatha/Makefile        Thu Aug 22 15:59:21 2024
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2024/05/29 16:34:49 adam Exp $
+# $NetBSD: Makefile,v 1.36 2024/08/22 15:59:21 hauke Exp $
 
 PKGNAME=       hiawatha-${PKGVER}
 DISTNAME=      hiawatha-v${PKGVER}
-PKGVER=                11.5
-PKGREVISION=   2
+PKGVER=                11.6
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=hsleisink/hiawatha/-/archive/v${PKGVER}/}
 EXTRACT_SUFX=  .tar.gz

Index: pkgsrc/www/hiawatha/distinfo
diff -u pkgsrc/www/hiawatha/distinfo:1.9 pkgsrc/www/hiawatha/distinfo:1.10
--- pkgsrc/www/hiawatha/distinfo:1.9    Fri Apr 26 09:18:00 2024
+++ pkgsrc/www/hiawatha/distinfo        Thu Aug 22 15:59:21 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9 2024/04/26 09:18:00 hauke Exp $
+$NetBSD: distinfo,v 1.10 2024/08/22 15:59:21 hauke Exp $
 
-BLAKE2s (hiawatha-v11.5.tar.gz) = d925682455f7c822d0aa5659716fbbf41fc6f04d53883945e0d0fe077794fb18
-SHA512 (hiawatha-v11.5.tar.gz) = c374ce680874aa9aacaa4d8b59cce3209275286e5b8baaabdf53346a0a743cb6decc97136b356c207b33b18db2977a0b1d6e9743cc6f4479860fade389bdd86a
-Size (hiawatha-v11.5.tar.gz) = 1810756 bytes
+BLAKE2s (hiawatha-v11.6.tar.gz) = cb18a61b34c9ae64a1c21bdff6c57562aecddeaa15f6d4da6ab2e278dd81ffa0
+SHA512 (hiawatha-v11.6.tar.gz) = e0b23dd0626ea9850469feefd3f4c69119230e327c63ab4b68442abe695a232c5b4ea4250791cd00fe730c1c6ff3a0a66fafccde38c029d43b4506b1c817dd53
+Size (hiawatha-v11.6.tar.gz) = 1844062 bytes
 SHA1 (patch-CMakeLists.txt) = a96e51545ab31e5ceb4a520bb4757787088c8174
 SHA1 (patch-config_hiawatha.conf.in) = 8a58402b0201ec6cd661f5d949e127edfe4b693a
 SHA1 (patch-extra_letsencrypt_letsencrypt.conf.in) = 718d44e883f8206fd88480c5503d962198992347
+SHA1 (patch-mbedtls_library_ssl_tls13_generic.c) = 292b21dfdb8b19309da8faa807fa200720b5e580

Added files:

Index: pkgsrc/www/hiawatha/patches/patch-mbedtls_library_ssl_tls13_generic.c
diff -u /dev/null pkgsrc/www/hiawatha/patches/patch-mbedtls_library_ssl_tls13_generic.c:1.1
--- /dev/null   Thu Aug 22 15:59:21 2024
+++ pkgsrc/www/hiawatha/patches/patch-mbedtls_library_ssl_tls13_generic.c       Thu Aug 22 15:59:21 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-mbedtls_library_ssl_tls13_generic.c,v 1.1 2024/08/22 15:59:21 hauke Exp $
+
+Fix compilation where memcpy as a function-like macro, from
+<https://github.com/tom-cosgrove-arm/mbedtls/commit/b32d7ae0fee2f906be59780b42a0cd4468a39bd1>
+
+--- mbedtls/library/ssl_tls13_generic.c.orig   2024-08-22 15:00:42.358144005 +0000
++++ mbedtls/library/ssl_tls13_generic.c
+@@ -193,10 +193,12 @@ static void ssl_tls13_create_verify_stru
+     idx = 64;
+ 
+     if (from == MBEDTLS_SSL_IS_CLIENT) {
+-        memcpy(verify_buffer + idx, MBEDTLS_SSL_TLS1_3_LBL_WITH_LEN(client_cv));
++        memcpy(verify_buffer + idx, mbedtls_ssl_tls13_labels.client_cv,
++               MBEDTLS_SSL_TLS1_3_LBL_LEN(client_cv));
+         idx += MBEDTLS_SSL_TLS1_3_LBL_LEN(client_cv);
+     } else { /* from == MBEDTLS_SSL_IS_SERVER */
+-        memcpy(verify_buffer + idx, MBEDTLS_SSL_TLS1_3_LBL_WITH_LEN(server_cv));
++        memcpy(verify_buffer + idx, mbedtls_ssl_tls13_labels.client_cv,
++               MBEDTLS_SSL_TLS1_3_LBL_LEN(client_cv));
+         idx += MBEDTLS_SSL_TLS1_3_LBL_LEN(server_cv);
+     }
+