From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 6JK0IINFM2eM8wAAqHPOHw:P1 (envelope-from ) for ; Tue, 12 Nov 2024 12:09:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 6JK0IINFM2eM8wAAqHPOHw (envelope-from ) for ; Tue, 12 Nov 2024 13:09:39 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RM8hdBs7; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=CnOaO+Gh; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731413379; h=from:from:sender:sender: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:resent-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=myHlEN9RCfeabSRQims4sfBScnskQdhzWz6FNEsNFYY=; b=hpGJG7rFS/tAxAWt/6CAN7uQo+HOiEKeenNXQmbTSTMwOqK91Lpbzj5DEUCz/q0u21yahR oyDa8dCPpTSgZtdFGsUkYkTr3c5/fSZ7YMbe5akCY7aqsq4hFQtks0wEBdi5A8a+5w08kO 4jpz9e6pjmjayHX/vTOqIJwqZ1C4XraHr/PZXfFr5uBzW+6Vm/c9ptw0DB1FMzuSivqCAb FU+XM3/U+aV4dXH+OaeXZapTSw70FKh4Sihf+3hQ/kuoF0uJn4A9imDp1o1bb/PGw5uE3C HLZFxx2289/eY2hYJ/jYPk68+hECg3B77yAq4Phv77dS+BkhN6864pjQoAh+xQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731413379; a=rsa-sha256; cv=none; b=PNuV/lEy6idGTnauMTRVO154LJ0SrCBXfqGuRfp1XxOkCtaPc79jJ6X+iHKslYQkLCOiCz DOPcU5Wa9//c+1JCZwD37TkwDVZjsFTsTtdloRot9VnAdZcgmoIZkKGu3P0hCRt2iVzh4D sHJO1+1L3byw163RBYJu7FPjAnEz27ewEc9fPjmjY7j225qLf/vDpbt7podnqzKmn6NbAS U9bEn8AzT8SJ0AgMKVD5NLmC8k51mduOqCGBbdvT3kFUuYVvRBj8Tnx/amf+jfXbtl3zi9 Kfs3VVy6M/1N9Z1w8Wzs3AGKcxSOfaq8gluO7HS5mQty0H21YPveZTMjbaW4fQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RM8hdBs7; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=CnOaO+Gh; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 03B7183109 for ; Tue, 12 Nov 2024 13:09:39 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAphn-0000kR-Q9; Tue, 12 Nov 2024 07:09:12 -0500 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 1tAphe-0000ik-Iw for guix-patches@gnu.org; Tue, 12 Nov 2024 07:09:05 -0500 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 1tAphe-0004Wt-8Z for guix-patches@gnu.org; Tue, 12 Nov 2024 07:09:02 -0500 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:References:In-Reply-To:From:To:Subject; bh=myHlEN9RCfeabSRQims4sfBScnskQdhzWz6FNEsNFYY=; b=RM8hdBs7ZMrOO3aMVFAPlEACVr5H51iuFLxfZAthMDO8JDIRiuA/eEuJurasnIZryXS/T/FtxhdYuDQVEmVZJzu2EZTO5D6/Tj+0SkUI4PHu6w4DvTmF+VtpPqFQ1NorzFSCBJ20hPQIcFXh9qQgC5emgiEZ8BXNe9Z9auRGa5fcLSrrqyZIx6tPtFg9OJWy21ms1FC4OBtPxy167qeUkUUKcI0FGGGRtLpZiPWG0keyGLoWp2ngKM7qd+Z+n1viaE6HgUq9HwEwO5+ObhnyHcw+3Py6eJx41GrpeE7XPcH8K3oOr/AW8H05o9PZGiNNr6n1PvHIg/wF3nQUN51yYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAphe-0003pw-3R for guix-patches@gnu.org; Tue, 12 Nov 2024 07:09:02 -0500 Subject: bug#73361: [PATCH v2] gnu: curl: Fix security vulnerability. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 12:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 73361 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Ashish SHUKLA" Cc: John Kehayias , 73361-done@debbugs.gnu.org Mail-Followup-To: 73361@debbugs.gnu.org, maxim.cournoyer@gmail.com, ashish.is@lostca.se Received: via spool by 73361-done@debbugs.gnu.org id=D73361.173141331414704 (code D ref 73361); Tue, 12 Nov 2024 12:09:01 +0000 Received: (at 73361-done) by debbugs.gnu.org; 12 Nov 2024 12:08:34 +0000 Received: from localhost ([127.0.0.1]:60959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAphB-0003p6-Ky for submit@debbugs.gnu.org; Tue, 12 Nov 2024 07:08:34 -0500 Received: from mail-pg1-f169.google.com ([209.85.215.169]:52555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAph9-0003oo-93 for 73361-done@debbugs.gnu.org; Tue, 12 Nov 2024 07:08:32 -0500 Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7f3e30a43f1so3790856a12.1 for <73361-done@debbugs.gnu.org>; Tue, 12 Nov 2024 04:08:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731413245; x=1732018045; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=myHlEN9RCfeabSRQims4sfBScnskQdhzWz6FNEsNFYY=; b=CnOaO+Gh/yyF4c3P38tmYldo61bhJFirJ4w/ivHXY+Pf19D6vfxl/+eoREQ1ugp3wa /Fy774VSiMY1hWMQ18VYdnfaseVWQMgxuoYB1O1F/JgOIuyREOaHgJxjC1pmSNr4PBeV hM9Jrrq/hijjoE9C0g7vAXxRroEHn64KPRQ/KRRRMwVdnwTfF5leeyRZabTBISah+qdD kwIzu7S+FRKFmIJbxvKEyba6FVFgfJe/8Kr+CExdpNqt6C9Go3MPl8ZHfLOA4ZEEZ4Bj u6LAoiejZ/JM2OFFT2m2IONhcVDaXXvO3gmuWUolq/gLABlC8vCw8+dbepgx/YzO9O/v mB3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731413245; x=1732018045; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=myHlEN9RCfeabSRQims4sfBScnskQdhzWz6FNEsNFYY=; b=Rhdgq9zClOMfSY5eu5ypws9rBCHcK+8VomrGPq2qf0fJlzdeQ+H5F967CRpwykUDmY QFb6XPPwXHD3TzHNaTIdhAkd0ZVwjoE2kVILzhcE+IQ0Y8l05sc+8W4MlaZ7uk+xtTkk 66cmcHSurCPPxrKyuNINy5zSPHV9u1goNdw15WWzCANxRk/R62D73fR+DC7HXhnKOOuz 5wvyjM1S2kRDuku3AuQr8/F9aCQh5Lf0RCXFNUA1G/m4/RuOwmkO+oF3YEoJlvvPuwVE VHnU5wfVl9vgBHa+Z4xs4z2laiQF8mmdV5zM/P0O/bw075AYwbvU53602FYfYVEOhE01 wuug== X-Forwarded-Encrypted: i=1; AJvYcCXl8G96LkOiN9gpMfMtP8josYQCY3SudZB7pK+3/GOcbKcxvCwKlz+2E2Z3U7r0ApCQ/VNBcABF3eic@debbugs.gnu.org X-Gm-Message-State: AOJu0YwayJWwC7cOk/9Lf5sVlB8nPUYHacssxi05hZZUy3v4/7u6qnYM MxVeWHqVgLCNhbsYhK5huFA3qfs6NqchbZj7l+pekJ0lLgBBYVmRY8ELlH51 X-Google-Smtp-Source: AGHT+IGv2yxaubA3xfCO8vYKyw6vgOAoJqngy2L14dc5PbKotw2Y7pKY9/xQ5XhWzXykRye+xgeDgg== X-Received: by 2002:a17:90b:240c:b0:2e9:e443:34d0 with SMTP id 98e67ed59e1d1-2e9e44334f8mr3163964a91.15.1731413244796; Tue, 12 Nov 2024 04:07:24 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e99a4f994asm12243371a91.1.2024.11.12.04.07.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 04:07:23 -0800 (PST) From: Maxim Cournoyer In-Reply-To: (Ashish SHUKLA's message of "Sat, 28 Sep 2024 01:24:05 +0000") References: <87tte13p5q.fsf@protonmail.com> Date: Tue, 12 Nov 2024 21:07:17 +0900 Message-ID: <875xos4pvu.fsf_-_@gmail.com> 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-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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.37 X-Spam-Score: 0.37 X-Migadu-Queue-Id: 03B7183109 X-Migadu-Scanner: mx13.migadu.com X-TUID: 0bk9X1VE3u3k Hi, "Ashish SHUKLA" writes: > On Fri Sep 27, 2024 at 8:52 PM CEST, John Kehayias wrote: >> Hello, >> >> On Thu, Sep 19, 2024 at 03:17 PM, Ashish SHUKLA wrote: >> >> > * gnu/packages/curl.scm (curl): Update to 8.10.1. >> > >> >> As curl causes a rebuild of just about everything, this will need to >> done as a graft on master. (And ungrafted with a world rebuild on a >> branch.) Would you like to take a stab at that? > > Prepared a new revision (attached) to add a new package 'curl/fixed'=20 > with just the fix from upstream applied[0][1]. > > As for the actual update to 8.10.1, I can send a patch (either in this=20 > thread, or in separate issue report). > > Please let me know if something is amiss with my patch. > > References: > [0] https://curl.se/docs/CVE-2024-8096.html > [1] https://github.com/curl/curl/commit/aeb1a281cab13c7ba > > Thanks! > -- > Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 > > "If I destroy you, what business is it of yours ?" (Dark Forest, Liu Cixi= n) > > From 82e4c9fdf2e4bc78dfad87ee956fd78051bbc763 Mon Sep 17 00:00:00 2001 > Message-ID: <82e4c9fdf2e4bc78dfad87ee956fd78051bbc763.1727486274.git.ashi= sh.is@lostca.se> > From: Ashish SHUKLA > Date: Sat, 28 Sep 2024 01:40:45 +0200 > Subject: [PATCH v2] gnu: curl: Fix security vulnerability. > > Fixes CVE-2024-8096. > > * gnu/packages/curl.scm (curl)[replacement]: New field. > (curl/fixed): New variable. > * gnu/packages/patches/curl-CVE-2024-8096.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > > Change-Id: I42facad095d97dc94302e9db60626b9fa00f3738 > --- > gnu/local.mk | 1 + > gnu/packages/curl.scm | 11 + > gnu/packages/patches/curl-CVE-2024-8096.patch | 200 ++++++++++++++++++ > 3 files changed, 212 insertions(+) > create mode 100644 gnu/packages/patches/curl-CVE-2024-8096.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 9fdad12b63..a2215ad4c2 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1114,6 +1114,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/crda-optional-gcrypt.patch \ > %D%/packages/patches/clucene-contribs-lib.patch \ > %D%/packages/patches/cube-nocheck.patch \ > + %D%/packages/patches/curl-CVE-2024-8096.patch \ > %D%/packages/patches/curl-use-ssl-cert-env.patch \ > %D%/packages/patches/curlftpfs-fix-error-closing-file.patch \ > %D%/packages/patches/curlftpfs-fix-file-names.patch \ > diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm > index 9f74018205..bbb266e236 100644 > --- a/gnu/packages/curl.scm > +++ b/gnu/packages/curl.scm > @@ -16,6 +16,7 @@ > ;;; Copyright =C2=A9 2021 Felix Gruber > ;;; Copyright =C2=A9 2023 Sharlatan Hellseher > ;;; Copyright =C2=A9 2023 John Kehayias > +;;; Copyright =C2=A9 2024 Ashish SHUKLA > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -67,6 +68,7 @@ (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-" > @@ -176,6 +178,15 @@ (define-public curl > "See COPYING in the distribution.")) > (home-page "https://curl.haxx.se/"))) >=20=20 > +(define-public curl/fixed > + (hidden-package > + (package > + (inherit curl) > + (replacement curl/fixed) > + (source (origin > + (inherit (package-source curl)) > + (patches (search-patches "curl-CVE-2024-8096.patch"))))))) > + I've applied it already, but noticed after that this doesn't add the curl patch 'curl-use-ssl-cert-env.patch'; which I've now fixed in commit b10ce47d8b. Closing! --=20 Thanks, Maxim