Date: Sun, 29 Apr 2012 22:48:12 -0700 (PDT) From: milki <milki@rescomp.berkeley.edu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tdb@FreeBSD.org Subject: ports/167440: [REPOCOPY+MAINTAINER] devel/gitolite -> devel/gitolite2, devel/gitolite: update to 3.01 Message-ID: <201204300548.q3U5mCwQ028924@cibo.ircmylife.com> Resent-Message-ID: <201204300550.q3U5o7W3026487@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 167440 >Category: ports >Synopsis: [REPOCOPY+MAINTAINER] devel/gitolite -> devel/gitolite2, devel/gitolite: update to 3.01 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 30 05:50:06 UTC 2012 >Closed-Date: >Last-Modified: >Originator: milki >Release: FreeBSD 8.2-RELEASE-p3 amd64 >Organization: UC Berkeley - RSSP-IT >Environment: System: FreeBSD cibo.ircmylife.com 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:45:57 UTC 2011 >Description: Please repocopy devel/gitolite to devel/gitolite2 with gitolite2-2.3.patch Update devel/gitolite with gitolite-3.01.patch Note to tdb: Please host 3.01 tarball http://milki.github.com/gitolite/gitolite-3.01.tar.gz Gitolite v2 will be maintained for security fixes. No deprecation necessary. Gitolte v3 is a complete rewrite. - Update to 3.01 Removed file(s): - files/patch-gl-install - files/patch-gl-setup Generated with FreeBSD Port Tools 0.99_5 (mode: update, diff: ports) >How-To-Repeat: >Fix: --- gitolite-3.01.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/gitolite/Makefile ./Makefile --- /usr/ports/devel/gitolite/Makefile 2012-02-17 03:50:50.000000000 -0800 +++ ./Makefile 2012-04-29 20:18:18.000000000 -0700 @@ -6,7 +6,7 @@ # PORTNAME= gitolite -PORTVERSION= 2.3 +PORTVERSION= 3.01 CATEGORIES= devel MASTER_SITES= http://milki.github.com/${PORTNAME}/ \ LOCAL/tdb @@ -18,6 +18,8 @@ RUN_DEPENDS= git>=0:${PORTSDIR}/devel/git +CONFLICTS= gitolite2-2* + USE_PERL5= yes SUB_FILES= pkg-message @@ -34,51 +36,23 @@ PLIST_SUB+= GITUSER="@comment " .endif -GLAUTHCOMMAND= \ -\#!/bin/sh\n \ -exec ${PREFIX}/libexec/gitolite/gl-auth-command \"\$$@\"\n - -GLSETUP= \ -\#!/bin/sh\n \ -exec ${PREFIX}/libexec/gitolite/gl-setup \"\$$@\"\n - post-patch: - @${ECHO} -e "${GLAUTHCOMMAND}" > ${WRKDIR}/auth-command - @${ECHO} -e "${GLSETUP}" > ${WRKDIR}/setup -.for FILE in gl-admin-push gl-auth-command gl-compile-conf gl-conf-convert gl-mirror-push gl-mirror-shell gl-query-rc gl-setup gl-setup-authkeys gl-time gl-tool sshkeys-lint - @${REINPLACE_CMD} \ - -Ee '1s|#!/usr/bin/perl|#!${PERL}|' \ - ${WRKSRC}/src/${FILE} -.endfor - @${REINPLACE_CMD} \ - -Ee '1s|#!/usr/bin/perl|#!${PERL}|' \ - ${WRKSRC}/hooks/common/update + @${FIND} ${WRKSRC}/t ${WRKSRC}/src \ + -exec ${GREP} -qs \#\!/usr/bin/perl {} \; \ + -exec ${REINPLACE_CMD} -Ee 's|#!/usr/bin/perl|#!${PERL}|' {} \; do-build: - -@${RM} ${WRKSRC}/src/gl-system-install - @${REINPLACE_CMD} \ - -E 's%^GL_PACKAGE_CONF=.*%GL_PACKAGE_CONF=${DATADIR}/conf;%' \ - ${WRKSRC}/src/gl-setup - @${REINPLACE_CMD} \ - -E "s%^#[[:blank:]]*\\\$$GL_PACKAGE_CONF[[:blank:]]*=.*%\$$GL_PACKAGE_CONF = '${DATADIR}/conf';%" \ - ${WRKSRC}/conf/example.gitolite.rc - @${REINPLACE_CMD} \ - -E "s%^#[[:blank:]]*\\\$$GL_PACKAGE_HOOKS[[:blank:]]*=.*%\$$GL_PACKAGE_HOOKS = '${DATADIR}/hooks';%" \ - ${WRKSRC}/conf/example.gitolite.rc + @${MKDIR} ${WRKSRC}/lib + @${MV} ${WRKSRC}/src/lib/Gitolite ${WRKSRC}/lib/ + @${RMDIR} ${WRKSRC}/src/lib post-build: @${FIND} ${WRKSRC} -name "*.bak" -delete - @${FIND} ${WRKSRC} -name "*.orig" -delete do-install: - ${MKDIR} ${PREFIX}/libexec/gitolite - ${INSTALL_SCRIPT} ${WRKSRC}/src/* ${PREFIX}/libexec/gitolite/ - ${MKDIR} ${DATADIR}/conf - ${INSTALL_DATA} ${WRKSRC}/conf/* ${DATADIR}/conf - ${MKDIR} ${DATADIR}/hooks - (cd ${WRKSRC}/hooks && ${COPYTREE_BIN} \* ${DATADIR}/hooks) - ${INSTALL_SCRIPT} ${WRKDIR}/auth-command ${PREFIX}/bin/gl-auth-command - ${INSTALL_SCRIPT} ${WRKDIR}/setup ${PREFIX}/bin/gl-setup + @(cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${PREFIX}/libexec/gitolite) + @(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${PREFIX}/${SITE_PERL_REL}/) + @${LN} -s ${PREFIX}/libexec/gitolite/gitolite ${PREFIX}/bin/gitolite post-install: @${CAT} ${PKGMESSAGE} diff -ruN --exclude=CVS /usr/ports/devel/gitolite/distinfo ./distinfo --- /usr/ports/devel/gitolite/distinfo 2012-02-17 03:50:50.000000000 -0800 +++ ./distinfo 2012-04-28 17:35:23.000000000 -0700 @@ -1,2 +1,2 @@ -SHA256 (gitolite-2.3.tar.gz) = cc973f499194cbe7c9434479383547a172a41a97ee5230af6681785fc40c783b -SIZE (gitolite-2.3.tar.gz) = 245415 +SHA256 (gitolite-3.01.tar.gz) = 5c0141eeab483dd3ebfcd153117492254b6f4f7d11b48907493f9054ee6c5088 +SIZE (gitolite-3.01.tar.gz) = 195318 diff -ruN --exclude=CVS /usr/ports/devel/gitolite/files/patch-gl-install ./files/patch-gl-install --- /usr/ports/devel/gitolite/files/patch-gl-install 2011-07-29 15:16:45.000000000 -0700 +++ ./files/patch-gl-install 1969-12-31 16:00:00.000000000 -0800 @@ -1,11 +0,0 @@ ---- src/gl-install 2011-07-26 11:16:41.000000000 -0700 -+++ src/gl-install 2011-07-28 07:30:17.000000000 -0700 -@@ -70,7 +70,7 @@ - - # "src" and "doc" will be overwritten on each install, but not conf - if ($GL_PACKAGE_HOOKS) { -- system("cp -R -p $GL_PACKAGE_HOOKS $GL_ADMINDIR"); -+ system("cp -f -R -p $GL_PACKAGE_HOOKS $GL_ADMINDIR"); - } else { - system("cp -R -p $ENV{GL_BINDIR}/../src $ENV{GL_BINDIR}/../doc $ENV{GL_BINDIR}/../hooks $GL_ADMINDIR"); - system("cp $ENV{GL_BINDIR}/../conf/VERSION $GL_ADMINDIR/conf"); diff -ruN --exclude=CVS /usr/ports/devel/gitolite/files/patch-gl-setup ./files/patch-gl-setup --- /usr/ports/devel/gitolite/files/patch-gl-setup 2011-07-29 15:16:45.000000000 -0700 +++ ./files/patch-gl-setup 1969-12-31 16:00:00.000000000 -0800 @@ -1,26 +0,0 @@ ---- src/gl-setup 2011-07-26 11:16:41.000000000 -0700 -+++ src/gl-setup 2011-07-28 04:02:41.000000000 -0700 -@@ -107,7 +107,7 @@ - - # now we get to gitolite itself - --gl-install -q -+${GL_BINDIR}/gl-install -q - - [ -f $GL_ADMINDIR/conf/gitolite.conf ] || { - cat <<EOF | cut -c9- > $GL_ADMINDIR/conf/gitolite.conf -@@ -121,7 +121,7 @@ - [ -n "$pubkey_file" ] && cp $pubkey_file $GL_ADMINDIR/keydir - - touch $HOME/.ssh/authorized_keys --gl-compile-conf -q -+${GL_BINDIR}/gl-compile-conf -q - - # setup push-to-admin - ( -@@ -133,4 +133,4 @@ - - # now that the admin repo is created, you have to set the hooks properly; best - # do it by running install again --gl-install -q -+${GL_BINDIR}/gl-install -q diff -ruN --exclude=CVS /usr/ports/devel/gitolite/files/pkg-message.in ./files/pkg-message.in --- /usr/ports/devel/gitolite/files/pkg-message.in 2011-07-29 15:16:45.000000000 -0700 +++ ./files/pkg-message.in 2012-04-28 17:46:54.000000000 -0700 @@ -1,11 +1,30 @@ ============================================================================== -Final gitolite installation instructions: +gitolite v2 -> v3 migration procedures: + +WARNING: gitolite v3 is NOT "API" compatible with gitolite v2. Any local +modifications - hooks, scripts, ADCs, etc - must be migrated. + +Please refer to [0] or [1] before moving on. + +tl;dr: + Backup gitolite-admin repo + Remove old gitolite references (authorized_keys, rc file, gitolite-admin, + ~/.gitolite) + Preset rc file + Proceed with final instructions for setup + Push old gitolite-admin repo + +[0] http://sitaramc.github.com/gitolite/install.html#migr +[1] http://sitaramc.github.com/gitolite/master-toc.html + + +Final gitolite setup instructions: Any ssh user can be a gitolite provider. Simply run the following command as the user: -%%PREFIX%%/bin/gl-setup /path/to/admin.ssh.key.pub +%%PREFIX%%/bin/gitolite -pk /path/to/admin.ssh.key.pub This will setup up the configuration files for gitolite, designating where the repositories are located and other options. diff -ruN --exclude=CVS /usr/ports/devel/gitolite/pkg-plist ./pkg-plist --- /usr/ports/devel/gitolite/pkg-plist 2011-09-30 04:39:37.000000000 -0700 +++ ./pkg-plist 2012-04-28 17:36:12.000000000 -0700 @@ -1,35 +1,65 @@ -bin/gl-auth-command -bin/gl-setup -libexec/gitolite/gitolite.pm -libexec/gitolite/gitolite_env.pm -libexec/gitolite/gitolite_rc.pm -libexec/gitolite/gl-admin-push -libexec/gitolite/gl-auth-command -libexec/gitolite/gl-compile-conf -libexec/gitolite/gl-conf-convert -libexec/gitolite/gl-dryrun -libexec/gitolite/gl-install -libexec/gitolite/gl-mirror-push -libexec/gitolite/gl-mirror-shell -libexec/gitolite/gl-query-rc -libexec/gitolite/gl-setup -libexec/gitolite/gl-setup-authkeys -libexec/gitolite/gl-time -libexec/gitolite/gl-tool -libexec/gitolite/sshkeys-lint -%%DATADIR%%/conf/example.conf -%%DATADIR%%/conf/example.gitolite.rc -%%DATADIR%%/conf/VERSION -%%DATADIR%%/hooks/common/gitolite-hooked -%%DATADIR%%/hooks/common/gl-pre-git.hub-sample -%%DATADIR%%/hooks/common/post-receive.mirrorpush -%%DATADIR%%/hooks/common/update -%%DATADIR%%/hooks/common/update.secondary.sample -%%DATADIR%%/hooks/gitolite-admin/post-update -@dirrm %%DATADIR%%/conf -@dirrm %%DATADIR%%/hooks/gitolite-admin -@dirrm %%DATADIR%%/hooks/common -@dirrm %%DATADIR%%/hooks -@dirrm %%DATADIR%% +bin/gitolite +%%SITE_PERL%%/Gitolite/Common.pm +%%SITE_PERL%%/Gitolite/Conf.pm +%%SITE_PERL%%/Gitolite/Conf/Explode.pm +%%SITE_PERL%%/Gitolite/Conf/Load.pm +%%SITE_PERL%%/Gitolite/Conf/Store.pm +%%SITE_PERL%%/Gitolite/Conf/Sugar.pm +%%SITE_PERL%%/Gitolite/Easy.pm +%%SITE_PERL%%/Gitolite/Hooks/PostUpdate.pm +%%SITE_PERL%%/Gitolite/Hooks/Update.pm +%%SITE_PERL%%/Gitolite/Rc.pm +%%SITE_PERL%%/Gitolite/Setup.pm +%%SITE_PERL%%/Gitolite/Test.pm +%%SITE_PERL%%/Gitolite/Test/Tsh.pm +%%SITE_PERL%%/Gitolite/Triggers.pm +%%SITE_PERL%%/Gitolite/Triggers/CpuTime.pm +%%SITE_PERL%%/Gitolite/Triggers/Mirroring.pm +%%SITE_PERL%%/Gitolite/Triggers/Shell.pm +%%SITE_PERL%%/Gitolite/Triggers/Writable.pm +libexec/gitolite/VERSION +libexec/gitolite/VREF/COUNT +libexec/gitolite/VREF/DUPKEYS +libexec/gitolite/VREF/EMAIL-CHECK +libexec/gitolite/VREF/FILETYPE +libexec/gitolite/VREF/MAX_NEWBIN_SIZE +libexec/gitolite/VREF/MERGE-CHECK +libexec/gitolite/VREF/partial-copy +libexec/gitolite/commands/D +libexec/gitolite/commands/access +libexec/gitolite/commands/creator +libexec/gitolite/commands/desc +libexec/gitolite/commands/fork +libexec/gitolite/commands/git-config +libexec/gitolite/commands/help +libexec/gitolite/commands/info +libexec/gitolite/commands/mirror +libexec/gitolite/commands/perms +libexec/gitolite/commands/print-default-rc +libexec/gitolite/commands/push +libexec/gitolite/commands/sshkeys-lint +libexec/gitolite/commands/sskm +libexec/gitolite/commands/svnserve +libexec/gitolite/commands/writable +libexec/gitolite/gitolite +libexec/gitolite/gitolite-shell +libexec/gitolite/syntactic-sugar/continuation-lines +libexec/gitolite/syntactic-sugar/keysubdirs-as-groups +libexec/gitolite/triggers/partial-copy +libexec/gitolite/triggers/post-compile/ssh-authkeys +libexec/gitolite/triggers/post-compile/update-git-configs +libexec/gitolite/triggers/post-compile/update-git-daemon-access-list +libexec/gitolite/triggers/post-compile/update-gitweb-access-list +libexec/gitolite/triggers/renice +@dirrm %%SITE_PERL%%/Gitolite/Conf +@dirrm %%SITE_PERL%%/Gitolite/Hooks +@dirrm %%SITE_PERL%%/Gitolite/Test +@dirrm %%SITE_PERL%%/Gitolite/Triggers +@dirrm %%SITE_PERL%%/Gitolite +@dirrm libexec/gitolite/VREF +@dirrm libexec/gitolite/commands +@dirrm libexec/gitolite/triggers/post-compile +@dirrm libexec/gitolite/triggers +@dirrm libexec/gitolite/syntactic-sugar @dirrm libexec/gitolite %%GITUSER%%@dirrmtry git --- gitolite-3.01.patch ends here --- --- gitolite2-2.3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/gitolite2/Makefile ./Makefile --- /usr/ports/devel/gitolite2/Makefile 2012-04-29 19:25:25.000000000 -0700 +++ ./Makefile 2012-04-29 22:09:03.000000000 -0700 @@ -5,11 +5,12 @@ # $FreeBSD: ports/devel/gitolite/Makefile,v 1.6 2012/02/17 11:50:50 culot Exp $ # -PORTNAME= gitolite +PORTNAME= gitolite2 PORTVERSION= 2.3 CATEGORIES= devel -MASTER_SITES= http://milki.github.com/${PORTNAME}/ \ +MASTER_SITES= http://milki.github.com/${LATEST_LINK}/ \ LOCAL/tdb +DISTNAME= gitolite-${PORTVERSION} MAINTAINER= milki@rescomp.berkeley.edu COMMENT= An access control layer on top of git @@ -18,6 +19,10 @@ RUN_DEPENDS= git>=0:${PORTSDIR}/devel/git +LATEST_LINK= gitolite + +CONFLICTS= gitolite-3* + USE_PERL5= yes SUB_FILES= pkg-message diff -ruN --exclude=CVS /usr/ports/devel/gitolite2/pkg-descr ./pkg-descr --- /usr/ports/devel/gitolite2/pkg-descr 2012-04-29 19:25:25.000000000 -0700 +++ ./pkg-descr 2012-04-29 19:49:38.000000000 -0700 @@ -11,4 +11,4 @@ repository. It can also restrict who can push to what branch or tag, which is very important in a corporate environment. -WWW: https://github.com/sitaramc/gitolite +WWW: https://github.com/sitaramc/gitolite/tree/g2 --- gitolite2-2.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204300548.q3U5mCwQ028924>