Subject: [PATCH 1/3] gnu: varnish: Update to 7.6.0. [security fixes]

From: Nicolas Graves <[email-masked]>
Date: Tue, 8 Oct 2024 00:07:49 +0200

This fixes CVE-2023-44487.

* gnu/packages/web.scm (varnish): Update to 7.6.0.
  [arguments]<#:phases>: Rewrite and update 'use-absolute-file-names
  phase. Add phase 'remove-failing-tests.
---
 gnu/packages/web.scm | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 552abf83c5..75bae5cc31 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6608,13 +6608,13 @@ (define-public varnish
   (package
     (name "varnish")
     (home-page "https://varnish-cache.org/")
-    (version "7.3.0")
+    (version "7.6.0")
     (source (origin
               (method url-fetch)
               (uri (string-append home-page "_downloads/varnish-" version ".tgz"))
               (sha256
                (base32
-                "1rsay4vrg0dvf8d7bpj8dvaax4v949p6x1l6qd3hdabhq87bpnz2"))))
+                "0p2xf4a8bk2w8j9q20fazrc93fwcfhw8zcvdd8ssbahvlg2q78mb"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")
@@ -6631,20 +6631,25 @@ (define-public varnish
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'use-absolute-file-names
-           (lambda* (#:key native-inputs inputs #:allow-other-keys)
-             (let* ((inpts (or native-inputs inputs))
-                    (sh (search-input-file inpts "/bin/sh"))
-                    (rm (search-input-file inpts "/bin/rm")))
-               (substitute* '("bin/varnishtest/vtc_varnish.c"
-                              "bin/varnishtest/vtc_process.c"
-                              "bin/varnishtest/vtc_haproxy.c"
-                              "bin/varnishtest/tests/u00014.vtc"
-                              "bin/varnishd/mgt/mgt_vcc.c")
-                 (("/bin/sh") sh))
+           (lambda _
+             (substitute* '("bin/varnishtest/vtc_varnish.c"
+                            "bin/varnishtest/vtc_process.c"
+                            "bin/varnishtest/vtc_haproxy.c"
+                            "bin/varnishtest/tests/u00014.vtc"
+                            "bin/varnishd/mgt/mgt_vcc.c")
+               (("/bin/sh") (which "bash")))
+             (let* ((rm (which "rm")))
                (substitute* "bin/varnishd/mgt/mgt_shmem.c"
                  (("rm -rf") (string-append rm " -rf")))
                (substitute* "bin/varnishtest/vtc_main.c"
-                 (("/bin/rm") rm)))))
+                 (("/bin/rm") rm)))
+             (substitute* "bin/varnishtest/tests/u00000.vtc"
+               (("/bin/echo") (which "echo")))))
+         (add-after 'unpack 'remove-failing-tests
+           (lambda  _
+             ;; This test seems to fail because of
+             ;; Failed: Servname not supported for ai_socktype
+             (delete-file "bin/varnishtest/tests/b00085.vtc")))
          (add-before 'install 'patch-Makefile
            (lambda _
              (substitute* "Makefile"
-- 
2.46.0