From af03cfe00a0df1c473f941dbe5a89f9833b4d1af Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Wed, 25 Nov 2020 23:38:08 -0700 Subject: [PATCH 1/5] Organize fossil documents in fossil repository format rhbz#1839024 --- fossil.spec | 20 ++++++++++++++++++-- template.config | 10 ++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 template.config diff --git a/fossil.spec b/fossil.spec index 028bbde..2f925ec 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,12 +1,13 @@ %bcond_without tests Name: fossil Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD URL: https://www.fossil-scm.org/ Source0: %{URL}index.html/uv/fossil-src-%{version}.tar.gz +Source1: template.config BuildRequires: gcc-c++ BuildRequires: zlib-devel @@ -23,7 +24,8 @@ interface. Summary: Fossil documentation %description doc -Documentation in HTML format for %{name}. +Documentation in repository format for %{name}. Users can run `fossil ui` +in %{_docdir}/%{name}-doc folder to view documents in browser. %prep %autosetup @@ -71,15 +73,29 @@ install -D -m 0644 -t %{buildroot}%{_mandir}/man1 fossil.1 tclsh test/tester.tcl %{buildroot}%{_bindir}/%name %endif + +# create a fossil repository for documents with default settings +%{buildroot}%{_bindir}/%name init --admin-user %name %name-doc.fossil +%{buildroot}%{_bindir}/%name open --empty --force %name-doc.fossil +%{buildroot}%{_bindir}/%name configuration import %{SOURCE1} +%{buildroot}%{_bindir}/%name add www +%{buildroot}%{_bindir}/%name commit --user %name --force --comment '%name-doc initial commit' + + %files %license COPYRIGHT-BSD2.txt %{_bindir}/%name %{_mandir}/man1/%name.1* %files doc +%doc %name-doc.fossil +%doc .fslckout %doc www %changelog +* Wed Nov 25 2020 Sheng Mao - 2.12.1-2 +- Organize fossil documents in fossil repository format rhbz#1839024 + * Mon Oct 19 2020 Sheng Mao - 2.12.1-1 - Upgrade to fossil 2.12.1 after adding FTS4 to system-wide sqlite (rhbz#1887106) rhbz#1863577, rhbz#1870790 diff --git a/template.config b/template.config new file mode 100644 index 0000000..d5f1811 --- /dev/null +++ b/template.config @@ -0,0 +1,10 @@ +config /config 41 +1606368705 'timeline-plaintext' value '1' +config /config 44 +1606369015 'project-name' value 'fossil-doc' +config /config 57 +1606369069 'index-page' value '/doc/trunk/www/index.wiki' +config /config 34 +1606369257 'binary-glob' value '*' +config /config 34 +1606368705 'hash-policy' value '2' From bbfcd6b63685104d12baff5a8add799070a08ac3 Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Thu, 28 Jan 2021 07:34:47 -0700 Subject: [PATCH 2/5] Upgrade to fossil 2.14 --- fossil-doc | 2 ++ fossil-doc-README | 1 + fossil.spec | 30 +++++++++++++++++++++++++----- sources | 2 +- 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 fossil-doc create mode 100644 fossil-doc-README diff --git a/fossil-doc b/fossil-doc new file mode 100644 index 0000000..a3cb5f6 --- /dev/null +++ b/fossil-doc @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/fossil ui "$@" /usr/share/doc/fossil-doc/fossil-doc.fossil diff --git a/fossil-doc-README b/fossil-doc-README new file mode 100644 index 0000000..aa14802 --- /dev/null +++ b/fossil-doc-README @@ -0,0 +1 @@ +Please run command fossil-doc to view fossil documents. \ No newline at end of file diff --git a/fossil.spec b/fossil.spec index 2f925ec..b1aabeb 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,17 +1,20 @@ %bcond_without tests Name: fossil -Version: 2.12.1 -Release: 2%{?dist} +Version: 2.14 +Release: 1%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD URL: https://www.fossil-scm.org/ Source0: %{URL}index.html/uv/fossil-src-%{version}.tar.gz Source1: template.config +Source2: fossil-doc +Source3: fossil-doc-README BuildRequires: gcc-c++ BuildRequires: zlib-devel -BuildRequires: sqlite-devel +BuildRequires: sqlite +BuildRequires: sqlite-devel >= 3.34.0 BuildRequires: openssl-devel BuildRequires: tcl @@ -23,6 +26,8 @@ interface. %package doc Summary: Fossil documentation +Requires: fossil + %description doc Documentation in repository format for %{name}. Users can run `fossil ui` in %{_docdir}/%{name}-doc folder to view documents in browser. @@ -78,9 +83,15 @@ tclsh test/tester.tcl %{buildroot}%{_bindir}/%name %{buildroot}%{_bindir}/%name init --admin-user %name %name-doc.fossil %{buildroot}%{_bindir}/%name open --empty --force %name-doc.fossil %{buildroot}%{_bindir}/%name configuration import %{SOURCE1} +sqlite3 %name-doc.fossil "REPLACE INTO config(name,value,mtime) VALUES('doc-glob','*.wiki,*.html,*.md,*.txt',1608172730);" %{buildroot}%{_bindir}/%name add www %{buildroot}%{_bindir}/%name commit --user %name --force --comment '%name-doc initial commit' +%{buildroot}%{_bindir}/%name fts-config enable d +%{buildroot}%{_bindir}/%name fts-config stemmer on +%{buildroot}%{_bindir}/%name fts-config index on +install -m 0755 -p -D %{SOURCE2} %{buildroot}%{_bindir} +cp %{SOURCE3} README %files %license COPYRIGHT-BSD2.txt @@ -88,11 +99,20 @@ tclsh test/tester.tcl %{buildroot}%{_bindir}/%name %{_mandir}/man1/%name.1* %files doc +%{_bindir}/%name-doc %doc %name-doc.fossil -%doc .fslckout -%doc www +%doc README %changelog +* Wed Jan 27 2021 Sheng Mao - 2.14-1 +- Upgrade to fossil 2.14 + +* Wed Dec 16 2020 Sheng Mao - 2.13-2 +- Enable fossil-doc with searching feature + +* Mon Dec 14 2020 Sheng Mao - 2.13-1 +- Upgrade to fossil 2.13 + * Wed Nov 25 2020 Sheng Mao - 2.12.1-2 - Organize fossil documents in fossil repository format rhbz#1839024 diff --git a/sources b/sources index 3fb1cbb..f29e563 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.12.1.tar.gz) = 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee +SHA512 (fossil-src-2.14.tar.gz) = f95291886484c9fb98224c17e07c9c2ada3d79974359234f1cc6a8fce603e45bf980ffe4f43a473d74d190b6975fff66e8d35ca680747385e72981caabfd6b10 From a81024a9e5fe52c5f9c61c412df08985c59756cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Sun, 7 Feb 2021 11:22:53 +0100 Subject: [PATCH 3/5] Update gitignore (cherry picked from commit ad25011ccaf339610531f86eedcc03ad55b868ab) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 524fe76..2a07e89 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /fossil-src-2.2.tar.gz /fossil-src-2.8.tar.gz /fossil-src-2.12.1.tar.gz +/fossil-src-2.14.tar.gz From 020348a439f0530dfdc3bfcaa8b206fac90df968 Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Sun, 4 Jul 2021 21:24:39 -0600 Subject: [PATCH 4/5] Upgrade to fossil 2.14.2 Fossil 2.14.2 instead of 2.16 is packaed for f34. 2.15+ needs SQLite 3.35, which is available to rawhide/main. Introduce two bug fixes from 2.14.1 and 2.14.2: - Verifies that the server hostname matches its certificate - Fix a data exfiltration bug in the server As the hosting site changed to fossil 2.15+, the download URL changed too: fossil's hash is appended to the URL. The unpacked folder name is changed too, so autosetup is updated. (cherry picked from commit 45610650d6435883b69254479e203e70228f6064) --- .gitignore | 1 + fossil.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2a07e89..91dc00e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /fossil-src-2.8.tar.gz /fossil-src-2.12.1.tar.gz /fossil-src-2.14.tar.gz +/fossil-2.14.2.tar.gz diff --git a/fossil.spec b/fossil.spec index b1aabeb..aadcba9 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,12 +1,12 @@ %bcond_without tests Name: fossil -Version: 2.14 +Version: 2.14.2 Release: 1%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD URL: https://www.fossil-scm.org/ -Source0: %{URL}index.html/uv/fossil-src-%{version}.tar.gz +Source0: %{URL}home/tarball/version-%{version}/fossil-%{version}.tar.gz Source1: template.config Source2: fossil-doc Source3: fossil-doc-README @@ -17,6 +17,7 @@ BuildRequires: sqlite BuildRequires: sqlite-devel >= 3.34.0 BuildRequires: openssl-devel BuildRequires: tcl +BuildRequires: make %description Fossil is a simple, high-reliability, distributed software configuration @@ -104,6 +105,11 @@ cp %{SOURCE3} README %doc README %changelog +* Sun Jul 04 2021 Sheng Mao - 2.14.2-1 +- Upgrade to fossil 2.14.2 +- Verifies that the server hostname matches its certificate +- Fix a data exfiltration bug in the server + * Wed Jan 27 2021 Sheng Mao - 2.14-1 - Upgrade to fossil 2.14 diff --git a/sources b/sources index f29e563..91cd67f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.14.tar.gz) = f95291886484c9fb98224c17e07c9c2ada3d79974359234f1cc6a8fce603e45bf980ffe4f43a473d74d190b6975fff66e8d35ca680747385e72981caabfd6b10 +SHA512 (fossil-2.14.2.tar.gz) = b7df35e7443966fafdc36242d4aab9e56ee63801134ad323ede6ec43168dc9807238323302ae7d04d24fcbc271b39cac7801eee9d6d24e3ce88301e38677a284 From 1916c8588f49e3f8c147f3d18eca299100f7320b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Sat, 17 Jul 2021 23:03:46 +0200 Subject: [PATCH 5/5] Add fixed CVE to the changelog (cherry picked from commit 971863248c1f3fec8233467c37d7a6deb5745de4) --- fossil.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fossil.spec b/fossil.spec index aadcba9..bc17382 100644 --- a/fossil.spec +++ b/fossil.spec @@ -109,6 +109,7 @@ cp %{SOURCE3} README - Upgrade to fossil 2.14.2 - Verifies that the server hostname matches its certificate - Fix a data exfiltration bug in the server +- Fixes CVE-2021-36377, rhbz#1980049 * Wed Jan 27 2021 Sheng Mao - 2.14-1 - Upgrade to fossil 2.14