From owner-svn-ports-all@freebsd.org Sat Feb 13 09:12:21 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72E8FAA61DC; Sat, 13 Feb 2016 09:12:21 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C6B9187E; Sat, 13 Feb 2016 09:12:21 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1D9CKbU047309; Sat, 13 Feb 2016 09:12:20 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1D9CKqr046969; Sat, 13 Feb 2016 09:12:20 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201602130912.u1D9CKqr046969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sat, 13 Feb 2016 09:12:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408775 - in head/devel/gitolite: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2016 09:12:21 -0000 Author: ohauer Date: Sat Feb 13 09:12:19 2016 New Revision: 408775 URL: https://svnweb.freebsd.org/changeset/ports/408775 Log: - update to 3.6.4 - remove MASTER_SITES/LOCAL, they are not needed with GH - fix VERSION - make ssh-authkeys-split work with sh instead bash 2015-11-01 v3.6.4 - a ref-create bug in wild repos was fixed - some contrib code related to AD integration, and to redmine user aliases - teach Alias.pm a few new tricks - remove a race condition in 'create' command that affected the 'default roles' setting - make 'who-pushed' more efficient (local push logs, and 'tip search') - 'gitolite query-rc' learns '-d' ('--dump') option 2015-04-26 v3.6.3 - allow limited use of 'git config' using the new 'config' command - accept openssh 6.8's new fingerprint output format - (finally!) allow limited symlinks within ~/repositories; see commit 8e36230 for details - perms command now lists available roles - minor backward compat breakage: 'perms -l repo' no longer works; see 'perms -h' for new usage - allow gitolite-shell to be used as $SHELL (experts only; no support, no docs; see commit 9cd1e37 for details) - help with 'git push --signed' using a post-receive hook to adopt push certs into 'refs/push-certs'; for details see contrib/hooks/repo-specific/save-push-signatures - new 'transparent proxy' feature for git repos; see src/lib/Gitolite/Triggers/TProxy.pm for details 2014-11-10 v3.6.2 - disable ../ everywhere (see mailing list thread for details) - VREF/NAME_NC -- like VREF/NAME but for new commits only. Details within src/VREF/NAME_NC. - allow gitolite.conf to be tested locally; details within contrib/utils/gitolite-local Added: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split (contents, props changed) Modified: head/devel/gitolite/Makefile head/devel/gitolite/distinfo head/devel/gitolite/pkg-plist Modified: head/devel/gitolite/Makefile ============================================================================== --- head/devel/gitolite/Makefile Sat Feb 13 09:03:15 2016 (r408774) +++ head/devel/gitolite/Makefile Sat Feb 13 09:12:19 2016 (r408775) @@ -1,13 +1,11 @@ # $FreeBSD$ PORTNAME= gitolite -PORTVERSION= 3.6.1 -PORTREVISION= 1 +PORTVERSION= 3.6.4 +DISTVERSIONPREFIX=v PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= GH \ - LOCAL/milki \ - LOCAL/tdb +MASTER_SITES= GH MAINTAINER= ports@FreeBSD.org COMMENT= Access control layer on top of git @@ -20,7 +18,6 @@ RUN_DEPENDS= git>=0:${PORTSDIR}/devel/gi USE_GITHUB= yes GH_ACCOUNT= sitaramc -GH_TAGNAME= 3455375 CONFLICTS= gitolite-[^3]* @@ -45,7 +42,7 @@ post-patch: -exec ${REINPLACE_CMD} -Ee 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} \; do-build: - echo "v${PORTVERSION}-0-g${GH_TAGNAME}" > ${WRKSRC}/src/VERSION + echo "${GH_TAGNAME}" > ${WRKSRC}/src/VERSION ${MKDIR} ${WRKSRC}/lib ${MV} ${WRKSRC}/src/lib/Gitolite ${WRKSRC}/lib/ ${RMDIR} ${WRKSRC}/src/lib @@ -63,7 +60,7 @@ do-install: do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR} .include Modified: head/devel/gitolite/distinfo ============================================================================== --- head/devel/gitolite/distinfo Sat Feb 13 09:03:15 2016 (r408774) +++ head/devel/gitolite/distinfo Sat Feb 13 09:12:19 2016 (r408775) @@ -1,2 +1,2 @@ -SHA256 (sitaramc-gitolite-3.6.1-3455375_GH0.tar.gz) = 007d7f171a1985b01689619ec60434dfaf355c5415a51e139de199cc11012df5 -SIZE (sitaramc-gitolite-3.6.1-3455375_GH0.tar.gz) = 165504 +SHA256 (sitaramc-gitolite-v3.6.4_GH0.tar.gz) = 15b19181dcc00233e4d031f07d769cf930e93963a925a71d684748068f38dd63 +SIZE (sitaramc-gitolite-v3.6.4_GH0.tar.gz) = 180619 Added: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split Sat Feb 13 09:12:19 2016 (r408775) @@ -0,0 +1,17 @@ +--- src/triggers/post-compile/ssh-authkeys-split.orig 2015-11-01 12:01:20 UTC ++++ src/triggers/post-compile/ssh-authkeys-split +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/bash ++#!/bin/sh + + # 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 +- (( seq++ )) ++ seq=$(( $seq + 1 )) + done < $k + + # now delete the original file Modified: head/devel/gitolite/pkg-plist ============================================================================== --- head/devel/gitolite/pkg-plist Sat Feb 13 09:03:15 2016 (r408774) +++ head/devel/gitolite/pkg-plist Sat Feb 13 09:12:19 2016 (r408775) @@ -23,6 +23,7 @@ bin/gitolite %%SITE_PERL%%/Gitolite/Triggers/RefexExpr.pm %%SITE_PERL%%/Gitolite/Triggers/RepoUmask.pm %%SITE_PERL%%/Gitolite/Triggers/Shell.pm +%%SITE_PERL%%/Gitolite/Triggers/TProxy.pm %%SITE_PERL%%/Gitolite/Triggers/Writable.pm libexec/gitolite/VERSION libexec/gitolite/VREF/COUNT @@ -30,6 +31,7 @@ libexec/gitolite/VREF/EMAIL-CHECK libexec/gitolite/VREF/FILETYPE libexec/gitolite/VREF/MAX_NEWBIN_SIZE libexec/gitolite/VREF/MERGE-CHECK +libexec/gitolite/VREF/NAME_NC libexec/gitolite/VREF/VOTES libexec/gitolite/VREF/lock libexec/gitolite/VREF/partial-copy @@ -37,6 +39,7 @@ libexec/gitolite/VREF/refex-expr libexec/gitolite/check-g2-compat libexec/gitolite/commands/D libexec/gitolite/commands/access +libexec/gitolite/commands/config libexec/gitolite/commands/create libexec/gitolite/commands/creator libexec/gitolite/commands/desc @@ -50,6 +53,7 @@ libexec/gitolite/commands/list-dangling- libexec/gitolite/commands/lock libexec/gitolite/commands/mirror libexec/gitolite/commands/motd +libexec/gitolite/commands/option libexec/gitolite/commands/owns libexec/gitolite/commands/perms libexec/gitolite/commands/print-default-rc @@ -86,4 +90,4 @@ libexec/gitolite/triggers/repo-specific- libexec/gitolite/triggers/set-default-roles libexec/gitolite/triggers/upstream %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/README.txt +%%PORTDOCS%%%%DOCSDIR%%/README.markdown