From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4BdIBtV73GP91AAAbAwnHQ (envelope-from ) for ; Fri, 03 Feb 2023 04:13:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mDl0BdV73GOXRgEAG6o9tA (envelope-from ) for ; Fri, 03 Feb 2023 04:13:25 +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 9F78AF5A3 for ; Fri, 3 Feb 2023 04:13:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNmVd-0003dn-3B; Thu, 02 Feb 2023 22:13:05 -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 1pNmVb-0003d5-7r for guix-patches@gnu.org; Thu, 02 Feb 2023 22:13: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 1pNmVa-0000Ms-Vz for guix-patches@gnu.org; Thu, 02 Feb 2023 22:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNmVa-0006uA-I3 for guix-patches@gnu.org; Thu, 02 Feb 2023 22:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61246] [PATCH] 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, 03 Feb 2023 03:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167539393226473 (code B ref -1); Fri, 03 Feb 2023 03:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Feb 2023 03:12:12 +0000 Received: from localhost ([127.0.0.1]:36240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNmUl-0006su-MD for submit@debbugs.gnu.org; Thu, 02 Feb 2023 22:12:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:52508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNmUj-0006sj-3i for submit@debbugs.gnu.org; Thu, 02 Feb 2023 22:12:09 -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 1pNmUg-0003a6-WF for guix-patches@gnu.org; Thu, 02 Feb 2023 22:12:07 -0500 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNmUd-0000Ha-BO for guix-patches@gnu.org; Thu, 02 Feb 2023 22:12:06 -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 4P7LKq3JNWz9tCR for ; Fri, 3 Feb 2023 03:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1675393919; bh=BTXTq0ncavsvAeNL9/BvbbCIKQiWU0/OpiGWPi2zab4=; h=From:To:Cc:Subject:Date:From; b=Cws9zeLUQBO19CrGBuenVmKDSjKmnO6wxuQ6b6M22tvu44TY1jpl9TWgNTjS4sh8D WCW7Ab6qZoAmpbCkFbE53vkk09J6ls73jl65k9fGWldLwskt0PLXYemTiZHi6DuTNW Vcm0lSbTJ0/mgeUYiEqvvAfWZnOwvhce9um1bEE4= X-Riseup-User-ID: 69BF3A8E90789C6CAB9E988CC6647149AC6218B8C55D84F4F8A1B4928819675B Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4P7LKp301pz5xWq; Fri, 3 Feb 2023 03:11:58 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Fri, 3 Feb 2023 00:11:29 -0300 Message-Id: <20230203031129.3529-1-nandre@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=198.252.153.6; envelope-from=nandre@riseup.net; helo=mx0.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, SPF_HELO_PASS=-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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675394004; 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-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=4WvjOGbTpp5zEtSZksiQm+eMWqXW1zuKBQx5qjAdqx0=; b=V+U1P0yZR+0rtcfLNTS9qCdlDEtQTJo5eLKlrfi8zQEcj5fkB2dt4S153IFG+QjP4vhx1s mxJ/Kl/MWVDX3OMwstf5SUy6awch4L0iRj9+i9mtO40r+wQEmcxvsQ2ZgL5tzOLywbZ8t1 nRA3VlqhmvXZ2Ofx98FpRVIh8v2tfDWAzXiFf2nQLht4xvkwD2AeFd9yYHYaNyp8eWLIWZ ZtSxHPAJ87gVb2RCenv7WaepRrZIWOnyhco64sDOKVTc1y28m5gZ1OEzQxt6nO9sUW0Hmt qRZ8PHoOlrk2ok7C0qH5AjRUafaxIgBU+QJb+umiNfNGbsPrDuEm579Thc+E/A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=Cws9zeLU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675394004; a=rsa-sha256; cv=none; b=e1Q1vQJxcsHNth5diC9eT5eE+7+7lzgVXtNZTt/JyAdHRGu/qbMeK0+kwwuaFZBVq+gmEJ Un9XpBunHWibdp6Ftn3GLU0Nvv78Df7aRSKg6GQOlE0v6dHFxEmdGgjSUhgJ+3itU9c2Dv jylKxhMybQgDa1sEfeBPj44U0Q+41aB2MDDejAUXCaTBS0KAEHHB0eKPKZGLRV+alKQCch L1GL6jh8H9GIAltVQbzX7MnuAdwGdOHd7qvcdQ9HIVjQ9O9xqJXybYLj62miBanVL/xk3L e8+ZS83RFYl7qGt4htRsB+V/vOP7x7r0gzu/DrEnBqF827ntfA/Xx5FETSFAQQ== X-Migadu-Spam-Score: 6.63 X-Spam-Score: 6.63 X-Migadu-Queue-Id: 9F78AF5A3 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=Cws9zeLU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); 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" X-Migadu-Scanner: scn0.migadu.com X-TUID: 4tGYAL5Tn8WD * 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. (libgit2-1.1): Update to 1.1.1. Add back the snippet which comments out the "10 years ago" test that remains on this older version. * doc/guix.texi (Using a Custom Guix Channel): Add note and example on how to exempt a local guix repository from git ownership checks. --- doc/guix.texi | 20 ++++++++++++- gnu/packages/version-control.scm | 50 +++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2b1ad77ba5..636078e245 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -81,7 +81,7 @@ Copyright @copyright{} 2020, 2021 Brice Waegeneire@* Copyright @copyright{} 2020 R Veera Kumar@* Copyright @copyright{} 2020, 2021 Pierre Langlois@* Copyright @copyright{} 2020 pinoaffe@* -Copyright @copyright{} 2020 André Batista@* +Copyright @copyright{} 2020,2023 André Batista@* Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@* Copyright @copyright{} 2020 raingloom@* Copyright @copyright{} 2020 Daniel Brooks@* @@ -5411,6 +5411,24 @@ From there on, @command{guix pull} will fetch code from the @code{super-hacks} branch of the repository at @code{example.org}. The authentication concern is addressed below (@pxref{Channel Authentication}). +Note that you can specify a local directory on the @code{url} field above if +the channel that you intend to use resides on a local file system. However, in +this case @{guix} checks said directory for ownership before any further +processing. This means that if the user is not the directory owner, but wants +to use it as their default, they will then need to set it as a safe directory +in their global git configuration file. Otherwise, @command{guix} will refuse +to even read it. Supposing your system-wide local directory is at +@code{/src/guix.git}, you would then create a git configuration file at +@code{~/.gitconfig} with the following contents: + +@example +[safe] + directory = /src/guix.git +@end example + +@noindent +This also applies to the root user. + @node Replicating Guix @section Replicating Guix diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 78a89cfd5b..2f1eb27b3c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -799,7 +799,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). @@ -810,18 +810,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 @@ -863,10 +856,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) @@ -876,7 +869,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) @@ -892,17 +900,25 @@ (define-public libgit2-1.3 (define-public libgit2-1.1 (package (inherit libgit2-1.3) - (version "1.1.0") + (version "1.1.1") (source (origin (inherit (package-source libgit2-1.3)) (file-name #f) ;use the default name (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" - "releases/download/v" version - "/libgit2-" version ".tar.gz")) + "archive/refs/tags/v" version ".tar.gz")) (sha256 (base32 - "1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd")) + "085644zkjydjba9y162z4s020lfij3c191851ah13iv47wvjb98k")) + (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"))))) (patches (search-patches "libgit2-mtime-0.patch")))))) (define-public git-crypt -- 2.39.1