From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 8FyPI+hn5GNvHwAAbAwnHQ (envelope-from ) for ; Thu, 09 Feb 2023 04:26:32 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yD2+Iuhn5GN9lQAAG6o9tA (envelope-from ) for ; Thu, 09 Feb 2023 04:26:32 +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 000852CD35 for ; Thu, 9 Feb 2023 04:26:31 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPxZc-0007uK-KM; Wed, 08 Feb 2023 22:26: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 1pPxZY-0007u7-8N for guix-patches@gnu.org; Wed, 08 Feb 2023 22:26:08 -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 1pPxZS-0003IL-N7 for guix-patches@gnu.org; Wed, 08 Feb 2023 22:26:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPxZS-0005kE-EV for guix-patches@gnu.org; Wed, 08 Feb 2023 22:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61246] [PATCH] gnu: libgit2: Update to 1.5.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Feb 2023 03:26: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: =?UTF-8?Q?Andr=C3=A9?= Batista Cc: 61246@debbugs.gnu.org Received: via spool by 61246-submit@debbugs.gnu.org id=B61246.167591315222066 (code B ref 61246); Thu, 09 Feb 2023 03:26:02 +0000 Received: (at 61246) by debbugs.gnu.org; 9 Feb 2023 03:25:52 +0000 Received: from localhost ([127.0.0.1]:57098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPxZH-0005jl-Os for submit@debbugs.gnu.org; Wed, 08 Feb 2023 22:25:52 -0500 Received: from mail-qv1-f46.google.com ([209.85.219.46]:35463) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPxZF-0005jY-Dc for 61246@debbugs.gnu.org; Wed, 08 Feb 2023 22:25:50 -0500 Received: by mail-qv1-f46.google.com with SMTP id i12so584160qvs.2 for <61246@debbugs.gnu.org>; Wed, 08 Feb 2023 19:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=syht8C6SUuGb9jE5lM/sRIoydZT8Z3CwUP4tjmcOouI=; b=ngznV+fesMnQxawY2wi9L/b2ARdd6r3MH0LYtCJHL1joFzUitU+qCKwF/yh5Q1ODHY BPnIWSk4do2oc4qE0VKxLoXqN9+ZLdQG3AqTvBshfHyg14lQfKRLVcLrOnAOFdbjjKbj 5d5vCdA1i5qRDOE43465rBUs53eEDniMlv/hM7arG5HLAPimQEckaHPUlXAfjWliZXXz uHZpmUe4qj/N9Lhmj1opvO+tjPNgMMJ1+k5nEGN/8/wPJBpRy520C053qSxH0O5KHR5K vrabwY9JRX/5DGBrYc7VNgJy86ba9Y3n6PnN86AReAqkso83dLhZ6f03K3iPIQAzKMhO y8wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=syht8C6SUuGb9jE5lM/sRIoydZT8Z3CwUP4tjmcOouI=; b=Xv5kIQDf+n9WHdA6LdNjtBp1SXfiDXYgm69fcaRB21A7f9yAYmoKyLOYhuL/menhIL 70yr9ZnOzg1M/OrmTL5g18pgvlgLvkQZ2oc2j0d8rbr69o5MUYAkUTSp9rvFpex076ZI J5M2iJXHmdl8jkz3Fq5elMxM0sopkxaTgoccJGO2cvEH44Mp6K6BtgxAZNIqxCYIzqdH rlykEyNrGLlnVexXWdXsgp1wmJurg278BSbJuaqm7gQPlHynseCIr8DKOfVrm0X7da+T FlCxvpmgFy6HtJTOvsdaM07IpZmHXUGXMhdlA8JFXYzXMw/ghajc0KobcexoVfhJs/w0 9FuA== X-Gm-Message-State: AO0yUKXva6LAuUQcop9E3e+AewNN1Zo+z3KifRYX0Cyei6ZLqGuKAn2q OrObqSJrQA0FHZGPPSEkgfNHBMz+zf3LkQ== X-Google-Smtp-Source: AK7set9t0g5bYKBBfC1EOUYhUA4IhFGPbUM24f7GIbFM33fgOd/8gZFnWKXYQ3aV/NDQy0oHyvlzMA== X-Received: by 2002:ad4:5bae:0:b0:532:1d87:d78a with SMTP id 14-20020ad45bae000000b005321d87d78amr15036574qvq.2.1675913143636; Wed, 08 Feb 2023 19:25:43 -0800 (PST) Received: from hurd (dsl-151-105.b2b2c.ca. [66.158.151.105]) by smtp.gmail.com with ESMTPSA id e65-20020a378244000000b0072ed644bb0dsm470035qkd.97.2023.02.08.19.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 19:25:42 -0800 (PST) From: Maxim Cournoyer References: <20230203031129.3529-1-nandre@riseup.net> Date: Wed, 08 Feb 2023 22:25:41 -0500 In-Reply-To: ("=?UTF-8?Q?Andr=C3=A9?= Batista"'s message of "Wed, 8 Feb 2023 12:43:58 -0300") Message-ID: <877cwrjz9m.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675913192; a=rsa-sha256; cv=none; b=aUdU/cE4aY37powrL0ckRwdIJKIKUnerX1K2Y29imefTTwgc+U50AheFrZEqoY+NbAuWls ilj+BsXQ3JyjcQdwbFT/91pPWl5NlURo70ADbtmr8fyMNOluGB0QFaVZI5L3FsPV/ZIV+G 7wPS2WfyQ9uwBM1uPGbsRPVUuN8vsT7EL5+lQdAFIv9ydlXkhy3dCnafsIphrEqyOqBYSv Cipy3OuRSbfqoI5LFsyeN/SYzXOPgiSKtYNJO6F6dCV099I78a9FjgmR7jeEecT25W9Zzi ijnvX9OQ/LTI9w98KWzWvcrifeYA1HOzBHk8DbdMlLJNIineXoC+3qUjTKpZVQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ngznV+fe; 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=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675913192; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=syht8C6SUuGb9jE5lM/sRIoydZT8Z3CwUP4tjmcOouI=; b=IXOR4v7NfEr1PMImigd4AZpvOJfuU1VF8Zu/UBaVkowPcf7sYHI04uw8t6sMhKyzcWVZ1T qoS/ANxzvL+nfmorx6HjRaS5Jck8EGa3u1ixKSEYR5B6oLwCca89zN7k6BxN5pYcdUcX7E 5ey5tIsZE6k5wXcMVXCB9rIHv7S0Y5ka/KR6VCDwRk/VDLwBqQqhwQ7+8a1D22/rKcPjDp YdqUH50vZJ3gw+86RLR17hcNe76R9/6wibYJD5soK0w2IsDRoPJZVBB53gv8Cp9xLvTmYC ZR5QbyeItEIGZJYS0JkPGwlcDdjaLqfa1ngwUEmUQsEQnXpCfj16lIiLh1WcCA== X-Migadu-Queue-Id: 000852CD35 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ngznV+fe; 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=gmail.com (policy=none) X-Migadu-Spam-Score: -2.00 X-Spam-Score: -2.00 X-TUID: 21gugRcXXKO8 Hello Andr=C3=A9, Andr=C3=A9 Batista writes: > There were both a missing space on the copyright and a missing texi > 'command' tag on the previous patch to guix.texi. Please, apply this > one instead. > > > From 97b1752180ac89f78fdbbbec7d6c4aaf0a18bdbf Mon Sep 17 00:00:00 2001 > From: =3D?UTF-8?q?Andr=3DC3=3DA9=3D20Batista?=3D > Date: Wed, 8 Feb 2023 12:28:25 -0300 > Subject: [PATCH] gnu: libgit2: Update to 1.5.1. > To: guix-patches@gnu.org > Cc: 61246@debbugs.gnu.org > > * 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. This loooks good, thanks! > 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..5314488d7e 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=C3=A9 Batista@* > +Copyright @copyright{} 2020, 2023 Andr=C3=A9 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 conc= ern is > addressed below (@pxref{Channel Authentication}). >=20=20 > +Note that you can specify a local directory on the @code{url} field abov= e if > +the channel that you intend to use resides on a local file system. Howe= ver, > +in this case @command{guix} checks said directory for ownership before a= ny > +further processing. This means that if the user is not the directory ow= ner, > +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{g= uix} > +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 =3D /src/guix.git > +@end example > + > +@noindent > +This also applies to the root user. > + > @node Replicating Guix > @section Replicating Guix >=20=20 > diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-cont= rol.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#dis= cussioncomment-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 co= mmit. > - ;; 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))) >=20=20 > -(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= ")) We do not use Github/Gitlab/etc. auto-generated tarballs has there is no guarantee that they'll be bit-for-bit identical upon regeneration and this led to broken checksums in the past. Could you please use the tag/commit instead? I noticed about this problem looking at the QA page here: https://qa.guix.gnu.org/issue/61246. I'm not sure what are the other problems reported, they look like false positives to me. Did you rebuild the dependent packages, used that with Guix without problems so far? The QA has yet to answer that question. --=20 Thanks, Maxim