From 90eabe004c15eb94862c8c1cc3569c86226f93cb Mon Sep 17 00:00:00 2001
From: Gabriel Wicki <gabriel@erlikon.ch>
Date: Fri, 27 Jan 2023 15:54:54 +0100
Subject: [PATCH 2/4] gnu: hiawatha: Update to 11.2.

* gnu/packages/web.scm (hiawatha): Update to 11.2.  [source] Delete unused
snippet.  [arguments] Clean up configure-flags.  Point hiawatha to mbedtls-apache3.
* gnu/packages/tls.scm (mbedtls-for-hiawatha): Update to MbedTLS
3.2.1.  [source] Delete unnecessary snippet.
---
 gnu/packages/tls.scm | 22 +++++-----------------
 gnu/packages/web.scm | 14 +++-----------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 19cefec795..1a1c99ab59 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -1068,9 +1068,9 @@ (define-public mbedtls-apache3
 (define-public mbedtls-for-hiawatha
   (hidden-package
    (package
-     (inherit mbedtls-apache)
-     (name "mbedtls-apache")
-     (version "2.26.0")
+     (inherit mbedtls-apache3)
+     (name "mbedtls-apache3")
+     (version "3.2.1")
      (source
       (origin
         (method git-fetch)
@@ -1078,17 +1078,8 @@ (define-public mbedtls-for-hiawatha
               (url "https://github.com/ARMmbed/mbedtls")
               (commit (string-append "mbedtls-" version))))
         (sha256
-         (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"))
-        (file-name (git-file-name name version))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin
-            ;; Can be removed with the next version.
-            ;; Reduce level of format truncation warnings due to false positives.
-            ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434
-            (substitute* "CMakeLists.txt"
-              (("Wformat-truncation=2") "Wformat-truncation"))
-            #t))))
+         (base32 "1dvj1m2i5lkaf8bcmslap8d82z2pi7ypgr8n7lv0rqjyy4vgmkgq"))
+        (file-name (git-file-name name version))))
      (arguments
       (substitute-keyword-arguments (package-arguments mbedtls-apache)
         ((#:phases phases)
@@ -1099,9 +1090,6 @@ (define-public mbedtls-for-hiawatha
                             (invoke "scripts/config.pl" "set" feature))
                           (list "MBEDTLS_THREADING_C"
                                 "MBEDTLS_THREADING_PTHREAD"))
-                ;; XXX The above enables code that breaks with -Werror…
-                (substitute* "CMakeLists.txt"
-                  ((" -Wformat-signedness") ""))
                 #t)))))))))
 
 (define-public dehydrated
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a29f53108c..d92457ea6b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6159,26 +6159,18 @@ (define-public tidy-html
 (define-public hiawatha
   (package
     (name "hiawatha")
-    (version "10.11")
+    (version "11.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.hiawatha-webserver.org/files/"
                            "hiawatha-" version ".tar.gz"))
-       (modules '((guix build utils)))
-       (snippet '(begin
-                   ;; We use packaged libraries, so delete the bundled copies.
-                   (for-each delete-file-recursively
-                             (list "extra/nghttp2.tgz" "mbedtls"))
-                   #t))
        (sha256
-        (base32 "09wpgilbv13zal71v9lbsqr8c3fignygadykpd1p1pb8blb5vn3r"))))
+        (base32 "1i8vrxbvpcj6yxmshbg19gm9g8vrxds6pdra0sgld4vzj9v4zilr"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ; no tests included
        #:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on")
-                               (string-append "-DENABLE_HTTP2=on")
-                               (string-append "-DUSE_SYSTEM_NGHTTP2=on")
                                (string-append "-DENABLE_TOMAHAWK=on")
                                (string-append "-DLOG_DIR=/var/log/hiawatha")
                                (string-append "-DPID_DIR=/run")
@@ -6199,7 +6191,7 @@ (define-public hiawatha
              ;; Make sure 'hiawatha' finds 'mbedtls'.
              (let* ((out (assoc-ref outputs "out"))
                     (sbin (string-append out "/sbin"))
-                    (mbed (assoc-ref inputs "mbedtls-apache")))
+                    (mbed (assoc-ref inputs "mbedtls-apache3")))
                (wrap-program (string-append sbin "/hiawatha")
                  `("PATH" ":" prefix (,mbed)))))))))
     (inputs
-- 
2.39.1