cgit: 0.9.0.3 -> 1.1

5 files changed, 68 insertions, 44 deletions

diff --git a/cgit/.footprint b/cgit/.footprint
index 903fcf328..f8fd9f67f 100644
--- a/cgit/.footprint
+++ b/cgit/.footprint
@@ -2,21 +2,40 @@ drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/apache/
 drwxr-xr-x	root/root	etc/apache/extra/
 -rw-r-----	root/root	etc/apache/extra/cgit.conf
+drwxr-xr-x	root/root	etc/apache/original/
+drwxr-xr-x	root/root	etc/apache/original/extra/
+-rw-r-----	root/root	etc/apache/original/extra/cgit.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cgit/
+-rwxr-xr-x	root/root	usr/lib/cgit/cgit.cgi
 drwxr-xr-x	root/root	usr/lib/cgit/filters/
+-rwxr-xr-x	root/root	usr/lib/cgit/filters/about-formatting.sh
 -rwxr-xr-x	root/root	usr/lib/cgit/filters/commit-links.sh
+-rw-r--r--	root/root	usr/lib/cgit/filters/email-gravatar.lua
+-rwxr-xr-x	root/root	usr/lib/cgit/filters/email-gravatar.py
+-rw-r--r--	root/root	usr/lib/cgit/filters/email-libravatar.lua
+-rw-r--r--	root/root	usr/lib/cgit/filters/gentoo-ldap-authentication.lua
+drwxr-xr-x	root/root	usr/lib/cgit/filters/html-converters/
+-rwxr-xr-x	root/root	usr/lib/cgit/filters/html-converters/man2html
+-rwxr-xr-x	root/root	usr/lib/cgit/filters/html-converters/md2html
+-rwxr-xr-x	root/root	usr/lib/cgit/filters/html-converters/rst2html
+-rwxr-xr-x	root/root	usr/lib/cgit/filters/html-converters/txt2html
+-rw-r--r--	root/root	usr/lib/cgit/filters/owner-example.lua
+-rw-r--r--	root/root	usr/lib/cgit/filters/simple-authentication.lua
+-rwxr-xr-x	root/root	usr/lib/cgit/filters/syntax-highlighting.py
 -rwxr-xr-x	root/root	usr/lib/cgit/filters/syntax-highlighting.sh
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man5/
--rw-r--r--	root/root	usr/man/man5/cgitrc.5.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/cgitrc.5.gz
+drwxr-xr-x	root/root	usr/share/webapps/
+drwxr-xr-x	root/root	usr/share/webapps/cgit/
+lrwxrwxrwx	root/root	usr/share/webapps/cgit/cgit.cgi -> ../../../lib/cgit/cgit.cgi
+-rw-r--r--	root/root	usr/share/webapps/cgit/cgit.css
+-rw-r--r--	root/root	usr/share/webapps/cgit/cgit.png
+-rw-r--r--	root/root	usr/share/webapps/cgit/favicon.ico
+-rw-r--r--	root/root	usr/share/webapps/cgit/robots.txt
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/cache/
-drwxr-x---	root/root	var/cache/cgit/
-drwxr-xr-x	root/root	var/www/
-drwxr-xr-x	root/root	var/www/htdocs/
-drwxr-xr-x	root/root	var/www/htdocs/cgit/
--rwxr-xr-x	root/root	var/www/htdocs/cgit/cgit.cgi
--rw-r--r--	root/root	var/www/htdocs/cgit/cgit.css
--rw-r--r--	root/root	var/www/htdocs/cgit/cgit.png
+drwxr-xr-x	root/root	var/cache/cgit/
diff --git a/cgit/.md5sum b/cgit/.md5sum
index ef420091a..7b171f567 100644
--- a/cgit/.md5sum
+++ b/cgit/.md5sum
@@ -1,3 +1,2 @@
-3d5481bf8a507694108f0996b8bde235  cgit-0.9.0.3.tar.bz2
-347db2eb49cea170b2e513189756ca82  cgit.conf
-bfa34028d6136f7c8981a916eda651d1  git-1.7.4.5.tar.bz2
+7cc92b94e4aaefed952b0e6b8fde0a3e  cgit-1.1.tar.xz
+8266cbc541d14297b8513e670c3dfe23  cgit.conf
diff --git a/cgit/.signature b/cgit/.signature
index 487c6d95b..cbe547e62 100644
--- a/cgit/.signature
+++ b/cgit/.signature
@@ -1,7 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32P3e8BuBdehUK7QXErIID32F1x3Da2blnS9NYf+K5ctxMP0ziKwIQ1O3X8QTjabftJls07W14Aw9ya0yZq+dws=
-SHA256 (Pkgfile) = e5942ccf82c32ee895f7d10321f6c30a0217f47468c4218d4988d7deec67453e
-SHA256 (.footprint) = 830cd3b9b74e963b01a7589adf80b054f46955e0710d5ed5891dc6c4a679e346
-SHA256 (cgit-0.9.0.3.tar.bz2) = 53ccf0c826f91c2184ec29b1b9ab8a6f42e0ef2e6fa9042c3759e2a2dc81baa5
-SHA256 (git-1.7.4.5.tar.bz2) = 029c71f0968e62c5ae90e47f3d267b759c2e9358d5a13820878355f0e5e448e2
-SHA256 (cgit.conf) = a4a0ffb957bd79368bb25a4270e9093fe3c19fe181be3fb060e279685212c72b
+RWSagIOpLGJF39bWDcQw6Bsi9RmjZ8YpQWtoFHpfgINei+BoB4XHSYxCT+1PZjOpsw5Gl974v9RaTLUccPXcE6N/0Ks0bIB6aws=
+SHA256 (Pkgfile) = 6b7b496286fa222ccb324b65b9d5eae9192e3d787f2e41e6f571e1a34fb19d67
+SHA256 (.footprint) = 26f5a0e7524e02e35d4b6300fa3f9ef17cd8f8e3ad90135c83fe0b3f5938e8d2
+SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890
+SHA256 (cgit.conf) = 89927d462c0504863c163eb8a210e5d65db30ee6e4300ff6a2f92460e4f20a62
diff --git a/cgit/Pkgfile b/cgit/Pkgfile
index a1085cfac..34a5428cd 100644
--- a/cgit/Pkgfile
+++ b/cgit/Pkgfile
@@ -1,30 +1,26 @@
 # Description: Git web interface written in C.
-# URL: http://hjemli.net/git/cgit/
+# URL: https://git.zx2c4.com/cgit/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Lucas Hazel, lucas at die dot net dot au
-# Depends on: git asciidoc
+# Depends on: zlib curl asciidoc
 
 name=cgit
-version=0.9.0.3
-gitversion=1.7.4.5
+version=1.1
 release=1
-source=(http://hjemli.net/git/cgit/snapshot/$name-$version.tar.bz2
-	http://hjemli.net/git/git/snapshot/git-$gitversion.tar.bz2
+source=(https://git.zx2c4.com/cgit/snapshot/$name-$version.tar.xz
 	cgit.conf)
 
 build() {
 	cd $name-$version
 
-	rm -rf git
-	ln -s $SRC/git-$gitversion git
-
-	sed -i \
-		-e "s/GIT_VER = .*/GIT_VER = $gitversion/" \
-		-e '/^mandir = $(prefix)/s|/share/man|/man|' Makefile
-
+	make get-git
 	make
-	make DESTDIR=$PKG install install-man
+	make doc-man
+	make CGIT_SCRIPT_PATH=/usr/share/webapps/cgit DESTDIR=$PKG prefix=/usr install install-man
 
+	install -d $PKG/var/cache/cgit $PKG/usr/lib/cgit
+	install -D -m 0640 $SRC/cgit.conf $PKG/etc/apache/original/extra/cgit.conf
 	install -D -m 0640 $SRC/cgit.conf $PKG/etc/apache/extra/cgit.conf
-	install -d -m 0750 $PKG/var/cache/cgit
+
+	mv $PKG/usr/share/webapps/cgit/cgit.cgi $PKG/usr/lib/cgit
+	ln -sf ../../../lib/cgit/cgit.cgi $PKG/usr/share/webapps/cgit/cgit.cgi
 }
diff --git a/cgit/cgit.conf b/cgit/cgit.conf
index 3eb4b55a9..5845c9507 100644
--- a/cgit/cgit.conf
+++ b/cgit/cgit.conf
@@ -1,12 +1,23 @@
-<IfModule mod_alias.c>
-    Alias /cgit/ /var/www/cgit/
-</IfModule>
+ScriptAlias /cgit/ "/usr/lib/cgit/cgit.cgi/"
 
-<Directory "/var/www/cgit/">
+Alias /cgit-css "/usr/share/webapps/cgit/"
+
+<Directory "/usr/share/webapps/cgit/">
+	AllowOverride None
+	Options None
+	Require all granted
+	AuthType Basic
+	AuthName cgit
+	AuthUserFile /etc/httpd/conf/passwd
+	Require user root
+</Directory>
+
+<Directory "/usr/lib/cgit/">
 	AllowOverride None
-	Options ExecCGI
-	DirectoryIndex cgit.cgi
-	AddHandler cgi-script .cgi
-	Order allow,deny
-	Allow from all
+	Options ExecCGI FollowSymlinks
+	Require all granted
+	AuthType Basic
+	AuthName cgit
+	AuthUserFile /etc/httpd/conf/passwd
+	Require user root
 </Directory>