From f71561567b369aac73a9783cef760cacecaad287 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 9 Aug 2018 17:28:11 +0200
Subject: gnu: libgit2: Update to 0.26.6.
* gnu/packages/version-control.scm (libgit2): Update to 0.26.6.
---
gnu/packages/version-control.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/version-control.scm')
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 3db5796b4c..6c419a1d38 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -419,7 +419,7 @@ (define-public git
(define-public libgit2
(package
(name "libgit2")
- (version "0.26.5")
+ (version "0.26.6")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libgit2/libgit2/"
@@ -427,7 +427,7 @@ (define-public libgit2
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1adhq7pk9zdj85i5j4xzimq39qy6wpsi4h9fb8vc8jsncr8qmqjj"))
+ "0qjn1v5q282v8jih8rqjdqxr5v4n4manr0c8i3nnrf6sxd3xssbn"))
(patches (search-patches "libgit2-mtime-0.patch"))
;; Remove bundled software.
--
cgit v1.2.3
From 19a3e7f84af512fb6ae718e25977458c0cd501af Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Thu, 9 Aug 2018 08:24:31 -0400
Subject: gnu: cgit: Update to 1.2.1 [fixes CVE-2018-14912].
* gnu/packages/version-control.scm (cgit): Update to 1.2.1.
[inputs]: Use the source of GIT.
---
gnu/packages/version-control.scm | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
(limited to 'gnu/packages/version-control.scm')
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 6c419a1d38..6eaaffba40 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -143,8 +143,8 @@ (define-public bazaar
(define-public git
(package
(name "git")
- ;; XXX When updating Git, check if the special 'git:src' input to cgit needs
- ;; to be updated as well.
+ ;; XXX When updating Git, check if the special 'git-source' input to cgit
+ ;; needs to be updated as well.
(version "2.18.0")
(source (origin
(method url-fetch)
@@ -558,9 +558,7 @@ (define-public git-remote-gcrypt
(define-public cgit
(package
(name "cgit")
- ;; XXX When updating cgit, try removing the special 'git:src' input and
- ;; using the source of the git package.
- (version "1.1")
+ (version "1.2.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -568,7 +566,7 @@ (define-public cgit
version ".tar.xz"))
(sha256
(base32
- "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288"))))
+ "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; XXX: fail to build the in-source git.
@@ -580,7 +578,7 @@ (define-public cgit
(lambda* (#:key inputs #:allow-other-keys)
;; Unpack the source of git into the 'git' directory.
(invoke "tar" "--strip-components=1" "-C" "git" "-xf"
- (assoc-ref inputs "git:src"))))
+ (assoc-ref inputs "git-source"))))
(add-after 'unpack 'patch-absolute-file-names
(lambda* (#:key inputs #:allow-other-keys)
(define (quoted-file-name input path)
@@ -642,16 +640,8 @@ (define (quoted-file-name input path)
("bzip2" ,bzip2)
("xz" ,xz)))
(inputs
- `(;; Cgit directly accesses some internal Git interfaces that changed in
- ;; Git 2.12. Try removing this special input and using the source of the
- ;; Git package for cgit > 1.1.
- ("git:src"
- ,(origin
- (method url-fetch)
- (uri "mirror://kernel.org/software/scm/git/git-2.10.5.tar.xz")
- (sha256
- (base32
- "1r2aa19gnrvm2y4fqcvpw1g9l72n48axqmpgv18s6d0y2p72vhzj"))))
+ `(;; Building cgit requires a Git source tree.
+ ("git-source" ,(package-source git))
("openssl" ,openssl)
("groff" ,groff)
("python" ,python)
--
cgit v1.2.3