[arch-commits] Commit in gitolite/trunk (2 files)

[Christian Hesse]

    Date: Sunday, April 26, 2015 @ 14:24:39
  Author: eworm
Revision: 132261

upgpkg: gitolite 3.6.3-1

Modified:
  gitolite/trunk/PKGBUILD
Deleted:
  gitolite/trunk/gitolite-3.6.2-openssh-6.8-compat.patch

-----------------------------------------+
 PKGBUILD                                |   12 ++++--------
 gitolite-3.6.2-openssh-6.8-compat.patch |   25 -------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-26 11:53:27 UTC (rev 132260)
+++ PKGBUILD	2015-04-26 12:24:39 UTC (rev 132261)
@@ -4,8 +4,8 @@
 # Contributor: Jon Eyolfson <jon at eyolfson.com>
 
 pkgname=gitolite
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.6.3
+pkgrel=1
 pkgdesc='An access control layer on top of git'
 url='https://github.com/sitaramc/gitolite'
 arch=('any')
@@ -12,16 +12,12 @@
 license=('GPL2')
 depends=('git' 'perl')
 install=gitolite.install
-source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz
-        gitolite-3.6.2-openssh-6.8-compat.patch)
-sha256sums=('012c372b53d765558131ae0df23a590d41b042c8b88e38e952992caf52fc4fbf'
-            '4943769dcf45a3f68fe7ffd7450239eae83c2bd723051b208a5d1fa4a5a93a75')
+source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz)
+sha256sums=('9b20eb6ae84358c5f063b02da64e49bef4605c9bfc7fb3700a2766dba58b9d99')
 
 prepare() {
   cd $pkgname-$pkgver/src
   echo "$pkgver" > VERSION
-
-  patch -p2 -i "$srcdir"/gitolite-3.6.2-openssh-6.8-compat.patch
 }
 
 package() {

Deleted: gitolite-3.6.2-openssh-6.8-compat.patch
===================================================================
--- gitolite-3.6.2-openssh-6.8-compat.patch	2015-04-26 11:53:27 UTC (rev 132260)
+++ gitolite-3.6.2-openssh-6.8-compat.patch	2015-04-26 12:24:39 UTC (rev 132261)
@@ -1,25 +0,0 @@
-From ed807a40c6683960e357bc995b3acf721ec088b4 Mon Sep 17 00:00:00 2001
-From: Sitaram Chamarty <sitaram at 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.1.0
-