From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SL0QF7LQ72P+GQAAbAwnHQ (envelope-from ) for ; Fri, 17 Feb 2023 20:08:34 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id CAQAF7LQ72NTSQAAauVa8A (envelope-from ) for ; Fri, 17 Feb 2023 20:08:34 +0100 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 209CE184FC for ; Fri, 17 Feb 2023 20:08:34 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=Dlzlpl2K; 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)" header.from=riseup.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676660914; a=rsa-sha256; cv=none; b=mLpZxEFET6TPpNuEYAOdAPp7pHG8rnvHMkNEA0iOSwzyC7+EFFbbj8vadIWyqmD1ATcybS vN8BcQpRdVW+laFOE4CCQq5LAKYb69JCUhv7zCiNlKKK54GDEk1tLAtSzHYRujawMfSrWQ 1TCQLbTTb3Y/SU/E2LyOa/X/TuEbK1dAfghdkZFn+NJ/dgcDMS+cJghP1S833oLRkNuH1c HWA887W4dVmK9DBu1ymjNYf94LmfjzvCLovDIsrUizg6VdBs5pds9NegKHBVyQGagc4cmh oIO/FdbOtft8pY1lMStIdD8Rnjaa+R3W4+eZrEhPbosPeIobmTqqovaRgLTs4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=Dlzlpl2K; 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)" header.from=riseup.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676660914; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: 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=dOxRH6Vg1KRH1rf/QL/PZf3Hm8jipAFwNSvgNB1XSIo=; b=PM4aulYSiqo0uy+gBcTLr28SNMJMViiVAcFK4w///4RhjEoFrDZ82qGwR7l7Y0hA+WQ5+a CnR5cEpNcZAw17yVBw8Tt6q8LgRHN0PbtDoMoHIOar1p2U5lW1Y1MZbMmJ3q9kF70QgYgW Cz1ecGLB1K4tK7Des8n8xhiKi2cbYZoWc/7d8gdnsCgP55zwBFs1GB4fJP5IGxTdmSpAXF BMUnRhBNtGSDPn2WYWKXAiGjdTfbCXfuYDvfHpBaDYrmFklhCKmWLW4C/jMUHWh/h/hFPS bTqJRLY9IyqNIuyHDKE7Cu8fN8Kh7wUPpTpH3ak050jND7w4IOqtPNUe4vCycA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT65U-0002Lo-Nw; Fri, 17 Feb 2023 14:08:04 -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 1pT65T-0002Kw-7I for guix-patches@gnu.org; Fri, 17 Feb 2023 14:08:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pT65S-0003Vw-Ub for guix-patches@gnu.org; Fri, 17 Feb 2023 14:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT65S-0005Gi-QH for guix-patches@gnu.org; Fri, 17 Feb 2023 14:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61246] [PATCH v3 3/3] gnu: libgit2: Update to 1.5.1. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 19:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61246@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 61246-submit@debbugs.gnu.org id=B61246.167666086320216 (code B ref 61246); Fri, 17 Feb 2023 19:08:02 +0000 Received: (at 61246) by debbugs.gnu.org; 17 Feb 2023 19:07:43 +0000 Received: from localhost ([127.0.0.1]:41555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT658-0005G0-Pi for submit@debbugs.gnu.org; Fri, 17 Feb 2023 14:07:43 -0500 Received: from mx0.riseup.net ([198.252.153.6]:52312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT655-0005Fa-5l for 61246@debbugs.gnu.org; Fri, 17 Feb 2023 14:07:39 -0500 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (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 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4PJLsx5TLJz9ss2 for <61246@debbugs.gnu.org>; Fri, 17 Feb 2023 19:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1676660853; bh=t1NikJS5y/4q0/BVCTk7k58Ve4wpbI20ofbGQGLt+MU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dlzlpl2KI+nZ+kavxfCu6L80BzRW9+9kWmZCNoBOc2iZvnmHpf/F2WbusEpbJfUbB BaMdZXwYiWJqG4HC79d/AjT7CmtCQyp0/l711rlqyGWKM9jWXzKsUeKZbZA8ze4YQU PKod3A0a7rSucARVcJa59L6DwGDserVhmtVL8SXA= X-Riseup-User-ID: B451376BDC5D20D8FA202C98D82AB511BAE40521B7EC78BA37A7848FC6829A99 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4PJLsw5fzxz5vg5; Fri, 17 Feb 2023 19:07:32 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Fri, 17 Feb 2023 16:07:10 -0300 Message-Id: <20230217190710.1927-1-nandre@riseup.net> In-Reply-To: <87a61ogomz.fsf@gmail.com> References: <87a61ogomz.fsf@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: X-Migadu-Queue-Id: 209CE184FC X-Spam-Score: -1.33 X-Migadu-Spam-Score: -1.33 X-Migadu-Scanner: scn0.migadu.com 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-TUID: Gr+DMpFM2OfF Fixes CVE-2023-22742. Follows up on fixes to CVE-2022-24765. Provides compatibility with git changes to address CVE-2022-29187. * gnu/packages/version-control.scm (libgit2): Update to 1.5.1. [source]: Remove snippet to comment out the "10 years ago" test, which was removed on newer versions. (libgit2-1.4): New variable. Update to 1.4.5. (libgit2-1.3): Inherit from 'libgit2-1.4'. Update to 1.3.2. --- gnu/packages/version-control.scm | 34 ++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e72c560928..49dc96d454 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -804,7 +804,7 @@ (define-public git-cal (define-public libgit2 (package (name "libgit2") - (version "1.4.3") + (version "1.5.1") (source (origin ;; Since v1.1.1, release artifacts are no longer offered (see: ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). @@ -815,18 +815,11 @@ (define-public libgit2 (file-name (git-file-name name version)) (sha256 (base32 - "02x1a4zrzpzjd0yxnsi8njh5hgihc1iy1v4r0fnl8m4ckcgp6x2s")) + "04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b")) (modules '((guix build utils))) (snippet '(begin - (delete-file-recursively "deps") - - ;; The "refs:revparse::date" test is time-dependent: it - ;; assumes "HEAD@{10 years ago}" matches a specific commit. - ;; See . - (substitute* "tests/refs/revparse.c" - (("test_object.*10 years ago.*" all) - (string-append "// " all "\n"))))))) + (delete-file-recursively "deps"))))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments @@ -868,10 +861,10 @@ (define-public libgit2 ;; GPLv2 with linking exception (license license:gpl2))) -(define-public libgit2-1.3 +(define-public libgit2-1.4 (package (inherit libgit2) - (version "1.3.0") + (version "1.4.5") (source (origin (inherit (package-source libgit2)) (method git-fetch) @@ -881,7 +874,22 @@ (define-public libgit2-1.3 (file-name (git-file-name "libgit2" version)) (sha256 (base32 - "0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd")))) + "0q754ipc6skagszi93lcy6qr09ibavivm2q5i5fhpdblvlnv2p7x")))))) + +(define-public libgit2-1.3 + (package + (inherit libgit2-1.4) + (version "1.3.2") + (source (origin + (inherit (package-source libgit2-1.4)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libgit2/libgit2") + (commit (string-append "v" version)))) + (file-name (git-file-name "libgit2" version)) + (sha256 + (base32 + "1dngga8jq419z6ps65wpmh2jihcf70k6r98pb1m1yiwj7qqh9792")))) (arguments (substitute-keyword-arguments (package-arguments libgit2) ((#:phases _ '%standard-phases) -- 2.39.1