Attachment 124871 Details for Bug 168378 – gitolite-3.03.patch

[patch] gitolite-3.03.patch

gitolite-3.03.patch (text/plain), 4.16 KB, created by Jonathan Chu on 2012-05-27 17:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Chu

Created: 2012-05-27 17:10:01 UTC

Size: 4.16 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/gitolite/Makefile ./Makefile
>--- /usr/ports/devel/gitolite/Makefile	2012-05-08 11:02:15.000000000 -0700
>+++ ./Makefile	2012-05-27 09:02:00.000000000 -0700
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	gitolite
>-PORTVERSION=	3.01
>-PORTREVISION=	1
>+PORTVERSION=	3.03
> CATEGORIES=	devel
> MASTER_SITES=	http://milki.github.com/${PORTNAME}/ \
> 		LOCAL/tdb
>@@ -38,7 +37,7 @@
> .endif
> 
> post-patch:
>-	@${FIND} ${WRKSRC}/t ${WRKSRC}/src \
>+	@${FIND} ${WRKSRC} \
> 		-exec ${GREP} -qs \#\!/usr/bin/perl {} \; \
> 		-exec ${REINPLACE_CMD} -Ee 's|#!/usr/bin/perl|#!${PERL}|' {} \;
> 
>@@ -46,6 +45,8 @@
> 	@${MKDIR} ${WRKSRC}/lib
> 	@${MV} ${WRKSRC}/src/lib/Gitolite ${WRKSRC}/lib/
> 	@${RMDIR} ${WRKSRC}/src/lib
>+	@${MV} ${WRKSRC}/check-g2-compat ${WRKSRC}/src/
>+	@${MV} ${WRKSRC}/convert-gitosis-conf ${WRKSRC}/src/
> 
> post-build:
> 	@${FIND} ${WRKSRC} -name "*.bak" -delete
>diff -ruN --exclude=CVS /usr/ports/devel/gitolite/distinfo ./distinfo
>--- /usr/ports/devel/gitolite/distinfo	2012-05-07 09:52:01.000000000 -0700
>+++ ./distinfo	2012-05-26 18:44:17.000000000 -0700
>@@ -1,2 +1,2 @@
>-SHA256 (gitolite-3.01.tar.gz) = 5c0141eeab483dd3ebfcd153117492254b6f4f7d11b48907493f9054ee6c5088
>-SIZE (gitolite-3.01.tar.gz) = 195318
>+SHA256 (gitolite-3.03.tar.gz) = b3487fd99cc46a7be32a58f8a86a520fc0943814794cc56b5f83d803591737ca
>+SIZE (gitolite-3.03.tar.gz) = 199433
>diff -ruN --exclude=CVS /usr/ports/devel/gitolite/files/pkg-message.in ./files/pkg-message.in
>--- /usr/ports/devel/gitolite/files/pkg-message.in	2012-05-08 11:02:15.000000000 -0700
>+++ ./files/pkg-message.in	2012-05-27 09:03:14.000000000 -0700
>@@ -8,6 +8,7 @@
> Please refer to [0] or [1] before moving on.
> 
> tl;dr:
>+    Run %%PREFIX%%/libexec/gitolite/check-g2-compat as your gitolite provider
>     Backup gitolite-admin repo
>     Remove old gitolite references (authorized_keys, rc file, gitolite-admin,
>         ~/.gitolite)
>@@ -26,8 +27,7 @@
> 
> %%PREFIX%%/bin/gitolite setup -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.
>+This will setup up the configuration files and repositories for gitolite.
> 
> The admin ssh key allows full access to the gitolite-admin repository where
> additional users and repositories can be configured.
>diff -ruN --exclude=CVS /usr/ports/devel/gitolite/pkg-plist ./pkg-plist
>--- /usr/ports/devel/gitolite/pkg-plist	2012-05-07 09:52:01.000000000 -0700
>+++ ./pkg-plist	2012-05-26 18:44:17.000000000 -0700
>@@ -13,18 +13,19 @@
> %%SITE_PERL%%/Gitolite/Test.pm
> %%SITE_PERL%%/Gitolite/Test/Tsh.pm
> %%SITE_PERL%%/Gitolite/Triggers.pm
>+%%SITE_PERL%%/Gitolite/Triggers/Alias.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/VREF/VOTES
> libexec/gitolite/commands/D
> libexec/gitolite/commands/access
> libexec/gitolite/commands/creator
>@@ -32,6 +33,7 @@
> libexec/gitolite/commands/fork
> libexec/gitolite/commands/git-config
> libexec/gitolite/commands/help
>+libexec/gitolite/commands/htpasswd
> libexec/gitolite/commands/info
> libexec/gitolite/commands/mirror
> libexec/gitolite/commands/perms
>@@ -41,12 +43,16 @@
> libexec/gitolite/commands/sskm
> libexec/gitolite/commands/svnserve
> libexec/gitolite/commands/writable
>+libexec/gitolite/check-g2-compat
>+libexec/gitolite/convert-gitosis-conf
> 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/new-normal-repos
> libexec/gitolite/triggers/post-compile/ssh-authkeys
>+libexec/gitolite/triggers/post-compile/ssh-authkeys-shell-users
> 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

Actions: View | Diff

Attachments on bug 168378: 124871