Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
Dan Čermák
1916c8588f
Add fixed CVE to the changelog
(cherry picked from commit 971863248c)
2021-07-18 23:17:56 +02:00
Sheng Mao
020348a439
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 45610650d6)
2021-07-18 23:17:25 +02:00
Dan Čermák
a81024a9e5
Update gitignore
(cherry picked from commit ad25011cca)
2021-07-18 23:15:55 +02:00
Sheng Mao
bbfcd6b636 Upgrade to fossil 2.14 2021-01-28 07:34:47 -07:00
Sheng Mao
af03cfe00a Organize fossil documents in fossil repository format rhbz#1839024 2020-12-14 20:03:38 -07:00
6 changed files with 64 additions and 6 deletions

2
.gitignore vendored
View file

@ -5,3 +5,5 @@
/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
/fossil-2.14.2.tar.gz

2
fossil-doc Normal file
View file

@ -0,0 +1,2 @@
#!/bin/sh
exec /usr/bin/fossil ui "$@" /usr/share/doc/fossil-doc/fossil-doc.fossil

1
fossil-doc-README Normal file
View file

@ -0,0 +1 @@
Please run command fossil-doc to view fossil documents.

View file

@ -1,18 +1,23 @@
%bcond_without tests
Name: fossil
Version: 2.12.1
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
BuildRequires: gcc-c++
BuildRequires: zlib-devel
BuildRequires: sqlite-devel
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
@ -22,8 +27,11 @@ interface.
%package doc
Summary: Fossil documentation
Requires: fossil
%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 +79,50 @@ 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}
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
%{_bindir}/%name
%{_mandir}/man1/%name.1*
%files doc
%doc www
%{_bindir}/%name-doc
%doc %name-doc.fossil
%doc README
%changelog
* Sun Jul 04 2021 Sheng Mao <shngmao@gmail.com> - 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
- Fixes CVE-2021-36377, rhbz#1980049
* Wed Jan 27 2021 Sheng Mao <shngmao@gmail.com> - 2.14-1
- Upgrade to fossil 2.14
* Wed Dec 16 2020 Sheng Mao <shngmao@gmail.com> - 2.13-2
- Enable fossil-doc with searching feature
* Mon Dec 14 2020 Sheng Mao <shngmao@gmail.com> - 2.13-1
- Upgrade to fossil 2.13
* Wed Nov 25 2020 Sheng Mao <shngmao@gmail.com> - 2.12.1-2
- Organize fossil documents in fossil repository format rhbz#1839024
* Mon Oct 19 2020 Sheng Mao <shngmao@gmail.com> - 2.12.1-1
- Upgrade to fossil 2.12.1 after adding FTS4 to system-wide sqlite (rhbz#1887106)
rhbz#1863577, rhbz#1870790

View file

@ -1 +1 @@
SHA512 (fossil-src-2.12.1.tar.gz) = 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
SHA512 (fossil-2.14.2.tar.gz) = b7df35e7443966fafdc36242d4aab9e56ee63801134ad323ede6ec43168dc9807238323302ae7d04d24fcbc271b39cac7801eee9d6d24e3ce88301e38677a284

10
template.config Normal file
View file

@ -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'