Accepting request 1275285 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/1275285
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fossil?expand=0&rev=43

fossil-2.24-17c01c549e73c6b8.patch

@@ -1,23 +0,0 @@
-From: juef
-Subject: Fix json-cap-POSTenv-name, json-cap-POSTenv-notsetup tests
-Date: 2024-04-25 13:34:13
-References: https://fossil-scm.org/home/info/17c01c549e73c6b8
-
-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
-

fossil-2.24-5ad708085a90365f.patch

@@ -1,192 +0,0 @@
-From: drh
-Subject: Fix or disable brittle test cases that were broken by changes in 2.23.
-Date: 2024-04-24 21:25:39
-References: https://fossil-scm.org/home/info/5ad708085a90365f
-
-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
-

fossil-2.24-fb4e90b662803e47.patch

@@ -1,124 +0,0 @@
-From: drh
-Subject: Comment out UTF tests 1179, 1586, and 1587 as they give different results on different platforms, for reasons unknown.
-Date: 2024-04-25 10:44:39
-References: https://fossil-scm.org/home/info/fb4e90b662803e47
-
-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
-

fossil-2.24.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95cd3c176835beb9b897076fa58171fe30b0b291f6387bb54749efbdfa962f4c
-size 6903811

fossil-2.26.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb34f788e181d4c4505d69ad40d6566b33988861f891db6dfca27ab9542b72aa
+size 7148640

fossil.changes

@@ -1,3 +1,56 @@
+-------------------------------------------------------------------
+Sun May  4 07:18:53 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- fossil 2.26:
+  * fossil diff usability improvements
+  * fossil merge-info and --tk provides analysis on the most recent
+    merge operations
+  * fossil commit now can help detect formatting mistakes, can be
+    a noop when there are no changes present (--if-changes), can
+    check in with SSH keys, and UI improvements
+  * fossil patch fixed some bugs
+  * ticketing system improved: tickets can now have wiki pages
+    attached, ticket templates, multiple ticket creation is easier
+  * The FOSSIL_REPOLIST_SHOW influences the default displayed info
+  * Improves security for TH1 scripting language
+  * /chat now behaves better during server outages
+  * Various UI improvements
+  * deprecated --comfmtflags and --comment-format global options
+- drop conflicted overflow.patch added with insufficient references
+- disable fusefs, fossil was not ported to fuse3 (boo#1242079)
+
+-------------------------------------------------------------------
+Wed Feb 12 10:23:53 UTC 2025 - Andreas Schwab <schwab@suse.de>
+
+- overflow.patch: Fix undefined behaviour due to overflow
+
+-------------------------------------------------------------------
+Sat Feb  8 11:52:28 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- fossil 2.25:
+  * The "fossil ui /" command now works even for repositories that
+    have non-ASCII filenames
+  * Add the fossil tree command.
+  * On case-insensitive filesystems, store files using the
+    filesystem's preferred case rather than the case typed in by
+    the user.
+  * Change the name "fossil cherry-pick" command to "fossil
+    cherrypick", which is more familiar to Git users. Retain the
+    legacy name for compatibility.
+  * Add new query parameters to the /timeline page: d2=, p2=, and
+    dp2=.
+  * Add options to the fossil tag command that will list tag values.
+  * Add the -b|--brief option to the fossil status command.
+  * Add ability to upload unversioned files via the /uvlist page.
+  * Add history search to the /chat page.
+  * Add Unix socket support to the server command.
+  * Take into account zero-width and double-width unicode characters
+    when formatting the command-line timeline.
+- drop patches:
+  * fossil-2.24-17c01c549e73c6b8.patch
+  * fossil-2.24-5ad708085a90365f.patch
+  * fossil-2.24-fb4e90b662803e47.patch
+
 -------------------------------------------------------------------
 Sun Jul 21 06:31:50 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
 

fossil.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package fossil
 #
-# Copyright (c) 2023 SUSE LLC
-# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
+# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,26 +18,24 @@
 
 
 # From https://fossil-scm.org/home/uv/releases.md
-%define fossil_uuid 8be0372c1051043761320c8ea8669c3cf320c406e5fe18ad36b7be5f844ca73b
+%define fossil_uuid 1205ec86cb5508e94b90698db2900997fe5c9db62429c67ac6fdc03d59aa2782
 %bcond_without tests
 Name:           fossil
-Version:        2.24
+Version:        2.26
 Release:        0
 Summary:        Distributed software configuration management
 License:        BSD-2-Clause
 Group:          Development/Tools/Version Control
 URL:            https://fossil-scm.org/
 Source:         https://fossil-scm.org/home/tarball/%{fossil_uuid}/%{name}-%{version}.tar.gz
-Patch0:         fossil-2.24-5ad708085a90365f.patch
-Patch1:         fossil-2.24-fb4e90b662803e47.patch
-Patch2:         fossil-2.24-17c01c549e73c6b8.patch
 BuildRequires:  pkgconfig
 BuildRequires:  tcl
-BuildRequires:  pkgconfig(fuse)
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(libssl)
-BuildRequires:  pkgconfig(sqlite3) >= 3.43.0
 BuildRequires:  pkgconfig(zlib)
+%if 0%{?suse_version} > 1600
+BuildRequires:  pkgconfig(sqlite3) >= 3.46.0
+%endif
 
 %description
 Fossil is a distributed software configuration management system with
@@ -49,20 +47,20 @@ these features:
 * sqlite-backed database
 
 %prep
-%autosetup -p0
+%autosetup -p1
 # test package version and source version match
 grep -qFx %{version} VERSION
 
 %build
-%{?set_build_flags: %{set_build_flags}}
-%{!?set_build_flags: export CFLAGS="%{optflags}"}
-# FIXME: you should use the %%configure macro
-./configure \
-        --prefix=%{_prefix} \
+%configure \
+	--host="" \
         --with-openssl=%{_prefix} \
         --with-zlib=%{_prefix} \
+%if 0%{?suse_version} > 1600
         --disable-internal-sqlite \
 	--with-sqlite=%{_prefix} \
+%endif
+	--disable-fusefs \
 	%{nil}
 %make_build