CVS commit: pkgsrc/www/hiawatha

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Jan  2 21:22:19 UTC 2025

Modified Files:
        pkgsrc/www/hiawatha: Makefile distinfo options.mk
Removed Files:
        pkgsrc/www/hiawatha/patches: patch-mbedtls_library_ssl_tls13_generic.c
            patch-src_tls.c

Log Message:
Following upstream's advice, replace the enclosed mbedtls version
3.6.0 with 3.6.2. HIAWATHA_REPLACE_MBEDTLS allows disabling the
update, once upstream has updated the distfile.

We replicate the relevant bits from upstream's update script in the
Makefile and options.mk.

The change restores TLS 1.3 support.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/hiawatha/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/hiawatha/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/hiawatha/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/hiawatha/patches/patch-mbedtls_library_ssl_tls13_generic.c \
    pkgsrc/www/hiawatha/patches/patch-src_tls.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.42 pkgsrc/www/hiawatha/Makefile:1.43
--- pkgsrc/www/hiawatha/Makefile:1.42   Sun Dec  1 22:30:06 2024
+++ pkgsrc/www/hiawatha/Makefile        Thu Jan  2 21:22:19 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2024/12/01 22:30:06 hauke Exp $
+# $NetBSD: Makefile,v 1.43 2025/01/02 21:22:19 hauke Exp $
 
 PKGNAME=       hiawatha-${PKGVER}
 DISTNAME=      hiawatha-v${PKGVER}
 PKGVER=                11.6
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=hsleisink/hiawatha/-/archive/v${PKGVER}/}
 EXTRACT_SUFX=  .tar.gz
@@ -77,10 +77,25 @@ SUBST_SED.path=             -e 's,/usr,${PREFIX},g'
 
 SUBST_CLASSES+=                uid
 SUBST_STAGE.uid=       pre-configure
-SUBST_MESSAGE.uid=     Configure Hiawatha user & group
+SUBST_MESSAGE.uid=     Configure Hiawatha user and group
 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
@@ -104,6 +119,15 @@ CONF_FILES+=       ${EGDIR}/index.html.sample 
 
 .include "../../mk/bsd.prefs.mk"
 
+post-extract:
+.if !empty(HIAWATHA_REPLACE_MBEDTLS:Myes)
+.for sdir in cmake include library
+       rm -r ${WRKSRC}/mbedtls/${sdir}
+       cp -R ${WRKDIR}/mbedtls-${MTVER}/${sdir} ${WRKSRC}/mbedtls/
+.endfor
+       cp ${WRKDIR}/mbedtls-${MTVER}/ChangeLog ${WRKSRC}/mbedtls/
+.endif
+
 post-install:
 .if !empty(PKG_OPTIONS:Mmbedtls-private)
        rm -r ${DESTDIR}${PREFIX}/include
@@ -135,6 +159,7 @@ post-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+
 .include "../../devel/cmake/build.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/hiawatha/distinfo
diff -u pkgsrc/www/hiawatha/distinfo:1.12 pkgsrc/www/hiawatha/distinfo:1.13
--- pkgsrc/www/hiawatha/distinfo:1.12   Wed Dec 18 16:44:36 2024
+++ pkgsrc/www/hiawatha/distinfo        Thu Jan  2 21:22:19 2025
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.12 2024/12/18 16:44:36 hauke Exp $
+$NetBSD: distinfo,v 1.13 2025/01/02 21:22:19 hauke Exp $
 
 BLAKE2s (hiawatha-v11.6.tar.gz) = cb18a61b34c9ae64a1c21bdff6c57562aecddeaa15f6d4da6ab2e278dd81ffa0
 SHA512 (hiawatha-v11.6.tar.gz) = e0b23dd0626ea9850469feefd3f4c69119230e327c63ab4b68442abe695a232c5b4ea4250791cd00fe730c1c6ff3a0a66fafccde38c029d43b4506b1c817dd53
 Size (hiawatha-v11.6.tar.gz) = 1844062 bytes
+BLAKE2s (mbedtls-3.6.2.tar.bz2) = 8beecad1021831d31d963f68f202d83d1a835f40e1de5552bbb08e7b929a198a
+SHA512 (mbedtls-3.6.2.tar.bz2) = 7ab3b1ec179681949e1b0d171e04f75a605ae9ed8177cf3f6f27c401efca4aff930437ecc425c9a994d36f50ddd6f0f0dd7feeb42251128ac875b4c57fe3811b
+Size (mbedtls-3.6.2.tar.bz2) = 4979769 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
 SHA1 (patch-src_hiawatha.c) = 4302f7f959799fc79bda6eda63901fb5b0fc3993
-SHA1 (patch-src_tls.c) = de1631f6ceff7a903964bcf5171e7ea24e933e71

Index: pkgsrc/www/hiawatha/options.mk
diff -u pkgsrc/www/hiawatha/options.mk:1.2 pkgsrc/www/hiawatha/options.mk:1.3
--- pkgsrc/www/hiawatha/options.mk:1.2  Thu Aug 22 17:54:51 2024
+++ pkgsrc/www/hiawatha/options.mk      Thu Jan  2 21:22:19 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2024/08/22 17:54:51 hauke Exp $
+# $NetBSD: options.mk,v 1.3 2025/01/02 21:22:19 hauke Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.hiawatha
 PKG_SUPPORTED_OPTIONS=         cache letsencrypt monitor rproxy tomahawk
@@ -55,13 +55,18 @@ CONF_FILES+=        ${EGDIR}/letsencrypt.conf $
 .include "../../security/mbedtls3/buildlink3.mk"
 .endif
 .if !empty(PKG_OPTIONS:Mmbedtls-private)
+# Should the enclosed mbedtls be replaced by an update?
+HIAWATHA_REPLACE_MBEDTLS=      yes
+.if !empty(HIAWATHA_REPLACE_MBEDTLS:Myes)
+MTVER=         3.6.2
+DISTFILES+=    mbedtls-${MTVER}.tar.bz2
+SITES.mbedtls-${MTVER}.tar.bz2= \
+               ${MASTER_SITE_GITHUB:=Mbed-TLS/mbedtls/releases/download/mbedtls-${MTVER}/}
+.endif
 CMAKE_CONFIGURE_ARGS+=         -DENABLE_TLS=on
 CMAKE_CONFIGURE_ARGS+=         -DUSE_SYSTEM_MBEDTLS=off
 CMAKE_CONFIGURE_ARGS+=         -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
 CMAKE_CONFIGURE_ARGS+=         -DUSE_STATIC_MBEDTLS_LIBRARY=ON
-##LDFLAGS+=            ${COMPILER_RPATH_FLAG}${PREFIX}/lib/hiawatha
-##CONFIGURE_ENV+=              LDFLAGS=${LDFLAGS:Q}
-##INSTALLATION_DIRS+=  lib/hiawatha
 .endif
 .if empty(PKG_OPTIONS:Mmbedtls) && empty(PKG_OPTIONS:Mmbedtls-private)
 CMAKE_CONFIGURE_ARGS+= -DENABLE_TLS=off