Package: guix-patches;
Reported by: Nicolas Graves <ngraves <at> ngraves.fr>
Date: Mon, 7 Oct 2024 21:56:02 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73682 in the body.
You can then email your comments to 73682 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Mon, 07 Oct 2024 21:56:02 GMT) Full text and rfc822 format available.Nicolas Graves <ngraves <at> ngraves.fr>:guix-patches <at> gnu.org.
(Mon, 07 Oct 2024 21:56:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: guix-patches <at> gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 0/3] gnu: varnish: Update to 7.6.0. [security fixes] Date: Mon, 7 Oct 2024 23:54:31 +0200
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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Mon, 07 Oct 2024 22:09:02 GMT) Full text and rfc822 format available.Message #8 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 1/3] gnu: varnish: Update to 7.6.0. [security fixes] 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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Tue, 08 Oct 2024 06:23:02 GMT) Full text and rfc822 format available.Message #11 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 2/3] gnu: varnish-modules: Update to 0.25.0. Date: Tue, 8 Oct 2024 08:21:40 +0200
* 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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Tue, 08 Oct 2024 06:23:03 GMT) Full text and rfc822 format available.Message #14 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 3/3] gnu: varnish: Improve style. Date: Tue, 8 Oct 2024 08:21:41 +0200
* 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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Tue, 15 Oct 2024 16:27:02 GMT) Full text and rfc822 format available.Message #17 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Ludovic Courtès <ludo <at> gnu.org> To: Nicolas Graves <ngraves <at> ngraves.fr> Cc: 73682 <at> debbugs.gnu.org Subject: Re: [bug#73682] [PATCH 3/3] gnu: varnish: Improve style. Date: Tue, 15 Oct 2024 18:25:55 +0200
Nicolas Graves <ngraves <at> 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’.
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Tue, 15 Oct 2024 19:58:02 GMT) Full text and rfc822 format available.Message #20 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 2/3] gnu: varnish-modules: Update to 0.25.0. Date: Tue, 15 Oct 2024 21:56:26 +0200
* 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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Tue, 15 Oct 2024 19:58:03 GMT) Full text and rfc822 format available.Message #23 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 1/3] gnu: varnish: Update to 7.6.0. [security fixes] Date: Tue, 15 Oct 2024 21:56:25 +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 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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Tue, 15 Oct 2024 19:58:03 GMT) Full text and rfc822 format available.Message #26 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 3/3] gnu: varnish: Improve style. Date: Tue, 15 Oct 2024 21:56:27 +0200
* 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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Wed, 16 Oct 2024 23:02:01 GMT) Full text and rfc822 format available.Message #29 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v3 2/3] gnu: varnish-modules: Update to 0.25.0. Date: Thu, 17 Oct 2024 01:00:41 +0200
* 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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Wed, 16 Oct 2024 23:02:02 GMT) Full text and rfc822 format available.Message #32 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v3 1/3] gnu: varnish: Update to 7.6.0. [security fixes] Date: Thu, 17 Oct 2024 01:00:40 +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 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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Wed, 16 Oct 2024 23:02:02 GMT) Full text and rfc822 format available.Message #35 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v3 3/3] gnu: varnish: Improve style. Date: Thu, 17 Oct 2024 01:00:42 +0200
* gnu/packages/web.scm (varnish): Improve style.
[arguments]: Rewrite using gexps.
[inputs]: Replace coreutils by coreutils-minimal, python by
python-minimal.
---
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..12e2c1de7b 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* (#:key inputs #:allow-other-keys)
+ (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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Thu, 17 Oct 2024 04:31:02 GMT) Full text and rfc822 format available.Message #38 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v4 1/4] gnu: varnish: Update to 7.6.0. [security fixes] Date: Thu, 17 Oct 2024 06:29:57 +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 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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Thu, 17 Oct 2024 04:31:02 GMT) Full text and rfc822 format available.Message #41 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v4 3/4] gnu: varnish-modules: Update to 0.25.0. Date: Thu, 17 Oct 2024 06:29:59 +0200
* 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 47c80c0065..19a451f55d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6698,14 +6698,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
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Thu, 17 Oct 2024 04:31:03 GMT) Full text and rfc822 format available.Message #44 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v4 2/4] gnu: varnish: Restrain build to x86-64-linux. Date: Thu, 17 Oct 2024 06:29:58 +0200
* gnu/packages/web.scm
(varnish)[supported-systems]: Set to '("x86-64-linux").
(varnish-modules)[supported-systems]: Set like varnish.
---
gnu/packages/web.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index e283797a62..47c80c0065 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6686,6 +6686,9 @@ (define-public varnish
configuration language.")
(properties
'((release-monitoring-url . "https://varnish-cache.org/releases/index.html")))
+ ;; On QA, also properly builds on i686-linux and armhf-linux.
+ ;; But we probably never want to cross-compile varnish.
+ (supported-systems '("x86_64-linux"))
(license (list license:bsd-2 ;main distribution
license:zlib ;lib/libvgz/*
license:public-domain ;bin/varnishncsa/as64.c, include/miniobj.h
@@ -6719,6 +6722,7 @@ (define-public varnish-modules
"This package provides a collection of modules (@dfn{vmods}) for the Varnish
cache server, extending the @acronym{VCL, Varnish Configuration Language} with
additional capabilities.")
+ (supported-systems (package-supported-systems varnish))
(license license:bsd-2)))
(define-public xinetd
--
2.46.0
guix-patches <at> gnu.org:bug#73682; Package guix-patches.
(Thu, 17 Oct 2024 04:31:03 GMT) Full text and rfc822 format available.Message #47 received at 73682 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 73682 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v4 4/4] gnu: varnish: Improve style. Date: Thu, 17 Oct 2024 06:30:00 +0200
* gnu/packages/web.scm (varnish): Improve style.
[arguments]: Rewrite using gexps.
[inputs]: Replace coreutils by coreutils-minimal, python by
python-minimal.
---
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 19a451f55d..e2702d7e98 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* (#:key inputs #:allow-other-keys)
+ (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
Ludovic Courtès <ludo <at> gnu.org>:Nicolas Graves <ngraves <at> ngraves.fr>:Message #52 received at 73682-done <at> debbugs.gnu.org (full text, mbox):
From: Ludovic Courtès <ludo <at> gnu.org> To: Nicolas Graves <ngraves <at> ngraves.fr> Cc: 73682-done <at> debbugs.gnu.org Subject: Re: [bug#73682] [PATCH v4 2/4] gnu: varnish: Restrain build to x86-64-linux. Date: Thu, 24 Oct 2024 12:03:44 +0200
Nicolas Graves <ngraves <at> ngraves.fr> skribis:
> * gnu/packages/web.scm
> (varnish)[supported-systems]: Set to '("x86-64-linux").
> (varnish-modules)[supported-systems]: Set like varnish.
[...]
> + ;; On QA, also properly builds on i686-linux and armhf-linux.
> + ;; But we probably never want to cross-compile varnish.
> + (supported-systems '("x86_64-linux"))
AFAICS, this package builds on all support *-linux platforms, so I don’t
understand the rationale here (this field is not just for qa.guix).
Anyhow, I applied the other 3 patches, thanks!
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Thu, 21 Nov 2024 12:24:14 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.