From patchwork Mon Oct 7 22:07:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 31915 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8C39827BBEA; Mon, 7 Oct 2024 23:09:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 978AB27BBE2 for ; Mon, 7 Oct 2024 23:09:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxvuf-0001AE-5z; Mon, 07 Oct 2024 18:09:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxvuR-00018v-08 for guix-patches@gnu.org; Mon, 07 Oct 2024 18:08:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxvuQ-0007a6-Fr for guix-patches@gnu.org; Mon, 07 Oct 2024 18:08:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=VLCR6j8rH7F56bV8woahD30lYczCPd9UVy5Y3W8LrpI=; b=UHzG/Qp5hQKphm572H5mcmZOeZBAua+G6p1G9LljlVZshSZv7xXy6b1Fe0sX5zCgWFrfUEO+xVUD0yiOFZ8cbrzHesGaG4MyPiPVZvZV8sZnU4oGvD1cYV1s8Vw5cBPBlFrRR7YZFrPbDb/I2ccGT7I01Bat5TgZ/61nScZc3xnBW9L0/nCT/3Q/tDupY4AN3p7LEzYAVu+8lm8fN6SbZQJsTEazXC1OdM88DI3DBMNRt7teuFuYF9+s8VucJhCIwW3TPCwMxPfoAJ89u6Vfw1PQpWnWoFXIu3RwHwEeMEfNEBg0BcXxYbnEK/K927y8dygpCIz5DIyQjC/3xYaPmA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxvuY-000860-6f for guix-patches@gnu.org; Mon, 07 Oct 2024 18:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH 1/3] gnu: varnish: Update to 7.6.0. [security fixes] References: <20241007215513.11989-1-ngraves@ngraves.fr> In-Reply-To: <20241007215513.11989-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 22:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73682@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 73682-submit@debbugs.gnu.org id=B73682.172833889631034 (code B ref 73682); Mon, 07 Oct 2024 22:09:02 +0000 Received: (at 73682) by debbugs.gnu.org; 7 Oct 2024 22:08:16 +0000 Received: from localhost ([127.0.0.1]:49191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxvto-00084U-AS for submit@debbugs.gnu.org; Mon, 07 Oct 2024 18:08:16 -0400 Received: from 16.mo582.mail-out.ovh.net ([87.98.139.208]:54725) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxvtk-00084E-N4 for 73682@debbugs.gnu.org; Mon, 07 Oct 2024 18:08:14 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.17.23]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4XMtZC2xF9z1Gb2 for <73682@debbugs.gnu.org>; Mon, 7 Oct 2024 22:08:03 +0000 (UTC) Received: from ghost-submission-55b549bf7b-rv6zc (unknown [10.108.42.32]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E439D1FDBE; Mon, 7 Oct 2024 22:08:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-55b549bf7b-rv6zc with ESMTPSA id JBi5KcJbBGfwCA0Akygpew (envelope-from ); Mon, 07 Oct 2024 22:08:02 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R001de31745e-f99f-4d6e-b1d5-aa591f89c20c, 83E631236A2B63DF756DDFD3729F0B2EAC058DF1) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Tue, 8 Oct 2024 00:07:49 +0200 Message-ID: <20241007220758.18974-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 6612128681624330978 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdeftddgtdeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepieffveeigeffudekfeeihfekgeefudelgedtudeugedvkeefiedtueelleevueffnecuffhomhgrihhnpehvrghrnhhishhhqdgtrggthhgvrdhorhhgnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefieekvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=VLCR6j8rH7F56bV8woahD30lYczCPd9UVy5Y3W8LrpI=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728338883; v=1; b=Vx2i9Q0YlMYFWwyQTphQvSTJW+piuodTn96V3uOzuJWkzg6tNBSqctz2VCZzVfruAGLP6h5h BcecImsiDHNv60S9r+/tf5yNP/b4Q4U/90ioJfm/dO8vAsW8TUd2IOlj0J/A6k6YgAHwfWw1LHZ Aa662/LNh6+Gx2gL7MQWXhzxaRlKi/F8CDjLIc1goQvxr27ebEu0DhbEXSyZO4iu6/vKJd4MEHs 5hfh2bhNQcg1oVYivygYQRYGjVbfDN+9oIqwej9V/pzjwSzDHPn1SjJOl+Ht1KTAL1i/Hppt5OI IpI39s+0sIr6eyU0n14XITLhLmAF8RZrDvTJBbtOJw7gQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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"