diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-03-15 07:03:39 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-03-15 07:10:35 +0200 |
| commit | 20109e07bde4be526df684f8606a189b1378cb52 (patch) | |
| tree | ef8d7cb0ea1c2173117890ae59a9c5aa469d9532 | |
| parent | b65195c2ccecb396f08233d73d378ec8e47620ed (diff) | |
| download | guix-20109e07bde4be526df684f8606a189b1378cb52.tar.gz | |
gnu: gitolite: Update to 3.6.5.
* gnu/packages/version-control.scm (gitolite): Update to 3.6.5. [source]: Remove patch. * gnu/packages/patches/gitolite-openssh-6.8-compat.patch: Remove file. * gnu-system.am (dist_patch_DATA): Remove it.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/gitolite-openssh-6.8-compat.patch | 25 | ||||
| -rw-r--r-- | gnu/packages/version-control.scm | 7 |
3 files changed, 2 insertions, 31 deletions
diff --git a/gnu-system.am b/gnu-system.am index e198793a87..634093ab6e 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -484,7 +484,6 @@ dist_patch_DATA = \ gnu/packages/patches/geoclue-config.patch \ gnu/packages/patches/ghostscript-CVE-2015-3228.patch \ gnu/packages/patches/ghostscript-runpath.patch \ - gnu/packages/patches/gitolite-openssh-6.8-compat.patch \ gnu/packages/patches/glib-networking-ssl-cert-file.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ diff --git a/gnu/packages/patches/gitolite-openssh-6.8-compat.patch b/gnu/packages/patches/gitolite-openssh-6.8-compat.patch deleted file mode 100644 index d7fc2e6b12..0000000000 --- a/gnu/packages/patches/gitolite-openssh-6.8-compat.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ed807a40c6683960e357bc995b3acf721ec088b4 Mon Sep 17 00:00:00 2001 -From: Sitaram Chamarty <sitaram@atc.tcs.com> -Date: Thu, 19 Mar 2015 05:17:59 +0530 -Subject: [PATCH] openssh 6.8 compat - ---- - src/triggers/post-compile/ssh-authkeys | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/triggers/post-compile/ssh-authkeys b/src/triggers/post-compile/ssh-authkeys -index 84dda73..d5f5d8b 100755 ---- a/src/triggers/post-compile/ssh-authkeys -+++ b/src/triggers/post-compile/ssh-authkeys -@@ -115,7 +115,7 @@ sub fp_file { - my $f = shift; - my $fp = `ssh-keygen -l -f '$f'`; - chomp($fp); -- _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/; -+ _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/ or $fp =~ m(SHA256:([A-ZA-z0-9+/]+)); - $fp = $1; - return $fp; - } --- -2.2.1 - diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 37e1b53d29..d0cc1459c5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -489,19 +489,16 @@ also walk each side of a merge and test those changes individually.") (define-public gitolite (package (name "gitolite") - (version "3.6.2") + (version "3.6.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/sitaramc/gitolite/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) - ;; Commit ed807a4 upstream - (patches - (list (search-patch "gitolite-openssh-6.8-compat.patch"))) (sha256 (base32 - "1gsgzi9ayb4rablki3mqr11b0h8db4xg43df660marfpacmkfb01")))) + "0xpqg04gyr4dhdhxx5lbk61lwwd5ml32530bigg2qy663icngwqm")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests |