From 36bfcf7e3a6d2a2dbaa05a4cfb4066adcf13da6d Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 14 Aug 2017 21:35:41 +0200
Subject: gnu: git@2.10: Update to 2.10.4 [fixes CVE-2017-1000117].

...also disable tests, since they broke after c9f4f56b24801718d89c2520b.

* gnu/packages/version-control.scm (git@2.10): Update to 2.10.4.
[arguments]: New field.
---
 gnu/packages/version-control.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'gnu/packages/version-control.scm')

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index bff6471559..151cf0cf10 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -350,18 +350,21 @@ everything from small to very large projects with speed and efficiency.")
    (home-page "https://git-scm.com/")))
 
 ;; Some dependent packages directly access internal interfaces which
-;; have changed in 2.12
+;; have changed in 2.12. TODO: Remove this for cgit > 1.1.
 (define-public git@2.10
   (package
     (inherit git)
-    (version "2.10.3")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://kernel.org/software/scm/git/git-"
-                                version ".tar.xz"))
-            (sha256
-             (base32
-              "02mb7yi49algsya3hnkcxdslwb6p1bi7c732z1g8kzq4hs838m7z"))))))
+    (version "2.10.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kernel.org/software/scm/git/git-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "1pni4mgih5w42813dxljl61s7xmcpdnar34d9m4548hzpljjyd4l"))))
+    (arguments
+     `(#:tests? #f
+       ,@(package-arguments git)))))
 
 (define-public libgit2
   (package
-- 
cgit v1.2.3

'qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=3bd092c0bf8dd4d315fc596a60e3ad5976b1e769&amp;ofs=50'>root</a>/<a href='/guix/log/gnu?id=3bd092c0bf8dd4d315fc596a60e3ad5976b1e769&amp;ofs=50'>gnu</a>/<a href='/guix/log/gnu/packages?id=3bd092c0bf8dd4d315fc596a60e3ad5976b1e769&amp;ofs=50'>packages</a>/<a href='/guix/log/gnu/packages/make-bootstrap.scm?id=3bd092c0bf8dd4d315fc596a60e3ad5976b1e769&amp;ofs=50'>make-bootstrap.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/make-bootstrap.scm?id=3bd092c0bf8dd4d315fc596a60e3ad5976b1e769&amp;ofs=50&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>