From unknown Sat Aug 16 16:06:14 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#27211 <27211@debbugs.gnu.org> To: bug#27211 <27211@debbugs.gnu.org> Subject: Status: [PATCH: core-updates] gnu: packages: libgit2: fix build and test runs Reply-To: bug#27211 <27211@debbugs.gnu.org> Date: Sat, 16 Aug 2025 23:06:14 +0000 retitle 27211 [PATCH: core-updates] gnu: packages: libgit2: fix build and t= est runs reassign 27211 guix-patches submitter 27211 Sergei Trofimovich severity 27211 normal tag 27211 fixed patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 03 11:18:28 2017 Received: (at submit) by debbugs.gnu.org; 3 Jun 2017 15:18:28 +0000 Received: from localhost ([127.0.0.1]:53992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHAou-0003Xj-20 for submit@debbugs.gnu.org; Sat, 03 Jun 2017 11:18:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHAoq-0003XS-Ba for submit@debbugs.gnu.org; Sat, 03 Jun 2017 11:18:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHAok-0003Sg-0Z for submit@debbugs.gnu.org; Sat, 03 Jun 2017 11:18:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:39367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dHAoj-0003SR-Tp for submit@debbugs.gnu.org; Sat, 03 Jun 2017 11:18:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHAoi-0005Zg-DX for guix-patches@gnu.org; Sat, 03 Jun 2017 11:18:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHAod-0003Nc-J7 for guix-patches@gnu.org; Sat, 03 Jun 2017 11:18:16 -0400 Received: from smtp34.i.mail.ru ([94.100.177.94]:53472) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dHAod-0003Jo-63 for guix-patches@gnu.org; Sat, 03 Jun 2017 11:18:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=inbox.ru; s=mail; h=Message-Id:Date:Subject:Cc:To:From; bh=lec0UM4tU4UD6SXysqX1wxUc4KjD2K4ch2Rfr5qqUgM=; b=mdq9WbwDaSQ45637y/OJIPyhCXhSi89RD1E+RZDwQBTd/YWva+JXG3ysx1xUxGbMigB5dmq05HnjizgAryByOLWdNo9OQ9L9Ee72vxJY09YPR4LkGsPJUbMSsPQBcufpjjYX0cIpMpdthjDftKDJIrfxi3UZbDImdt2lHpmEXiA=; Received: from host81-154-9-172.range81-154.btcentralplus.com ([81.154.9.172]:46204 helo=sf.home) by smtp34.i.mail.ru with esmtpa (envelope-from ) id 1dHAoY-0002a2-9G; Sat, 03 Jun 2017 18:18:06 +0300 Received: by sf.home (Postfix, from userid 1000) id E898C1B60E55C; Sat, 3 Jun 2017 16:18:01 +0100 (BST) From: Sergei Trofimovich To: guix-patches@gnu.org Subject: [PATCH: core-updates] gnu: packages: libgit2: fix build and test runs Date: Sat, 3 Jun 2017 16:17:58 +0100 Message-Id: <20170603151758.30769-1-slyfox@inbox.ru> X-Mailer: git-send-email 2.13.0 Authentication-Results: smtp34.i.mail.ru; auth=pass smtp.auth=slyfox@inbox.ru smtp.mailfrom=slyfox@inbox.ru X-7FA49CB5: 0D63561A33F958A5D4BB298A57DD79CD4FB3C37F63D82769AEF60641CB128713725E5C173C3A84C39B7AFBAF9359C3A247C07A5DB081018ABA6625F88748EAEFC4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0FF045C6A0F83C8214574AF45C6390F7469DAA53EE0834AAEE X-Mailru-Sender: FA4CBDC5470C32070EE9EFE54BAA98C99AD338C63481AF11A6B539CEA0A4D65D8D2F0B78A5E2C0F938F48B1DF051BE983DDE9B364B0DF28966D7C7C3F77E58D71B4ECFBB0E18FD14AE208404248635DF X-Mras: OK X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Sergei Trofimovich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) This commit reverts 'patch' hack introduced in a48a1071a686b250bf8b7982ca0ce8dda1d93c61 and fixes bug in clar test framework. Patch is proposed to clar upstream as https://github.com/vmg/clar/pull/78 * gnu/local.mk: add libgit2-0.25.1-mtime-0.patch * gnu/packages/patches/libgit2-0.25.1-mtime-0.patch: new file * gnu/packages/version-control.scm: remove 'patch' hack and apply libgit2-0.25.1-mtime-0.patch to fix tests Signed-off-by: Sergei Trofimovich --- gnu/local.mk | 1 + gnu/packages/patches/libgit2-0.25.1-mtime-0.patch | 13 +++++++++++++ gnu/packages/version-control.scm | 18 ++++-------------- 3 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/libgit2-0.25.1-mtime-0.patch diff --git a/gnu/local.mk b/gnu/local.mk index 95efe60ed..aacf9b020 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -720,6 +720,7 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-dns-tests.patch \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libextractor-ffmpeg-3.patch \ + %D%/packages/patches/libgit2-0.25.1-mtime-0.patch \ %D%/packages/patches/libgit2-use-after-free.patch \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ diff --git a/gnu/packages/patches/libgit2-0.25.1-mtime-0.patch b/gnu/packages/patches/libgit2-0.25.1-mtime-0.patch new file mode 100644 index 000000000..8ea018103 --- /dev/null +++ b/gnu/packages/patches/libgit2-0.25.1-mtime-0.patch @@ -0,0 +1,13 @@ +clar has a bug on fils with mtime=0 where +it skips file parsing phase. + +https://github.com/vmg/clar/pull/78 +diff --git a/tests/generate.py b/tests/generate.py +index b639c8f..111ca41 100644 +--- a/tests/generate.py ++++ b/tests/generate.py +@@ -63,3 +63,3 @@ class Module(object): + +- self.mtime = 0 ++ self.mtime = None # guix sets all file mtimes to '0' + self.enabled = True diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cd684c04e..e82e04053 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -335,7 +335,9 @@ everything from small to very large projects with speed and efficiency.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1cdwcw38frc1wf28x5ppddazv9hywc718j92f3xa3ybzzycyds3s")))) + "1cdwcw38frc1wf28x5ppddazv9hywc718j92f3xa3ybzzycyds3s")) + (patches (search-patches "libgit2-use-after-free.patch" + "libgit2-0.25.1-mtime-0.patch")))) (build-system cmake-build-system) (arguments `(#:phases @@ -348,25 +350,13 @@ everything from small to very large projects with speed and efficiency.") (("/bin/cp") (which "cp")) (("/bin/rm") (which "rm"))) #t)) - (add-after 'unpack 'apply-patch - (lambda* (#:key inputs #:allow-other-keys) - ;; XXX: For some reason adding the patch in 'patches', which - ;; leads to a new tarball with all timestamps reset and ordering - ;; by name (slightly different file order compared to the - ;; original tarball) leads to an obscure Python error while - ;; running 'generate.py': - ;; 'Module' object has no attribute 'callbacks' - ;; Thus, apply the patch here, which minimizes disruption. - (let ((patch (assoc-ref inputs "patch"))) - (zero? (system* "patch" "-p1" "--force" "--input" patch))))) ;; Run checks more verbosely. (replace 'check (lambda _ (zero? (system* "./libgit2_clar" "-v" "-Q"))))))) (inputs `(("libssh2" ,libssh2) ("libcurl" ,curl) - ("python" ,python-wrapper) - ("patch" ,(search-patch "libgit2-use-after-free.patch")))) + ("python" ,python-wrapper))) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs -- 2.13.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 03 19:00:35 2017 Received: (at 27211) by debbugs.gnu.org; 3 Jun 2017 23:00:35 +0000 Received: from localhost ([127.0.0.1]:54309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHI26-0002nF-W8 for submit@debbugs.gnu.org; Sat, 03 Jun 2017 19:00:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHI25-0002mq-Pm for 27211@debbugs.gnu.org; Sat, 03 Jun 2017 19:00:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHI1o-00029C-Kd for 27211@debbugs.gnu.org; Sat, 03 Jun 2017 19:00:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHI1o-000292-HN; Sat, 03 Jun 2017 19:00:16 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:48300 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dHI1n-0002uH-Sh; Sat, 03 Jun 2017 19:00:16 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Sergei Trofimovich Subject: Re: bug#27211: [PATCH: core-updates] gnu: packages: libgit2: fix build and test runs References: <20170603151758.30769-1-slyfox@inbox.ru> Date: Sun, 04 Jun 2017 01:00:13 +0200 In-Reply-To: <20170603151758.30769-1-slyfox@inbox.ru> (Sergei Trofimovich's message of "Sat, 3 Jun 2017 16:17:58 +0100") Message-ID: <87d1akisn6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27211 Cc: 27211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hello, Sergei Trofimovich skribis: > This commit reverts 'patch' hack introduced in > a48a1071a686b250bf8b7982ca0ce8dda1d93c61 and fixes > bug in clar test framework. > > Patch is proposed to clar upstream as > https://github.com/vmg/clar/pull/78 > > * gnu/local.mk: add libgit2-0.25.1-mtime-0.patch > * gnu/packages/patches/libgit2-0.25.1-mtime-0.patch: new file > * gnu/packages/version-control.scm: remove 'patch' hack and apply > libgit2-0.25.1-mtime-0.patch to fix tests > > Signed-off-by: Sergei Trofimovich Woow, good catch! I=E2=80=99ve pushed it to =E2=80=98master=E2=80=99 (I adjusted the commit l= og and the comment in the patch) since few packages depend on libgit2 according to =E2=80=98guix refresh -l=E2=80=99. Thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 03 19:00:40 2017 Received: (at control) by debbugs.gnu.org; 3 Jun 2017 23:00:40 +0000 Received: from localhost ([127.0.0.1]:54312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHI2C-0002nY-7i for submit@debbugs.gnu.org; Sat, 03 Jun 2017 19:00:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHI2A-0002n8-O2 for control@debbugs.gnu.org; Sat, 03 Jun 2017 19:00:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHI1x-0002HE-HT for control@debbugs.gnu.org; Sat, 03 Jun 2017 19:00:33 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHI1x-0002H8-E9 for control@debbugs.gnu.org; Sat, 03 Jun 2017 19:00:25 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:48302 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dHI1w-0002uN-Ly for control@debbugs.gnu.org; Sat, 03 Jun 2017 19:00:25 -0400 Date: Sun, 04 Jun 2017 01:00:22 +0200 Message-Id: <87bmq4ismx.fsf@gnu.org> To: control@debbugs.gnu.org From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: control message for bug #27211 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) tags 27211 fixed close 27211 From unknown Sat Aug 16 16:06:14 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 02 Jul 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator