* [bug#73682] [PATCH 0/3] gnu: varnish: Update to 7.6.0. [security fixes]
@ 2024-10-07 21:54 Nicolas Graves via Guix-patches via
2024-10-07 22:07 ` [bug#73682] [PATCH 1/3] " Nicolas Graves via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-07 21:54 UTC (permalink / raw)
To: 73682; +Cc: Nicolas Graves
Nicolas Graves (3):
gnu: varnish: Update to 7.6.0. [security fixes]
gnu: varnish-modules: Update to 0.25.0.
gnu: varnish: Improve style.
gnu/packages/web.scm | 99 ++++++++++++++++++++++++--------------------
1 file changed, 54 insertions(+), 45 deletions(-)
--
2.46.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#73682] [PATCH 1/3] gnu: varnish: Update to 7.6.0. [security fixes]
2024-10-07 21:54 [bug#73682] [PATCH 0/3] gnu: varnish: Update to 7.6.0. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-07 22:07 ` Nicolas Graves via Guix-patches via
2024-10-08 6:21 ` [bug#73682] [PATCH 2/3] gnu: varnish-modules: Update to 0.25.0 Nicolas Graves via Guix-patches via
2024-10-15 19:56 ` [bug#73682] [PATCH v2 1/3] gnu: varnish: Update to 7.6.0. [security fixes] Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 8+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-07 22:07 UTC (permalink / raw)
To: 73682; +Cc: Nicolas Graves
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#73682] [PATCH 2/3] gnu: varnish-modules: Update to 0.25.0.
2024-10-07 21:54 [bug#73682] [PATCH 0/3] gnu: varnish: Update to 7.6.0. [security fixes] Nicolas Graves via Guix-patches via
2024-10-07 22:07 ` [bug#73682] [PATCH 1/3] " Nicolas Graves via Guix-patches via
@ 2024-10-08 6:21 ` Nicolas Graves via Guix-patches via
2024-10-08 6:21 ` [bug#73682] [PATCH 3/3] gnu: varnish: Improve style Nicolas Graves via Guix-patches via
2024-10-15 19:56 ` [bug#73682] [PATCH v2 1/3] gnu: varnish: Update to 7.6.0. [security fixes] Nicolas Graves via Guix-patches via
2 siblings, 1 reply; 8+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-08 6:21 UTC (permalink / raw)
To: 73682; +Cc: Nicolas Graves
* gnu/packages/web.scm (varnish-modules): Update to 0.25.0.
---
gnu/packages/web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 75bae5cc31..dec0e8e2c6 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6695,14 +6695,14 @@ (define-public varnish-modules
(package
(name "varnish-modules")
(home-page "https://github.com/varnish/varnish-modules")
- (version "0.22.0")
+ (version "0.25.0")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "1dxnla1k6kra0nkvm20iszgmq0czr5bgx002qlljwf9fl25vm1ks"))))
+ "1jan3lwynp14awh6jk4zc052lm8m02vqms8ryc7zmjnm5jifdzlv"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config
--
2.46.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#73682] [PATCH 3/3] gnu: varnish: Improve style.
2024-10-08 6:21 ` [bug#73682] [PATCH 2/3] gnu: varnish-modules: Update to 0.25.0 Nicolas Graves via Guix-patches via
@ 2024-10-08 6:21 ` Nicolas Graves via Guix-patches via
2024-10-15 16:25 ` Ludovic Courtès
0 siblings, 1 reply; 8+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-08 6:21 UTC (permalink / raw)
To: 73682; +Cc: Nicolas Graves
* gnu/packages/web.scm (varnish): Improve style.
[arguments]: Rewrite using gexps.
[inputs]: Replace coreutils by coreutils-minimal, python by
python-minimal. Add glibc.
---
gnu/packages/web.scm | 106 ++++++++++++++++++++++---------------------
1 file changed, 55 insertions(+), 51 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index dec0e8e2c6..75bad3a579 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6617,66 +6617,70 @@ (define-public varnish
"0p2xf4a8bk2w8j9q20fazrc93fwcfhw8zcvdd8ssbahvlg2q78mb"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")
- (string-append "CC=" ,(cc-for-target))
- ;; Use absolute path of GCC so it's found at runtime.
- (string-append "PTHREAD_CC="
- (search-input-file %build-inputs
- "/bin/gcc"))
- "--localstatedir=/var")
- ,@(if (target-x86-32?)
- '(#:make-flags
- (list "CFLAGS+=-fexcess-precision=standard"))
- '())
+ (append
+ (if (target-x86-32?)
+ '(#:make-flags
+ (list "CFLAGS+=-fexcess-precision=standard"))
+ '())
+ (list
+ #:configure-flags
+ #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
+ (string-append "CC=" #$(cc-for-target))
+ ;; Use absolute path of GCC so it's found at runtime.
+ (string-append "PTHREAD_CC="
+ (search-input-file %build-inputs
+ "/bin/gcc"))
+ "--localstatedir=/var")
#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'use-absolute-file-names
- (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)))
- (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"
- ;; Do not create /var/varnish during install.
- (("^install-data-am: install-data-local") "install-data-am: "))))
- (add-after 'install 'wrap-varnishd
- ;; Varnish uses GCC to compile VCL, so wrap it with required GCC
- ;; environment variables to avoid propagating them to profiles.
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (varnishd (string-append out "/sbin/varnishd"))
- (PATH (string-append (assoc-ref inputs "binutils") "/bin"))
- (LIBRARY_PATH (string-append (assoc-ref inputs "libc") "/lib")))
- (wrap-program varnishd
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'use-absolute-file-names
+ (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)))
+ (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"
+ ;; Do not create /var/varnish during install.
+ (("^install-data-am: install-data-local")
+ "install-data-am: "))))
+ (add-after 'install 'wrap-varnishd
+ ;; Varnish uses GCC to compile VCL, so wrap it with required GCC
+ ;; environment variables to avoid propagating them to profiles.
+ (lambda _
+ (wrap-program (string-append #$output "/sbin/varnishd")
;; Add binutils to PATH so gcc finds the 'as' executable.
- `("PATH" ":" prefix (,PATH))
+ `("PATH" ":" prefix (,(dirname (which "as"))))
;; Make sure 'crti.o' et.al is found.
- `("LIBRARY_PATH" ":" prefix (,LIBRARY_PATH)))))))))
+ `("LIBRARY_PATH" ":" prefix
+ (,#$(file-append (this-package-input "glibc") "/lib"))))))))))
(native-inputs
- (list pkg-config python-sphinx python-docutils))
+ (list pkg-config
+ python-sphinx
+ python-docutils))
(inputs
(list bash-minimal
- coreutils
+ coreutils-minimal
+ glibc
jemalloc
ncurses
pcre2
- python
+ python-minimal
readline))
(synopsis "Web application accelerator")
(description
--
2.46.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#73682] [PATCH 3/3] gnu: varnish: Improve style.
2024-10-08 6:21 ` [bug#73682] [PATCH 3/3] gnu: varnish: Improve style Nicolas Graves via Guix-patches via
@ 2024-10-15 16:25 ` Ludovic Courtès
0 siblings, 0 replies; 8+ messages in thread
From: Ludovic Courtès @ 2024-10-15 16:25 UTC (permalink / raw)
To: Nicolas Graves; +Cc: 73682
Nicolas Graves <ngraves@ngraves.fr> skribis:
> * gnu/packages/web.scm (varnish): Improve style.
> [arguments]: Rewrite using gexps.
> [inputs]: Replace coreutils by coreutils-minimal, python by
> python-minimal. Add glibc.
[...]
> + ;; Varnish uses GCC to compile VCL, so wrap it with required GCC
> + ;; environment variables to avoid propagating them to profiles.
> + (lambda _
> + (wrap-program (string-append #$output "/sbin/varnishd")
> ;; Add binutils to PATH so gcc finds the 'as' executable.
> - `("PATH" ":" prefix (,PATH))
> + `("PATH" ":" prefix (,(dirname (which "as"))))
> ;; Make sure 'crti.o' et.al is found.
> - `("LIBRARY_PATH" ":" prefix (,LIBRARY_PATH)))))))))
> + `("LIBRARY_PATH" ":" prefix
> + (,#$(file-append (this-package-input "glibc") "/lib"))))))))))
If we assume we’ll never want to cross-compile Varnish (sounds
reasonable to me), use:
(dirname (search-input-file inputs "/lib/libc.so"))
and do *not* add ‘glibc’ as an input, as this effectively adds a
dependency on a second glibc.
Ludo’.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#73682] [PATCH v2 1/3] gnu: varnish: Update to 7.6.0. [security fixes]
2024-10-07 21:54 [bug#73682] [PATCH 0/3] gnu: varnish: Update to 7.6.0. [security fixes] Nicolas Graves via Guix-patches via
2024-10-07 22:07 ` [bug#73682] [PATCH 1/3] " Nicolas Graves via Guix-patches via
2024-10-08 6:21 ` [bug#73682] [PATCH 2/3] gnu: varnish-modules: Update to 0.25.0 Nicolas Graves via Guix-patches via
@ 2024-10-15 19:56 ` Nicolas Graves via Guix-patches via
2024-10-15 19:56 ` [bug#73682] [PATCH v2 2/3] gnu: varnish-modules: Update to 0.25.0 Nicolas Graves via Guix-patches via
2024-10-15 19:56 ` [bug#73682] [PATCH v2 3/3] gnu: varnish: Improve style Nicolas Graves via Guix-patches via
2 siblings, 2 replies; 8+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-15 19:56 UTC (permalink / raw)
To: 73682; +Cc: Nicolas Graves
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 5d2ab791ae..e283797a62 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#73682] [PATCH v2 2/3] gnu: varnish-modules: Update to 0.25.0.
2024-10-15 19:56 ` [bug#73682] [PATCH v2 1/3] gnu: varnish: Update to 7.6.0. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-15 19:56 ` Nicolas Graves via Guix-patches via
2024-10-15 19:56 ` [bug#73682] [PATCH v2 3/3] gnu: varnish: Improve style Nicolas Graves via Guix-patches via
1 sibling, 0 replies; 8+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-15 19:56 UTC (permalink / raw)
To: 73682; +Cc: Nicolas Graves
* gnu/packages/web.scm (varnish-modules): Update to 0.25.0.
---
gnu/packages/web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index e283797a62..fe6b40067b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6695,14 +6695,14 @@ (define-public varnish-modules
(package
(name "varnish-modules")
(home-page "https://github.com/varnish/varnish-modules")
- (version "0.22.0")
+ (version "0.25.0")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "1dxnla1k6kra0nkvm20iszgmq0czr5bgx002qlljwf9fl25vm1ks"))))
+ "1jan3lwynp14awh6jk4zc052lm8m02vqms8ryc7zmjnm5jifdzlv"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config
--
2.46.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#73682] [PATCH v2 3/3] gnu: varnish: Improve style.
2024-10-15 19:56 ` [bug#73682] [PATCH v2 1/3] gnu: varnish: Update to 7.6.0. [security fixes] Nicolas Graves via Guix-patches via
2024-10-15 19:56 ` [bug#73682] [PATCH v2 2/3] gnu: varnish-modules: Update to 0.25.0 Nicolas Graves via Guix-patches via
@ 2024-10-15 19:56 ` Nicolas Graves via Guix-patches via
1 sibling, 0 replies; 8+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-15 19:56 UTC (permalink / raw)
To: 73682; +Cc: Nicolas Graves
* gnu/packages/web.scm (varnish): Improve style.
[arguments]: Rewrite using gexps.
[inputs]: Replace coreutils by coreutils-minimal, python by
python-minimal. Add glibc.
---
gnu/packages/web.scm | 106 ++++++++++++++++++++++---------------------
1 file changed, 55 insertions(+), 51 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index fe6b40067b..87eab9b4af 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6617,66 +6617,70 @@ (define-public varnish
"0p2xf4a8bk2w8j9q20fazrc93fwcfhw8zcvdd8ssbahvlg2q78mb"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")
- (string-append "CC=" ,(cc-for-target))
- ;; Use absolute path of GCC so it's found at runtime.
- (string-append "PTHREAD_CC="
- (search-input-file %build-inputs
- "/bin/gcc"))
- "--localstatedir=/var")
- ,@(if (target-x86-32?)
- '(#:make-flags
- (list "CFLAGS+=-fexcess-precision=standard"))
- '())
+ (append
+ (if (target-x86-32?)
+ '(#:make-flags
+ (list "CFLAGS+=-fexcess-precision=standard"))
+ '())
+ (list
+ #:configure-flags
+ #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
+ (string-append "CC=" #$(cc-for-target))
+ ;; Use absolute path of GCC so it's found at runtime.
+ (string-append "PTHREAD_CC="
+ (search-input-file %build-inputs
+ "/bin/gcc"))
+ "--localstatedir=/var")
#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'use-absolute-file-names
- (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)))
- (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"
- ;; Do not create /var/varnish during install.
- (("^install-data-am: install-data-local") "install-data-am: "))))
- (add-after 'install 'wrap-varnishd
- ;; Varnish uses GCC to compile VCL, so wrap it with required GCC
- ;; environment variables to avoid propagating them to profiles.
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (varnishd (string-append out "/sbin/varnishd"))
- (PATH (string-append (assoc-ref inputs "binutils") "/bin"))
- (LIBRARY_PATH (string-append (assoc-ref inputs "libc") "/lib")))
- (wrap-program varnishd
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'use-absolute-file-names
+ (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)))
+ (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"
+ ;; Do not create /var/varnish during install.
+ (("^install-data-am: install-data-local")
+ "install-data-am: "))))
+ (add-after 'install 'wrap-varnishd
+ ;; Varnish uses GCC to compile VCL, so wrap it with required GCC
+ ;; environment variables to avoid propagating them to profiles.
+ (lambda _
+ (wrap-program (string-append #$output "/sbin/varnishd")
;; Add binutils to PATH so gcc finds the 'as' executable.
- `("PATH" ":" prefix (,PATH))
+ `("PATH" ":" prefix (,(dirname (which "as"))))
;; Make sure 'crti.o' et.al is found.
- `("LIBRARY_PATH" ":" prefix (,LIBRARY_PATH)))))))))
+ `("LIBRARY_PATH" ":" prefix
+ (,(dirname
+ (search-input-file inputs "lib/libc.so")))))))))))
(native-inputs
- (list pkg-config python-sphinx python-docutils))
+ (list pkg-config
+ python-sphinx
+ python-docutils))
(inputs
(list bash-minimal
- coreutils
+ coreutils-minimal
jemalloc
ncurses
pcre2
- python
+ python-minimal
readline))
(synopsis "Web application accelerator")
(description
--
2.46.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-10-15 19:58 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-07 21:54 [bug#73682] [PATCH 0/3] gnu: varnish: Update to 7.6.0. [security fixes] Nicolas Graves via Guix-patches via
2024-10-07 22:07 ` [bug#73682] [PATCH 1/3] " Nicolas Graves via Guix-patches via
2024-10-08 6:21 ` [bug#73682] [PATCH 2/3] gnu: varnish-modules: Update to 0.25.0 Nicolas Graves via Guix-patches via
2024-10-08 6:21 ` [bug#73682] [PATCH 3/3] gnu: varnish: Improve style Nicolas Graves via Guix-patches via
2024-10-15 16:25 ` Ludovic Courtès
2024-10-15 19:56 ` [bug#73682] [PATCH v2 1/3] gnu: varnish: Update to 7.6.0. [security fixes] Nicolas Graves via Guix-patches via
2024-10-15 19:56 ` [bug#73682] [PATCH v2 2/3] gnu: varnish-modules: Update to 0.25.0 Nicolas Graves via Guix-patches via
2024-10-15 19:56 ` [bug#73682] [PATCH v2 3/3] gnu: varnish: Improve style Nicolas Graves via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).