diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2024-10-17 06:29:57 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-10-24 14:50:09 +0200 |
| commit | 70bb5b76797f7d368c8a0880c78d214d04611aa9 (patch) | |
| tree | cd2affc50b784f702a81d4898afca6c67834b416 /gnu/packages/web.scm | |
| parent | 3196e072d730acd633f04184461597c55efc463f (diff) | |
| download | guix-70bb5b76797f7d368c8a0880c78d214d04611aa9.tar guix-70bb5b76797f7d368c8a0880c78d214d04611aa9.tar.gz | |
gnu: varnish: Update to 7.6.0. [security fixes]
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.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/web.scm')
| -rw-r--r-- | gnu/packages/web.scm | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9cd6d4dd40..e328e66cb5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6632,13 +6632,13 @@ deployments.") (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") @@ -6655,20 +6655,25 @@ deployments.") #: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" |