* [bug#32407] [PATCH] gnu: cgit: Update to 1.2.1 [fixes CVE-2018-14912].
@ 2018-08-09 12:26 Leo Famulari
2018-08-09 20:30 ` Marius Bakke
0 siblings, 1 reply; 3+ messages in thread
From: Leo Famulari @ 2018-08-09 12:26 UTC (permalink / raw)
To: 32407
* 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(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 3db5796b4..14e0b9d7f 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)
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#32407] [PATCH] gnu: cgit: Update to 1.2.1 [fixes CVE-2018-14912].
2018-08-09 12:26 [bug#32407] [PATCH] gnu: cgit: Update to 1.2.1 [fixes CVE-2018-14912] Leo Famulari
@ 2018-08-09 20:30 ` Marius Bakke
2018-08-09 22:22 ` bug#32407: " Leo Famulari
0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2018-08-09 20:30 UTC (permalink / raw)
To: Leo Famulari, 32407
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
Leo Famulari <leo@famulari.name> writes:
> * gnu/packages/version-control.scm (cgit): Update to 1.2.1.
> [inputs]: Use the source of GIT.
LGTM, thank you!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#32407: [PATCH] gnu: cgit: Update to 1.2.1 [fixes CVE-2018-14912].
2018-08-09 20:30 ` Marius Bakke
@ 2018-08-09 22:22 ` Leo Famulari
0 siblings, 0 replies; 3+ messages in thread
From: Leo Famulari @ 2018-08-09 22:22 UTC (permalink / raw)
To: Marius Bakke; +Cc: 32407-done
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
On Thu, Aug 09, 2018 at 10:30:31PM +0200, Marius Bakke wrote:
> Leo Famulari <leo@famulari.name> writes:
>
> > * gnu/packages/version-control.scm (cgit): Update to 1.2.1.
> > [inputs]: Use the source of GIT.
>
> LGTM, thank you!
Thanks, pushed as 19a3e7f84af512fb6ae718e25977458c0cd501af
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-09 22:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-09 12:26 [bug#32407] [PATCH] gnu: cgit: Update to 1.2.1 [fixes CVE-2018-14912] Leo Famulari
2018-08-09 20:30 ` Marius Bakke
2018-08-09 22:22 ` bug#32407: " Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).