From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH 0/3] gnu: varnish: Update to 7.6.0. [security fixes] Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 21:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73682@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172833813328669 (code B ref -1); Mon, 07 Oct 2024 21:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Oct 2024 21:55:33 +0000 Received: from localhost ([127.0.0.1]:49153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxvhV-0007SJ-G0 for submit@debbugs.gnu.org; Mon, 07 Oct 2024 17:55:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:50424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxvhT-0007SB-NR for submit@debbugs.gnu.org; Mon, 07 Oct 2024 17:55:32 -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 1sxvhK-0008Iy-7I for guix-patches@gnu.org; Mon, 07 Oct 2024 17:55:22 -0400 Received: from 1.mo584.mail-out.ovh.net ([178.33.248.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxvhI-0006IJ-Ck for guix-patches@gnu.org; Mon, 07 Oct 2024 17:55:21 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.176.32]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4XMtHT3981z1JXF for ; Mon, 7 Oct 2024 21:55:17 +0000 (UTC) Received: from ghost-submission-55b549bf7b-gg5fb (unknown [10.110.164.11]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E1C7C1FDBB; Mon, 7 Oct 2024 21:55:16 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-55b549bf7b-gg5fb with ESMTPSA id V2WJKcRYBGeRQQAAXSYGQA (envelope-from ); Mon, 07 Oct 2024 21:55:16 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G002fd5f0486-a20c-4dca-8e42-59fece4642ad, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves Date: Mon, 7 Oct 2024 23:54:31 +0200 Message-ID: <20241007215513.11989-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 6396518846369293026 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdeftddgtdegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=Z7rXRqJJ7p0li2avBL4vyn1iPIloyzSchIjR7uSCOtQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728338117; v=1; b=vqhh7Kp0szPrqSCR9cWuH3MFD8ymJQpyzn1GEjKD2zkEWdYQhBf8xebalsC+ocKQiKBUENgM k8JQYTIg7SN/cX734itTnkRtc01P4a81EM5x3TWN/6hfCvh/OMyNgWJlTCRiM0PRQZpYIMFP4Vr aZAIkQRMsYvLDtwP2V4lxNkDnV/shH1XZ0kShiV83FEclDN/oXI3Z+3ulMqelU7exIAz+SDRTty N5Hbh1fclk9tFW1RvQPP8jcVU1R/0ulojjRHPqqFMo0whGKkFfKzpGS+VDZIt7qzKZtmJBqP01f +f7hbd8gBJHgx7zAAAT2rs2n1AgsLg39QCWw+IJe8A2LQ== Received-SPF: pass client-ip=178.33.248.196; envelope-from=ngraves@ngraves.fr; helo=1.mo584.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 From unknown Sun Jun 22 11:47:40 2025 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 From: Nicolas Graves 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH 2/3] gnu: varnish-modules: Update to 0.25.0. 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, 08 Oct 2024 06:23: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.17283685223281 (code B ref 73682); Tue, 08 Oct 2024 06:23:02 +0000 Received: (at 73682) by debbugs.gnu.org; 8 Oct 2024 06:22:02 +0000 Received: from localhost ([127.0.0.1]:50381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy3be-0000qg-9r for submit@debbugs.gnu.org; Tue, 08 Oct 2024 02:22:02 -0400 Received: from 15.mo584.mail-out.ovh.net ([91.121.62.11]:42421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy3bc-0000qQ-GS for 73682@debbugs.gnu.org; Tue, 08 Oct 2024 02:22:01 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.176.72]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4XN5Wy3wMHz1PbN for <73682@debbugs.gnu.org>; Tue, 8 Oct 2024 06:21:50 +0000 (UTC) Received: from ghost-submission-55b549bf7b-ht4wk (unknown [10.111.182.10]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 128151FE2E; Tue, 8 Oct 2024 06:21:49 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-55b549bf7b-ht4wk with ESMTPSA id T4UHGX3PBGeKAAAA8Qu5dQ (envelope-from ); Tue, 08 Oct 2024 06:21:49 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G006366ee4c3-3810-4b01-8ac9-983f58006a44, 83E631236A2B63DF756DDFD3729F0B2EAC058DF1) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves Date: Tue, 8 Oct 2024 08:21:40 +0200 Message-ID: <20241008062144.22558-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14951387813090484962 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdeftddguddtkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeetfeefhfffhfejveeluedvhefggfevkeehuefhkefhheeugfehffehudfggeelieenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrddutdehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeeikedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=TFWnM94gX7VsugCJgd7FufwiPXsxHiSkwpEPueM2030=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728368510; v=1; b=Xz7Y++w9Zjz1rk8CKYXZan9ERn/OIywz1a8sKs1SAQvC1Frk+ysO+MxkoW2Cw82rC//eeFy5 /BdXZYc+kCk17gY2biuinrglF0lQdPM8aViQOdxmOyJ6CjRHy/paDoJllQPUHCy3TxBUQqAuQ/q +UpxHs2kVLoTzCo6O3z/M7Zb9o0ukwNjo6nRW9cDeJbwp/AS9z5tvlmlILQwjMat/x0qtU5t+Pm osLsOJ10+RP5kP++y/JsGV1cIlVx1hmGQjrCY4WisOxbgDKGuPJYX7QL2gPaVoIF5X6oPTNY6iH 2mC7zkByXRqoDxE1Aa9APUI0Tnol/2P2f6rnUzptgTc6g== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH 3/3] gnu: varnish: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Oct 2024 06:23: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.17283685323306 (code B ref 73682); Tue, 08 Oct 2024 06:23:03 +0000 Received: (at 73682) by debbugs.gnu.org; 8 Oct 2024 06:22:12 +0000 Received: from localhost ([127.0.0.1]:50383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy3bj-0000rB-LI for submit@debbugs.gnu.org; Tue, 08 Oct 2024 02:22:12 -0400 Received: from 14.mo584.mail-out.ovh.net ([46.105.40.29]:57819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy3be-0000qT-0w for 73682@debbugs.gnu.org; Tue, 08 Oct 2024 02:22:06 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.17.245]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4XN5X02kpLz197Z for <73682@debbugs.gnu.org>; Tue, 8 Oct 2024 06:21:52 +0000 (UTC) Received: from ghost-submission-55b549bf7b-65s68 (unknown [10.110.96.132]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B1A431FD24; Tue, 8 Oct 2024 06:21:51 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-55b549bf7b-65s68 with ESMTPSA id KwnXHn/PBGe+OgAAObLSPQ (envelope-from ); Tue, 08 Oct 2024 06:21:51 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S00173abaf29-be38-4fac-894f-69845b9e4722, 83E631236A2B63DF756DDFD3729F0B2EAC058DF1) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves Date: Tue, 8 Oct 2024 08:21:41 +0200 Message-ID: <20241008062144.22558-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241008062144.22558-2-ngraves@ngraves.fr> References: <20241008062144.22558-2-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14951950766882415330 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdeftddguddtkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefieekvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=D+PhA+631rgUNDNFEexPO0Nyg24k7e7TAlpANxpgfs0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728368512; v=1; b=TlFpiean8zsF5vngF2+3GaF9VEnROMKCt4zmRlFcNkv2totqFDhnypL/f7pHjt7+DD6q/UnO stR44HGDibvogEQMqFihZCBxhg95UTxhkPPJ4EXxQaIR6nhtnK5q4RuePoQaDf9ORpfk21OmkBA PLR4khpUJ0vCx53scTOTt6InT7N9HG7uZTwWc4e+rkZ80/cgMs16EHAJa7QaFpqg0FZBYrxEZbq 2dP+JImeiSpxbabUTxK25mmIcoxUGM14ajsRTj7l0QmVF2mXTCMUD4VwEkmdtZ/jCj3BF6MGWfS dOu/h1xYKq6IplsDxumEAX+sKGrDnU9oIThDndXqB80Fw== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH 3/3] gnu: varnish: Improve style. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Oct 2024 16:27: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: Nicolas Graves Cc: 73682@debbugs.gnu.org Received: via spool by 73682-submit@debbugs.gnu.org id=B73682.172900959216273 (code B ref 73682); Tue, 15 Oct 2024 16:27:02 +0000 Received: (at 73682) by debbugs.gnu.org; 15 Oct 2024 16:26:32 +0000 Received: from localhost ([127.0.0.1]:56667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0kNQ-0004EJ-1D for submit@debbugs.gnu.org; Tue, 15 Oct 2024 12:26:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0kNK-0004E1-Pu for 73682@debbugs.gnu.org; Tue, 15 Oct 2024 12:26:26 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0kMv-0006SE-K3; Tue, 15 Oct 2024 12:25:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=XDVNxOuMvEQCLXtfIDRmx/Kfas+ofpPbowUK2vWyUNk=; b=fNMIrH1Gz+Klu14qfjLE jryT59lnzcqoXlxsgHwQ8W3q14SR/zjqQxHVQ74R9SAW9TJEH8iuUQIROQfpSGvDBuH0aRtaXPvh6 HAEqeov3TJE/RXcKkBdRhwQEim5mELe2xNp3gaMddIsQJmqKri2wUDI+DC4seBopLwfa9kZ11YiBx FOAQTuI+jriOxXG8/eZ5HCkUcJ8VpWcRnTVVPABD+4Kv8/WvWneWY07JyFu+EwgF1PV8tjI/11K3u ujnDb+19ZJ51PJR9z72nUzM4TFwKTESnAraSvUfG7sshJxP82XouWiK/mhaL+NrwKkz6Jy5/kqOAS mZBo0VpqZoxxSw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <20241008062144.22558-3-ngraves@ngraves.fr> (Nicolas Graves's message of "Tue, 8 Oct 2024 08:21:41 +0200") References: <20241008062144.22558-2-ngraves@ngraves.fr> <20241008062144.22558-3-ngraves@ngraves.fr> Date: Tue, 15 Oct 2024 18:25:55 +0200 Message-ID: <875xptwcx8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Nicolas Graves 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 require= d GCC > + ;; environment variables to avoid propagating them to profi= les. > + (lambda _ > + (wrap-program (string-append #$output "/sbin/varnishd") > ;; Add binutils to PATH so gcc finds the 'as' executabl= e. > - `("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=E2=80=99ll never want to cross-compile Varnish (sounds reasonable to me), use: (dirname (search-input-file inputs "/lib/libc.so")) and do *not* add =E2=80=98glibc=E2=80=99 as an input, as this effectively a= dds a dependency on a second glibc. Ludo=E2=80=99. From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v2 2/3] gnu: varnish-modules: Update to 0.25.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Oct 2024 19:58: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.172902222626012 (code B ref 73682); Tue, 15 Oct 2024 19:58:02 +0000 Received: (at 73682) by debbugs.gnu.org; 15 Oct 2024 19:57:06 +0000 Received: from localhost ([127.0.0.1]:57595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0nfG-0006lS-4n for submit@debbugs.gnu.org; Tue, 15 Oct 2024 15:57:06 -0400 Received: from 1.mo581.mail-out.ovh.net ([178.33.45.51]:33739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0nfD-0006l6-GQ for 73682@debbugs.gnu.org; Tue, 15 Oct 2024 15:57:04 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.2.55]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4XSlGz2Zd4z1GHW for <73682@debbugs.gnu.org>; Tue, 15 Oct 2024 19:56:43 +0000 (UTC) Received: from ghost-submission-55b549bf7b-s5xgx (unknown [10.110.101.71]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id EAC141FDAC; Tue, 15 Oct 2024 19:56:42 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-55b549bf7b-s5xgx with ESMTPSA id k33gHvrIDmf9yAEAFEoEuw (envelope-from ); Tue, 15 Oct 2024 19:56:42 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R0021120e8b0-57f6-426b-b135-63e40ed5c047, CF2AE4A0E363BA58B1F3D86A566A74E0B801644F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves Date: Tue, 15 Oct 2024 21:56:26 +0200 Message-ID: <20241015195634.6829-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241015195634.6829-1-ngraves@ngraves.fr> References: <20241015195634.6829-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14482169029455766242 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdegjedgudegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefieekvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=E3EQDoXAZGkjSlz5QzDJiGRrNTW+3y2Gh/pcvCjp5WQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729022203; v=1; b=VpVwQIvKI3o28uW88OGEIFhlFHVvdqeYgJxbWcGUEStDvhuI6pHzIBCyBGjnkGSzQnUU5RmJ WPwEFL4tK5hMYP2PurKAQ34bmPCz6rqgT2+Jmn61qH9CLfHnXRZ0GZv6ec1IHcFpb7X37RMJ3K5 S1UkLKK127LxUDM1lA1QYZ4q9hRCJn29aLntlUf5ef3yrqnxYBXksRG94TxFGOY5SAji727R0tu 2lxDEeTMTl4CH91q5bFYQaWSU5chtqREuMFOjCIDs6MfmLzTdNjHTBoOUXsH3UrHPRnmg60V17Q eYyN9HOnwJr8hvy/9WE1J2t47UhJOCLvLaqahkMLD0zDA== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Sun Jun 22 11:47:40 2025 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 Authentication-Results: garm.ovh; auth=pass (GARM-96R0018c1ef3c9-4571-4b19-ad7e-8531ffa36275, CF2AE4A0E363BA58B1F3D86A566A74E0B801644F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v2 3/3] gnu: varnish: Improve style. 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.172902223526054 (code B ref 73682); Tue, 15 Oct 2024 19:58:03 +0000 Received: (at 73682) by debbugs.gnu.org; 15 Oct 2024 19:57:15 +0000 Received: from localhost ([127.0.0.1]:57599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0nfL-0006ly-3n for submit@debbugs.gnu.org; Tue, 15 Oct 2024 15:57:15 -0400 Received: from 12.mo550.mail-out.ovh.net ([87.98.162.229]:45777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0nfE-0006lA-PY for 73682@debbugs.gnu.org; Tue, 15 Oct 2024 15:57:09 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.25.35]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4XSlH042sqz1RH4 for <73682@debbugs.gnu.org>; Tue, 15 Oct 2024 19:56:44 +0000 (UTC) Received: from ghost-submission-55b549bf7b-5bnnl (unknown [10.111.174.132]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 23B791FD1C; Tue, 15 Oct 2024 19:56:43 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-55b549bf7b-5bnnl with ESMTPSA id V0ZFKvvIDmcbGAMAIAE+RQ (envelope-from ); Tue, 15 Oct 2024 19:56:43 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G002b9a0aa0e-df0f-4edc-9cfe-3a928ee86117, CF2AE4A0E363BA58B1F3D86A566A74E0B801644F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves Date: Tue, 15 Oct 2024 21:56:27 +0200 Message-ID: <20241015195634.6829-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241015195634.6829-1-ngraves@ngraves.fr> References: <20241015195634.6829-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14482450505804538594 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdegjedgudegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeeikedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=WiDK4UQb7COIaDu9pd6XRxd7olLT88sP3z+KIodRdKY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729022204; v=1; b=arYthiJODW6XrFP4ez2WWI/TuW/rrTDXFS13EzD8Ytth1idiWlNX7C5t+S8eakuKRCCSuXZI pXGGT+PUj1817+bPTMU/w8pLlO1AtxZ7qC6u0WjqvY+ufQdlIoPMKP9OHJUuVL++nQVNtpbvpZM JNoDUUgGta16j1jGFjXSE+cIaeP5NmjQ0hAX8IgI+zBsH737OAoVL4lwlmSXJMVGzCwifyoSPnu vgbiVGoc+S08wYgqeBvQYMH4m266SPYlOPLWMa/xuGaEWwSQl67akaKZ5L6vnh37GqltlK1qs5y Kw51mtUP8rPL1C5kNSw597pTrOKmeHSMgim26rKeM7D/A== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v3 2/3] gnu: varnish-modules: Update to 0.25.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Oct 2024 23:02:01 +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.17291196748315 (code B ref 73682); Wed, 16 Oct 2024 23:02:01 +0000 Received: (at 73682) by debbugs.gnu.org; 16 Oct 2024 23:01:14 +0000 Received: from localhost ([127.0.0.1]:60826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1D10-0002A3-12 for submit@debbugs.gnu.org; Wed, 16 Oct 2024 19:01:14 -0400 Received: from 13.mo581.mail-out.ovh.net ([87.98.150.175]:42595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1D0x-00029m-2C for 73682@debbugs.gnu.org; Wed, 16 Oct 2024 19:01:12 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.126]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4XTRJx1Tmrz1GFj for <73682@debbugs.gnu.org>; Wed, 16 Oct 2024 23:00:48 +0000 (UTC) Received: from ghost-submission-55b549bf7b-9mjq6 (unknown [10.111.182.7]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 96C0F1FDAC; Wed, 16 Oct 2024 23:00:48 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-55b549bf7b-9mjq6 with ESMTPSA id AAXzCqBFEGf4vQ0Au3bGdQ (envelope-from ); Wed, 16 Oct 2024 23:00:48 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G0052e568dff-2d7b-44a8-b5b0-60fa47f45c17, 73C839D51F9C708623F95E2DCAB32052372F5FAF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves Date: Thu, 17 Oct 2024 01:00:41 +0200 Message-ID: <20241016230045.1878-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241016230045.1878-1-ngraves@ngraves.fr> References: <20241016230045.1878-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5017009988001260258 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehtddgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdduuddtrddujedvrdefgedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefieekvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=E3EQDoXAZGkjSlz5QzDJiGRrNTW+3y2Gh/pcvCjp5WQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729119649; v=1; b=sp18AHOtJf1ixuURM/IuvSi9Ko5j7OXMfUBePGNwJxSBPfvGcBQmIU46APChJl6VJOEdAj3k 4ZQaXFwmXWfn40/tUZ6Lcp66pCACF4mK/jDI4dGvKpktnW2rdHfEGgxBRBfi9OqOgu0iZu76mot 5ZupurYh6q3hJo4jEjv9V920Uv79jQpy4HcvOv7g5p1/uHIHnFnZ7ynE9y1B+dckE/IrbIzp2JK e7ZojANAW7F3oud977Cp9Lvz9kJQIGTPT/x8W7JtBERMtsM1Ulwdd+0T9MEscGZudzo9aPhURgq vrF2Lv4T4q9lbZWbo/ho1hGZpdzEzdkIPG27OodcmzV2Q== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Sun Jun 22 11:47:40 2025 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 Authentication-Results: garm.ovh; auth=pass (GARM-96R00137cfcb02-825b-4bcd-a537-d1f00d5339e3, 73C839D51F9C708623F95E2DCAB32052372F5FAF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v3 3/3] gnu: varnish: Improve style. 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.17291196838345 (code B ref 73682); Wed, 16 Oct 2024 23:02:02 +0000 Received: (at 73682) by debbugs.gnu.org; 16 Oct 2024 23:01:23 +0000 Received: from localhost ([127.0.0.1]:60830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1D14-0002AR-TB for submit@debbugs.gnu.org; Wed, 16 Oct 2024 19:01:23 -0400 Received: from 15.mo583.mail-out.ovh.net ([178.33.107.29]:43601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1D0x-00029o-J5 for 73682@debbugs.gnu.org; Wed, 16 Oct 2024 19:01:16 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.2.251]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XTRJy02Qfz1J4p for <73682@debbugs.gnu.org>; Wed, 16 Oct 2024 23:00:49 +0000 (UTC) Received: from ghost-submission-55b549bf7b-jp7j2 (unknown [10.110.96.50]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A50441FE45; Wed, 16 Oct 2024 23:00:49 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-55b549bf7b-jp7j2 with ESMTPSA id T/zXEaFFEGc3KAAAgeqroA (envelope-from ); Wed, 16 Oct 2024 23:00:49 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G00534d88a1e-2eb8-4edf-9c75-28f4138476ae, 73C839D51F9C708623F95E2DCAB32052372F5FAF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves Date: Thu, 17 Oct 2024 01:00:42 +0200 Message-ID: <20241016230045.1878-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241016230045.1878-1-ngraves@ngraves.fr> References: <20241016230045.1878-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5017291461153579746 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehtddgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeeikedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=z6URux1MzL3pvljitZ/LKX6aoBNqNWANHEoxu9ULDSs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729119650; v=1; b=navjYuHwBn8qonERp+7rzJRtH+GxQVqgKubaS7rEVl003QWLNEsC+2HeX4HnpucrcsYsvefK jCtRhayHCih8GZhGCbJO4HTZz+3F2fk6zAJqqKzMNvw5aSGmtAZmTiQPAdFMNlo2sdgekU7q9Lm z7xdxMNaS+qf92ejzDl4USYw5XYY3I7JS/l0Xl25axxEQApxm657OOyBe9f4FEpbqaax7hE8x2l ZDA9rWFBEG/rnG4qeH26lY1xkhf0m+m8mg1Ersoq4H6ufK9cRGAwP8FpYUKAn7oyHlieVWIhB5J aQUsRXfKsmIavIU4VnzZqp0j2O+FURRalEulaLccJccug== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v4 1/4] 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: Thu, 17 Oct 2024 04:31: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.17291394381334 (code B ref 73682); Thu, 17 Oct 2024 04:31:02 +0000 Received: (at 73682) by debbugs.gnu.org; 17 Oct 2024 04:30:38 +0000 Received: from localhost ([127.0.0.1]:32965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9l-0000KQ-0x for submit@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:38 -0400 Received: from 10.mo561.mail-out.ovh.net ([87.98.165.232]:50871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9g-0000Gg-HF for 73682@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:35 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.109.176.118]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4XTZcx4fBzz1R6n for <73682@debbugs.gnu.org>; Thu, 17 Oct 2024 04:30:09 +0000 (UTC) Received: from ghost-submission-55b549bf7b-fp976 (unknown [10.110.113.153]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 515A51FD3D; Thu, 17 Oct 2024 04:30:08 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-55b549bf7b-fp976 with ESMTPSA id vVCaLNCSEGcFagQAhv1Hng (envelope-from ); Thu, 17 Oct 2024 04:30:08 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G003f729f0f7-43f2-4def-813d-18b906d02d53, 73C839D51F9C708623F95E2DCAB32052372F5FAF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves Date: Thu, 17 Oct 2024 06:29:57 +0200 Message-ID: <20241017043006.4836-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 10579237000300454626 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehtddgkeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepieffveeigeffudekfeeihfekgeefudelgedtudeugedvkeefiedtueelleevueffnecuffhomhgrihhnpehvrghrnhhishhhqdgtrggthhgvrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefieekvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=hXVMx8ojbhaCV/TUjUKulOoemeLsNW3MD7a9VT0Vzhs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729139409; v=1; b=phc1hFwfVVdsr0i4nPTVBBXWOIOQloheMG6yhbLEljZasrF9Rs2ZL2+OCndhLlX2yBhjwrZX VpZ6GZDIU4EMTHdDSmdWNiasfyjVyBWyGS4Jf1EjlpmmDrNb5BRkWhz1MpPgt0NeYCP/mk/hjvJ +7o0YsDbvxtwzf6iixDvT8bcKIzH0CbFy/grZCWO95EyXH1GgkzDQkHlkkPTNXN8AnLaUHblyrO Z7R5yGm0WNBEHDL9BA6jDkwBWnVoRCIdkRChgkqiGJ1t2z1CsHaahBLN6BOE8xt1bh/E7YaWsD/ WXfDNAoUWaR6/RNL2I4kgdTsGQ2Kx8OfZZPtCbl2kQ8Qg== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v4 3/4] gnu: varnish-modules: Update to 0.25.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Oct 2024 04:31: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.17291394411441 (code B ref 73682); Thu, 17 Oct 2024 04:31:02 +0000 Received: (at 73682) by debbugs.gnu.org; 17 Oct 2024 04:30:41 +0000 Received: from localhost ([127.0.0.1]:32968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9o-0000NA-Ox for submit@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:41 -0400 Received: from 6.mo584.mail-out.ovh.net ([188.165.36.253]:57145) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9h-0000HC-KF for 73682@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:36 -0400 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.148.103]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4XTZcz5QB9z1D5w for <73682@debbugs.gnu.org>; Thu, 17 Oct 2024 04:30:11 +0000 (UTC) Received: from ghost-submission-55b549bf7b-4pw7g (unknown [10.110.188.251]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5D9A91FD6B; Thu, 17 Oct 2024 04:30:11 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-55b549bf7b-4pw7g with ESMTPSA id JtbQD9OSEGeyKwAANZsXoQ (envelope-from ); Thu, 17 Oct 2024 04:30:11 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R006f4d619a9-4413-452b-af60-9f82c8815df9, 73C839D51F9C708623F95E2DCAB32052372F5FAF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves Date: Thu, 17 Oct 2024 06:29:59 +0200 Message-ID: <20241017043006.4836-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241017043006.4836-1-ngraves@ngraves.fr> References: <20241017043006.4836-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 10579799950573691618 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehtddgkeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdduuddtrddujedvrdefgedpfeejrdehledrudegvddruddtieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefieekvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=JX/Jni8sAW6pP5LWtpT8U9uZTPf9eXUfZEEFgFjU08c=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729139411; v=1; b=HnjvEqW2D0zwMhWi2noqIuB4IQGPQKVwu/4mjhJZqJbrifKvliIilv7rHbg/MvcTANIl4JrM QN7oiCIfgBiFydlTCsoRRrC2yKEQvElbRM6ddAtOFKX4ic3OwE9GriCdGEQZ+74YY8QrQd8zdKu 9GYmMF8CvmVKumswf+0B30Op4GtQ9oSptZYZ7LfnkPp27q29iQVxl3yaPbRV49foUJHCJUX0gL/ aJ9hZWNnChwG2AZ4H7alia5dgAeghv24jXLOVxzb+Ik0FWTEdRHYg9WWJIbaYQ8J1YmxKvy0zv4 v+pfjbO+OpO9x8vg5w0ZX5a/T1/L7oul6YRG9bbSzfBWQ== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v4 2/4] gnu: varnish: Restrain build to x86-64-linux. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Oct 2024 04:31: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.17291394411453 (code B ref 73682); Thu, 17 Oct 2024 04:31:03 +0000 Received: (at 73682) by debbugs.gnu.org; 17 Oct 2024 04:30:41 +0000 Received: from localhost ([127.0.0.1]:32970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9p-0000NC-2z for submit@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:41 -0400 Received: from 19.mo550.mail-out.ovh.net ([178.32.97.206]:57707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9h-0000Gm-AV for 73682@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:37 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.148.103]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4XTZcy5dtyz1VLJ for <73682@debbugs.gnu.org>; Thu, 17 Oct 2024 04:30:10 +0000 (UTC) Received: from ghost-submission-55b549bf7b-4cxg6 (unknown [10.110.188.251]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 611C61FDBB; Thu, 17 Oct 2024 04:30:10 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-55b549bf7b-4cxg6 with ESMTPSA id IpOnCdKSEGcBQA8AOQETzQ (envelope-from ); Thu, 17 Oct 2024 04:30:10 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S00217d8e8df-510e-4646-8cd4-c94374ca6ace, 73C839D51F9C708623F95E2DCAB32052372F5FAF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves Date: Thu, 17 Oct 2024 06:29:58 +0200 Message-ID: <20241017043006.4836-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241017043006.4836-1-ngraves@ngraves.fr> References: <20241017043006.4836-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 10579518475217658594 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehtddgkeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfeettdetudevkeffgfehffejhfefudeuhfefudetieeuheeijeffgfdvgedvvdevnecuffhomhgrihhnpehvrghrnhhishhhqdgtrggthhgvrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeeikedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=boi1IixJtoWaMLgf7avigIfE1WsRAipTEde3hxWjPRM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729139410; v=1; b=vm0sau1FkMLj4Xjbwa6fwLyYBhMciAjypWBsYFuvDuHi0vxb1Hnr3OnF++c0bwwL3dKlyGSz pJdv+sBbhhaOzu1hS6XSdILt0tQsdz93cnfJxE062iV3qM2b+kEIn1HmV18Fz6dCGuT6mwD52/7 8gACcdI4DjPcT0gLKv4BCZfT8Sm40ydvp2W6q4756LssalWjFhqroYEIph9lr70VQY3y4Ao52tM DiV3Wr5WGF2nOXZHRTc386Rg3/59Fx6gAxfizMhgziAv/z1Pt+MoVMb/KcZumNKCRLxCLYiQtu6 5mJtNhEgjtk8jK88gCrsa+nYg5dKyWeevPStTq1pgtWyg== X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * 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 From unknown Sun Jun 22 11:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v4 4/4] gnu: varnish: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Oct 2024 04:31: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.17291394501471 (code B ref 73682); Thu, 17 Oct 2024 04:31:03 +0000 Received: (at 73682) by debbugs.gnu.org; 17 Oct 2024 04:30:50 +0000 Received: from localhost ([127.0.0.1]:32972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9u-0000Nb-JY for submit@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:50 -0400 Received: from 10.mo576.mail-out.ovh.net ([46.105.73.241]:55497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9j-0000I5-6B for 73682@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:41 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.140.75]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4XTZd05WV4z1hT9 for <73682@debbugs.gnu.org>; Thu, 17 Oct 2024 04:30:12 +0000 (UTC) Received: from ghost-submission-55b549bf7b-jm7lf (unknown [10.110.118.109]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4D1321FDAE; Thu, 17 Oct 2024 04:30:12 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-55b549bf7b-jm7lf with ESMTPSA id GX92BNSSEGfeOwwAIE+McA (envelope-from ); Thu, 17 Oct 2024 04:30:12 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S00164f9365d-d20f-423d-802f-be070d03b86b, 73C839D51F9C708623F95E2DCAB32052372F5FAF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves Date: Thu, 17 Oct 2024 06:30:00 +0200 Message-ID: <20241017043006.4836-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241017043006.4836-1-ngraves@ngraves.fr> References: <20241017043006.4836-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 10580081427724690146 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehtddgkeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeeikedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=IXw61wLlbc4vcCKzXYbrLfxAnlyGOyryMJHwuEY5qTU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729139412; v=1; b=NQ4sqTz2M46jtTuNYaEcPlQt8cINgnDRsBiRlqtYVmdjS3RmgqfMl/nVMD45uBxQI3XP5NcO eYdm7vkDaEl+c1pEwr8QgVPzO114D5rc/saNybgZasQFAo6zpye+8eYUEYVCVPFmBxZA9+SQ392 AV6Go+re+ZmZFTLXANhNzDF5b+0mYmMO+A/KXpBPrbSRKat2plHE11R4Qo19BIhkfI9vk2esJHH uzqPz5KbqUaWqUhNRIsUdSx4VV2YBJ1Rjx7Y0Nx2JadSwT9Q9Q3y7CPR4WBjJQZufpXHDy7P0dC f/DxA9qLZ6laBNRuHlpg2tDUokMfmkbN5zPBosekAvFaw== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Sun Jun 22 11:47:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Graves Subject: bug#73682: closed (Re: [bug#73682] [PATCH v4 2/4] gnu: varnish: Restrain build to x86-64-linux.) Message-ID: References: <87o73924xr.fsf@gnu.org> <20241007215513.11989-1-ngraves@ngraves.fr> X-Gnu-PR-Message: they-closed 73682 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 73682@debbugs.gnu.org Date: Thu, 24 Oct 2024 10:07:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1729764422-9203-1" This is a multi-part message in MIME format... ------------=_1729764422-9203-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #73682: [PATCH 0/3] gnu: varnish: Update to 7.6.0. [security fixes] which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 73682@debbugs.gnu.org. --=20 73682: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D73682 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1729764422-9203-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 73682-done) by debbugs.gnu.org; 24 Oct 2024 10:06:41 +0000 Received: from localhost ([127.0.0.1]:33713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3ujp-0002Nr-8H for submit@debbugs.gnu.org; Thu, 24 Oct 2024 06:06:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3ujj-0002NZ-W1 for 73682-done@debbugs.gnu.org; Thu, 24 Oct 2024 06:06:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3uh1-0004fs-V0; Thu, 24 Oct 2024 06:03:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=0HPaG3XWCCDzW0sux5AcXkpX1to444vTM67wM+ehEXU=; b=D4yHAkq9Yn5VfoxX4Ow/ ZjJX25KtE4zK4Nhrz47AZjw6k04wQGaXXS4S26rIWACTP0eRNhqQfsMOr0lTqBz4EXhqWttlhBxhJ SdtpIzLo68lJnod2mwlQyOb7gFujVgGFUl+bIb4sNnjtC0jjeJjNU3o2FRh8ARMIFqPAgD2z7L1q6 ILkEXXnsS9ZNyzTZaaRMNx3v/8Sse0lCwC6BszNJReD/bQenHW4rOvMu3rajjCLBifkMPtEqHrmuu qYkxdbMgJXpLB8hHzmg6zMGwTwu9uUujfjBjcNkQnNhZXbwCEOK7cTSMYI/woIj19R7WfkA9ArIte ogrxd1dwxZ5Jlg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Graves Subject: Re: [bug#73682] [PATCH v4 2/4] gnu: varnish: Restrain build to x86-64-linux. In-Reply-To: <20241017043006.4836-2-ngraves@ngraves.fr> (Nicolas Graves's message of "Thu, 17 Oct 2024 06:29:58 +0200") References: <20241017043006.4836-1-ngraves@ngraves.fr> <20241017043006.4836-2-ngraves@ngraves.fr> Date: Thu, 24 Oct 2024 12:03:44 +0200 Message-ID: <87o73924xr.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 73682-done Cc: 73682-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Nicolas Graves 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=E2= =80=99t understand the rationale here (this field is not just for qa.guix). Anyhow, I applied the other 3 patches, thanks! ------------=_1729764422-9203-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 7 Oct 2024 21:55:33 +0000 Received: from localhost ([127.0.0.1]:49153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxvhV-0007SJ-G0 for submit@debbugs.gnu.org; Mon, 07 Oct 2024 17:55:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:50424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxvhT-0007SB-NR for submit@debbugs.gnu.org; Mon, 07 Oct 2024 17:55:32 -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 1sxvhK-0008Iy-7I for guix-patches@gnu.org; Mon, 07 Oct 2024 17:55:22 -0400 Received: from 1.mo584.mail-out.ovh.net ([178.33.248.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxvhI-0006IJ-Ck for guix-patches@gnu.org; Mon, 07 Oct 2024 17:55:21 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.176.32]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4XMtHT3981z1JXF for ; Mon, 7 Oct 2024 21:55:17 +0000 (UTC) Received: from ghost-submission-55b549bf7b-gg5fb (unknown [10.110.164.11]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E1C7C1FDBB; Mon, 7 Oct 2024 21:55:16 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-55b549bf7b-gg5fb with ESMTPSA id V2WJKcRYBGeRQQAAXSYGQA (envelope-from ); Mon, 07 Oct 2024 21:55:16 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G002fd5f0486-a20c-4dca-8e42-59fece4642ad, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH 0/3] gnu: varnish: Update to 7.6.0. [security fixes] Date: Mon, 7 Oct 2024 23:54:31 +0200 Message-ID: <20241007215513.11989-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 6396518846369293026 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdeftddgtdegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=Z7rXRqJJ7p0li2avBL4vyn1iPIloyzSchIjR7uSCOtQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728338117; v=1; b=vqhh7Kp0szPrqSCR9cWuH3MFD8ymJQpyzn1GEjKD2zkEWdYQhBf8xebalsC+ocKQiKBUENgM k8JQYTIg7SN/cX734itTnkRtc01P4a81EM5x3TWN/6hfCvh/OMyNgWJlTCRiM0PRQZpYIMFP4Vr aZAIkQRMsYvLDtwP2V4lxNkDnV/shH1XZ0kShiV83FEclDN/oXI3Z+3ulMqelU7exIAz+SDRTty N5Hbh1fclk9tFW1RvQPP8jcVU1R/0ulojjRHPqqFMo0whGKkFfKzpGS+VDZIt7qzKZtmJBqP01f +f7hbd8gBJHgx7zAAAT2rs2n1AgsLg39QCWw+IJe8A2LQ== Received-SPF: pass client-ip=178.33.248.196; envelope-from=ngraves@ngraves.fr; helo=1.mo584.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Nicolas Graves X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 ------------=_1729764422-9203-1--