From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnk2w-0006fE-Ka for guix-patches@gnu.org; Thu, 09 Aug 2018 08:28:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnk2s-00060Y-KK for guix-patches@gnu.org; Thu, 09 Aug 2018 08:28:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:40571) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnk2s-00060B-EV for guix-patches@gnu.org; Thu, 09 Aug 2018 08:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fnk2s-00022z-7o for guix-patches@gnu.org; Thu, 09 Aug 2018 08:28:02 -0400 Subject: [bug#32407] [PATCH] gnu: cgit: Update to 1.2.1 [fixes CVE-2018-14912]. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnk1n-0006cU-Rq for guix-patches@gnu.org; Thu, 09 Aug 2018 08:26:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnk1j-0005T3-TQ for guix-patches@gnu.org; Thu, 09 Aug 2018 08:26:55 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:47995) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fnk1j-0005S3-9S for guix-patches@gnu.org; Thu, 09 Aug 2018 08:26:51 -0400 Received: from jasmine.lan (unknown [128.64.129.14]) by mail.messagingengine.com (Postfix) with ESMTPA id 2B2391025D for ; Thu, 9 Aug 2018 08:26:49 -0400 (EDT) From: Leo Famulari Date: Thu, 9 Aug 2018 08:26:34 -0400 Message-Id: <6524c392617ffd5cfacc8d599b9fc60f07c9d5c1.1533817593.git.leo@famulari.name> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32407@debbugs.gnu.org * 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