From patchwork Fri May 9 16:50:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 42486 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 011E027BC4B; Fri, 9 May 2025 17:52:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7E6AD27BC49 for ; Fri, 9 May 2025 17:52:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDQxF-0003bu-FL; Fri, 09 May 2025 12:52:11 -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 1uDQx9-0003bj-2X for guix-patches@gnu.org; Fri, 09 May 2025 12:52:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uDQx8-0001ll-OZ for guix-patches@gnu.org; Fri, 09 May 2025 12:52:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=KSiag2sG21sMgtN+6va4lW6hkQB5IamyLsXU33Vq+b8=; b=FsEsDldzkItjCENeHPYTwxDmV9pmeIkFNkDkqw8SlQc9xh8k/otGyUSk6dyI9jIyjufLIxGhXfvukccLdnbClbFJZJzQpwDEyMNUr8ZL9gqFNNQjGRMGoEvcf1VBGwV2zBif57iHKOJ739qmZSpwSx+GtUkrrp6641qeRDm+uNVU70Ubfi4V7yTqiaAbyCPBi8kIxXqlNcJbnb8GFcr0H6nm5euiWmdzSvMwk6FxMeNuftyWVdiUnQ2rdJ39zEzrM/8W2N7mxphuZy3SBgr75VwmOrQwAaxyGTf02kZ2lXBQ9/HOv9Rrn8RVzCIkBXG40ZaCn76RLfjkRjV/aZe+9g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uDQx8-0007Q8-9T for guix-patches@gnu.org; Fri, 09 May 2025 12:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78337] [PATCH core-packages-team 1/4] gnu: curl: Ungraft. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 May 2025 16:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78337@debbugs.gnu.org Received: via spool by 78337-submit@debbugs.gnu.org id=B78337.174680946828381 (code B ref 78337); Fri, 09 May 2025 16:52:02 +0000 Received: (at 78337) by debbugs.gnu.org; 9 May 2025 16:51:08 +0000 Received: from localhost ([127.0.0.1]:38973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uDQwG-0007Ne-3f for submit@debbugs.gnu.org; Fri, 09 May 2025 12:51:08 -0400 Received: from mail.z572.online ([88.99.160.180]:46358) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDQwD-0007N1-0o for 78337@debbugs.gnu.org; Fri, 09 May 2025 12:51:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1746809878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KSiag2sG21sMgtN+6va4lW6hkQB5IamyLsXU33Vq+b8=; b=X2XNkiwW5TIrUZzKWh4MmGm8cBzvYcGFPm8RxOikwY0j0TprSStk7Cr9vhf6MWwbTfxeqM iuPFwsJRTCgzc1SW3cdamgGSiV0Daz8j3jYLj5vorSbDW1o095q30qI0suBmI/Rwo+SkK8 28grCg+G1RG5ij9ln8KL1XE6r+r9eKk= Received: from m.tailaa68d.ts.net ( [61.174.159.83]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 9a9eb3fb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <78337@debbugs.gnu.org>; Fri, 9 May 2025 16:57:57 +0000 (UTC) From: Zheng Junjie Date: Sat, 10 May 2025 00:50:52 +0800 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/curl.scm (curl)[replacement]: Remove it. [source]: Add curl-CVE-2024-8096.patch. * gnu/packages/curl.scm (curl/fixed): Remove it. Change-Id: I43e6c1c0c97bc86ce0e4801559eead53a1a07d12 --- gnu/packages/curl.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 3e9cd517a2..ded616a052 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -69,7 +69,6 @@ (define-public curl (package (name "curl") (version "8.6.0") - (replacement curl/fixed) (source (origin (method url-fetch) (uri (string-append "https://curl.se/download/curl-" @@ -77,7 +76,8 @@ (define-public curl (sha256 (base32 "05fv468yjrb7qwrxmfprxkrcckbkij0myql0vwwnalgr3bcmbk9w")) - (patches (search-patches "curl-use-ssl-cert-env.patch")))) + (patches (search-patches "curl-use-ssl-cert-env.patch" + "curl-CVE-2024-8096.patch")))) (outputs '("out" "doc")) ;1.2 MiB of man3 pages (build-system gnu-build-system) @@ -179,16 +179,6 @@ (define-public curl (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")))) -(define-public curl/fixed - (hidden-package - (package - (inherit curl) - (replacement curl/fixed) - (source (origin - (inherit (package-source curl)) - (patches (append (origin-patches (package-source curl)) - (search-patches "curl-CVE-2024-8096.patch")))))))) - (define-public gnurl (deprecated-package "gnurl" curl)) (define-public curl-ssh