From patchwork Thu Sep 19 15:17:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 68135 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 33E3D27BBEA; Thu, 19 Sep 2024 16:18:55 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 E0A9827BBE2 for ; Thu, 19 Sep 2024 16:18:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srIvg-0001bX-JY; Thu, 19 Sep 2024 11:18:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srIvd-0001bC-Eu for guix-patches@gnu.org; Thu, 19 Sep 2024 11:18:45 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1srIvd-0000fh-2g for guix-patches@gnu.org; Thu, 19 Sep 2024 11:18:45 -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:Subject; bh=IkV83umnIbHI96sa/aNZVTVL0wxjgpiapDjwlHSdpb4=; b=st9xI6de4D+3y9BUs8k4qHGAEt9SY5XU98HJ/kiuj4SS7XXWpcM49A/G8l9TqRb9K2It9p3Hn4hJahGmaGdpyjd92Olx9f40dSqp+uZIgDX3B9+m/xht+o8g6JYJF6Sys1KicgIiu8Ykk/VRTMY0JKFGRalh5odt1RVXB/w8KsBqh/vtCfPCDyhoabvuHYINgTUWh0e1RFGGR3lHgilhrC5HLkyj9gTpPG3AwxdG3S1CGD21+NBvN5LR5lYDfj15AXLKbPZwecWAK1fQxb0nHMfxwa/XqiFu9TZ/RkxQpzUK6YHg/p/cKDD5Nar7scJ+A8SdaKuHeDTmPMWooGMdQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srIvu-0005IN-DH for guix-patches@gnu.org; Thu, 19 Sep 2024 11:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73361] [PATCH] gnu: curl: Update to 8.10.1 [security fixes]. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Sep 2024 15:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73361 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73361@debbugs.gnu.org Cc: Ashish SHUKLA X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172675912020317 (code B ref -1); Thu, 19 Sep 2024 15:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Sep 2024 15:18:40 +0000 Received: from localhost ([127.0.0.1]:33261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srIvX-0005Hd-QI for submit@debbugs.gnu.org; Thu, 19 Sep 2024 11:18:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:39038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srIvT-0005HR-OL for submit@debbugs.gnu.org; Thu, 19 Sep 2024 11:18:37 -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 1srIvB-0001Xd-S2 for guix-patches@gnu.org; Thu, 19 Sep 2024 11:18:17 -0400 Received: from anamika.lostca.se ([65.21.75.227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1srIv9-0000bq-C9 for guix-patches@gnu.org; Thu, 19 Sep 2024 11:18:17 -0400 Received: from seneca.inet6.in (unknown [IPv6:2401:c080:3400:28a8:5400:5ff:fe16:9400]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id CEF822C4AE; Thu, 19 Sep 2024 15:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1726759081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IkV83umnIbHI96sa/aNZVTVL0wxjgpiapDjwlHSdpb4=; b=d5L+Z09HKhmlByb2HNhpuC65zuJrqxw91vJSqYb08oNASh8il18+JKr752CyayI5nZDwxT KRw3yHYEp6HWzRTdIcAKtT0eSY87XSB6I2PBJhdNh0Q62YPuBam8mV6CgAgaHAY5Hf31CM mzu0whCP1KVxSM5aQj+yfJszR7J9K3o= Date: Thu, 19 Sep 2024 15:17:29 +0000 Message-ID: <5cadbf4fe10768fae553fd71f8b0edeb384c7fb0.1726759049.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 Received-SPF: pass client-ip=65.21.75.227; envelope-from=ashish.is@lostca.se; helo=anamika.lostca.se 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA 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): Update to 8.10.1. * gnu/packages/patches/curl-use-ssl-cert-env.patch: Update for 8.10.1. Change-Id: I2a1566a3b7ca0a097c77f158bd370945cf16baf8 --- gnu/packages/curl.scm | 5 ++- .../patches/curl-use-ssl-cert-env.patch | 41 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) base-commit: e85f52e826b0701c3dcf9acf9d81e5ae57aec8f9 diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 9f74018205..7ab886f195 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 John Kehayias +;;; Copyright © 2024 Ashish SHUKLA ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,14 +67,14 @@ (define-module (gnu packages curl) (define-public curl (package (name "curl") - (version "8.6.0") + (version "8.10.1") (source (origin (method url-fetch) (uri (string-append "https://curl.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "05fv468yjrb7qwrxmfprxkrcckbkij0myql0vwwnalgr3bcmbk9w")) + "1vh4rvmln4ygp4mc18hq1pd5za4mp7jbfksajajrz84njplv193k")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) (outputs '("out" "doc")) ;1.2 MiB of man3 pages diff --git a/gnu/packages/patches/curl-use-ssl-cert-env.patch b/gnu/packages/patches/curl-use-ssl-cert-env.patch index c39c1f7e98..2a57f0f8be 100644 --- a/gnu/packages/patches/curl-use-ssl-cert-env.patch +++ b/gnu/packages/patches/curl-use-ssl-cert-env.patch @@ -37,28 +37,27 @@ for other future workarounds. #ifdef _WIN32 Curl_win32_cleanup(easy_init_flags); #endif -diff -ur curl-7.66.0.orig/lib/url.c curl-7.66.0/lib/url.c ---- curl-7.66.0.orig/lib/url.c 2020-01-02 15:43:11.883921171 +0100 -+++ curl-7.66.0/lib/url.c 2020-01-02 16:21:11.563880346 +0100 -@@ -524,6 +524,21 @@ - if(result) - return result; +--- curl-8.10.0/lib/url.c.orig 2024-09-17 16:57:50.407214691 +0000 ++++ curl-8.10.0/lib/url.c 2024-09-17 16:59:47.507214691 +0000 +@@ -455,6 +455,21 @@ + #endif #endif -+ extern char * Curl_ssl_cert_dir; -+ extern char * Curl_ssl_cert_file; -+ if(Curl_ssl_cert_dir) { -+ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH], Curl_ssl_cert_dir)) -+ return result; -+ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], Curl_ssl_cert_dir)) -+ return result; -+ } -+ -+ if(Curl_ssl_cert_file) { -+ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], Curl_ssl_cert_file)) -+ return result; -+ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], Curl_ssl_cert_file)) -+ return result; -+ } } ++ extern char * Curl_ssl_cert_dir; ++ extern char * Curl_ssl_cert_file; ++ if(Curl_ssl_cert_dir) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH], Curl_ssl_cert_dir)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], Curl_ssl_cert_dir)) ++ return result; ++ } ++ ++ if(Curl_ssl_cert_file) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], Curl_ssl_cert_file)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], Curl_ssl_cert_file)) ++ return result; ++ } + #ifndef CURL_DISABLE_FTP set->wildcard_enabled = FALSE;