From patchwork Tue Jan 28 14:51:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 37794 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 EC1CB27BBE9; Tue, 28 Jan 2025 14:52:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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=unavailable 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 F29C227BBE2 for ; Tue, 28 Jan 2025 14:52:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tcmwf-0000bx-MF; Tue, 28 Jan 2025 09:52:06 -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 1tcmwd-0000aB-E8 for guix-patches@gnu.org; Tue, 28 Jan 2025 09:52:03 -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 1tcmwd-0007YQ-4n for guix-patches@gnu.org; Tue, 28 Jan 2025 09:52:03 -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=0FLD1S6GUi6suO3mjzvTtGzTnILS2FMnd+flnpxd1BA=; b=FRhAM8o+nxtmEp0wZ/H9z5bC13a6DJsuBvku9H/pST2IivCPzHXvQnYM6cmgfKkmJZPdHWE0M8K23QviY9Mgk/qiFHOWBB2x4O6BiPfLLhQGYNo2664NLuDhNAljXWRt7W+BaX5pn6eKQVR7byCr3MkvuXbv16uT2MkUvLIh2vz2g/rN6TkpqBR8s5CqqjmKi0sR04f1+UHv3tnugBdmbvvpJb9plSaGko30mDtiFT7yLVqSly3+NEpqNx+D7pgVVuyDQVQAZrqadYQ4/ZPgE3Bae9JOXm2ZX/yEU/rcz4LyBaCZGVH6upRsGmOJRNU0PIm/P+TBwAo2XMt46lMR3g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tcmwc-00079D-GG for guix-patches@gnu.org; Tue, 28 Jan 2025 09:52:02 -0500 Subject: bug#75711: [PATCH] gnu: git: Update to 2.48.1. [security fixes] Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 28 Jan 2025 14:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 75711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ashish.is@lostca.se Cc: 75711-done@debbugs.gnu.org Mail-Followup-To: 75711@debbugs.gnu.org, ludo@gnu.org, ashish.is@lostca.se Received: via spool by 75711-done@debbugs.gnu.org id=D75711.173807588627402 (code D ref 75711); Tue, 28 Jan 2025 14:52:02 +0000 Received: (at 75711-done) by debbugs.gnu.org; 28 Jan 2025 14:51:26 +0000 Received: from localhost ([127.0.0.1]:36179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcmvw-00077o-29 for submit@debbugs.gnu.org; Tue, 28 Jan 2025 09:51:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58554) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tcmvs-00077S-GD for 75711-done@debbugs.gnu.org; Tue, 28 Jan 2025 09:51:18 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tcmvm-0007NY-E7; Tue, 28 Jan 2025 09:51:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=0FLD1S6GUi6suO3mjzvTtGzTnILS2FMnd+flnpxd1BA=; b=GvvJC+RCyMQD2W4Ovx5C 7JYIyD9U6x9n5TMFZOqva2xQ1teSaEc8Qcbw7ih1vjPrPd7vx7QSwwteXOrIdkzJf66uW1/tPbo+/ leL9GOhvKI5jsNiBEw77/mVEZW0Khb6CDZTI02T87XdSnHThD1eEd4TTihI/WVNUb3gUYuaLu4els tqPU1ZXdruSaWcWFaT+/TXyO4XwB2OOA/xDc+NtmiFECpdVAHQOzPjb1pFc0isKPZZk2LgyT735bl MJ4RMxsrFIr+yban51Im2Z2zzmibh1dtKJleN6N3uGtLSq+43AozXVv3nWyvjWQ0vIT78JwA9a3ur 3e00xBdNXbOpRw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: <1f5595d141a20b2878592d2ace02af4e9d9c981c.1737409570.git.ashish.is@lostca.se> (ashish is's message of "Mon, 20 Jan 2025 21:46:10 +0000") References: <1f5595d141a20b2878592d2ace02af4e9d9c981c.1737409570.git.ashish.is@lostca.se> Date: Tue, 28 Jan 2025 15:51:08 +0100 Message-ID: <87sep3at5v.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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 Hi, ashish.is@lostca.se skribis: > From: Ashish SHUKLA > > Fixes the CVE-2024-50349 and CVE-2024-52006. > > * gnu/packages/version-control.scm (git-minimal): Update to 2.48.1. > [#:phases]: Purge purged tests in meson.build. > (git)[#:phases]: Update to also generate asciidoc.conf. > : Update hash. > > Change-Id: I6616e95822ded252a9bec1312702016985cb9de7 Applied with the following change to avoid a rebuild of ‘git-minimal/pinned’ and everything that depends on it. Thanks, Ludo’. diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 96cbac0824..636509d6c5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2013-2022, 2024 Ludovic Courtès +;;; Copyright © 2013-2022, 2024-2025 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -435,18 +435,23 @@ (define-public git-minimal '("t/t9128-git-svn-cmd-branch.sh" "t/t9167-git-svn-cmd-branch-subproject.sh" "t/t9141-git-svn-multiple-branches.sh")) - ;; Purge the purged tests in meson.build - (substitute "t/meson.build" - (list (cons "^(.+')(t[^']+[.]sh)('.*)$" - (lambda (line matches) - (let* ((match-offset (vector-ref (car matches) 3)) - (test-file (string-append "t/" - (substring line - (car match-offset) - (cdr match-offset))))) - (if (file-exists? test-file) - line - ""))))))))) + + #$@(if (version>=? (package-version this-package) + "2.48.0") + ;; Purge the purged tests in meson.build + #~((substitute + "t/meson.build" + (list (cons "^(.+')(t[^']+[.]sh)('.*)$" + (lambda (line matches) + (let* ((match-offset (vector-ref (car matches) 3)) + (test-file (string-append "t/" + (substring line + (car match-offset) + (cdr match-offset))))) + (if (file-exists? test-file) + line + ""))))))) + #~())))) (add-after 'install 'install-shell-completion (lambda _ (let ((bash (string-append #$output "/etc/bash_completion.d"))