[packages/cgit] Up to 1.3.1
arekm
arekm at pld-linux.org
Wed May 20 18:41:34 CEST 2026
commit ae222ee6af9a209ac420c02a7ac72c6e34878043
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed May 20 18:41:18 2026 +0200
Up to 1.3.1
cgit-git-2.0.3.patch | 136 --------------------------------------------------
cgit-system-git.patch | 12 -----
cgit.spec | 54 ++++++++++++--------
3 files changed, 33 insertions(+), 169 deletions(-)
---
diff --git a/cgit.spec b/cgit.spec
index 746f507..b1323a4 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -1,21 +1,26 @@
Summary: cgit - a fast webinterface to git
Summary(pl.UTF-8): cgit - szybki interfejs WWW do gita
Name: cgit
-Version: 0.10.2
-Release: 2
+Version: 1.3.1
+%define git_ver 2.54.0
+Release: 1
License: GPL v2
Group: Development/Tools
-Source0: http://git.zx2c4.com/cgit/snapshot/%{name}-%{version}.tar.xz
-# Source0-md5: 6682d597f6e3e76645a254c7be537bd3
+Source0: https://git.zx2c4.com/cgit/snapshot/%{name}-%{version}.tar.xz
+# Source0-md5: a72a9c1531b3b054f94f92c71d77ba6f
Source1: %{name}.conf
Source2: %{name}-repo.conf
Source3: %{name}-apache.conf
-Patch0: %{name}-system-git.patch
-Patch1: %{name}-git-2.0.3.patch
-URL: http://git.zx2c4.com/cgit/about/
-BuildRequires: git-core-devel >= 2.0.3
+Source4: https://www.kernel.org/pub/software/scm/git/git-%{git_ver}.tar.xz
+# Source4-md5: eb1137f556bd67cb4cea974275e51297
+URL: https://git.zx2c4.com/cgit/about/
+BuildRequires: asciidoc
+BuildRequires: curl-devel
+BuildRequires: expat-devel
BuildRequires: lua52-devel
BuildRequires: openssl-devel
+BuildRequires: xmlto
+BuildRequires: zlib-devel
BuildConflicts: zlib-devel = 1.2.5-1
Requires: webapps
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,36 +47,43 @@ użyciem biblioteki. Aplikacja ta korzysta z cache - wygenerowany kod
HTML zapisany jest na dysku dla kolejnych żądań.
%prep
-%setup -q
-%patch -P0 -p1
-%patch -P1 -p1
-cp %{_includedir}/git-core/{Makefile,config.*} git
+%setup -q -a4
+rmdir git
+mv git-%{git_ver} git
%build
%{__make} \
V=1 \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags} -I/usr/include/git-core" \
+ CFLAGS="%{rpmcflags} %{rpmcppflags}" \
LDFLAGS="%{rpmldflags}" \
- LIBDIR=%{_libdir} \
LUA_PKGCONFIG=lua5.2 \
CGIT_CONFIG="%{webappdir}/%{webapp}.conf" \
CGIT_SCRIPT_PATH="%{cgibindir}"
+%{__make} doc-man \
+ V=1
+
%install
rm -rf $RPM_BUILD_ROOT
-# The same CFLAGS as in %build stage has to be passed to avoid
+# The same CFLAGS as in %build stage has to be passed to avoid
# "new build flags" logic in Makefile
-%{__make} install \
+%{__make} install install-man \
V=1 \
DESTDIR=$RPM_BUILD_ROOT \
prefix=%{_prefix} \
- CFLAGS="%{rpmcflags} -I/usr/include/git-core" \
+ CFLAGS="%{rpmcflags} %{rpmcppflags}" \
CGIT_CONFIG="%{webappdir}/%{webapp}.conf" \
CGIT_DATA_PATH="%{appdir}" \
CGIT_SCRIPT_PATH="%{cgibindir}"
+# PLD shebang policy disallows /usr/bin/env python3
+%{__sed} -i -e '1s,#!/usr/bin/env python3,#!%{__python3},' \
+ $RPM_BUILD_ROOT%{_prefix}/lib/cgit/filters/email-gravatar.py \
+ $RPM_BUILD_ROOT%{_prefix}/lib/cgit/filters/syntax-highlighting.py \
+ $RPM_BUILD_ROOT%{_prefix}/lib/cgit/filters/html-converters/md2html
+
# cache
install -d $RPM_BUILD_ROOT/var/cache/cgit
@@ -114,7 +126,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_prefix}/lib/cgit/filters/commit-links.sh
%attr(655,root,root) %{_prefix}/lib/cgit/filters/email-gravatar.lua
%attr(755,root,root) %{_prefix}/lib/cgit/filters/email-gravatar.py
-%attr(655,root,root) %{_prefix}/lib/cgit/filters/email-libravatar.lua
+%attr(655,root,root) %{_prefix}/lib/cgit/filters/file-authentication.lua
+%attr(655,root,root) %{_prefix}/lib/cgit/filters/gentoo-ldap-authentication.lua
+%attr(655,root,root) %{_prefix}/lib/cgit/filters/owner-example.lua
%attr(655,root,root) %{_prefix}/lib/cgit/filters/simple-authentication.lua
%attr(755,root,root) %{_prefix}/lib/cgit/filters/syntax-highlighting.py
%attr(755,root,root) %{_prefix}/lib/cgit/filters/syntax-highlighting.sh
@@ -123,6 +137,4 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_prefix}/lib/cgit/filters/html-converters/md2html
%attr(755,root,root) %{_prefix}/lib/cgit/filters/html-converters/rst2html
%attr(755,root,root) %{_prefix}/lib/cgit/filters/html-converters/txt2html
-%dir %{_prefix}/lib/cgit/filters/html-converters/resources
-%attr(755,root,root) %{_prefix}/lib/cgit/filters/html-converters/resources/markdown.pl
-%attr(655,root,root) %{_prefix}/lib/cgit/filters/html-converters/resources/rst-template.txt
+%{_mandir}/man5/cgitrc.5*
diff --git a/cgit-git-2.0.3.patch b/cgit-git-2.0.3.patch
deleted file mode 100644
index f0178dd..0000000
--- a/cgit-git-2.0.3.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-commit 93d8ef8f1de4385c565049e1ccd7fdd25e6c14d7
-Author: John Keeping <john at keeping.me.uk>
-Date: Sun Jul 27 11:56:18 2014 +0100
-
- parsing.c: make commit buffer const
-
- This will be required in order to incorporate the changes to commit
- buffer handling in Git 2.0.2.
-
- Signed-off-by: John Keeping <john at keeping.me.uk>
-
-diff --git a/parsing.c b/parsing.c
-index 073f46f..edb3416 100644
---- a/parsing.c
-+++ b/parsing.c
-@@ -69,9 +69,9 @@ static char *substr(const char *head, const char *tail)
- return buf;
- }
-
--static char *parse_user(char *t, char **name, char **email, unsigned long *date)
-+static const char *parse_user(const char *t, char **name, char **email, unsigned long *date)
- {
-- char *p = t;
-+ const char *p = t;
- int mode = 1;
-
- while (p && *p) {
-@@ -132,7 +132,7 @@ static const char *reencode(char **txt, const char *src_enc, const char *dst_enc
- struct commitinfo *cgit_parse_commit(struct commit *commit)
- {
- struct commitinfo *ret;
-- char *p = commit->buffer, *t;
-+ const char *p = commit->buffer, *t;
-
- ret = xmalloc(sizeof(*ret));
- ret->commit = commit;
-@@ -223,7 +223,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
- void *data;
- enum object_type type;
- unsigned long size;
-- char *p;
-+ const char *p;
- struct taginfo *ret;
-
- data = read_sha1_file(tag->object.sha1, &type, &size);
-commit 865afe0eb1b5e6485fe0f65472e6635266e393b1
-Author: John Keeping <john at keeping.me.uk>
-Date: Sun Jul 27 11:56:19 2014 +0100
-
- git: update to v2.0.3
-
- This is slightly more involved than just bumping the version number
- because it pulls in a change to convert the commit buffer to a slab,
- removing the "buffer" field from "struct commit". All sites that access
- "commit->buffer" have been changed to use the new functions provided for
- this purpose.
-
- Signed-off-by: John Keeping <john at keeping.me.uk>
-
-diff --git a/Makefile b/Makefile
-index bf8be02..93b525a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,7 +14,7 @@ htmldir = $(docdir)
- pdfdir = $(docdir)
- mandir = $(prefix)/share/man
- SHA1_HEADER = <openssl/sha.h>
--GIT_VER = 2.0.1
-+GIT_VER = 2.0.3
- GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
- INSTALL = install
- COPYTREE = cp -r
-diff --git a/parsing.c b/parsing.c
-index edb3416..3dbd122 100644
---- a/parsing.c
-+++ b/parsing.c
-@@ -132,7 +132,8 @@ static const char *reencode(char **txt, const char *src_enc, const char *dst_enc
- struct commitinfo *cgit_parse_commit(struct commit *commit)
- {
- struct commitinfo *ret;
-- const char *p = commit->buffer, *t;
-+ const char *p = get_cached_commit_buffer(commit, NULL);
-+ const char *t;
-
- ret = xmalloc(sizeof(*ret));
- ret->commit = commit;
-diff --git a/ui-atom.c b/ui-atom.c
-index b22d745..e2b39ee 100644
---- a/ui-atom.c
-+++ b/ui-atom.c
-@@ -133,8 +133,7 @@ void cgit_print_atom(char *tip, char *path, int max_count)
- }
- while ((commit = get_revision(&rev)) != NULL) {
- add_entry(commit, host);
-- free(commit->buffer);
-- commit->buffer = NULL;
-+ free_commit_buffer(commit);
- free_commit_list(commit->parents);
- commit->parents = NULL;
- }
-diff --git a/ui-log.c b/ui-log.c
-index b5846e4..bcdb666 100644
---- a/ui-log.c
-+++ b/ui-log.c
-@@ -388,16 +388,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
- ofs = 0;
-
- for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
-- free(commit->buffer);
-- commit->buffer = NULL;
-+ free_commit_buffer(commit);
- free_commit_list(commit->parents);
- commit->parents = NULL;
- }
-
- for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
- print_commit(commit, &rev);
-- free(commit->buffer);
-- commit->buffer = NULL;
-+ free_commit_buffer(commit);
- free_commit_list(commit->parents);
- commit->parents = NULL;
- }
-diff --git a/ui-stats.c b/ui-stats.c
-index bc27308..6f13c32 100644
---- a/ui-stats.c
-+++ b/ui-stats.c
-@@ -244,7 +244,7 @@ static struct string_list collect_stats(struct cgit_period *period)
- memset(&authors, 0, sizeof(authors));
- while ((commit = get_revision(&rev)) != NULL) {
- add_commit(&authors, commit, period);
-- free(commit->buffer);
-+ free_commit_buffer(commit);
- free_commit_list(commit->parents);
- }
- return authors;
diff --git a/cgit-system-git.patch b/cgit-system-git.patch
deleted file mode 100644
index f0275e0..0000000
--- a/cgit-system-git.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr cgit-0.10.old/cgit.mk cgit-0.10/cgit.mk
---- cgit-0.10.old/cgit.mk 2014-01-17 16:09:16.000000000 +0100
-+++ cgit-0.10/cgit.mk 2014-02-25 15:22:09.208586612 +0100
-@@ -130,6 +130,7 @@
- $(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs)
- $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $<
-
--$(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS)
-+LIBS = -lgit -lgit_xdiff $(EXTLIBS)
-+$(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS
- @echo 1>&1 " * $(LUA_MESSAGE)"
- $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cgit.git/commitdiff/ae222ee6af9a209ac420c02a7ac72c6e34878043
More information about the pld-cvs-commit
mailing list