From patchwork Wed Apr 26 17:27:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 49547 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 78D8D27BBE2; Wed, 26 Apr 2023 18:28:32 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 2FBB627BBE9 for ; Wed, 26 Apr 2023 18:28:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1priw5-0004Q0-AD; Wed, 26 Apr 2023 13:28:09 -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 1privz-0004PL-GV for guix-patches@gnu.org; Wed, 26 Apr 2023 13:28:03 -0400 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 1privz-0000YD-7C for guix-patches@gnu.org; Wed, 26 Apr 2023 13:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1privy-0002Ln-Qp for guix-patches@gnu.org; Wed, 26 Apr 2023 13:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63092] [PATCH v2 1/2] gnu: git: Update to 2.40.1 [security fixes]. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2023 17:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63092 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63092@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 63092-submit@debbugs.gnu.org id=B63092.16825300588984 (code B ref 63092); Wed, 26 Apr 2023 17:28:02 +0000 Received: (at 63092) by debbugs.gnu.org; 26 Apr 2023 17:27:38 +0000 Received: from localhost ([127.0.0.1]:56908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1privZ-0002Kk-Qj for submit@debbugs.gnu.org; Wed, 26 Apr 2023 13:27:38 -0400 Received: from mail-yb1-f177.google.com ([209.85.219.177]:61758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1privU-0002K8-L8 for 63092@debbugs.gnu.org; Wed, 26 Apr 2023 13:27:33 -0400 Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-b8f5276baa3so5929274276.3 for <63092@debbugs.gnu.org>; Wed, 26 Apr 2023 10:27:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20221208.gappssmtp.com; s=20221208; t=1682530047; x=1685122047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=diKSJfXYOfclswwwxkmUVpv39bW4eFqsdWIq2RiFhlM=; b=30s7LKJLYZC+PqjelD5JqqNdUPwoxns3vO8VSUEicTP7h9Pc0/rJwzNaykhLo4hdT3 E98tDpxf7po6yZGnm6xWqpDcfpuUXFEkIAOLryhfVHa1LcyPHa+DxAcfUuJEvJ+32AQb 5yVS/ErSnBNpnsR77CRM9QL+LI6+Mq/1UOE0xrY3lkMCb2WSAWg+yWr38IPcCqdVSz2N OsQ3/G/qKZdoKBCIfjUeLVFSvXrjOspPIj9akH5XkN3PxSPQgO7jxLqmhRmpfjp6gTMI kKnAkmmUJIGVRoyx14m1PoFtc97zwAWvx3U6v/nagi8RgX/nMIpwq1xmfudXRVzWeKlQ q6Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682530047; x=1685122047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=diKSJfXYOfclswwwxkmUVpv39bW4eFqsdWIq2RiFhlM=; b=ENEA5bkXOXIKpP+/OLm60esQxctpXgcKTaXBVVCfGC8tvRhaqj3BtCe4UTsYkn1zcK bRgy0XCIcKfcWmKsyvysAiFCfr4Ew8KtTGtzm/JFE+6ZjJc1e6Xnb/kFlwZx1lJwRSMu pXeqrkrI8Xmv0OZu+Jh8ixvEvQLJUo9HkdN8Wbx9x2jElSdrKE0xdOsjsaCS7ePxOslR f06n349oqV3DNtpqwDwDLEQ1aifYgVPrFab8whO8+Jb6Ybr5Cdr1H+yk2rnamcX0AXzB VieoW8Vs++cZcbBT0Xznk4odRyy3BaGO6/RKTm+NuA69ohih3QasQkhtEQ/gzQqMUNJM oqOg== X-Gm-Message-State: AAQBX9fSPOK/TUjQGJCOksnOZn33xdWCY0aQ9Gt3w52s+TobM5G6/Xi1 TWrzTRkxosI8deUwMCEQL2wIoFHxu4Ec+T8EVQgMEQ== X-Google-Smtp-Source: AKy350YhDk8y02uDRSHtqhgjcvN3Q586NQg2t5hYvOFDOZA95y79jXqYZUI2fU2Mu37JjOkrybVSog== X-Received: by 2002:a25:e00b:0:b0:b96:b439:1511 with SMTP id x11-20020a25e00b000000b00b96b4391511mr17129584ybg.10.1682530047166; Wed, 26 Apr 2023 10:27:27 -0700 (PDT) Received: from ip-172-31-16-142.us-east-2.compute.internal (ec2-18-219-13-189.us-east-2.compute.amazonaws.com. [18.219.13.189]) by smtp.gmail.com with ESMTPSA id o68-20020a254147000000b00b8f5b078eacsm4145682yba.39.2023.04.26.10.27.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 10:27:26 -0700 (PDT) From: Greg Hogan Date: Wed, 26 Apr 2023 17:27:22 +0000 Message-Id: <20230426172723.2684501-2-code@greghogan.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426172723.2684501-1-code@greghogan.com> References: <20230426172723.2684501-1-code@greghogan.com> 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 Fixes CVE-2023-25652 and CVE-2023-29007. * gnu/packages/version-control.scm (git): Update to 2.40.1. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c2ec490383..5f6766f510 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -227,14 +227,14 @@ (define git-cross-configure-flags (define-public git (package (name "git") - (version "2.39.2") + (version "2.40.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1mpjvhyw8mv2q941xny4d0gw3mb6b4bqaqbh73jd8b1v6zqpaps7")))) + "1li1xwgiwccy88bkshsah2kzl1006jg29jp7n32gvjggiswvi4s8")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -254,7 +254,7 @@ (define-public git version ".tar.xz")) (sha256 (base32 - "09cva868qb4705s884dzvbwkm78jlw4q8m6xj7nd7cwxy2i2ff8b")))) + "04yy5za8963q6xzrirflvxbi1216jzqj8ssvgd9nkld3ifa9q1gy")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook2x" ,docbook2x) From patchwork Wed Apr 26 17:27:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 49546 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 1753827BBE2; Wed, 26 Apr 2023 18:28:31 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 4F54627BBE9 for ; Wed, 26 Apr 2023 18:28:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1priw5-0004Pz-3h; Wed, 26 Apr 2023 13:28:09 -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 1privy-0004PJ-Pi for guix-patches@gnu.org; Wed, 26 Apr 2023 13:28:03 -0400 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 1privy-0000Y6-IF for guix-patches@gnu.org; Wed, 26 Apr 2023 13:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1privy-0002Lf-Dj for guix-patches@gnu.org; Wed, 26 Apr 2023 13:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63092] [PATCH v2 2/2] gnu: git-minimal: Remove deletion of removed file. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2023 17:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63092 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63092@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 63092-submit@debbugs.gnu.org id=B63092.16825300578977 (code B ref 63092); Wed, 26 Apr 2023 17:28:02 +0000 Received: (at 63092) by debbugs.gnu.org; 26 Apr 2023 17:27:37 +0000 Received: from localhost ([127.0.0.1]:56906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1privZ-0002Ki-Hq for submit@debbugs.gnu.org; Wed, 26 Apr 2023 13:27:37 -0400 Received: from mail-yb1-f173.google.com ([209.85.219.173]:53595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1privV-0002KA-E8 for 63092@debbugs.gnu.org; Wed, 26 Apr 2023 13:27:33 -0400 Received: by mail-yb1-f173.google.com with SMTP id 3f1490d57ef6-b99f0a0052fso3807576276.3 for <63092@debbugs.gnu.org>; Wed, 26 Apr 2023 10:27:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20221208.gappssmtp.com; s=20221208; t=1682530048; x=1685122048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w263VRLh1lFTR3h/uz91BGe8s8oHE77cK67r6doS9/k=; b=tDmeaCaEmKVoWCfmTvSM9zzWPcpltbGfPXLRp0V/ikI94PNijolcOXlaUM3OEb0pbE ysoNpNKKK7H8qhtGGSz/uJSsvie4AetlG21nuLEAnIyLhtGN7dKuRgDgMbjxXWKL9VuA 7W1qnF0VAWMOJfEx+Jv4uffZP3oaN86fKrggVVb18WeCAwwEGYuJnwyjX2W5ucPPZrwg njZRlyKKBH1+KsOMXB8Gvq6WX7kzdmWEIFmAIahlYbuO7JFlpXX8MMGDKaWfXBkRU7t5 TzClfOrJeaIXFZEDXFU9ZyhQPNIMFt4CnuX48iIeDpPQEPHYWU+eVUj5sks02MCasnn/ vo0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682530048; x=1685122048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w263VRLh1lFTR3h/uz91BGe8s8oHE77cK67r6doS9/k=; b=lQtEciSF7PXjgcef7M7EeA9iHzlihGvaDp7gplPta7YInGW1smRxAqhaHd3kD3Bqoi AX9DA7fNaQ/s450v7j0/Tni0zcptfvnil+bweVQoSx7Xe1UKf/crVjqYeqtGEsusg6vd 1b5QQqo7h0qrlnPAi8HezLBa7b/MH3rE0U/e83qgayEbU3htAyUxU7WFbP9DGxgyQJjJ 06Nfw4ke4SDLkfdfJqAyPTGYKLXQODnunftHHKXYelDagQigDrW79u+SMT5hm0a33cOY v+HQcULl+SjcDRHhCzMnlTS6LhExxitD+6fIyzXz2v9gpBybjB/3WDO3YQwlgANn6tC1 57ig== X-Gm-Message-State: AC+VfDxXEvH99UA+uIbBfNaV2hjGbVo0ahe8V48VpDCvjfDX3Qr+J1OX X3i9rk4+ct37HtfIowzhLhC1J3zrhsgQv3Xfzbktog== X-Google-Smtp-Source: ACHHUZ4JHK6hR3/xTTxtJCqMvzFZPf9+m6YqLawGRyZgNVHBA6E9Ur7clWutQbyt/EPVe9/HSg1rTA== X-Received: by 2002:a05:6902:100e:b0:b9a:36da:dcc4 with SMTP id w14-20020a056902100e00b00b9a36dadcc4mr2888486ybt.60.1682530047903; Wed, 26 Apr 2023 10:27:27 -0700 (PDT) Received: from ip-172-31-16-142.us-east-2.compute.internal (ec2-18-219-13-189.us-east-2.compute.amazonaws.com. [18.219.13.189]) by smtp.gmail.com with ESMTPSA id o68-20020a254147000000b00b8f5b078eacsm4145682yba.39.2023.04.26.10.27.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 10:27:27 -0700 (PDT) From: Greg Hogan Date: Wed, 26 Apr 2023 17:27:23 +0000 Message-Id: <20230426172723.2684501-3-code@greghogan.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426172723.2684501-1-code@greghogan.com> References: <20230426172723.2684501-1-code@greghogan.com> 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 * gnu/packages/version-control.scm (git-minimal) [arguments]<#:phases>(remove-unusable-perl-commands): Remove from deletion list the file deleted from upstream. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5f6766f510..3f1f8d4ec2 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -638,7 +638,7 @@ (define-public git-minimal "/git-core/" file))) '("git-svn" "git-cvsimport" "git-archimport" "git-cvsserver" "git-request-pull" - "git-add--interactive" "git-cvsexportcommit" + "git-cvsexportcommit" "git-instaweb" "git-send-email")) (delete-file (string-append bin "/git-cvsserver"))