From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kFl+Ff1FEGfJYwEAqHPOHw:P1 (envelope-from ) for ; Wed, 16 Oct 2024 23:02:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id kFl+Ff1FEGfJYwEAqHPOHw (envelope-from ) for ; Thu, 17 Oct 2024 01:02:21 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=U1ZFjeaC; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=xNrlp7f0; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1729119741; a=rsa-sha256; cv=none; b=iCq43boWcxdVaiWozSWmpZsZyjJ8rlkts7lL75RfNymqJ8eU4OKd+2zdG4R5qMRv/b1HOO 0R9Wfdv6ze955PdWSgbTJHG3rOt+5dDnGeUS/rLA87qZ1ykbKqz6jdwEUqG76LrWnA3cdG R16L3TrLyxK6WcoXwbT6qtuGjn1CwnWgpPiS69Shcs/j3Qp2CLlfDryg44VuQM6rtWDHIw nYyX8WCN3Yk1lhSHZupAZYkUI7FutFuN0lStrm3egKWXTTd+L/QFyZSkwWsqmWFMmulR/5 Lp++JmZzXRd103SgZ4sidwjhSOe+c6JkAcPBFBLA4q0cLFI9xNGmFxcIxT+R6Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=U1ZFjeaC; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=xNrlp7f0; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1729119741; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=hXVMx8ojbhaCV/TUjUKulOoemeLsNW3MD7a9VT0Vzhs=; b=Np+EaxP9rTsKA+ypZfrsANe9M76ydiV030fyfRkEXQAmVEiNaV6Zz8ge+76jRi6yNpSE2J gfphLtNOhvp8sFQjvjJD/G3lXgPvUxSdIZrmhgXrZHFs4eWNegqm8rlT2PlhLf7OBqMPnX 7IM7E1/sGPNZHDBMK7rywtfVvl12xQl1XCj8HSGWsrhphtNbnEecrxZnecjvvVJ8i9jeoF nBfegCBAqSKmTMY5JuQpCGUaY1U/h007lV8P1Ssv8oaXXt22QFqY0Xe3A8/37W+s0/TIqR N8imwjhqu89ARj8S2MmAXSsxFih89iRfAM27eiJ3lQC+X+5gVPQDBvSFp7TVUg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E5D6E1FCF0 for ; Thu, 17 Oct 2024 01:02:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1D1Z-0000QF-7f; Wed, 16 Oct 2024 19:01:49 -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 1t1D1T-0000P8-1s for guix-patches@gnu.org; Wed, 16 Oct 2024 19:01:43 -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 1t1D1S-0003vp-1G for guix-patches@gnu.org; Wed, 16 Oct 2024 19:01:42 -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=hXVMx8ojbhaCV/TUjUKulOoemeLsNW3MD7a9VT0Vzhs=; b=U1ZFjeaCwj+cbjHZBtU0rKhvQ/B2RkX6ahuWIFOLqjRxBAV7HsnVoEcVCQoTpWYtF/dO07tcHT2lrG66QlYIvzi0wUMv2888H05UJlN24vOecW21VaIR7YiW8WGFfZnoeSMusc6B6Xa+nCdvtRASJKrC1PfLSvqHnLnUETQwfozlE5MsEIrdADB9WBouizH4rlMhBppoL79+pUeTCzhyFPDnlgOs4+M8ARFYrE7g7i+NuIiYdl4heWkeKU2wjdesK0Y4WPMrwnm1lZnPsUvNycqTLk6VsCKAKmEx+f+qnL/7APTlMfV1vH2HZNZS2hPTYyjHtsehbLDJTkVm17DkGw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t1D1m-0002C2-3D for guix-patches@gnu.org; Wed, 16 Oct 2024 19:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v3 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: Wed, 16 Oct 2024 23:02: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.17291196768330 (code B ref 73682); Wed, 16 Oct 2024 23:02:02 +0000 Received: (at 73682) by debbugs.gnu.org; 16 Oct 2024 23:01:16 +0000 Received: from localhost ([127.0.0.1]:60828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1D12-0002AI-Fh for submit@debbugs.gnu.org; Wed, 16 Oct 2024 19:01:16 -0400 Received: from 3.mo576.mail-out.ovh.net ([188.165.52.203]:53681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1D0v-00029i-Mc for 73682@debbugs.gnu.org; Wed, 16 Oct 2024 19:01:13 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.176.37]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4XTRJv4jk2z1qg2 for <73682@debbugs.gnu.org>; Wed, 16 Oct 2024 23:00:47 +0000 (UTC) Received: from ghost-submission-55b549bf7b-qvnxd (unknown [10.110.188.135]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 6A5C61FE5E; Wed, 16 Oct 2024 23:00:47 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-55b549bf7b-qvnxd with ESMTPSA id JPSWE59FEGdKMgIAhbMICA (envelope-from ); Wed, 16 Oct 2024 23:00:47 +0000 X-OVh-ClientIp: 90.110.172.34 Date: Thu, 17 Oct 2024 01:00:40 +0200 Message-ID: <20241016230045.1878-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5016728510372831970 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehtddgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepieffveeigeffudekfeeihfekgeefudelgedtudeugedvkeefiedtueelleevueffnecuffhomhgrihhnpehvrghrnhhishhhqdgtrggthhgvrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefieekvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=hXVMx8ojbhaCV/TUjUKulOoemeLsNW3MD7a9VT0Vzhs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729119647; v=1; b=xNrlp7f0km6p49UXLevIGezWgEF7jiTFVUXC60ZFEd309Yb3gw78WxoJcgkTNEPZpwmg1GcD tqrwDSTZWpOA2JaP3oTPOVRAkgduiq+a4FEghSKP4ZbkT9n60vQu5HIitzDVB0tKt10BZScUMEC TxSDij/+6ZONcwiqTKg/JtSlKS74tMUbHhkXww8ymlrk3ayJE5JRLARgsNm3hU4JnsC2TOIsgfm djiJXlN8cflUkmybEtpG9IhpGUsDy7IBt8F7Md+S2da/bCgNki7PLG5AgLRM3M36JzwSedioJhw 74fEzbhVAhpitGFnp9EC1tw15ynizZit1J9U+RbVbcmDQ== 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.98 X-Spam-Score: 0.98 X-Migadu-Queue-Id: E5D6E1FCF0 X-Migadu-Scanner: mx12.migadu.com X-TUID: 7/Xwq5t/Y2WT 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