main/git: update to 2.8.6 (CVE-2017-1000117)

3 files changed, 24 insertions, 47 deletions

diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 5060c4e995..2a8d21d899 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=2.6.7
+pkgver=2.8.6
 pkgrel=0
 pkgdesc="A distributed version control system"
 url="https://www.git-scm.com/"
@@ -30,7 +30,7 @@ subpackages="$pkgname-doc
 # we need tcl and tk to be built before git due to git-gui and gitk
 makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev
 	pcre-dev asciidoc xmlto perl-error tcl tk"
-source="git-$pkgver.tar.xz::https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
+source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
 	bb-tar.patch
 	git-daemon.initd
 	git-daemon.confd
@@ -43,10 +43,13 @@ _makeopts="
 	USE_LIBPCRE=1"
 
 _gitcoredir=/usr/libexec/git-core
+_builddir="$srcdir"/$pkgname-$pkgver
 
 # secfixes:
 #   2.6.7-r0:
 #     - CVE-2017-8386
+#   2.8.6-r0:
+#     - CVE-2017-1000117
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -58,13 +61,14 @@ prepare() {
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
+	make -j1 prefix=/usr DESTDIR="$pkgdir" $_makeopts perl/perl.mak || return 1
 	make prefix=/usr DESTDIR="$pkgdir" $_makeopts || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make prefix=/usr \
+	cd "$_builddir"
+	make -j1 prefix=/usr \
 		DESTDIR="$pkgdir" \
 		INSTALLDIRS=vendor \
 		$_makeopts install || return 1
@@ -110,7 +114,6 @@ email() {
 	mv "$pkgdir"/$_gitcoredir/*email* "$subpkgdir"/$_gitcoredir
 }
 
-
 svn() {
 	depends="perl perl-git-svn=$pkgver-r$pkgrel perl-subversion
 		perl-term-readkey"
@@ -170,7 +173,7 @@ completion() {
 	replaces=""
 	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
 
-	install -Dm644 "$srcdir"/git-$pkgver/contrib/completion/git-completion.bash \
+	install -Dm644 "$_builddir"/contrib/completion/git-completion.bash \
 		"$subpkgdir"/usr/share/bash-completion/completions/git
 }
 
@@ -180,7 +183,7 @@ subtree() {
 	arch="noarch"
 	replaces=""
 
-	cd "$srcdir"/$pkgname-$pkgver/contrib/subtree
+	cd "$_builddir"/contrib/subtree
 	make prefix=/usr DESTDIR="$pkgdir" || return 1
 	make install prefix=/usr DESTDIR="$subpkgdir"
 }
@@ -191,7 +194,7 @@ subtree_doc() {
 	arch="noarch"
 	replaces=""
 
-	cd "$srcdir"/$pkgname-$pkgver/contrib/subtree
+	cd "$_builddir"/contrib/subtree
 	make install-man prefix=/usr DESTDIR="$subpkgdir" || return 1
 	gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1
 }
@@ -239,15 +242,7 @@ _git_perl() {
 }
 
 
-md5sums="2fbcd25b9c8af1ea0e92212fef153cda  git-2.6.7.tar.xz
-0549894076c2081d886fa5ee44c20e23  bb-tar.patch
-75b9d8f33fbec38a8e0e06baf5165b19  git-daemon.initd
-2258e95d389ccc6de0b5111d53d9eed6  git-daemon.confd"
-sha256sums="85e076821287d5261472f6c9d5f055aa7679b142f149624c579ac41271e02139  git-2.6.7.tar.xz
-968e996a306dab643970c5ce1ac40926146b01b9c38a8fe81c74340a0302dbc7  bb-tar.patch
-7918837f77b4cebce70b600b2f6da00e4c0df6b946f4ff5671c797c37b2ffc4f  git-daemon.initd
-aaa80bd059db549dadf4c4e27a9aa41a4b5def844f8e563c493bc8513dcd981e  git-daemon.confd"
-sha512sums="feca860e0f37ab7d246f74aa36d2caffb45f01672797195ad1ade18376a66d4b18052bcd38d1dfa5383a9ab6f280ecaaf1f4f74349c43faaddbd108c8b38f0dd  git-2.6.7.tar.xz
+sha512sums="3dde26378b8df2c9903cc5a5fffd8d5bbe82619853a1391c3e1f7d4766bf9dba154babeed794b65ed17826f6644b23c719bd13764cdf272a3d1aa01345a40afd  git-2.8.6.tar.xz
 85767b5e03137008d6a96199e769e3979f75d83603ac8cb13a3481a915005637409a4fd94e0720da2ec6cd1124f35eba7cf20109a94816c4b4898a81fbc46bd2  bb-tar.patch
-1e707250d133d56100f0311e7c2610920d6d81809c425ebf3e6acb4a289b958707a90dc38e1c17720da6dc2758dd84bf957fe6aed3854eacea79226eb616e885  git-daemon.initd
-9640f8078d68ed2678e5249da3f946fc21f50e858b94127a4221de73c6132101afcd46bc1fe33861e9a7f731c0dc9591915b8ebf376b8e690cd7135703966509  git-daemon.confd"
+e32e57652a99243e8a3f2cfcfa641215eec27c463d5dbcbb8f9213474526ba3e4a23c188b5653a5100bb56857f0785e35e799b0c6336ec0b596b9b8e62af9d30  git-daemon.initd
+fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec  git-daemon.confd"
diff --git a/main/git/git-daemon.confd b/main/git/git-daemon.confd
index 6369053fc9..69b209ff18 100644
--- a/main/git/git-daemon.confd
+++ b/main/git/git-daemon.confd
@@ -10,11 +10,10 @@
 #   --export-all  --- Exports all repositories
 #   --port=XXXX   --- Starts in port XXXX instead of 9418
 #
-GITDAEMON_REPO="/var/git"
-GITDAEMON_OPTS="--syslog --base-path=${GITDAEMON_REPO} ${GITDAEMON_REPO}"
+GITDAEMON_OPTS="--syslog --base-path=/var/git"
 
 # To run an anonymous git safely, the following user should be able to only
-# read your Git repositories. It should not able able to write to anywhere on
+# read your Git repositories. It should not be able to write to anywhere on
 # your system, esp. not the repositories.
 GIT_USER="nobody"
 GIT_GROUP="nobody"
diff --git a/main/git/git-daemon.initd b/main/git/git-daemon.initd
index cb765bdf2b..b6ecfd9c50 100644
--- a/main/git/git-daemon.initd
+++ b/main/git/git-daemon.initd
@@ -1,30 +1,13 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $
+# $Id$
 
-PIDFILE=/var/run/git-daemon.pid
+pidfile="/var/run/git-daemon.pid"
+command="/usr/bin/git"
+command_args="daemon ${GITDAEMON_OPTS}"
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
 
 depend() {
-	need net
 	use logger
 }
-
-start() {
-	ebegin "Starting git-daemon"
-		start-stop-daemon --start --quiet --background \
-		--env HOME=${GIT_HOME:-/var/git} \
-		--pidfile ${PIDFILE} \
-		--exec /usr/bin/git -- daemon \
-			--pid-file=${PIDFILE} \
-			--user=${GIT_USER} --group=${GIT_GROUP} \
-			${GITDAEMON_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping git-daemon"
-		start-stop-daemon --stop --quiet \
-		--pidfile ${PIDFILE}
-	eend $?
-}