summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Hauer <ohauer@FreeBSD.org>2016-02-21 13:33:59 +0000
committerOlli Hauer <ohauer@FreeBSD.org>2016-02-21 13:33:59 +0000
commit20d066eee09e56966303b591925b081736068573 (patch)
tree649cd88f0a1f114ab692f181c7162dea1bbbf9dd
parent- Update to version 3.5.5.2016.02.20 (diff)
- update to v3.6.5
Changes: 2016-02-20 v3.6.5 - allow creator check to be bypassed during mirroring - handle new style ssh fingerprinting correctly (thanks to Robin Johnson) - allow pre-auto-gc as a repo-specific hook - optimise mirror pushes for heavily used repos - create-with-reference trigger: on repo creation, setup objects/info/alternates for a server side alternate object store. - 'mirror status all all' prints a list of repos that have *some* error, which is arguably more useful for further action/processing - allow incrementally adding more repo-specific hooks
-rw-r--r--devel/gitolite/Makefile2
-rw-r--r--devel/gitolite/distinfo4
-rw-r--r--devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split10
-rw-r--r--devel/gitolite/pkg-plist2
4 files changed, 10 insertions, 8 deletions
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index fa45f03ff813..de50661d53b9 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitolite
-PORTVERSION= 3.6.4
+PORTVERSION= 3.6.5
DISTVERSIONPREFIX=v
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/gitolite/distinfo b/devel/gitolite/distinfo
index ce64019d8862..d8b57b3386ef 100644
--- a/devel/gitolite/distinfo
+++ b/devel/gitolite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sitaramc-gitolite-v3.6.4_GH0.tar.gz) = 15b19181dcc00233e4d031f07d769cf930e93963a925a71d684748068f38dd63
-SIZE (sitaramc-gitolite-v3.6.4_GH0.tar.gz) = 180619
+SHA256 (sitaramc-gitolite-v3.6.5_GH0.tar.gz) = 15f367591cc6782cde8b0b8c2206ada5714e83998b96de61838d64ff0878f876
+SIZE (sitaramc-gitolite-v3.6.5_GH0.tar.gz) = 182496
diff --git a/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split b/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split
index 277e8830fe71..6afcda2ac10f 100644
--- a/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split
+++ b/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split
@@ -1,4 +1,4 @@
---- src/triggers/post-compile/ssh-authkeys-split.orig 2015-11-01 12:01:20 UTC
+--- src/triggers/post-compile/ssh-authkeys-split.orig 2016-02-20 12:48:57 UTC
+++ src/triggers/post-compile/ssh-authkeys-split
@@ -1,4 +1,4 @@
-#!/usr/local/bin/bash
@@ -6,10 +6,10 @@
# split multi-key files into separate keys like ssh-authkeys likes
-@@ -60,7 +60,7 @@ do
- while read line
- do
- echo "$line" > $SKD/$base@$seq.pub
+@@ -64,7 +64,7 @@ do
+ echo 1>&2 "ssh-authkeys-split: bad line $seq in keydir/$k"
+ rm -f $f
+ fi
- (( seq++ ))
+ seq=$(( $seq + 1 ))
done < $k
diff --git a/devel/gitolite/pkg-plist b/devel/gitolite/pkg-plist
index 8fccd918bbf7..3db4fee98f14 100644
--- a/devel/gitolite/pkg-plist
+++ b/devel/gitolite/pkg-plist
@@ -37,6 +37,7 @@ libexec/gitolite/VREF/lock
libexec/gitolite/VREF/partial-copy
libexec/gitolite/VREF/refex-expr
libexec/gitolite/check-g2-compat
+libexec/gitolite/commands/1plus1
libexec/gitolite/commands/D
libexec/gitolite/commands/access
libexec/gitolite/commands/config
@@ -77,6 +78,7 @@ libexec/gitolite/syntactic-sugar/refex-expr
libexec/gitolite/triggers/bg
libexec/gitolite/triggers/expand-deny-messages
libexec/gitolite/triggers/partial-copy
+libexec/gitolite/triggers/post-compile/create-with-reference
libexec/gitolite/triggers/post-compile/ssh-authkeys
libexec/gitolite/triggers/post-compile/ssh-authkeys-shell-users
libexec/gitolite/triggers/post-compile/ssh-authkeys-split