From 58dce7bfb59d4f89b035c9bf181e73f4b667b57c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 31 Jul 2017 11:13:49 +0200 Subject: gnu: libgit2: Update to 0.26.0. * gnu/packages/version-control.scm (libgit2): Update to 0.26.0. Remove "libgit2-use-after-free.patch". * gnu/packages/patches/libgit2-use-after-free.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/version-control.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 2e17201a5f..fbaf8f2f29 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -334,7 +334,7 @@ everything from small to very large projects with speed and efficiency.") (define-public libgit2 (package (name "libgit2") - (version "0.25.1") + (version "0.26.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" @@ -342,9 +342,8 @@ everything from small to very large projects with speed and efficiency.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1cdwcw38frc1wf28x5ppddazv9hywc718j92f3xa3ybzzycyds3s")) - (patches (search-patches "libgit2-use-after-free.patch" - "libgit2-0.25.1-mtime-0.patch")))) + "1fdk9yhwvl1w1z71ykzcvgh4nsf8scxcbclz5anh98zpplmhmisa")) + (patches (search-patches "libgit2-0.25.1-mtime-0.patch")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8ecba89b7777a21b633f9807b997076e4e5c210d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 31 Jul 2017 11:14:37 +0200 Subject: gnu: libgit2: Add "debug" output. * gnu/packages/version-control.scm (libgit2)[outputs]: New field. --- gnu/packages/version-control.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index fbaf8f2f29..bc4242fc10 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -345,6 +345,7 @@ everything from small to very large projects with speed and efficiency.") "1fdk9yhwvl1w1z71ykzcvgh4nsf8scxcbclz5anh98zpplmhmisa")) (patches (search-patches "libgit2-0.25.1-mtime-0.patch")))) (build-system cmake-build-system) + (outputs '("out" "debug")) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 3d0fbd3c2f92cee74fd443eb5c252b8dd9b75b43 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 31 Jul 2017 18:56:44 -0400 Subject: gnu: libgit2: Enable SHA-1 collision detection. * gnu/packages/version-control.scm (libgit2)[arguments]: Enable '-DUSE_SHA1DC' in #:configure-flags. --- gnu/packages/version-control.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index bc4242fc10..9667b2f3ec 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -347,7 +347,8 @@ everything from small to very large projects with speed and efficiency.") (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - `(#:phases + `(#:configure-flags '("-DUSE_SHA1DC=ON") ; SHA-1 collision detection + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-hardcoded-paths (lambda _ -- cgit v1.2.3 From b73e49f595635d191b98997e4c6cce67b1bbe071 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 Aug 2017 23:28:23 +0200 Subject: gnu: git: Update to 2.13.4. * gnu/packages/version-control.scm (git): Update to 2.13.4. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9667b2f3ec..9274a93f6a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -120,14 +120,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.13.3") + (version "2.13.4") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0qiy696pwqhbxcrvm3zhyjnfjrym541glhvgc4cynrwg8az27ali")))) + "1nmg0n9l5ix876iqhcyhdnmiy7ihv0ybdijf1lssch6ja8m5j6ip")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -140,7 +140,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1hl1fhbr3jn4y9pkj26kk9frj6wjlxiphl7x5c9ma6x4081xna0i")))))) + "0ljxkfi7ski9bgpdb8xpikl1xgjjk7bdzmzzkbj93jybk6iajkv7")))))) (inputs `(("curl" ,curl) ("expat" ,expat) -- cgit v1.2.3