From patchwork Tue May 20 02:58:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42759 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 1990E27BC4D; Tue, 20 May 2025 03:59:47 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 AED7827BC4A for ; Tue, 20 May 2025 03:59:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHDC4-0006C5-Jx; Mon, 19 May 2025 22:59:04 -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 1uHDC2-0006BX-SL for guix-patches@gnu.org; Mon, 19 May 2025 22:59:02 -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 1uHDC2-0005sb-IS for guix-patches@gnu.org; Mon, 19 May 2025 22:59: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:Date:From:To:In-Reply-To:References:Subject; bh=zyKSS4rIi1rg0owHCrkWT/qIp8VkGDajCWnCoR4imUk=; b=LTfzgX8Jmq7NrL4J14zTHxuU3KMhkq5yinfRAYPYwFt3e7GYzRXNATjYoyIrN2hPFiGyGDtzlG/6nhJ4jKCfKaVmjkF+ISaDKMMOIAl/Ic8Hygbc19J8KHzwGm4nk/23FumfWC2Co1CG3Ay9nje+gBPUCSHGMLOaQgkuSS9eobljR2mFlT4AJXoe/NOXsrvEzvpTcAUWIknto1sIc0XqcQuvpEzJfop+YoZBSilE55YfLrnugkQe/xfcHvVxUe7lZsENe1D9tDJpHGZH6Mi7t/D8RE830UzR3poEAPOV2QSQGu14boRjUm6Ymp1ojS+1BH+3NAOQUT8U8pLU69KSRQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHDC2-0000UA-9D; Mon, 19 May 2025 22:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78337] [PATCH v2 1/6] gnu: curl: Ungraft. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: z572@z572.online, guix-patches@gnu.org Resent-Date: Tue, 20 May 2025 02:59: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 Cc: Zheng Junjie , Maxim Cournoyer , Zheng Junjie X-Debbugs-Original-Xcc: Zheng Junjie Received: via spool by 78337-submit@debbugs.gnu.org id=B78337.17477099261743 (code B ref 78337); Tue, 20 May 2025 02:59:02 +0000 Received: (at 78337) by debbugs.gnu.org; 20 May 2025 02:58:46 +0000 Received: from localhost ([127.0.0.1]:50161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHDBm-0000S3-BE for submit@debbugs.gnu.org; Mon, 19 May 2025 22:58:46 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:55420) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uHDBh-0000R3-7u for 78337@debbugs.gnu.org; Mon, 19 May 2025 22:58:44 -0400 Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-30dfd9e7fa8so6384456a91.2 for <78337@debbugs.gnu.org>; Mon, 19 May 2025 19:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747709915; x=1748314715; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zyKSS4rIi1rg0owHCrkWT/qIp8VkGDajCWnCoR4imUk=; b=Jh0URjQTFRmQfeCicMQoGZn+W7ViaCYByOqxRaqiA+DT92TBEAjAYrvwALCqpZBCzn 21SarSENKtg2pGzArPMCumuTEgK4iUXBhMvAQY3My1TmAWHTrdVjNG/c62f+6xodhQ9y 6czkgzNg/nfZmF9K23MDLsc7q7rUcOELnaXf3LPlc/K3cwtCSt6RZSZqy96WGbkBj/wR LbiKwWXrd6k2tByWuZK7sO/kxoLki8idMfh8D1+5gM6v+sYiKadns5tZpS2z6sEduMiI lid4BcdGmF7QR0HJOpirwtDAnPsjTevsLiwq+5rSCBJxa4AGY7iBirLAzRWszOXYOZ77 DYVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747709915; x=1748314715; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zyKSS4rIi1rg0owHCrkWT/qIp8VkGDajCWnCoR4imUk=; b=TKmr7RrxwlylPvUANw2s0UL6uaOsObKDNDndp9W4OCFmmuR2n4NTEMb0ZpQKMha4oW zBu/xJwgtiugozTO/9aKozFXaRM+b38nDIq0RjiYPru8HtKMO9JLXvzFpSQEB5zFdEiK swZAg8TG7/HHKs04ZSoR33Qwtg3UdjO7UeR+658n8cyBmlE0IUaebTOTB+gs1ASsUMVO DjILTYpljx0JovLcmb5TvETQTJkmMepo4fDzpI+GhGF4yCNFogFKZrwzKc2rfQTdjq8y 0AWaJ1UJvsER+D8TXD34o9fepXaQ+haQPDtvpmlTZO7JhCk5o2/56o1TwZ1XR+WDJN+l Vc/A== X-Gm-Message-State: AOJu0YxH60OjQVC4jgKU8WMO2W8o4z7HuCasXo83VKV8/diEuOK3zmFm TQOT8yRn51TklRAx6+6xLzRn+pNPZ7TTkptPoy7cLtVdeQb6NBrTIg0SYiRoCw== X-Gm-Gg: ASbGncusgiRjMXW0RF5FBOOEyVhloICjRNmhyoEaoV3MWxscfyk7KJxiDMDs/JDKw/q qLHQMe3Rx8jgN9NEAWvDsKPvK+eagnnIfKuoHM1dkjDIhhoMrjjuJuY+KmqJgLKmaFD00gHWD0+ SgP5OMF/QPNunhxgyC9MGAi/4bdawcUFoicciPyqP3pkPA/SbfquKo2zIYntdOP92QEk/ia6XsK kVBCVBg8mHeab2b1wK8Goq+6ESLhDqfR/jCKp5eaai3W7C9Z9vlNJANQZdKU7Fjk9nEt5S++JvZ 68XBiZ1x1MgSWakSJM9s9VroffSrdtJGISKV3MP5Pklwtnsl9zZasuKZFenwgVlxhcA1qE8= X-Google-Smtp-Source: AGHT+IFQLKwpCGPQ73WoPzB27RurV4/P0kmbfzoo+kWIP9uK3Zp7qpQVR8EN21oHi8RzZrv2zTcxJw== X-Received: by 2002:a17:90b:3c90:b0:2ff:6af3:b5fa with SMTP id 98e67ed59e1d1-30e8322592emr19182747a91.22.1747709914502; Mon, 19 May 2025 19:58:34 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30f365d460fsm480078a91.23.2025.05.19.19.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 19:58:34 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 20 May 2025 11:58:11 +0900 Message-ID: <62f70621a69a09b7195dca52741ed454bec9b3d7.1747709896.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 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 From: Zheng Junjie * 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 Signed-off-by: Maxim Cournoyer --- gnu/packages/curl.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) base-commit: e7d73a08d569904f8a71db5b84f5fafaf0dff188 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