X-Loop: help-debbugs@HIDDEN
Subject: [bug#70389] [PATCH] gnu: fossil: update to 2.23
Resent-From: ashish.is@HIDDEN
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 14 Apr 2024 23:56:01 +0000
Resent-Message-ID: <handler.70389.B.17131389534284 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 70389
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70389 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.17131389534284
(code B ref -1); Sun, 14 Apr 2024 23:56:01 +0000
Received: (at submit) by debbugs.gnu.org; 14 Apr 2024 23:55:53 +0000
Received: from localhost ([127.0.0.1]:36387 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rw9hP-00016Z-7l
for submit <at> debbugs.gnu.org; Sun, 14 Apr 2024 19:55:52 -0400
Received: from lists.gnu.org ([2001:470:142::17]:35816)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ashish.is@HIDDEN>) id 1rw9hM-00014y-SO
for submit <at> debbugs.gnu.org; Sun, 14 Apr 2024 19:55:49 -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 <ashish.is@HIDDEN>)
id 1rw9h4-0001y2-9p
for guix-patches@HIDDEN; Sun, 14 Apr 2024 19:55:30 -0400
Received: from anamika.lostca.se ([65.21.75.227])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <ashish.is@HIDDEN>)
id 1rw9h2-0003pu-8A
for guix-patches@HIDDEN; Sun, 14 Apr 2024 19:55:30 -0400
Received: from localhost.localdomain (poincare.inet6.in
[IPv6:2a0a:4cc0:1:12d4::1])
(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)
(No client certificate requested) (Authenticated sender: abbe)
by anamika.lostca.se (Postfix) with ESMTPSA id 391595B6;
Sun, 14 Apr 2024 23:55:15 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika;
t=1713138915;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding;
bh=zEAEkIIwWAezGp9QfQPEfjF2NDUKmLwJMIzX2ZQ5Sok=;
b=gaguzlSQhhqHIQHz4dGNiBsxs7lrWJSU9WgTb+DkWRlF9tDbUkY3b+2lbwuijzIPg7wea1
eWQq91aO8j5soecSq55pEJHpttZMT2DB1ZzXXDPuA3JwiXRMtwnSGgjGpL2X2H1xyzCqhM
AK3cGjI97I2bfTlZhdiw/kV/c4bp54Y=
From: ashish.is@HIDDEN
Date: Sun, 14 Apr 2024 23:54:50 +0000
Message-ID: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=65.21.75.227; envelope-from=ashish.is@HIDDEN;
helo=anamika.lostca.se
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
From: Ashish SHUKLA <ashish.is@HIDDEN>
* gnu/packages/version-control.scm (fossil): Update to 2.23.
Signed-off-by: Ashish SHUKLA <ashish.is@HIDDEN>
Change-Id: I1794e75cedc4a9bd878850e25686674cecd360e0
---
gnu/packages/version-control.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 19f128d45f..923f67a6a4 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3015,17 +3015,17 @@ (define-public git-annex-remote-rclone
(define-public fossil
(package
(name "fossil")
- (version "2.20")
+ (version "2.23")
(source
(origin
(method url-fetch)
(uri (string-append
"https://www.fossil-scm.org/home/tarball/"
- "210e89a0597f225f49722b096cf5563bf193e920e02a9bd38503a906deacd416"
+ "47362306a7dd7c6fc3cab77cebe5d25469b0a9448479d9718eb5c49c8337b29"
"/fossil-src-" version ".tar.gz"))
;; XXX: Currently the above hash must be manually updated.
(sha256
- (base32 "08g7img88n2nwcdkpzmg4aqbp2iy40nllgas53502dspm97ym4h8"))
+ (base32 "1r1kabvmlhc0qgyq8g9zhq8i0123x9dba9b71j4xc71k14kfqjm9"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "compat"))))
@@ -3035,7 +3035,7 @@ (define-public fossil
which ;for tests only
ed)) ;ditto
(inputs
- (list openssl zlib sqlite))
+ (list openssl zlib sqlite-next))
(arguments
`(#:configure-flags (list "--with-openssl=auto"
"--disable-internal-sqlite")
base-commit: 4e7337536ba41e888a601c92fada8a4adca9d2c6
--
2.41.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: ashish.is@HIDDEN Subject: bug#70389: Acknowledgement ([PATCH] gnu: fossil: update to 2.23) Message-ID: <handler.70389.B.17131389534284.ack <at> debbugs.gnu.org> References: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN> X-Gnu-PR-Message: ack 70389 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 70389 <at> debbugs.gnu.org Date: Sun, 14 Apr 2024 23:56:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 70389 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 70389: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D70389 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#70389] [PATCH v2] gnu: fossil: Update to 2.24.
Resent-From: ashish.is@HIDDEN
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 22 May 2024 00:03:01 +0000
Resent-Message-ID: <handler.70389.B70389.171633616931515 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70389
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70389 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is@HIDDEN>
Received: via spool by 70389-submit <at> debbugs.gnu.org id=B70389.171633616931515
(code B ref 70389); Wed, 22 May 2024 00:03:01 +0000
Received: (at 70389) by debbugs.gnu.org; 22 May 2024 00:02:49 +0000
Received: from localhost ([127.0.0.1]:51952 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s9ZRQ-0008CF-1Y
for submit <at> debbugs.gnu.org; Tue, 21 May 2024 20:02:48 -0400
Received: from anamika.lostca.se ([65.21.75.227]:43364)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ashish.is@HIDDEN>) id 1s9ZRL-0008C9-3Q
for 70389 <at> debbugs.gnu.org; Tue, 21 May 2024 20:02:46 -0400
Received: from localhost.localdomain (poincare.inet6.in
[IPv6:2a0a:4cc0:1:12d4::1])
(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)
(No client certificate requested) (Authenticated sender: abbe)
by anamika.lostca.se (Postfix) with ESMTPSA id 0623FAD3A;
Wed, 22 May 2024 00:01:59 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika;
t=1716336120;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=huxyI8UkNLWyuFH2UdroSJ8t0iGYbPyv3ANHEN+MltY=;
b=Z98X5d02cYwYs7m1uA2F4rge760s7kJd1kEjC+rnYzxhTGgFxBrxuhX+bt3tY5/umituGI
ZMWhegB39BJ4PagpPG9DdR8Gr0lEuyJJyZnnAUR6WXOqjRcnWKdEq+ERUnGHCuNfYxyE47
WMMy7XVp7m3XG6pnpA8IsimPnQo0XnM=
From: ashish.is@HIDDEN
Date: Tue, 21 May 2024 23:59:46 +0000
Message-ID: <b96ed1d29cfc8601ccd8ead081ff931b11f52eb3.1716335986.git.ashish.is@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
References: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
From: Ashish SHUKLA <ashish.is@HIDDEN>
* gnu/packages/version-control.scm (fossil): Update to 2.24.
[sources]: Switch to a simpler tarball URL. Add patches from
upstream to fix unit-tests.
[inputs]: Switch to sqlite-next as fossil needs bleeding edge
sqlite.
Change-Id: Id0cac2634282a0a141e2b17cb423c25e8aacee38
---
gnu/packages/version-control.scm | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c01eb9decd..d985c531d0 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3068,19 +3068,35 @@ (define-public git-annex-remote-rclone
(license license:gpl3+)))
(define-public fossil
+ (define (fossil-patch name from to hash)
+ (origin (method url-fetch)
+ (uri (string-append "https://fossil-scm.org/home/vpatch?from=" from
+ "&to=" to))
+ (sha256 (base32 hash))
+ (file-name name)))
(package
(name "fossil")
- (version "2.20")
+ (version "2.24")
(source
(origin
(method url-fetch)
(uri (string-append
- "https://www.fossil-scm.org/home/tarball/"
- "210e89a0597f225f49722b096cf5563bf193e920e02a9bd38503a906deacd416"
- "/fossil-src-" version ".tar.gz"))
- ;; XXX: Currently the above hash must be manually updated.
+ "https://fossil-scm.org/home/tarball/version-" version "/fossil-" version ".tar.gz"))
(sha256
- (base32 "08g7img88n2nwcdkpzmg4aqbp2iy40nllgas53502dspm97ym4h8"))
+ (base32 "0k1gjvxbvvs98yspnf7nj6rb0c7yf60savq7jywbkgimd0bkrkcm"))
+ (patch-flags '("-p0"))
+ (patches `(,(fossil-patch "fossil-disable-tests.patch"
+ "8be0372c10510437"
+ "5ad708085a90365f"
+ "1b4svsrz7cr1zi6qfpavj3ddm6dr0966jbgkbvgjz79ljqmpiasf")
+ ,(fossil-patch "fossil-fix-json-test.patch"
+ "fb4e90b662803e47"
+ "17c01c549e73c6b8"
+ "12gjzyxs22g9grv7qbgp9jg133bgcsj74621s05fk82j3fc7z59g")
+ ,(fossil-patch "fossil-comment-utf-tests.patch"
+ "5ad708085a90365f"
+ "fb4e90b662803e47"
+ "05h2mb6g0840yq74x1cdj95jmqb95i75h6g5v0rzqdc994b96cd4")))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "compat"))))
@@ -3090,7 +3106,7 @@ (define-public fossil
which ;for tests only
ed)) ;ditto
(inputs
- (list openssl zlib sqlite))
+ (list openssl zlib sqlite-next))
(arguments
`(#:configure-flags (list "--with-openssl=auto"
"--disable-internal-sqlite")
base-commit: 413ef75f89ac337f7ac3331a862c7c8cdc88aa64
--
2.45.1
Received: (at control) by debbugs.gnu.org; 22 May 2024 00:20:43 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 21 20:20:43 2024 Received: from localhost ([127.0.0.1]:52037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s9Zik-0008MG-RV for submit <at> debbugs.gnu.org; Tue, 21 May 2024 20:20:43 -0400 Received: from anamika.lostca.se ([65.21.75.227]:40436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ashish.is@HIDDEN>) id 1s9Zih-0008M4-RG for control <at> debbugs.gnu.org; Tue, 21 May 2024 20:20:41 -0400 Received: from email.lostca.se (localhost [IPv6:::1]) by anamika.lostca.se (Postfix) with ESMTP id 19184B206 for <control <at> debbugs.gnu.org>; Wed, 22 May 2024 00:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1716337198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A6bXxIrOdAOrwuBq/EeOAVbZu4h/1Tm5kaLNqWuuvTk=; b=CER1N4PpAzjCRNBusLcX7oytNJbGfZVF1XAbBMt8jzU8Kl/oODN1SMCWF14XspczbtpSi3 bGzxWqo+cg+3Ca9EsosAx4LdWniKCDBZWsPR8KxUJyIL1+PLNRgg6Mduq5cOqjtV9vLMNB vOTC/rbYeIpkcR0PhlcB6geWV7M9Uqw= MIME-Version: 1.0 Date: Wed, 22 May 2024 02:19:51 +0200 From: Ashish SHUKLA <ashish.is@HIDDEN> To: control <at> debbugs.gnu.org Subject: retitle bug 70389 User-Agent: Roundcube Webmail/1.6.5 Message-ID: <080c62214ee3a2566e4390ace04eec44@HIDDEN> X-Sender: ashish.is@HIDDEN Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) retitle 70389 [PATCH] gnu: fossil: update to 2.24
X-Loop: help-debbugs@HIDDEN
Subject: [bug#70389] [PATCH v2] gnu: fossil: Update to 2.24.
References: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
In-Reply-To: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
Resent-From: ashish.is@HIDDEN
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: ashish.is@HIDDEN, ashish.is@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 01 Aug 2024 21:49:02 +0000
Resent-Message-ID: <handler.70389.B70389.17225489144411 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70389
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70389 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is@HIDDEN>, ashish.is@HIDDEN, Ashish SHUKLA <ashish.is@HIDDEN>
X-Debbugs-Original-Xcc: ashish.is@HIDDEN, Ashish SHUKLA <ashish.is@HIDDEN>
Received: via spool by 70389-submit <at> debbugs.gnu.org id=B70389.17225489144411
(code B ref 70389); Thu, 01 Aug 2024 21:49:02 +0000
Received: (at 70389) by debbugs.gnu.org; 1 Aug 2024 21:48:34 +0000
Received: from localhost ([127.0.0.1]:52030 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sZdez-000192-Az
for submit <at> debbugs.gnu.org; Thu, 01 Aug 2024 17:48:34 -0400
Received: from anamika.lostca.se ([65.21.75.227]:33184)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ashish.is@HIDDEN>) id 1sZdeu-00018m-PE
for 70389 <at> debbugs.gnu.org; Thu, 01 Aug 2024 17:48:31 -0400
Received: from localhost.localdomain (poincare.inet6.in
[IPv6:2a0a:4cc0:1:12d4::1])
(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)
(No client certificate requested) (Authenticated sender: abbe)
by anamika.lostca.se (Postfix) with ESMTPSA id 49F141EB7A;
Thu, 1 Aug 2024 21:47:33 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika;
t=1722548853;
h=from:from: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;
bh=1mw3u4XpAYsnkuudRHXUky2R23oxK0r2E9+/2wnMC8w=;
b=Gb1tM0SUhaGnfrc1Is3ZiMEYB3bpoJ8fySame4iX1AGP7zFE7uiTbjnIRb6TEuGbqdFz6Q
Ye0YQJWhjZLfuiUDlYhCqdP6SkNqSihGU+M+uXccrTjCFWHeTcxmP0mS2PhaW1RU7xV0rD
+YTHan7zVe5bv7SzVp+UDz1tRU4GIgM=
From: ashish.is@HIDDEN
Date: Thu, 1 Aug 2024 21:44:19 +0000
Message-ID: <7c073e6175196f701f9104c4ac5bc20991d8b562.1722548648.git.ashish.is@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
From: Ashish SHUKLA <ashish.is@HIDDEN>
* gnu/packages/version-control.scm (fossil): Update to 2.24.
[sources]: switch to a simpler tarball URL. (patches): Add patches
from upstream to fix test failures. [inputs]: Switch to sqlite-next
as fossil needs bleeding edge sqlite.
* gnu/packages/patches/fossil-comment-utf-tests.patch: New file.
* gnu/packages/patches/fossil-disable-tests.patch: New file.
* gnu/packages/patches/fossil-fix-json-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register them.
Change-Id: I0e4ffa6b5017cce345b28de953564e534282f6b4
---
Hi,
It seems fossil upstream has introduced a captcha on their web interface which
is where the patches in the previous revision were fetched from. This revision
bundles those patches.
Thanks!
Ashish
gnu/local.mk | 3 +
.../patches/fossil-comment-utf-tests.patch | 119 +++++++++++
.../patches/fossil-disable-tests.patch | 187 ++++++++++++++++++
.../patches/fossil-fix-json-test.patch | 18 ++
gnu/packages/version-control.scm | 16 +-
5 files changed, 336 insertions(+), 7 deletions(-)
create mode 100644 gnu/packages/patches/fossil-comment-utf-tests.patch
create mode 100644 gnu/packages/patches/fossil-disable-tests.patch
create mode 100644 gnu/packages/patches/fossil-fix-json-test.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6d2b14e72d..d328533eee 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1240,6 +1240,9 @@ dist_patch_DATA = \
%D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
+ %D%/packages/patches/fossil-comment-utf-tests.patch \
+ %D%/packages/patches/fossil-disable-tests.patch \
+ %D%/packages/patches/fossil-fix-json-test.patch \
%D%/packages/patches/foxi-fix-build.patch \
%D%/packages/patches/fp16-implicit-double.patch \
%D%/packages/patches/fp16-system-libraries.patch \
diff --git a/gnu/packages/patches/fossil-comment-utf-tests.patch b/gnu/packages/patches/fossil-comment-utf-tests.patch
new file mode 100644
index 0000000000..7f03362be2
--- /dev/null
+++ b/gnu/packages/patches/fossil-comment-utf-tests.patch
@@ -0,0 +1,119 @@
+Index: test/utf.test
+==================================================================
+--- test/utf.test
++++ test/utf.test
+@@ -17609,25 +17609,25 @@
+ Has flag LOOK_LONG: no
+ Has flag LOOK_INVALID: no
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+
+-utf-check 1179 utf-check-1179-2-129-1.jnk \
+-{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: yes
+-Looks like UTF-8: yes
+-Has flag LOOK_NUL: no
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
++#utf-check 1179 utf-check-1179-2-129-1.jnk \
++#{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: yes
++#Looks like UTF-8: yes
++#Has flag LOOK_NUL: no
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: yes
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
+
+ utf-check 1180 utf-check-1180-2-130-0.jnk \
+ {File "%TEMP%/utf-check-1180-2-130-0.jnk" has 4 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: yes
+@@ -24121,41 +24121,41 @@
+ Has flag LOOK_LONG: no
+ Has flag LOOK_INVALID: yes
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+
+-utf-check 1586 utf-check-1586-3-128-0.jnk \
+-{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: reversed
+-Looks like UTF-16: no
+-Has flag LOOK_NUL: yes
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: no
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
+-
+-utf-check 1587 utf-check-1587-3-128-1.jnk \
+-{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: reversed
+-Looks like UTF-8: no
+-Has flag LOOK_NUL: yes
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
++#utf-check 1586 utf-check-1586-3-128-0.jnk \
++#{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: reversed
++#Looks like UTF-16: no
++#Has flag LOOK_NUL: yes
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: no
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
++
++#utf-check 1587 utf-check-1587-3-128-1.jnk \
++#{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: reversed
++#Looks like UTF-8: no
++#Has flag LOOK_NUL: yes
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: yes
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
+
+ utf-check 1588 utf-check-1588-3-129-0.jnk \
+ {File "%TEMP%/utf-check-1588-3-129-0.jnk" has 6 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: no
+
diff --git a/gnu/packages/patches/fossil-disable-tests.patch b/gnu/packages/patches/fossil-disable-tests.patch
new file mode 100644
index 0000000000..2aaf04e6d4
--- /dev/null
+++ b/gnu/packages/patches/fossil-disable-tests.patch
@@ -0,0 +1,187 @@
+Index: test/amend.test
+==================================================================
+--- test/amend.test
++++ test/amend.test
+@@ -313,10 +313,11 @@
+ }
+ foreach res [lsort -nocase $result] {
+ append t2exp "sym-$res*"
+ }
+ eval fossil amend $HASH $tags
++ set t1exp [string trimleft $t1exp ,]
+ test amend-tag-$tc.1 {[string match "*hash:*$HASH*tags:*$t1exp*" $RESULT]}
+ fossil tag ls --raw $HASH
+ test amend-tag-$tc.2 {[string match $t2exp $RESULT]}
+ fossil timeline -n 1
+ test amend-tag-$tc.3 {[string match $t3exp $RESULT]}
+
+Index: test/merge5.test
+==================================================================
+--- test/merge5.test
++++ test/merge5.test
+@@ -23,11 +23,11 @@
+ }
+ protOut {
+ fossil sqlite3 --no-repository reacts badly to SQL dumped from
+ repositories created from fossil older than version 2.0.
+ }
+-test merge5-sqlite3-issue false knownBug
++#test merge5-sqlite3-issue false knownBug
+ test_cleanup_then_return
+
+ # Verify the results of a check-out
+ #
+ proc checkout-test {testid expected_content} {
+
+Index: test/stash.test
+==================================================================
+--- test/stash.test
++++ test/stash.test
+@@ -168,14 +168,14 @@
+
+ ########
+ # fossil stash show|cat ?STASHID? ?DIFF-OPTIONS?
+ # fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS?
+
+-fossil stash show
+-test stash-1-show {[normalize_result] eq $diff_stash_1}
+-fossil stash diff
+-test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
++#fossil stash show
++#test stash-1-show {[normalize_result] eq $diff_stash_1}
++#fossil stash diff
++#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
+
+ ########
+ # fossil stash pop
+
+ stash-test 2 pop {
+@@ -206,16 +206,16 @@
+ # fossil: ./src/delta.c:231: checksum: Assertion '...' failed.
+ # Should be triggered by this stash-WY-1 test.
+ fossil checkout --force c1
+ fossil clean
+ fossil mv --soft f1 f1new
+-stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
+- REVERT f1
+- DELETE f1new
+-} -changes {
+-} -addremove {
+-} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
++#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
++# REVERT f1
++# DELETE f1new
++#} -changes {
++#} -addremove {
++#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
+ # TODO: add tests that verify the saved stash is sensible. Possibly
+ # by applying it and checking results. But until the SQLITE_CONSTRAINT
+ # error is fixed, there is nothing stashed to test.
+
+
+@@ -296,16 +296,17 @@
+ }] -changes {
+ RENAMED f2 -> f2n
+ } -addremove {
+ } -exists {f1 f2n} -notexists {f2}
+
+-stash-test 3-2 {save -m f2n} {
+- REVERT f2
+- DELETE f2n
+-} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
++fossil stash save -m f2n
++#stash-test 3-2 {save -m f2n} {
++# REVERT f2
++# DELETE f2n
++#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
+ fossil stash show
+-test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
++#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
+ test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
+ stash-test 3-2-pop {pop} {
+ UPDATE f1
+ UPDATE f2n
+ } -changes {
+
+Index: test/tester.tcl
+==================================================================
+--- test/tester.tcl
++++ test/tester.tcl
+@@ -308,10 +308,11 @@
+ comment-format \
+ crlf-glob \
+ crnl-glob \
+ default-csp \
+ default-perms \
++ default-skin \
+ diff-binary \
+ diff-command \
+ dont-commit \
+ dont-push \
+ dotfiles \
+
+Index: test/utf.test
+==================================================================
+--- test/utf.test
++++ test/utf.test
+@@ -35,11 +35,11 @@
+ set i 1
+ foreach {fileName result} $args {
+ set fileName [file join $tempPath $fileName]
+ fossil test-looks-like-utf $fileName
+ set result [string map [list %TEMP% $tempPath \r\n \n] $result]
+- # if {$::RESULT ne $result} {puts stdout $::RESULT}
++ # if {$::RESULT ne $result} {puts stdout $::RESULT; exit}
+ test utf-check-$testname.$i {$::RESULT eq $result}
+ incr i
+ }
+ }
+
+@@ -17613,12 +17613,12 @@
+
+ utf-check 1179 utf-check-1179-2-129-1.jnk \
+ {File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: yes
+-Looks like UTF-8: no
+-Has flag LOOK_NUL: yes
++Looks like UTF-8: yes
++Has flag LOOK_NUL: no
+ Has flag LOOK_CR: no
+ Has flag LOOK_LONE_CR: no
+ Has flag LOOK_LF: no
+ Has flag LOOK_LONE_LF: no
+ Has flag LOOK_CRLF: no
+@@ -24124,27 +24124,27 @@
+ Has flag LOOK_SHORT: no}
+
+ utf-check 1586 utf-check-1586-3-128-0.jnk \
+ {File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
+ Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: no
+-Looks like UTF-8: no
++Starts with UTF-16 BOM: reversed
++Looks like UTF-16: no
+ Has flag LOOK_NUL: yes
+ Has flag LOOK_CR: no
+ Has flag LOOK_LONE_CR: no
+ Has flag LOOK_LF: no
+ Has flag LOOK_LONE_LF: no
+ Has flag LOOK_CRLF: no
+ Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
++Has flag LOOK_INVALID: no
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+
+ utf-check 1587 utf-check-1587-3-128-1.jnk \
+ {File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
+ Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: no
++Starts with UTF-16 BOM: reversed
+ Looks like UTF-8: no
+ Has flag LOOK_NUL: yes
+ Has flag LOOK_CR: no
+ Has flag LOOK_LONE_CR: no
+ Has flag LOOK_LF: no
+
diff --git a/gnu/packages/patches/fossil-fix-json-test.patch b/gnu/packages/patches/fossil-fix-json-test.patch
new file mode 100644
index 0000000000..adafce2e9e
--- /dev/null
+++ b/gnu/packages/patches/fossil-fix-json-test.patch
@@ -0,0 +1,18 @@
+Index: test/json.test
+==================================================================
+--- test/json.test
++++ test/json.test
+@@ -107,11 +107,11 @@
+ set request [subst {POST $url HTTP/1.0\r
+ Host: localhost\r
+ User-Agent: Fossil-Test\r
+ Cookie: $cookie\r
+ Content-Type: application/json
+-Content-Length $len
++Content-Length: $len
+ \r
+ $data}]
+ } else {
+ set request [subst {GET $url HTTP/1.0\r
+ Host: localhost\r
+
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 9f67237d5d..0951eb6f23 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -53,6 +53,7 @@
;;; Copyright © 2023 Josselin Poiret <dev@HIDDEN>
;;; Copyright © 2024 Hilton Chain <hako@HIDDEN>
;;; Copyright © 2024 Suhail Singh <suhail@HIDDEN>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3132,17 +3133,18 @@ (define-public git-annex-remote-rclone
(define-public fossil
(package
(name "fossil")
- (version "2.20")
+ (version "2.24")
(source
(origin
(method url-fetch)
(uri (string-append
- "https://www.fossil-scm.org/home/tarball/"
- "210e89a0597f225f49722b096cf5563bf193e920e02a9bd38503a906deacd416"
- "/fossil-src-" version ".tar.gz"))
- ;; XXX: Currently the above hash must be manually updated.
+ "https://fossil-scm.org/home/tarball/version-" version "/fossil-" version ".tar.gz"))
(sha256
- (base32 "08g7img88n2nwcdkpzmg4aqbp2iy40nllgas53502dspm97ym4h8"))
+ (base32 "0k1gjvxbvvs98yspnf7nj6rb0c7yf60savq7jywbkgimd0bkrkcm"))
+ (patch-flags '("-p0"))
+ (patches (search-patches "fossil-comment-utf-tests.patch"
+ "fossil-disable-tests.patch"
+ "fossil-fix-json-test.patch"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "compat"))))
@@ -3152,7 +3154,7 @@ (define-public fossil
which ;for tests only
ed)) ;ditto
(inputs
- (list openssl zlib sqlite))
+ (list openssl zlib sqlite-next))
(arguments
`(#:configure-flags (list "--with-openssl=auto"
"--disable-internal-sqlite")
base-commit: 2b4e3c9847dce02e371ff4dce615789fdfd101fa
--
2.45.2
Received: (at control) by debbugs.gnu.org; 1 Aug 2024 21:51:09 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 01 17:51:09 2024 Received: from localhost ([127.0.0.1]:52041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sZdhV-0001DX-1g for submit <at> debbugs.gnu.org; Thu, 01 Aug 2024 17:51:09 -0400 Received: from anamika.lostca.se ([65.21.75.227]:35208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ashish.is@HIDDEN>) id 1sZdhS-0001D2-OR for control <at> debbugs.gnu.org; Thu, 01 Aug 2024 17:51:07 -0400 Received: from sofia (186.red-81-34-66.dynamicip.rima-tde.net [81.34.66.186]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 2ECCB1E9FC for <control <at> debbugs.gnu.org>; Thu, 1 Aug 2024 21:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1722549013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=G2Xu/lsHH4EtfaMkviatQ1zVUeAxB5+Jm8o23bT0Aww=; b=kt1BIUxLDLUDYSkdiLPSpMdvfepGzYE4BarEkE2SuYzLJN0uRIRPx5dBp3luBLdFmY1nx7 nII9ioYZbPvmHVwW0O4F3fLnRd0rPqXO9/2jX3p0fEqalRlMAibT+ceSsNtubRrEGf9pqO sKKku4Ybx5ArlExfaC1YKnSxF0dpkGo= Date: Thu, 1 Aug 2024 21:50:01 +0000 From: Ashish <ashish.is@HIDDEN> To: control <at> debbugs.gnu.org Subject: retitle bug report Message-ID: <gfhgqs3qwvut6ingm5ne2ni3faswbbuc3olytxokrmo5vahmda@wgjzq6zflvtq> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: NeoMutt/20230517 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) retitle 70389 [PATCH v2] gnu: fossil: Update to 2.24. quit
X-Loop: help-debbugs@HIDDEN
Subject: [bug#70389] [PATCH v2] gnu: fossil: Update to 2.24.
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 15 Sep 2024 22:01:02 +0000
Resent-Message-ID: <handler.70389.B70389.172643761530432 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70389
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: ashish.is@HIDDEN
Cc: 70389 <at> debbugs.gnu.org
Received: via spool by 70389-submit <at> debbugs.gnu.org id=B70389.172643761530432
(code B ref 70389); Sun, 15 Sep 2024 22:01:02 +0000
Received: (at 70389) by debbugs.gnu.org; 15 Sep 2024 22:00:15 +0000
Received: from localhost ([127.0.0.1]:50663 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1spxHz-0007uU-7f
for submit <at> debbugs.gnu.org; Sun, 15 Sep 2024 18:00:15 -0400
Received: from eggs.gnu.org ([209.51.188.92]:33818)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1spxHw-0007t4-9F
for 70389 <at> debbugs.gnu.org; Sun, 15 Sep 2024 18:00:13 -0400
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 <ludo@HIDDEN>)
id 1spxHd-0000fS-6i; Sun, 15 Sep 2024 17:59:53 -0400
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=NSowaoL1aOMtBXPndvJUba9QfSibIe/CEcCkVdVGSm0=; b=SUbZ7miVI8VuT6S+yB+X
WvMdjWwhUjNryWv9RWx4t+323c8uL53siJ0sKs9fVOBTF2L6U2SGExuDNU3HSI/NhLi0lnHvcFH0H
9OVAl/OMTD+Ig6QCSEXBPhSiWQkQhmRKdiKHhrKsoZG1IsFp3oLLmSavdgZx1bUzWunFFuDDgfp/4
iY0uPtS5RWknmbLqiD/c9KwZNM6sfXARs10+a6ryf760nKTvvljXoO6J1+rE6fw2AMsWqM+8dYA4d
LG7EtsB2wbDaw0Dwv29EROPvxSKlK0Z15By9NfMEZvfnADyvKS4lS2qFAJ+4REjbRr7cUGZ/vdqfq
ekZ6WOK72+UkZw==;
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
In-Reply-To: <7c073e6175196f701f9104c4ac5bc20991d8b562.1722548648.git.ashish.is@HIDDEN>
(ashish is's message of "Thu, 1 Aug 2024 21:44:19 +0000")
References: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
<7c073e6175196f701f9104c4ac5bc20991d8b562.1722548648.git.ashish.is@HIDDEN>
Date: Sun, 15 Sep 2024 23:59:50 +0200
Message-ID: <87bk0obmsp.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi,
ashish.is@HIDDEN skribis:
> From: Ashish SHUKLA <ashish.is@HIDDEN>
>
> * gnu/packages/version-control.scm (fossil): Update to 2.24.
> [sources]: switch to a simpler tarball URL. (patches): Add patches
> from upstream to fix test failures. [inputs]: Switch to sqlite-next
> as fossil needs bleeding edge sqlite.
>
> * gnu/packages/patches/fossil-comment-utf-tests.patch: New file.
> * gnu/packages/patches/fossil-disable-tests.patch: New file.
> * gnu/packages/patches/fossil-fix-json-test.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register them.
>
> Change-Id: I0e4ffa6b5017cce345b28de953564e534282f6b4
> ---
> Hi,
>
> It seems fossil upstream has introduced a captcha on their web interface =
which
> is where the patches in the previous revision were fetched from. This rev=
ision
> bundles those patches.
Right, this is terrible.
> diff --git a/gnu/packages/patches/fossil-comment-utf-tests.patch b/gnu/pa=
ckages/patches/fossil-comment-utf-tests.patch
> new file mode 100644
> index 0000000000..7f03362be2
> --- /dev/null
> +++ b/gnu/packages/patches/fossil-comment-utf-tests.patch
> @@ -0,0 +1,119 @@
> +Index: test/utf.test
Could you add a couple of lines at the top of each patch to (1) briefly
state what they=E2=80=99re about and (2) where they come from (upstream
revisions or branches they were taken from, as could be seen in the
/home/vpatch?from=3DX&to=3DY URLs)?
Otherwise LGTM, thanks!
Ludo=E2=80=99.
X-Loop: help-debbugs@HIDDEN
Subject: [bug#70389] [PATCH v3] gnu: fossil: Update to 2.24.
References: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
In-Reply-To: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
Resent-From: Ashish SHUKLA <ashish.is@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 16 Sep 2024 03:32:02 +0000
Resent-Message-ID: <handler.70389.B70389.17264575213501 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70389
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70389 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is@HIDDEN>
Received: via spool by 70389-submit <at> debbugs.gnu.org id=B70389.17264575213501
(code B ref 70389); Mon, 16 Sep 2024 03:32:02 +0000
Received: (at 70389) by debbugs.gnu.org; 16 Sep 2024 03:32:01 +0000
Received: from localhost ([127.0.0.1]:50827 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sq2T2-0000uL-JA
for submit <at> debbugs.gnu.org; Sun, 15 Sep 2024 23:32:01 -0400
Received: from anamika.lostca.se ([65.21.75.227]:59740)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ashish.is@HIDDEN>) id 1sq2Sz-0000u3-3F
for 70389 <at> debbugs.gnu.org; Sun, 15 Sep 2024 23:31:59 -0400
Received: from seneca.inet6.in (unknown
[IPv6:2401:c080:3400:28a8:5400:5ff:fe16:9400])
(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)
(No client certificate requested) (Authenticated sender: abbe)
by anamika.lostca.se (Postfix) with ESMTPSA id 37B972A9D0;
Mon, 16 Sep 2024 03:31:37 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika;
t=1726457497;
h=from:from: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;
bh=sg/LPcCqh/ssfmoELkJLzOemO97mQiTtbIQrgsreQgw=;
b=VEg4cILrKfM0dwaHHzwsRvw+Dgt7q3bGJ2bd3FMB8xXzW+TjLDpIgwp1WEeegubClyfQS3
8YizZRTnPOl+6LCu56TrZ85TD5rN8k0Y9PYrpaNjEj8cb86+bv09Pgqg1NNn+r2d1uikq0
hE6LiuFgzGzmIHan1F4rtpkL0rtTbwE=
From: Ashish SHUKLA <ashish.is@HIDDEN>
Date: Mon, 16 Sep 2024 03:29:40 +0000
Message-ID: <90567de912b6539854b18e4657f8c82364f56245.1726457379.git.ashish.is@HIDDEN>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/version-control.scm (fossil): Update to 2.24.
[sources]: switch to a simpler tarball URL. (patches): Add patches
from upstream to fix test failures. [inputs]: Switch to sqlite-next
as fossil needs bleeding edge sqlite.
* gnu/packages/patches/fossil-comment-utf-tests.patch: New file.
* gnu/packages/patches/fossil-disable-tests.patch: New file.
* gnu/packages/patches/fossil-fix-json-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register them.
Change-Id: I0e4ffa6b5017cce345b28de953564e534282f6b4
---
Hi,
In this revision, the patches to fix/mask failing test cases are annotated with the upstream source URLs, and the commit messages.
HTH
gnu/local.mk | 3 +
.../patches/fossil-comment-utf-tests.patch | 124 ++++++++++++
.../patches/fossil-disable-tests.patch | 191 ++++++++++++++++++
.../patches/fossil-fix-json-test.patch | 22 ++
gnu/packages/version-control.scm | 16 +-
5 files changed, 349 insertions(+), 7 deletions(-)
create mode 100644 gnu/packages/patches/fossil-comment-utf-tests.patch
create mode 100644 gnu/packages/patches/fossil-disable-tests.patch
create mode 100644 gnu/packages/patches/fossil-fix-json-test.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index fcdf174099..f609e48881 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1267,6 +1267,9 @@ dist_patch_DATA = \
%D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
+ %D%/packages/patches/fossil-comment-utf-tests.patch \
+ %D%/packages/patches/fossil-disable-tests.patch \
+ %D%/packages/patches/fossil-fix-json-test.patch \
%D%/packages/patches/foxi-fix-build.patch \
%D%/packages/patches/fp16-implicit-double.patch \
%D%/packages/patches/fp16-system-libraries.patch \
diff --git a/gnu/packages/patches/fossil-comment-utf-tests.patch b/gnu/packages/patches/fossil-comment-utf-tests.patch
new file mode 100644
index 0000000000..1d3c676af8
--- /dev/null
+++ b/gnu/packages/patches/fossil-comment-utf-tests.patch
@@ -0,0 +1,124 @@
+Source: https://fossil-scm.org/home/vdiff?from=5ad708085a90365f&to=fb4e90b662803e47
+
+Comment out UTF tests 1179, 1586, and 1587 as they give different results on
+different platforms, for reasons unknown.
+
+Index: test/utf.test
+==================================================================
+--- test/utf.test
++++ test/utf.test
+@@ -17609,25 +17609,25 @@
+ Has flag LOOK_LONG: no
+ Has flag LOOK_INVALID: no
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+
+-utf-check 1179 utf-check-1179-2-129-1.jnk \
+-{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: yes
+-Looks like UTF-8: yes
+-Has flag LOOK_NUL: no
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
++#utf-check 1179 utf-check-1179-2-129-1.jnk \
++#{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: yes
++#Looks like UTF-8: yes
++#Has flag LOOK_NUL: no
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: yes
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
+
+ utf-check 1180 utf-check-1180-2-130-0.jnk \
+ {File "%TEMP%/utf-check-1180-2-130-0.jnk" has 4 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: yes
+@@ -24121,41 +24121,41 @@
+ Has flag LOOK_LONG: no
+ Has flag LOOK_INVALID: yes
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+
+-utf-check 1586 utf-check-1586-3-128-0.jnk \
+-{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: reversed
+-Looks like UTF-16: no
+-Has flag LOOK_NUL: yes
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: no
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
+-
+-utf-check 1587 utf-check-1587-3-128-1.jnk \
+-{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: reversed
+-Looks like UTF-8: no
+-Has flag LOOK_NUL: yes
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
++#utf-check 1586 utf-check-1586-3-128-0.jnk \
++#{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: reversed
++#Looks like UTF-16: no
++#Has flag LOOK_NUL: yes
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: no
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
++
++#utf-check 1587 utf-check-1587-3-128-1.jnk \
++#{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: reversed
++#Looks like UTF-8: no
++#Has flag LOOK_NUL: yes
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: yes
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
+
+ utf-check 1588 utf-check-1588-3-129-0.jnk \
+ {File "%TEMP%/utf-check-1588-3-129-0.jnk" has 6 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: no
+
diff --git a/gnu/packages/patches/fossil-disable-tests.patch b/gnu/packages/patches/fossil-disable-tests.patch
new file mode 100644
index 0000000000..06bc3cb71a
--- /dev/null
+++ b/gnu/packages/patches/fossil-disable-tests.patch
@@ -0,0 +1,191 @@
+Source: https://fossil-scm.org/home/vdiff?to=5ad708085a90365f&from=8be0372c10510437
+
+Fix or disable brittle test cases that were broken by changes in 2.23.
+
+Index: test/amend.test
+==================================================================
+--- test/amend.test
++++ test/amend.test
+@@ -313,10 +313,11 @@
+ }
+ foreach res [lsort -nocase $result] {
+ append t2exp "sym-$res*"
+ }
+ eval fossil amend $HASH $tags
++ set t1exp [string trimleft $t1exp ,]
+ test amend-tag-$tc.1 {[string match "*hash:*$HASH*tags:*$t1exp*" $RESULT]}
+ fossil tag ls --raw $HASH
+ test amend-tag-$tc.2 {[string match $t2exp $RESULT]}
+ fossil timeline -n 1
+ test amend-tag-$tc.3 {[string match $t3exp $RESULT]}
+
+Index: test/merge5.test
+==================================================================
+--- test/merge5.test
++++ test/merge5.test
+@@ -23,11 +23,11 @@
+ }
+ protOut {
+ fossil sqlite3 --no-repository reacts badly to SQL dumped from
+ repositories created from fossil older than version 2.0.
+ }
+-test merge5-sqlite3-issue false knownBug
++#test merge5-sqlite3-issue false knownBug
+ test_cleanup_then_return
+
+ # Verify the results of a check-out
+ #
+ proc checkout-test {testid expected_content} {
+
+Index: test/stash.test
+==================================================================
+--- test/stash.test
++++ test/stash.test
+@@ -168,14 +168,14 @@
+
+ ########
+ # fossil stash show|cat ?STASHID? ?DIFF-OPTIONS?
+ # fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS?
+
+-fossil stash show
+-test stash-1-show {[normalize_result] eq $diff_stash_1}
+-fossil stash diff
+-test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
++#fossil stash show
++#test stash-1-show {[normalize_result] eq $diff_stash_1}
++#fossil stash diff
++#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
+
+ ########
+ # fossil stash pop
+
+ stash-test 2 pop {
+@@ -206,16 +206,16 @@
+ # fossil: ./src/delta.c:231: checksum: Assertion '...' failed.
+ # Should be triggered by this stash-WY-1 test.
+ fossil checkout --force c1
+ fossil clean
+ fossil mv --soft f1 f1new
+-stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
+- REVERT f1
+- DELETE f1new
+-} -changes {
+-} -addremove {
+-} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
++#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
++# REVERT f1
++# DELETE f1new
++#} -changes {
++#} -addremove {
++#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
+ # TODO: add tests that verify the saved stash is sensible. Possibly
+ # by applying it and checking results. But until the SQLITE_CONSTRAINT
+ # error is fixed, there is nothing stashed to test.
+
+
+@@ -296,16 +296,17 @@
+ }] -changes {
+ RENAMED f2 -> f2n
+ } -addremove {
+ } -exists {f1 f2n} -notexists {f2}
+
+-stash-test 3-2 {save -m f2n} {
+- REVERT f2
+- DELETE f2n
+-} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
++fossil stash save -m f2n
++#stash-test 3-2 {save -m f2n} {
++# REVERT f2
++# DELETE f2n
++#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
+ fossil stash show
+-test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
++#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
+ test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
+ stash-test 3-2-pop {pop} {
+ UPDATE f1
+ UPDATE f2n
+ } -changes {
+
+Index: test/tester.tcl
+==================================================================
+--- test/tester.tcl
++++ test/tester.tcl
+@@ -308,10 +308,11 @@
+ comment-format \
+ crlf-glob \
+ crnl-glob \
+ default-csp \
+ default-perms \
++ default-skin \
+ diff-binary \
+ diff-command \
+ dont-commit \
+ dont-push \
+ dotfiles \
+
+Index: test/utf.test
+==================================================================
+--- test/utf.test
++++ test/utf.test
+@@ -35,11 +35,11 @@
+ set i 1
+ foreach {fileName result} $args {
+ set fileName [file join $tempPath $fileName]
+ fossil test-looks-like-utf $fileName
+ set result [string map [list %TEMP% $tempPath \r\n \n] $result]
+- # if {$::RESULT ne $result} {puts stdout $::RESULT}
++ # if {$::RESULT ne $result} {puts stdout $::RESULT; exit}
+ test utf-check-$testname.$i {$::RESULT eq $result}
+ incr i
+ }
+ }
+
+@@ -17613,12 +17613,12 @@
+
+ utf-check 1179 utf-check-1179-2-129-1.jnk \
+ {File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: yes
+-Looks like UTF-8: no
+-Has flag LOOK_NUL: yes
++Looks like UTF-8: yes
++Has flag LOOK_NUL: no
+ Has flag LOOK_CR: no
+ Has flag LOOK_LONE_CR: no
+ Has flag LOOK_LF: no
+ Has flag LOOK_LONE_LF: no
+ Has flag LOOK_CRLF: no
+@@ -24124,27 +24124,27 @@
+ Has flag LOOK_SHORT: no}
+
+ utf-check 1586 utf-check-1586-3-128-0.jnk \
+ {File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
+ Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: no
+-Looks like UTF-8: no
++Starts with UTF-16 BOM: reversed
++Looks like UTF-16: no
+ Has flag LOOK_NUL: yes
+ Has flag LOOK_CR: no
+ Has flag LOOK_LONE_CR: no
+ Has flag LOOK_LF: no
+ Has flag LOOK_LONE_LF: no
+ Has flag LOOK_CRLF: no
+ Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
++Has flag LOOK_INVALID: no
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+
+ utf-check 1587 utf-check-1587-3-128-1.jnk \
+ {File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
+ Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: no
++Starts with UTF-16 BOM: reversed
+ Looks like UTF-8: no
+ Has flag LOOK_NUL: yes
+ Has flag LOOK_CR: no
+ Has flag LOOK_LONE_CR: no
+ Has flag LOOK_LF: no
+
diff --git a/gnu/packages/patches/fossil-fix-json-test.patch b/gnu/packages/patches/fossil-fix-json-test.patch
new file mode 100644
index 0000000000..7d26298028
--- /dev/null
+++ b/gnu/packages/patches/fossil-fix-json-test.patch
@@ -0,0 +1,22 @@
+Source: https://fossil-scm.org/home/vdiff?to=17c01c549e73c6b8&from=fb4e90b662803e47
+
+Fix json-cap-POSTenv-name, json-cap-POSTenv-notsetup tests
+
+Index: test/json.test
+==================================================================
+--- test/json.test
++++ test/json.test
+@@ -107,11 +107,11 @@
+ set request [subst {POST $url HTTP/1.0\r
+ Host: localhost\r
+ User-Agent: Fossil-Test\r
+ Cookie: $cookie\r
+ Content-Type: application/json
+-Content-Length $len
++Content-Length: $len
+ \r
+ $data}]
+ } else {
+ set request [subst {GET $url HTTP/1.0\r
+ Host: localhost\r
+
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 852879901a..f438b7ada5 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -56,6 +56,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@HIDDEN>
;;; Copyright © 2024 Suhail Singh <suhail@HIDDEN>
;;; Copyright © 2024 Simon Tournier <zimon.toutoune@HIDDEN>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3223,17 +3224,18 @@ (define-public git-annex-remote-rclone
(define-public fossil
(package
(name "fossil")
- (version "2.20")
+ (version "2.24")
(source
(origin
(method url-fetch)
(uri (string-append
- "https://www.fossil-scm.org/home/tarball/"
- "210e89a0597f225f49722b096cf5563bf193e920e02a9bd38503a906deacd416"
- "/fossil-src-" version ".tar.gz"))
- ;; XXX: Currently the above hash must be manually updated.
+ "https://fossil-scm.org/home/tarball/version-" version "/fossil-" version ".tar.gz"))
(sha256
- (base32 "08g7img88n2nwcdkpzmg4aqbp2iy40nllgas53502dspm97ym4h8"))
+ (base32 "0k1gjvxbvvs98yspnf7nj6rb0c7yf60savq7jywbkgimd0bkrkcm"))
+ (patch-flags '("-p0"))
+ (patches (search-patches "fossil-comment-utf-tests.patch"
+ "fossil-disable-tests.patch"
+ "fossil-fix-json-test.patch"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "compat"))))
@@ -3243,7 +3245,7 @@ (define-public fossil
which ;for tests only
ed)) ;ditto
(inputs
- (list openssl zlib sqlite))
+ (list openssl zlib sqlite-next))
(arguments
`(#:configure-flags (list "--with-openssl=auto"
"--disable-internal-sqlite")
base-commit: 8bb98e67cb3ff0a73463787654ab6460a3a9db0a
--
2.46.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#70389] [PATCH v4] gnu: fossil: Update to 2.24.
Resent-From: Ashish SHUKLA <ashish.is@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 16 Sep 2024 15:51:01 +0000
Resent-Message-ID: <handler.70389.B70389.172650185930918 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70389
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70389 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is@HIDDEN>
Received: via spool by 70389-submit <at> debbugs.gnu.org id=B70389.172650185930918
(code B ref 70389); Mon, 16 Sep 2024 15:51:01 +0000
Received: (at 70389) by debbugs.gnu.org; 16 Sep 2024 15:50:59 +0000
Received: from localhost ([127.0.0.1]:53104 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sqE0A-00082b-Ca
for submit <at> debbugs.gnu.org; Mon, 16 Sep 2024 11:50:59 -0400
Received: from anamika.lostca.se ([65.21.75.227]:45126)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ashish.is@HIDDEN>) id 1sqE07-00082I-It
for 70389 <at> debbugs.gnu.org; Mon, 16 Sep 2024 11:50:57 -0400
Received: from seneca.inet6.in (unknown
[IPv6:2401:c080:3400:28a8:5400:5ff:fe16:9400])
(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)
(No client certificate requested) (Authenticated sender: abbe)
by anamika.lostca.se (Postfix) with ESMTPSA id CFEE92B08E;
Mon, 16 Sep 2024 15:50:33 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika;
t=1726501834;
h=from:from: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:
in-reply-to:in-reply-to:references:references;
bh=hBydva2jpdIL7tFohwgWTBJRSsk8aYf86ju5KadIZ3I=;
b=f6tAzJu8/pOn5+um0aTgoDXaJfHScRpV27554dFBvn4SJH4qEIzC3F6Y7zLzeqQqi8MsyF
n8KErsAc1wjmfTRyhzYmIYNhyP3QCSARPG5pi09FF3Z8bCG1ASuOTvbO+lYjPjlamQAMq9
ilPjE+X5cG8R6Yu5Bsw6Ott38RAuklM=
From: Ashish SHUKLA <ashish.is@HIDDEN>
Date: Mon, 16 Sep 2024 15:48:38 +0000
Message-ID: <70ca87be51ea591a128edd857d15188e5d869c8f.1726501717.git.ashish.is@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <87bk0obmsp.fsf_-_@HIDDEN>
References: <87bk0obmsp.fsf_-_@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam: Yes
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/version-control.scm (fossil): Update to 2.24.
[sources]: switch to a simpler tarball URL. (patches): Add patches
from upstream to fix test failures. [inputs]: Switch to sqlite-next
as fossil needs bleeding edge sqlite.
* gnu/packages/patches/fossil-comment-utf-tests.patch: New file.
* gnu/packages/patches/fossil-disable-tests.patch: New file.
* gnu/packages/patches/fossil-fix-json-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register them.
Change-Id: I0e4ffa6b5017cce345b28de953564e534282f6b4
---
Hi,
This revision fixes the build error in previous revision that was sneaked in due to reordering of the patches on my part.
Thanks!
Ashish
gnu/local.mk | 3 +
.../patches/fossil-comment-utf-tests.patch | 124 ++++++++++++
.../patches/fossil-disable-tests.patch | 191 ++++++++++++++++++
.../patches/fossil-fix-json-test.patch | 22 ++
gnu/packages/version-control.scm | 16 +-
5 files changed, 349 insertions(+), 7 deletions(-)
create mode 100644 gnu/packages/patches/fossil-comment-utf-tests.patch
create mode 100644 gnu/packages/patches/fossil-disable-tests.patch
create mode 100644 gnu/packages/patches/fossil-fix-json-test.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index fcdf174099..f609e48881 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1267,6 +1267,9 @@ dist_patch_DATA = \
%D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
+ %D%/packages/patches/fossil-comment-utf-tests.patch \
+ %D%/packages/patches/fossil-disable-tests.patch \
+ %D%/packages/patches/fossil-fix-json-test.patch \
%D%/packages/patches/foxi-fix-build.patch \
%D%/packages/patches/fp16-implicit-double.patch \
%D%/packages/patches/fp16-system-libraries.patch \
diff --git a/gnu/packages/patches/fossil-comment-utf-tests.patch b/gnu/packages/patches/fossil-comment-utf-tests.patch
new file mode 100644
index 0000000000..1d3c676af8
--- /dev/null
+++ b/gnu/packages/patches/fossil-comment-utf-tests.patch
@@ -0,0 +1,124 @@
+Source: https://fossil-scm.org/home/vdiff?from=5ad708085a90365f&to=fb4e90b662803e47
+
+Comment out UTF tests 1179, 1586, and 1587 as they give different results on
+different platforms, for reasons unknown.
+
+Index: test/utf.test
+==================================================================
+--- test/utf.test
++++ test/utf.test
+@@ -17609,25 +17609,25 @@
+ Has flag LOOK_LONG: no
+ Has flag LOOK_INVALID: no
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+
+-utf-check 1179 utf-check-1179-2-129-1.jnk \
+-{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: yes
+-Looks like UTF-8: yes
+-Has flag LOOK_NUL: no
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
++#utf-check 1179 utf-check-1179-2-129-1.jnk \
++#{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: yes
++#Looks like UTF-8: yes
++#Has flag LOOK_NUL: no
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: yes
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
+
+ utf-check 1180 utf-check-1180-2-130-0.jnk \
+ {File "%TEMP%/utf-check-1180-2-130-0.jnk" has 4 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: yes
+@@ -24121,41 +24121,41 @@
+ Has flag LOOK_LONG: no
+ Has flag LOOK_INVALID: yes
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+
+-utf-check 1586 utf-check-1586-3-128-0.jnk \
+-{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: reversed
+-Looks like UTF-16: no
+-Has flag LOOK_NUL: yes
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: no
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
+-
+-utf-check 1587 utf-check-1587-3-128-1.jnk \
+-{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: reversed
+-Looks like UTF-8: no
+-Has flag LOOK_NUL: yes
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
++#utf-check 1586 utf-check-1586-3-128-0.jnk \
++#{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: reversed
++#Looks like UTF-16: no
++#Has flag LOOK_NUL: yes
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: no
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
++
++#utf-check 1587 utf-check-1587-3-128-1.jnk \
++#{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: reversed
++#Looks like UTF-8: no
++#Has flag LOOK_NUL: yes
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: yes
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
+
+ utf-check 1588 utf-check-1588-3-129-0.jnk \
+ {File "%TEMP%/utf-check-1588-3-129-0.jnk" has 6 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: no
+
diff --git a/gnu/packages/patches/fossil-disable-tests.patch b/gnu/packages/patches/fossil-disable-tests.patch
new file mode 100644
index 0000000000..06bc3cb71a
--- /dev/null
+++ b/gnu/packages/patches/fossil-disable-tests.patch
@@ -0,0 +1,191 @@
+Source: https://fossil-scm.org/home/vdiff?to=5ad708085a90365f&from=8be0372c10510437
+
+Fix or disable brittle test cases that were broken by changes in 2.23.
+
+Index: test/amend.test
+==================================================================
+--- test/amend.test
++++ test/amend.test
+@@ -313,10 +313,11 @@
+ }
+ foreach res [lsort -nocase $result] {
+ append t2exp "sym-$res*"
+ }
+ eval fossil amend $HASH $tags
++ set t1exp [string trimleft $t1exp ,]
+ test amend-tag-$tc.1 {[string match "*hash:*$HASH*tags:*$t1exp*" $RESULT]}
+ fossil tag ls --raw $HASH
+ test amend-tag-$tc.2 {[string match $t2exp $RESULT]}
+ fossil timeline -n 1
+ test amend-tag-$tc.3 {[string match $t3exp $RESULT]}
+
+Index: test/merge5.test
+==================================================================
+--- test/merge5.test
++++ test/merge5.test
+@@ -23,11 +23,11 @@
+ }
+ protOut {
+ fossil sqlite3 --no-repository reacts badly to SQL dumped from
+ repositories created from fossil older than version 2.0.
+ }
+-test merge5-sqlite3-issue false knownBug
++#test merge5-sqlite3-issue false knownBug
+ test_cleanup_then_return
+
+ # Verify the results of a check-out
+ #
+ proc checkout-test {testid expected_content} {
+
+Index: test/stash.test
+==================================================================
+--- test/stash.test
++++ test/stash.test
+@@ -168,14 +168,14 @@
+
+ ########
+ # fossil stash show|cat ?STASHID? ?DIFF-OPTIONS?
+ # fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS?
+
+-fossil stash show
+-test stash-1-show {[normalize_result] eq $diff_stash_1}
+-fossil stash diff
+-test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
++#fossil stash show
++#test stash-1-show {[normalize_result] eq $diff_stash_1}
++#fossil stash diff
++#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
+
+ ########
+ # fossil stash pop
+
+ stash-test 2 pop {
+@@ -206,16 +206,16 @@
+ # fossil: ./src/delta.c:231: checksum: Assertion '...' failed.
+ # Should be triggered by this stash-WY-1 test.
+ fossil checkout --force c1
+ fossil clean
+ fossil mv --soft f1 f1new
+-stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
+- REVERT f1
+- DELETE f1new
+-} -changes {
+-} -addremove {
+-} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
++#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
++# REVERT f1
++# DELETE f1new
++#} -changes {
++#} -addremove {
++#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
+ # TODO: add tests that verify the saved stash is sensible. Possibly
+ # by applying it and checking results. But until the SQLITE_CONSTRAINT
+ # error is fixed, there is nothing stashed to test.
+
+
+@@ -296,16 +296,17 @@
+ }] -changes {
+ RENAMED f2 -> f2n
+ } -addremove {
+ } -exists {f1 f2n} -notexists {f2}
+
+-stash-test 3-2 {save -m f2n} {
+- REVERT f2
+- DELETE f2n
+-} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
++fossil stash save -m f2n
++#stash-test 3-2 {save -m f2n} {
++# REVERT f2
++# DELETE f2n
++#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
+ fossil stash show
+-test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
++#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
+ test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
+ stash-test 3-2-pop {pop} {
+ UPDATE f1
+ UPDATE f2n
+ } -changes {
+
+Index: test/tester.tcl
+==================================================================
+--- test/tester.tcl
++++ test/tester.tcl
+@@ -308,10 +308,11 @@
+ comment-format \
+ crlf-glob \
+ crnl-glob \
+ default-csp \
+ default-perms \
++ default-skin \
+ diff-binary \
+ diff-command \
+ dont-commit \
+ dont-push \
+ dotfiles \
+
+Index: test/utf.test
+==================================================================
+--- test/utf.test
++++ test/utf.test
+@@ -35,11 +35,11 @@
+ set i 1
+ foreach {fileName result} $args {
+ set fileName [file join $tempPath $fileName]
+ fossil test-looks-like-utf $fileName
+ set result [string map [list %TEMP% $tempPath \r\n \n] $result]
+- # if {$::RESULT ne $result} {puts stdout $::RESULT}
++ # if {$::RESULT ne $result} {puts stdout $::RESULT; exit}
+ test utf-check-$testname.$i {$::RESULT eq $result}
+ incr i
+ }
+ }
+
+@@ -17613,12 +17613,12 @@
+
+ utf-check 1179 utf-check-1179-2-129-1.jnk \
+ {File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: yes
+-Looks like UTF-8: no
+-Has flag LOOK_NUL: yes
++Looks like UTF-8: yes
++Has flag LOOK_NUL: no
+ Has flag LOOK_CR: no
+ Has flag LOOK_LONE_CR: no
+ Has flag LOOK_LF: no
+ Has flag LOOK_LONE_LF: no
+ Has flag LOOK_CRLF: no
+@@ -24124,27 +24124,27 @@
+ Has flag LOOK_SHORT: no}
+
+ utf-check 1586 utf-check-1586-3-128-0.jnk \
+ {File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
+ Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: no
+-Looks like UTF-8: no
++Starts with UTF-16 BOM: reversed
++Looks like UTF-16: no
+ Has flag LOOK_NUL: yes
+ Has flag LOOK_CR: no
+ Has flag LOOK_LONE_CR: no
+ Has flag LOOK_LF: no
+ Has flag LOOK_LONE_LF: no
+ Has flag LOOK_CRLF: no
+ Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
++Has flag LOOK_INVALID: no
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+
+ utf-check 1587 utf-check-1587-3-128-1.jnk \
+ {File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
+ Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: no
++Starts with UTF-16 BOM: reversed
+ Looks like UTF-8: no
+ Has flag LOOK_NUL: yes
+ Has flag LOOK_CR: no
+ Has flag LOOK_LONE_CR: no
+ Has flag LOOK_LF: no
+
diff --git a/gnu/packages/patches/fossil-fix-json-test.patch b/gnu/packages/patches/fossil-fix-json-test.patch
new file mode 100644
index 0000000000..7d26298028
--- /dev/null
+++ b/gnu/packages/patches/fossil-fix-json-test.patch
@@ -0,0 +1,22 @@
+Source: https://fossil-scm.org/home/vdiff?to=17c01c549e73c6b8&from=fb4e90b662803e47
+
+Fix json-cap-POSTenv-name, json-cap-POSTenv-notsetup tests
+
+Index: test/json.test
+==================================================================
+--- test/json.test
++++ test/json.test
+@@ -107,11 +107,11 @@
+ set request [subst {POST $url HTTP/1.0\r
+ Host: localhost\r
+ User-Agent: Fossil-Test\r
+ Cookie: $cookie\r
+ Content-Type: application/json
+-Content-Length $len
++Content-Length: $len
+ \r
+ $data}]
+ } else {
+ set request [subst {GET $url HTTP/1.0\r
+ Host: localhost\r
+
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 852879901a..14ec018205 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -56,6 +56,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@HIDDEN>
;;; Copyright © 2024 Suhail Singh <suhail@HIDDEN>
;;; Copyright © 2024 Simon Tournier <zimon.toutoune@HIDDEN>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3223,17 +3224,18 @@ (define-public git-annex-remote-rclone
(define-public fossil
(package
(name "fossil")
- (version "2.20")
+ (version "2.24")
(source
(origin
(method url-fetch)
(uri (string-append
- "https://www.fossil-scm.org/home/tarball/"
- "210e89a0597f225f49722b096cf5563bf193e920e02a9bd38503a906deacd416"
- "/fossil-src-" version ".tar.gz"))
- ;; XXX: Currently the above hash must be manually updated.
+ "https://fossil-scm.org/home/tarball/version-" version "/fossil-" version ".tar.gz"))
(sha256
- (base32 "08g7img88n2nwcdkpzmg4aqbp2iy40nllgas53502dspm97ym4h8"))
+ (base32 "0k1gjvxbvvs98yspnf7nj6rb0c7yf60savq7jywbkgimd0bkrkcm"))
+ (patch-flags '("-p0"))
+ (patches (search-patches "fossil-disable-tests.patch"
+ "fossil-comment-utf-tests.patch"
+ "fossil-fix-json-test.patch"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "compat"))))
@@ -3243,7 +3245,7 @@ (define-public fossil
which ;for tests only
ed)) ;ditto
(inputs
- (list openssl zlib sqlite))
+ (list openssl zlib sqlite-next))
(arguments
`(#:configure-flags (list "--with-openssl=auto"
"--disable-internal-sqlite")
base-commit: ee64bcfb796ef36db4b63f79540627fb25f3320a
--
2.46.0
Received: (at control) by debbugs.gnu.org; 16 Sep 2024 15:52:47 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 16 11:52:47 2024 Received: from localhost ([127.0.0.1]:53109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sqE1v-000860-HY for submit <at> debbugs.gnu.org; Mon, 16 Sep 2024 11:52:47 -0400 Received: from anamika.lostca.se ([65.21.75.227]:45116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ashish.is@HIDDEN>) id 1sqE1t-00085k-AW for control <at> debbugs.gnu.org; Mon, 16 Sep 2024 11:52:45 -0400 Received: from localhost (unknown [103.55.60.118]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 9D8D02B380; Mon, 16 Sep 2024 15:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1726501916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u+imcKjwH1lrUc5ptfWoTpHr4mx+lMi/xneooHJcBDY=; b=JdqpKf/R8hlZ+UKKgK0VIodBMMbOKZm8M4HQy0P1fhU5dGC/9sjM1ra63YXvYcZHB6xKvD SiIcT63nR+VvY6Kd6QvPA6vvfyGrHRzilqVYGngEBkluZEfOLsTjrSOKYJwF/TFcKRshkJ atP8asWbPrC9IlKKFcC/5X7W3Gyc/+g= Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8; format=Flowed Date: Mon, 16 Sep 2024 21:21:53 +0530 Message-Id: <D47TULCRR3PC.23TH15GG6B52Y@HIDDEN> Subject: retite bug report From: "Ashish SHUKLA" <ashish.is@HIDDEN> To: <control <at> debbugs.gnu.org> X-Mailer: aerc 0.18.2 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) retitle 70389 [PATCH v4] gnu: fossil: Update to 2.24. quit
X-Loop: help-debbugs@HIDDEN
Subject: [bug#70389] [PATCH v5] gnu: fossil: Update to 2.25.
Resent-From: ashish.is@HIDDEN
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 19 Nov 2024 04:55:02 +0000
Resent-Message-ID: <handler.70389.B70389.173199208329089 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70389
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70389 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is@HIDDEN>
Received: via spool by 70389-submit <at> debbugs.gnu.org id=B70389.173199208329089
(code B ref 70389); Tue, 19 Nov 2024 04:55:02 +0000
Received: (at 70389) by debbugs.gnu.org; 19 Nov 2024 04:54:43 +0000
Received: from localhost ([127.0.0.1]:40121 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tDGG6-0007Yx-W3
for submit <at> debbugs.gnu.org; Mon, 18 Nov 2024 23:54:43 -0500
Received: from anamika.lostca.se ([65.21.75.227]:46040)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ashish.is@HIDDEN>) id 1tDGG4-0007Yf-Hy
for 70389 <at> debbugs.gnu.org; Mon, 18 Nov 2024 23:54:37 -0500
Received: from bob.inet6.fi (bob.inet6.fi [IPv6:2a0a:4cc0:0:1325::1])
(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)
(No client certificate requested) (Authenticated sender: abbe)
by anamika.lostca.se (Postfix) with ESMTPSA id 2AB7F3BD8C;
Tue, 19 Nov 2024 04:53:57 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika;
t=1731992037;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=K8O8A8Cxm9JySwaHJZxDg3Mdc9TLk1s2YGMkpylhdjg=;
b=PNvru7ET4KugoTXBdKo+3GZJu8z1lC59jtOFpYmRK8je5gsLNKa4Ypv1CfIvrJDeyvaD4O
94H+EA6PPKicsEAK2FkZG2jsDShkcXNawFvmQ37GPxJ+W0/zwp0hxhA2Wwjv8QqDyMjwC0
1r7uxCR9wSW9g1TkTZXhNaZlbtDRG/o=
From: ashish.is@HIDDEN
Date: Tue, 19 Nov 2024 04:53:46 +0000
Message-ID: <1b0c7c42a4cce63266a9be38d2f85d70b0232118.1731992026.git.ashish.is@HIDDEN>
X-Mailer: git-send-email 2.47.0
In-Reply-To: <70ca87be51ea591a128edd857d15188e5d869c8f.1726501717.git.ashish.is@HIDDEN>
References: <70ca87be51ea591a128edd857d15188e5d869c8f.1726501717.git.ashish.is@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
From: Ashish SHUKLA <ashish.is@HIDDEN>
* gnu/packages/version-control.scm (fossil): Update to 2.25.
[source]: switch to a simpler tarball URL.
[arguments]<configure-flags>: Add flag to enable JSON support.
Change-Id: I644dff44ce96d7f42e92cdbc994c4096ac55bf10
---
gnu/packages/version-control.scm | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c892a83a98..e39c57c137 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3309,20 +3309,15 @@ (define-public git-annex-remote-rclone
(define-public fossil
(package
(name "fossil")
- (version "2.23")
+ (version "2.25")
(source
(origin
(method url-fetch)
(uri (string-append
- "https://www.fossil-scm.org/home/tarball/"
- "47362306a7dd7c6fc3cab77cebe5d25469b0a9448479d9718eb5c49c8337b29"
- "/fossil-src-" version ".tar.gz"))
- ;; XXX: Currently the above hash must be manually updated.
+ "https://fossil-scm.org/home/tarball/version-" version
+ "/fossil-" version ".tar.gz"))
(sha256
- (base32 "1r1kabvmlhc0qgyq8g9zhq8i0123x9dba9b71j4xc71k14kfqjm9"))
- (modules '((guix build utils)))
- (snippet
- '(delete-file-recursively "compat"))))
+ (base32 "18gws90by2q6a6rk7h3mx46pn79lz4zi3saxlyrdz5982mw9rvp4"))))
(build-system gnu-build-system)
(native-inputs
(list tcl ;for configuration only
@@ -3333,6 +3328,7 @@ (define-public fossil
(list openssl zlib sqlite-next))
(arguments
`(#:configure-flags (list "--with-openssl=auto"
+ "--enable-json"
"--disable-internal-sqlite")
#:test-target "test"
#:phases (modify-phases %standard-phases
base-commit: 4473f8ae902c2192cab6919363a9101ce9861e45
--
2.47.0
Received: (at control) by debbugs.gnu.org; 19 Nov 2024 04:54:44 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 18 23:54:43 2024 Received: from localhost ([127.0.0.1]:40124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tDGGB-0007Z8-Fp for submit <at> debbugs.gnu.org; Mon, 18 Nov 2024 23:54:43 -0500 Received: from anamika.lostca.se ([65.21.75.227]:46052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ashish.is@HIDDEN>) id 1tDGG8-0007Yo-V7 for control <at> debbugs.gnu.org; Mon, 18 Nov 2024 23:54:41 -0500 Received: from localhost (unknown [IPv6:2a02:9140:3880:af00:a568:d4c7:7a14:562c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 401053BD8E; Tue, 19 Nov 2024 04:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1731992075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WJGUwxfPxEqX6IOW8Pu90wQyhPPXFJNfMGe3nO4ONsE=; b=QQMvIYb34Dwi+lYJNB8Dfov0pfuaf1hpQx6O2hEyLdGp4MediyNOai3f0p2OO2j2v75ONV PuYSYo4bd6ABOPnSMOI5zV0ENbQHMOQp1uBB5wzJrE2YwxTHXMYBfi1SNrN+B9H2CHInkz QoLftFXa3mCN/772TRy0GXorXND5giU= Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8; format=Flowed Date: Tue, 19 Nov 2024 05:54:33 +0100 Message-Id: <D5PVY640JS28.3KED1M1MVGQ7K@HIDDEN> Subject: retitle bug From: "Ashish SHUKLA" <ashish.is@HIDDEN> To: <control <at> debbugs.gnu.org> X-Mailer: aerc 0.18.2 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) retitle 70389 [PATCH v5] gnu: fossil: Update to 2.25. quit
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.