From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id uJzHAU/JDmcOsAAA62LTzQ:P1 (envelope-from ) for ; Tue, 15 Oct 2024 19:58:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id uJzHAU/JDmcOsAAA62LTzQ (envelope-from ) for ; Tue, 15 Oct 2024 21:58:07 +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=g+sbc1NF; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=kUURmO1u; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1729022286; 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=UqaChuxabmkjuJoKxckZ0n7P0OIU0wTfnv3vfJJso2BCvZYRTisSSN+ZEllnj2pWfY6lfW xYzuYA/rnuAirfAM4gEFMA+ott2o73d6vwlIOLkYSNg0LsDpxwC1fUbF5uQxGTMGMUBX1i vl2GAVteeu7n8ApmCzyxqgkYy1oYsyDdL3D6VHMBpkGfJDxpDoigTMOS/3sLIyttiAt5zC 6SdTnwnT3mV3iFvU52fS0oh7iLV/pZHAACXxSmTBOVsAi8PON+PuJm1HGLUUKo4oQHnAnP euUgv/jvAJmMdiO7CYqTecYqv9pzlMsq0WOZjjW2gZKuvMtOYtbg5d8PvlOSiA== 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=g+sbc1NF; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=kUURmO1u; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1729022286; a=rsa-sha256; cv=none; b=UwrUhg8RXBL85uTIvhr6zm7Og3eujLQeyoIHcc96W+ooDoMZLmiQjf/qfqyOtGcKUkHBly RhUK7uAzdwX81qjjQwUG4OElQQIuxK5d1PhAYhTIpMuYfj7yTLogGDHMp+FZJfMNGTBT8H iM+dlIGtkvBPHnOBlM9+HzqsiLkuz6R2tWppMMDLre+a+u9MuEqJZLwF9x9ZJ4k/sKLNOU qE8AaoMkWUC/orGCx3e40kX6+ctQBvyFjVY882XK4evbhtW6FYXLykMfn09vvsJhuvAdns sku8q96TIC89bLKf7EFWxgWNYf3Xt3HD4kGuqnovlpdtMVbTvYTqmC+yuv5zzA== 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 328CC8A2BE for ; Tue, 15 Oct 2024 21:58:05 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0nfw-0003ZM-14; Tue, 15 Oct 2024 15:57:48 -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 1t0nfs-0003Vr-V1 for guix-patches@gnu.org; Tue, 15 Oct 2024 15:57:45 -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 1t0nfs-0005yL-Mr for guix-patches@gnu.org; Tue, 15 Oct 2024 15:57:44 -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=g+sbc1NFHumcyBNVMJDz8eGcWD6oOqwCD2Wv+8cLjXkawLsr8SYRNJV+lKCV1IJWUKdDyctxgLC1QufyQLMvsa/Uv/wXOIV83xsYWTeGDgFnjsAzcT83r0t8+sm848PSOOrr8BJMSq1LR5b1oMH3Gs1v/cU7nwQqvGSv8awYNHgBRZf/RB5/xFezC066MKIbXc+/wTnTwU1SXMlSuVb86KVAN7FsZxz+is/z0SBp6FR/x/p+MdH4eCYMjhmDeTiiExhDyzWoU7cW1zGN31+bH7jpFS4gxo4gqeWxiavO6eqlfU4TechbfP4+l/fW2Kq5+91AxiKTD7+nmL08AtVJwQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t0ngB-0006o5-1d for guix-patches@gnu.org; Tue, 15 Oct 2024 15:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v2 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: Tue, 15 Oct 2024 19:58:03 +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.172902222726020 (code B ref 73682); Tue, 15 Oct 2024 19:58:03 +0000 Received: (at 73682) by debbugs.gnu.org; 15 Oct 2024 19:57:07 +0000 Received: from localhost ([127.0.0.1]:57597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0nfG-0006la-MO for submit@debbugs.gnu.org; Tue, 15 Oct 2024 15:57:07 -0400 Received: from 1.mo575.mail-out.ovh.net ([46.105.41.146]:49551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0nfC-0006kn-NA for 73682@debbugs.gnu.org; Tue, 15 Oct 2024 15:57:05 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.140.55]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4XSlGy3yTQz1lWk for <73682@debbugs.gnu.org>; Tue, 15 Oct 2024 19:56:42 +0000 (UTC) Received: from ghost-submission-55b549bf7b-s9ddx (unknown [10.110.96.9]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BCAA21FDD5; Tue, 15 Oct 2024 19:56:41 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-55b549bf7b-s9ddx with ESMTPSA id 2pdhN/jIDmdTQwgAMpt5hg (envelope-from ); Tue, 15 Oct 2024 19:56:41 +0000 X-OVh-ClientIp: 86.246.19.221 Date: Tue, 15 Oct 2024 21:56:25 +0200 Message-ID: <20241015195634.6829-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14481887551943729890 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdegjedgudegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeiffevieegffdukeefiefhkeegfeduleegtdduueegvdekfeeitdeuleelveeuffenucffohhmrghinhepvhgrrhhnihhshhdqtggrtghhvgdrohhrghenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeeikedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=hXVMx8ojbhaCV/TUjUKulOoemeLsNW3MD7a9VT0Vzhs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729022202; v=1; b=kUURmO1u0wf0Ilez4w3IWUM0gOg1p3gfeqYP2rgdLNeUl7Teuu7DaOYNx9OmlBAA9VCCr5Zl WEq9MwLfD057/tOOT4CkQRuMt7RlU7n59na6IyWxLm3LjbQKvOgl11sQm8HUhuN3Pt3dGRnm+fl Ea7KlDbjk2bFvpXtxUoBNYBDZzvUc0Rz40YG/7vD8EQqiT+Jh4jQAmJ/Ol3b3wOnBzgv575YlmG eerOQ3teO1IGUZcMBhNJVk4Jgn1Lx0i4VxO8h5A2gUOGyZnR2k5MaUntyYo9cF+T2/I4YcoSxPY TmoCpHjqZZl0wRP/W4J1sx8LbFq//G0PpEb8AGFqxdVkQ== 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 0.48 X-Spam-Score: 0.48 X-Migadu-Queue-Id: 328CC8A2BE X-TUID: yAVgp2Ketdd0 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