diff options
| author | Leo Famulari <leo@famulari.name> | 2018-08-09 08:24:31 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-08-09 18:21:47 -0400 |
| commit | 19a3e7f84af512fb6ae718e25977458c0cd501af (patch) | |
| tree | f0041819fbe8b2adb85f057afea48faf1c337397 | |
| parent | 4e23e8d80913fc2a69e97b29b5640e745b0d550b (diff) | |
| download | guix-19a3e7f84af512fb6ae718e25977458c0cd501af.tar guix-19a3e7f84af512fb6ae718e25977458c0cd501af.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/version-control.scm | 24 |
1 files changed, 7 insertions, 17 deletions
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 @@ as well as the classic centralized workflow.") (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 @@ collaboration using typical untrusted file hosts or services.") (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 @@ collaboration using typical untrusted file hosts or services.") 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 @@ collaboration using typical untrusted file hosts or services.") (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 @@ collaboration using typical untrusted file hosts or services.") ("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) |