From 64de183697991fc25efb55aed2423f121c37a867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Tue, 9 Feb 2016 19:19:34 +0100
Subject: main/cgit: upgrade to 0.12

CVE-2016-1899
CVE-2016-1900
CVE-2016-1901
---
 main/cgit/APKBUILD | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'main/cgit/APKBUILD')

diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index 54cef07829..56420e9029 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -1,8 +1,9 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cgit
-pkgver=0.11.2
+pkgver=0.12
 pkgrel=0
-_gitver=2.3.2
+_gitver=2.7.0 # 2.7.1 and 2.7.0 are compatible
 pkgdesc="A fast webinterface for git"
 url="http://git.zx2c4.com/cgit/"
 arch="all"
@@ -10,8 +11,7 @@ license="GPL2"
 makedepends="openssl-dev zlib-dev lua5.2-dev asciidoc"
 depends=""
 subpackages="$pkgname-doc"
-source="
-	http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz
+source="http://git.zx2c4.com/$pkgname/snapshot/$pkgname-$pkgver.tar.xz
 	https://www.kernel.org/pub/software/scm/git/git-$_gitver.tar.gz
 	"
 
@@ -22,14 +22,17 @@ _makeopts="NO_ICONV=YesPlease
 	LUA_PKGCONFIG=lua5.2
 	prefix=/usr"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
+
 	# check that upstream git ver corresponds with our
 	local _ver=$(awk -F'[ \t]*=[ \t]*' '/^GIT_VER/ { print $2 }' Makefile)
 	if [ "$_ver" != "$_gitver" ]; then
 		error "Please set _gitver in APKBUILD to $_ver"
 		return 1
 	fi
+
 	rm -rf git
 	mv ../git-$_gitver git
 
@@ -41,21 +44,21 @@ prepare() {
 }
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make $_makeopts all doc-man
+	cd "$_builddir"
+	make $_makeopts all doc-man || return 1
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make $_makeopts DESTDIR="$pkgdir" \
 		CGIT_SCRIPT_PATH=/usr/share/webapps/cgit \
-		install install-man
-	ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit
+		install install-man || return 1
+	ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit || return 1
 }
 
-md5sums="dbafc4e19c715c5ee9ed0cd9d0fda9fa  cgit-0.11.2.tar.xz
-1e9141d60940eeda6b3d04646b2e8d1a  git-2.3.2.tar.gz"
-sha256sums="2e126e770693d7296c7eb5eb83b809410aef29870bfe8f54da072a3f4d813e3b  cgit-0.11.2.tar.xz
-a35aea3a0f63f4cc3dd38fa32127e97273f335a14ea2586b649eb759ecf675a3  git-2.3.2.tar.gz"
-sha512sums="a29bce6e02c61bb2683ce96f867c3050c03dc9e45b5154507e92a30f9e436f61517eeff0c5b9023727e54a9212bf9bf6692a33e791e7883976a5349ae58c0c72  cgit-0.11.2.tar.xz
-ac56a8b2351e85c7c02b206ca17bf4c96569ad13bbe92dace2f8ed05f146c3e352248d52d15f3bfd33b705a816dcdd60909f1fd3e38e437130ba18e0c34925df  git-2.3.2.tar.gz"
+md5sums="192efcca82bf3bf07cd2746685a9f87a  cgit-0.12.tar.xz
+f3c3ed131e37e5e07cc0b81e9b539908  git-2.7.0.tar.gz"
+sha256sums="2ee233849335a64529a01cf2b6165ed492e20268e6e2526d7a7529ef1e24a5b7  cgit-0.12.tar.xz
+db9df4435c70a9b25d20a9ee20d65101692dc907a5a4b30e8343c9ae1b913ead  git-2.7.0.tar.gz"
+sha512sums="59c9189b5713184b07a7db65c30e26987bd14d76ccb998be52fb2d1cca0ae0d1637391c4d14ab58d29c0b58b586c1294ae865e140eda2a031ca1f175d83abc34  cgit-0.12.tar.xz
+d79933dbf4d993e14a9e4e3201cb64aa2be064692381daa9caa558f4369d471c4f3ea0aab35bccb4bfa684e188ed0fd0c6d1a497217a539e2959e2eca4d52e41  git-2.7.0.tar.gz"
-- 
cgit v1.2.3