diff options
| author |   Robby Workman | 2017-08-25 02:22:28 +0200 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2017-08-26 02:20:38 +0200 |
| commit | 4174da45a36fdf2f65914f22865dcc48433554c2 (patch) | |
| tree | 14e161231bc5a8675857dbd5e124af8cc5864659 /development/cgit/cgit.SlackBuild | |
| parent | df75f0401ee693208abfaf397f480ae1f61862d1 (diff) | |
| download | slackbuilds-4174da45a36fdf2f65914f22865dcc48433554c2.tar.gz | |
development/cgit: Include some upstream git patches
Some general bugfixes, but more importantly, patch 0005 fixes
a segfault in git's pathspec.c that we were seeing on the
SBo git server.
Thanks to John Keeping (cgit contributor) for helping with
debug suggestions and identifying the specific commit we
needed to fix it.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'development/cgit/cgit.SlackBuild')
| -rw-r--r-- | development/cgit/cgit.SlackBuild | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/development/cgit/cgit.SlackBuild b/development/cgit/cgit.SlackBuild index 49bca2536b..b55f3a5739 100644 --- a/development/cgit/cgit.SlackBuild +++ b/development/cgit/cgit.SlackBuild @@ -23,7 +23,7 @@ PRGNAM=cgit VERSION=${VERSION:-1.1} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} DOCROOT=${DOCROOT:-/var/www} @@ -78,6 +78,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# apply some upstream patches +patch -p1 < $CWD/patches/0004-syntax-highlighting-replace-invalid-unicode-with.patch +patch -p1 < $CWD/patches/0005-ui-patch-fix-crash-when-using-path-limit.patch +patch -p1 < $CWD/patches/0006-ui-repolist-properly-sort-by-age.patch +patch -p1 < $CWD/patches/0007-Remove-unused-variable-from-sort_section.patch +patch -p1 < $CWD/patches/0011-ui-atom-properly-escape-delimiter-in-page-link.patch +patch -p1 < $CWD/patches/0012-ui-shared-don-t-print-path-crumbs-without-a-repo.patch +patch -p1 < $CWD/patches/0013-parsing-clear-query-path-before-starting.patch +patch -p1 < $CWD/patches/0014-cgit-don-t-set-vpath-unless-repo-is-set.patch +patch -p1 < $CWD/patches/0015-ui-plain-print-symlink-content.patch + # prepare sources sed -i Makefile \ -e "s|-g -Wall -Igit|-Wall ${SLKCFLAGS} -Igit|" \ |