commit fossil for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fossil for openSUSE:Factory checked in at 2024-07-25 15:39:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fossil (Old) and /work/SRC/openSUSE:Factory/.fossil.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fossil" Thu Jul 25 15:39:00 2024 rev:40 rq:1189337 version:2.24 Changes: -------- --- /work/SRC/openSUSE:Factory/fossil/fossil.changes 2023-11-16 20:27:57.611038892 +0100 +++ /work/SRC/openSUSE:Factory/.fossil.new.1882/fossil.changes 2024-07-25 15:39:37.168163643 +0200 @@ -1,0 +2,20 @@ +Sun Jul 21 06:31:50 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de> + +- fossil 2.24: + * Work around Apache httpd mod_cgi changes for Content-Length + * UI skin enhancements + * Enhancements to the /timeline page + * Improved display of hash algorithm used on uv-list page + * If the autosync setting contains keyword "all", the automatic + sync occurs against all defined remote repositories, not just + the default. + * Markdown formatter: improved handling of indented fenced code + blocks that contain blank lines. + * Fix problems with one-click unsubscribe on email notifications. + * Detect GoogleOther crawler as a robot +- add upstream patches addressing test failures: + * fossil-2.24-5ad708085a90365f.patch + * fossil-2.24-fb4e90b662803e47.patch + * fossil-2.24-17c01c549e73c6b8.patch + +------------------------------------------------------------------- Old: ---- fossil-2.23.tar.gz New: ---- fossil-2.24-17c01c549e73c6b8.patch fossil-2.24-5ad708085a90365f.patch fossil-2.24-fb4e90b662803e47.patch fossil-2.24.tar.gz BETA DEBUG BEGIN: New: * fossil-2.24-fb4e90b662803e47.patch * fossil-2.24-17c01c549e73c6b8.patch New:- add upstream patches addressing test failures: * fossil-2.24-5ad708085a90365f.patch * fossil-2.24-fb4e90b662803e47.patch New: * fossil-2.24-5ad708085a90365f.patch * fossil-2.24-fb4e90b662803e47.patch * fossil-2.24-17c01c549e73c6b8.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fossil.spec ++++++ --- /var/tmp/diff_new_pack.AxNLVL/_old 2024-07-25 15:39:48.716628645 +0200 +++ /var/tmp/diff_new_pack.AxNLVL/_new 2024-07-25 15:39:48.720628805 +0200 @@ -2,6 +2,7 @@ # spec file for package fossil # # Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 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 @@ -16,29 +17,27 @@ # -%define fossil_uuid 47362306a7dd7c6fc3cab77cebe5d25469b0a9448479d9718eb5c49c8337b29 -%if 0%{?suse_version} > 1600 -%bcond_without system_sqlite -%else -%bcond_with system_sqlite -%endif +# From https://fossil-scm.org/home/uv/releases.md +%define fossil_uuid 8be0372c1051043761320c8ea8669c3cf320c406e5fe18ad36b7be5f844ca73b %bcond_without tests Name: fossil -Version: 2.23 +Version: 2.24 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 -BuildRequires: fuse-devel -BuildRequires: gcc -BuildRequires: openssl-devel +Patch0: fossil-2.24-5ad708085a90365f.patch +Patch1: fossil-2.24-fb4e90b662803e47.patch +Patch2: fossil-2.24-17c01c549e73c6b8.patch +BuildRequires: pkgconfig BuildRequires: tcl -BuildRequires: zlib-devel -%if %{with system_sqlite} -BuildRequires: sqlite3-devel >= 3.43.0 -%endif +BuildRequires: pkgconfig(fuse) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(sqlite3) >= 3.43.0 +BuildRequires: pkgconfig(zlib) %description Fossil is a distributed software configuration management system with @@ -60,13 +59,11 @@ # FIXME: you should use the %%configure macro ./configure \ --prefix=%{_prefix} \ - --with-openssl=auto \ -%if %{with system_sqlite} + --with-openssl=%{_prefix} \ + --with-zlib=%{_prefix} \ --disable-internal-sqlite \ --with-sqlite=%{_prefix} \ -%endif %{nil} - %make_build %install @@ -75,11 +72,14 @@ %check %if %{with tests} +# Tests fail on Leap due to TCL "time value too large/small to represent" +%if 0%{?suse_version} > 1600 tclsh test/tester.tcl %{buildroot}%{_bindir}/%{name} %endif +%endif %files %license COPYRIGHT-BSD2.txt %{_bindir}/fossil -%{_mandir}/*/* +%{_mandir}/man1/fossil.1%{?ext_man} ++++++ fossil-2.24-17c01c549e73c6b8.patch ++++++ 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 ++++++ 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 ++++++ 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.23.tar.gz -> fossil-2.24.tar.gz ++++++ /work/SRC/openSUSE:Factory/fossil/fossil-2.23.tar.gz /work/SRC/openSUSE:Factory/.fossil.new.1882/fossil-2.24.tar.gz differ: char 5, line 1
participants (1)
-
Source-Sync