From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id aLcTBOpT6GavQQEA62LTzQ:P1 (envelope-from ) for ; Mon, 16 Sep 2024 15:51:06 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id aLcTBOpT6GavQQEA62LTzQ (envelope-from ) for ; Mon, 16 Sep 2024 17:51:06 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=QCqY5yT7; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=f6tAzJu8; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726501865; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=hBydva2jpdIL7tFohwgWTBJRSsk8aYf86ju5KadIZ3I=; b=CpZalolH/nJT5fsh2d14aC9adyIIzRzR1SEITplF+VQWYthapZegz4wqL+RLesmfxUlZ/b 9d/mgfze6IGmm3yCA1DktPbn36dFlFAXrAvyXirEt8GgBwQLpdvYeZgXfZHD+EYmX6zx/c gnXA6g4DO3NYFM4y6pJRl5Ob9kHEgnCFZ83dlSG/wlEiLhyxP+oQJgq194kzyo8/dsbdJk Ucea30K0YM3jmihGNHKZCDAMDKGH7dZlOvBN+sX43/GgsmSYomHhC3aPdFbOh9xoTNcj7P KqSXn32WsO+Uhs+DivHDDE5CeOmkGJVLnweluSE1Szr1HvF98LXkj6AwVDK85A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=QCqY5yT7; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=f6tAzJu8; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726501865; a=rsa-sha256; cv=none; b=lLCPbxGoVV2wxgO3xy6VX/ZedeNG7U07GWYfZiAV9szA2NRWJCIoEfPooOHh3ICx4idvM9 ly5+Gb+vVdSVFEfGULnJiIUjaVwS6s7w6HXvw03VEZAzPD2jOpgSrFMRN3utq+okJho+rg GqmZq5fQ3OmF+Mj2HzDz0ietUMIzMEpIzkRdWLNmkwJ3FC/2ZhdsfltaAPVOiizsx89t1D 22CYA/OA7S86jNwTvTO0EZR7VrPIiwFtFdIkQGsgxvHEt/fiLvDc54bxXD/A1p4HPjMTx8 g38YXFwWDFIfpxI4t5DM8j+P4Hx0muAAJO1f+MRdKmQP5Kyv7IUh09/R5/toIA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8DA0BAC1 for ; Mon, 16 Sep 2024 17:51:05 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqE02-00063t-6R; Mon, 16 Sep 2024 11:50:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sqE00-00063X-Tr for guix-patches@gnu.org; Mon, 16 Sep 2024 11:50:48 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sqE00-0000OZ-Kv for guix-patches@gnu.org; Mon, 16 Sep 2024 11:50:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=hBydva2jpdIL7tFohwgWTBJRSsk8aYf86ju5KadIZ3I=; b=QCqY5yT7E/EEWDmH0aEeKsA712LoJDKSSfF/ZtPUynUtTcK+KupgtJoFRnvePlmCJ/VOVeqX+PlL/avslSK94yA6R8YnbnARkfZpU9FqFLYlowe37k1abZIywN1u5I/2yx4MSNaXvG+5xqy/5qUL00Rhy2M/wPIqoU52xPAH1kM3ChOigcfx3uPPzUrLcK3nEERFt60cy0DjhBCYI/IRcnjkcf13pDCiELNx/TAwfevoJeWvbJ+41AUSkS2W1LnyjQzYHufwfUgLznsdEqyjUPuunA7cb0sWHhcm9hGeZnPIDLUigOn2MrQyMyBSR2kFlZrZ9cHGNGXHUyfyfsLEyA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sqE0E-00082s-0i for guix-patches@gnu.org; Mon, 16 Sep 2024 11:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70389] [PATCH v4] gnu: fossil: Update to 2.24. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Sep 2024 15:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70389 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70389@debbugs.gnu.org Cc: Ashish SHUKLA Received: via spool by 70389-submit@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 ) id 1sqE0A-00082b-Ca for submit@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 ) id 1sqE07-00082I-It for 70389@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= Date: Mon, 16 Sep 2024 15:48:38 +0000 Message-ID: <70ca87be51ea591a128edd857d15188e5d869c8f.1726501717.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.46.0 In-Reply-To: <87bk0obmsp.fsf_-_@gnu.org> References: <87bk0obmsp.fsf_-_@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches From: Ashish SHUKLA via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.09 X-Spam-Score: 0.09 X-Migadu-Queue-Id: 8DA0BAC1 X-Migadu-Scanner: mx10.migadu.com X-TUID: sd23MxI7uUYA * 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@qq.com> ;;; Copyright © 2024 Suhail Singh ;;; Copyright © 2024 Simon Tournier +;;; Copyright © 2024 Ashish SHUKLA ;;; ;;; 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