From owner-svn-ports-all@freebsd.org Thu Jul 12 08:42:37 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D43D21042333; Thu, 12 Jul 2018 08:42:36 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 86F6184294; Thu, 12 Jul 2018 08:42:36 +0000 (UTC) (envelope-from mat@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67F0A1F1B0; Thu, 12 Jul 2018 08:42:36 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6C8gaMX005561; Thu, 12 Jul 2018 08:42:36 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6C8gZ7W005557; Thu, 12 Jul 2018 08:42:35 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201807120842.w6C8gZ7W005557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 12 Jul 2018 08:42:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474495 - in head/devel/gitolite: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/devel/gitolite: . files X-SVN-Commit-Revision: 474495 X-SVN-Commit-Repository: ports 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.27 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: Thu, 12 Jul 2018 08:42:37 -0000 Author: mat Date: Thu Jul 12 08:42:35 2018 New Revision: 474495 URL: https://svnweb.freebsd.org/changeset/ports/474495 Log: Update to 3.6.8. Sponsored by: Absolight Modified: head/devel/gitolite/Makefile (contents, props changed) head/devel/gitolite/distinfo (contents, props changed) head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split (contents, props changed) head/devel/gitolite/pkg-plist (contents, props changed) Modified: head/devel/gitolite/Makefile ============================================================================== --- head/devel/gitolite/Makefile Thu Jul 12 08:37:45 2018 (r474494) +++ head/devel/gitolite/Makefile Thu Jul 12 08:42:35 2018 (r474495) @@ -2,8 +2,7 @@ PORTNAME= gitolite DISTVERSIONPREFIX=v -DISTVERSION= 3.6.7 -PORTREVISION= 1 +DISTVERSION= 3.6.8 PORTEPOCH= 1 CATEGORIES= devel @@ -30,14 +29,17 @@ bash_CMD= /bin/sh SUB_FILES= pkg-message -OPTIONS_DEFINE= GITUSER DOCS +OPTIONS_DEFINE= GITUSER DOCS CONTRIB +OPTIONS_DEFAULT= CONTRIB OPTIONS_SUB= yes +CONTRIB_DESC= Install additionnal contrib files GITUSER_DESC= Create git user as gitolite provider + GITUSER_VARS= USERS=git GROUPS=git post-patch: - @${REINPLACE_CMD} -i '' -e 's,#!/usr/bin/perl,#!${PERL},' \ + @${REINPLACE_CMD} -e 's,#!/usr/bin/perl,#!${PERL},' \ ${WRKSRC}/src/lib/Gitolite/Hooks/*.pm do-build: @@ -47,11 +49,8 @@ do-build: ${RMDIR} ${WRKSRC}/src/lib ${MV} ${WRKSRC}/check-g2-compat ${WRKSRC}/src/ ${MV} ${WRKSRC}/convert-gitosis-conf ${WRKSRC}/src/ + ${FIND} ${WRKSRC} '(' -name '*.bak' -o -name '*.orig' ')' -delete -post-build: - ${FIND} ${WRKSRC} -name "*.bak" -delete - ${FIND} ${WRKSRC} -name "*.orig" -delete - do-install: (cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/libexec/gitolite) (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/) @@ -61,5 +60,10 @@ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR} + +do-install-CONTRIB-on: + @${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${PREFIX}/share/vim + (cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) + ${MV} ${STAGEDIR}${DATADIR}/vim ${STAGEDIR}${PREFIX}/share/vim/vimfiles .include Modified: head/devel/gitolite/distinfo ============================================================================== --- head/devel/gitolite/distinfo Thu Jul 12 08:37:45 2018 (r474494) +++ head/devel/gitolite/distinfo Thu Jul 12 08:42:35 2018 (r474495) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499082012 -SHA256 (sitaramc-gitolite-v3.6.7_GH0.tar.gz) = f75d15bb438986b77bd8aeda7839dcd3624ae9d09dbfce245c00b906de8dbdc5 -SIZE (sitaramc-gitolite-v3.6.7_GH0.tar.gz) = 186298 +TIMESTAMP = 1531381584 +SHA256 (sitaramc-gitolite-v3.6.8_GH0.tar.gz) = 4c5d66964b2881221915f1751ae5e64a89266f8943abf5efd457672374f03edf +SIZE (sitaramc-gitolite-v3.6.8_GH0.tar.gz) = 197551 Modified: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split ============================================================================== --- head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split Thu Jul 12 08:37:45 2018 (r474494) +++ head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split Thu Jul 12 08:42:35 2018 (r474495) @@ -1,11 +1,11 @@ ---- src/triggers/post-compile/ssh-authkeys-split.orig 2017-07-02 14:01:25 UTC +--- src/triggers/post-compile/ssh-authkeys-split.orig 2018-07-12 07:50:58 UTC +++ src/triggers/post-compile/ssh-authkeys-split -@@ -66,7 +66,7 @@ do - echo 1>&2 "ssh-authkeys-split: bad line $seq in keydir/$k" - rm -f $f - fi +@@ -73,7 +73,7 @@ do + seq=0 + while read line + do - (( seq++ )) -+ seq=$(( $seq + 1 )) - done < $k - - # now delete the original file ++ seq=$(( $seq + 1 )) + [ -z "$line" ] && continue + f=$SKD/$base@$seq.pub + echo "$line" > $f Modified: head/devel/gitolite/pkg-plist ============================================================================== --- head/devel/gitolite/pkg-plist Thu Jul 12 08:37:45 2018 (r474494) +++ head/devel/gitolite/pkg-plist Thu Jul 12 08:42:35 2018 (r474495) @@ -40,6 +40,7 @@ libexec/gitolite/check-g2-compat libexec/gitolite/commands/1plus1 libexec/gitolite/commands/D libexec/gitolite/commands/access +libexec/gitolite/commands/compile-template-data libexec/gitolite/commands/config libexec/gitolite/commands/create libexec/gitolite/commands/creator @@ -93,3 +94,19 @@ libexec/gitolite/triggers/set-default-roles libexec/gitolite/triggers/upstream %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/README.markdown +%%CONTRIB%%%%DATADIR%%/commands/compile-1 +%%CONTRIB%%%%DATADIR%%/commands/ukm +%%CONTRIB%%%%DATADIR%%/hooks/repo-specific/save-push-signatures +%%CONTRIB%%%%DATADIR%%/lib/Apache/gitolite.conf +%%CONTRIB%%%%DATADIR%%/lib/Gitolite/Triggers/RedmineUserAlias.pm +%%CONTRIB%%%%DATADIR%%/t/ukm.t +%%CONTRIB%%%%DATADIR%%/triggers/IP-check +%%CONTRIB%%%%DATADIR%%/triggers/file_mirror +%%CONTRIB%%%%DATADIR%%/utils/ad_groups.sh +%%CONTRIB%%%%DATADIR%%/utils/gitolite-local +%%CONTRIB%%%%DATADIR%%/utils/ipa_groups.pl +%%CONTRIB%%%%DATADIR%%/utils/ldap_groups.sh +%%CONTRIB%%%%DATADIR%%/utils/rc-format-v3.4 +%%CONTRIB%%%%DATADIR%%/utils/testconf +%%CONTRIB%%share/vim/vimfiles/indent/gitolite.vim +%%CONTRIB%%share/vim/vimfiles/syntax/gitolite.vim