dev-vcs/fossil: Fix incorrect checksum and tests

Tag number wasn't changed before generating manifest. Correct
file/release now fetched and correct checksum generated.

No longer a straight to stable ebuild, either.

New depend on dev-tcltk/tcllib for JSON tests. If the package is
missing, as it currently will be on riscv architectures, the tests are
nonfatally skipped.

Several more test patches included from upstream to fix tests that
didn't work in the wider world.

Now installs a man page. Thanks to Bernd Feige <Bernd.Feige@gmx.net> for
this addition.

Closes: https://bugs.gentoo.org/931862
Closes: https://bugs.gentoo.org/923783
Signed-off-by: Aaron W. Swenson <titanofold@gentoo.org>

3 files changed, 225 insertions, 42 deletions

diff --git a/dev-vcs/fossil/files/fossil-2.24-disable-utf8-tests-1179-1586-1587.patch b/dev-vcs/fossil/files/fossil-2.24-disable-utf8-tests-1179-1586-1587.patch
new file mode 100644
index 000000000000..7f03362be201
--- /dev/null
+++ b/dev-vcs/fossil/files/fossil-2.24-disable-utf8-tests-1179-1586-1587.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/dev-vcs/fossil/files/fossil-2.24-fix-json-test-content-length.patch b/dev-vcs/fossil/files/fossil-2.24-fix-json-test-content-length.patch
new file mode 100644
index 000000000000..adafce2e9e95
--- /dev/null
+++ b/dev-vcs/fossil/files/fossil-2.24-fix-json-test-content-length.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/dev-vcs/fossil/files/fossil-2.24-test-fixes.patch b/dev-vcs/fossil/files/fossil-2.24-test-fixes.patch
index 1289b2ab2dbe..2aaf04e6d46b 100644
--- a/dev-vcs/fossil/files/fossil-2.24-test-fixes.patch
+++ b/dev-vcs/fossil/files/fossil-2.24-test-fixes.patch
@@ -1,18 +1,27 @@
-diff -Naruw a/test/amend.test b/test/amend.test
---- a/test/amend.test	2024-05-12 18:41:35.201744668 -0400
-+++ b/test/amend.test	2024-05-12 18:44:30.388911629 -0400
-@@ -313,6 +313,7 @@
-     append t5exp "Cancel*tag*\"$res\".*"
+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]}
-diff -Naruw a/test/merge5.test b/test/merge5.test
---- a/test/merge5.test	2024-05-12 18:41:35.201744668 -0400
-+++ b/test/merge5.test	2024-05-12 18:48:11.376209386 -0400
-@@ -23,7 +23,7 @@
+   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.
  }
@@ -21,10 +30,16 @@ diff -Naruw a/test/merge5.test b/test/merge5.test
  test_cleanup_then_return
  
  # Verify the results of a check-out
-diff -Naruw a/test/stash.test b/test/stash.test
---- a/test/stash.test	2024-05-12 18:41:35.205078010 -0400
-+++ b/test/stash.test	2024-05-12 18:50:29.989938569 -0400
-@@ -170,10 +170,10 @@
+ #
+ 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?
  
@@ -32,33 +47,41 @@ diff -Naruw a/test/stash.test b/test/stash.test
 -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 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
-@@ -208,12 +208,12 @@
+ 
+ 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 {save -m "Reported 2016-02-09"} {
+-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 {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.
-@@ -298,12 +298,13 @@
+ 
+ 
+@@ -296,16 +296,17 @@
+ }] -changes {
+   RENAMED f2  ->  f2n
  } -addremove {
  } -exists {f1 f2n} -notexists {f2}
  
@@ -67,31 +90,43 @@ diff -Naruw a/test/stash.test b/test/stash.test
 -  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}
++#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-1 {![regexp {\sf1} $RESULT]} knownBug
  test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
  stash-test 3-2-pop {pop} {
    UPDATE f1
-diff -Naruw a/test/tester.tcl b/test/tester.tcl
---- a/test/tester.tcl	2024-05-12 18:41:35.205078010 -0400
-+++ b/test/tester.tcl	2024-05-12 18:51:04.566703979 -0400
-@@ -301,6 +301,7 @@
+   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 \
-diff -Naruw a/test/utf.test b/test/utf.test
---- a/test/utf.test	2024-05-12 18:41:35.205078010 -0400
-+++ b/test/utf.test	2024-05-12 18:54:21.871455531 -0400
-@@ -37,7 +37,7 @@
+       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]
@@ -100,7 +135,11 @@ diff -Naruw a/test/utf.test b/test/utf.test
      test utf-check-$testname.$i {$::RESULT eq $result}
      incr i
    }
-@@ -17615,8 +17615,8 @@
+ }
+ 
+@@ -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
@@ -111,7 +150,11 @@ diff -Naruw a/test/utf.test b/test/utf.test
  Has flag LOOK_CR: no
  Has flag LOOK_LONE_CR: no
  Has flag LOOK_LF: no
-@@ -24126,8 +24126,8 @@
+ 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
@@ -122,7 +165,7 @@ diff -Naruw a/test/utf.test b/test/utf.test
  Has flag LOOK_NUL: yes
  Has flag LOOK_CR: no
  Has flag LOOK_LONE_CR: no
-@@ -24135,14 +24135,14 @@
+ Has flag LOOK_LF: no
  Has flag LOOK_LONE_LF: no
  Has flag LOOK_CRLF: no
  Has flag LOOK_LONG: no
@@ -139,3 +182,6 @@ diff -Naruw a/test/utf.test b/test/utf.test
  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
+