diff options
| author | Todd Zullinger <tmz@pobox.com> | 2022-01-02 00:01:29 -0500 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2022-01-02 01:13:23 -0500 |
| commit | 283408564162619d0c3929772e33418e5ffa30fe (patch) | |
| tree | 738e0da9126accbc5e75fc69e8a39ae8bdabf224 /cgit.spec | |
| parent | da736d6412c48c744637cfd2c9a63b7fa5646c97 (diff) | |
| download | cgit_EL6-283408564162619d0c3929772e33418e5ffa30fe.tar.gz | |
build with git-2.34.1
Apply the patches Christian Hesse has regularly posted upstream to track
the current git release. Just because it's bundled doesn't mean it
should fall so far behind.
While here, update the comment regarding bundled git provides. It is
neither safe nor fair to assume that the security team are the folks
interested in tracking the bundled git, nor that they are all guys. :)
Diffstat (limited to 'cgit.spec')
| -rw-r--r-- | cgit.spec | 22 |
1 files changed, 19 insertions, 3 deletions
@@ -1,7 +1,7 @@ # Review bug: https://bugzilla.redhat.com/479723 # Defaults -%global gitver 2.25.1 +%global gitver 2.34.1 %global cachedir %{_localstatedir}/cache/%{name} %global filterdir %{_libexecdir}/%{name}/filters %global scriptdir %{_localstatedir}/www/cgi-bin @@ -31,7 +31,7 @@ Name: cgit Version: 1.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A fast web interface for git License: GPLv2 @@ -68,7 +68,20 @@ Patch0: 0001-use-highlight-3-by-default.patch # https://lists.zx2c4.com/pipermail/cgit/2020-August/004513.html Patch1: https://git.zx2c4.com/cgit/patch/?id=bd6f5683f#/0001-t0107-support-older-and-or-non-GNU-tar.patch -# Security guys might try to repoquery for this. +# Update to current git +# +# This is a compilation of patches Christian Hesse has sent to the cgit list. +# It was created somewhat manually by reviewing the number of patches since the +# last update to git-2.25.1 (14). Then patch was generated via: +# +# git log --grep=git: --format='%h' --reverse -14 origin/ch/for-jason | +# while read c _; do +# git format-patch -1 --ignore-submodules --no-signature --stdout $c +# done >~/src/dist/fedora/cgit/cgit-1.2.3-update-to-git-2.34.1.patch +Patch2: cgit-1.2.3-update-to-git-2.34.1.patch + +# Note the bundled git, per the packaging guidelines +# https://docs.fedoraproject.org/en-US/packaging-guidelines/#bundling Provides: bundled(git) = %gitver %if %{with highlight} @@ -214,6 +227,9 @@ make test %changelog +* Sun Jan 02 2022 Todd Zullinger <tmz@pobox.com> - 1.2.3-8 +- update to git-2.34.1 + * Mon Jul 26 2021 Todd Zullinger <tmz@pobox.com> - 1.2.3-7 - update SELinux README - simplify install commands |