mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 14:56:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: varnish: Update to 7.6.0. [security fixes]

Browse source 
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>
This commit is contained in:
Nicolas Graves 2024-10-17 06:29:57 +02:00 committed by Ludovic Courtès
parent 3196e072d7
commit 70bb5b7679
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/web.scm
View file

@ -6632,13 +6632,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")
@ -6655,20 +6655,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"