[arch-commits] Commit in gitolite/repos/community-testing-any (5 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Mon Mar 23 19:04:31 UTC 2015
Date: Monday, March 23, 2015 @ 20:04:31
Author: bpiotrowski
Revision: 129813
archrelease: copy trunk to community-testing-any
Added:
gitolite/repos/community-testing-any/PKGBUILD
(from rev 129812, gitolite/trunk/PKGBUILD)
gitolite/repos/community-testing-any/gitolite-3.6.2-openssh-6.8-compat.patch
(from rev 129812, gitolite/trunk/gitolite-3.6.2-openssh-6.8-compat.patch)
gitolite/repos/community-testing-any/gitolite.install
(from rev 129812, gitolite/trunk/gitolite.install)
Deleted:
gitolite/repos/community-testing-any/PKGBUILD
gitolite/repos/community-testing-any/gitolite.install
-----------------------------------------+
PKGBUILD | 58 ++++++++++++++++--------------
gitolite-3.6.2-openssh-6.8-compat.patch | 25 ++++++++++++
gitolite.install | 48 ++++++++++++------------
3 files changed, 80 insertions(+), 51 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-03-23 19:04:23 UTC (rev 129812)
+++ PKGBUILD 2015-03-23 19:04:31 UTC (rev 129813)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Jon Eyolfson <jon at eyolfson.com>
-
-pkgname=gitolite
-pkgver=3.6.2
-pkgrel=1
-pkgdesc='An access control layer on top of git'
-url='https://github.com/sitaramc/gitolite'
-arch=('any')
-license=('GPL2')
-depends=('git' 'perl')
-install=gitolite.install
-source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz)
-sha256sums=('012c372b53d765558131ae0df23a590d41b042c8b88e38e952992caf52fc4fbf')
-
-prepare() {
- cd $pkgname-$pkgver/src
- echo "$pkgver" > VERSION
-}
-
-package() {
- install -d "$pkgdir"/usr/{bin,lib/gitolite}
- cp -a $pkgname-$pkgver/src/* "$pkgdir"/usr/lib/gitolite
- ln -s /usr/lib/gitolite/gitolite "$pkgdir"/usr/bin/
-}
Copied: gitolite/repos/community-testing-any/PKGBUILD (from rev 129812, gitolite/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-03-23 19:04:31 UTC (rev 129813)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Jon Eyolfson <jon at eyolfson.com>
+
+pkgname=gitolite
+pkgver=3.6.2
+pkgrel=2
+pkgdesc='An access control layer on top of git'
+url='https://github.com/sitaramc/gitolite'
+arch=('any')
+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')
+
+prepare() {
+ cd $pkgname-$pkgver/src
+ echo "$pkgver" > VERSION
+
+ patch -p2 -i "$srcdir"/gitolite-3.6.2-openssh-6.8-compat.patch
+}
+
+package() {
+ install -d "$pkgdir"/usr/{bin,lib/gitolite}
+ cp -a $pkgname-$pkgver/src/* "$pkgdir"/usr/lib/gitolite
+ ln -s /usr/lib/gitolite/gitolite "$pkgdir"/usr/bin/
+}
Copied: gitolite/repos/community-testing-any/gitolite-3.6.2-openssh-6.8-compat.patch (from rev 129812, gitolite/trunk/gitolite-3.6.2-openssh-6.8-compat.patch)
===================================================================
--- gitolite-3.6.2-openssh-6.8-compat.patch (rev 0)
+++ gitolite-3.6.2-openssh-6.8-compat.patch 2015-03-23 19:04:31 UTC (rev 129813)
@@ -0,0 +1,25 @@
+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
+
Deleted: gitolite.install
===================================================================
--- gitolite.install 2015-03-23 19:04:23 UTC (rev 129812)
+++ gitolite.install 2015-03-23 19:04:31 UTC (rev 129813)
@@ -1,24 +0,0 @@
-post_install() {
- if ! getent group gitolite &>/dev/null; then
- groupadd -r -g 196 gitolite >/dev/null
- fi
-
- if ! getent passwd gitolite &>/dev/null; then
- useradd -m -r -u 196 -g gitolite -d /var/lib/gitolite \
- -s /bin/bash gitolite >/dev/null
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- if getent passwd gitolite &>/dev/null; then
- userdel gitolite >/dev/null
- fi
-
- if getent group gitolite &>/dev/null; then
- groupdel gitolite >/dev/null
- fi
-}
Copied: gitolite/repos/community-testing-any/gitolite.install (from rev 129812, gitolite/trunk/gitolite.install)
===================================================================
--- gitolite.install (rev 0)
+++ gitolite.install 2015-03-23 19:04:31 UTC (rev 129813)
@@ -0,0 +1,24 @@
+post_install() {
+ if ! getent group gitolite &>/dev/null; then
+ groupadd -r -g 196 gitolite >/dev/null
+ fi
+
+ if ! getent passwd gitolite &>/dev/null; then
+ useradd -m -r -u 196 -g gitolite -d /var/lib/gitolite \
+ -s /bin/bash gitolite >/dev/null
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ if getent passwd gitolite &>/dev/null; then
+ userdel gitolite >/dev/null
+ fi
+
+ if getent group gitolite &>/dev/null; then
+ groupdel gitolite >/dev/null
+ fi
+}
More information about the arch-commits
mailing list