Fri Jan 25 21:04:03 2013 UTC ()
Update to 3.04

* Update MESSAGE.

Changelog:
* Re-written from scratch, this is gilolite g3.


(ryoon)
diff -r1.1.1.1 -r1.2 pkgsrc/devel/gitolite/MESSAGE
diff -r1.1.1.1 -r1.2 pkgsrc/devel/gitolite/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/devel/gitolite/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/gitolite/Makefile

cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/gitolite/MESSAGE (expand / switch to unified diff)

--- pkgsrc/devel/gitolite/MESSAGE 2011/11/20 19:11:49 1.1.1.1
+++ pkgsrc/devel/gitolite/MESSAGE 2013/01/25 21:04:02 1.2
@@ -1,39 +1,46 @@ @@ -1,39 +1,46 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1.1.1 2011/11/20 19:11:49 ryoon Exp $ 2$NetBSD: MESSAGE,v 1.2 2013/01/25 21:04:02 ryoon Exp $
3 3
4To use gitolite, you will need to perform the following steps. 4To use gitolite, you will need to perform the following steps.
5 5
61. Create a new user/group, for example, git/git. 61. Create a new user/group, for example, git/git.
7 7
8 On server, 8 On server,
9 # groupadd git 9 # groupadd git
10 # useradd -m -g git git 10 # useradd -m -g git git
11 11
122. login to new user git, create ssh public key, and copy public key 122. login with new user git, create ssh public key, and copy public key
13 file to user git's home directory on server. 13 file to user git's home directory on server.
14 14
15 $ ssh-keygen -t rsa -f git-admin 15 On server
16 $ cp git-admin.pub ~/.ssh/ 16 $ mkdir ~/.ssh
17 $ scp ~/git-admin.pub gitserver:~/.ssh/ 17 $ chmof 700 ~/.ssh
 18
 19 On client
 20 $ ssh-keygen -t rsa -f git
 21 $ scp ~/git.pub gitserver:~/
 22
 23 On server
 24 $ chmod 600 ~/git.pub
18 25
193. Setup gitolite. 263. Setup gitolite.
20 27
21 On server, 28 On server,
22 $ gl-setup ~/git-admin.pub 29 $ gitolite setup -pk git.pub
23 30
24 And edit config file. 31 And edit config file.
25 32
264. Setup ~/.ssh/config on client. 334. Setup ~/.ssh/config on client.
27 Add the following lines. 34 Add the following lines.
28 35
29 host gitserver 36 host gitserver
30 user git 37 user git
31 hostname RealGitServerName 38 hostname RealGitServerName
32 port 22 39 port 22
33 identityfile ~/.ssh/git-admin 40 identityfile ~/.ssh/git
34 41
355. For testing, please clone testing repository. 425. For administrative setting, please clone gitolite-admin repository.
36 43
37 On client, 44 On client,
38 $ git clone ssh://gitserver/testing 45 $ git clone gitserver:gitolite-admin
39=========================================================================== 46===========================================================================

cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/gitolite/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gitolite/PLIST 2011/11/20 19:11:49 1.1.1.1
+++ pkgsrc/devel/gitolite/PLIST 2013/01/25 21:04:02 1.2
@@ -1,28 +1,65 @@ @@ -1,28 +1,65 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2011/11/20 19:11:49 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.2 2013/01/25 21:04:02 ryoon Exp $
2bin/gitolite.pm 2bin/gitolite
3bin/gitolite_env.pm 3${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Common.pm
4bin/gitolite_rc.pm 4${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf.pm
5bin/gl-admin-push 5${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf/Explode.pm
6bin/gl-auth-command 6${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf/Load.pm
7bin/gl-compile-conf 7${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf/Store.pm
8bin/gl-conf-convert 8${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf/Sugar.pm
9bin/gl-dryrun 9${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Easy.pm
10bin/gl-install 10${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Hooks/PostUpdate.pm
11bin/gl-mirror-push 11${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Hooks/Update.pm
12bin/gl-mirror-shell 12${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Rc.pm
13bin/gl-query-rc 13${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Setup.pm
14bin/gl-setup 14${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Test.pm
15bin/gl-setup-authkeys 15${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Test/Tsh.pm
16bin/gl-system-install 16${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers.pm
17bin/gl-time 17${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/Alias.pm
18bin/gl-tool 18${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/CpuTime.pm
19bin/sshkeys-lint 19${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/Mirroring.pm
20share/gitolite/conf/VERSION 20${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/RepoUmask.pm
21share/gitolite/conf/example.conf 21${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/Shell.pm
22share/gitolite/conf/example.gitolite.rc 22${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/Writable.pm
23share/gitolite/hooks/common/gitolite-hooked 23libexec/gitolite/VREF/COUNT
24share/gitolite/hooks/common/gl-pre-git.hub-sample 24libexec/gitolite/VREF/EMAIL-CHECK
25share/gitolite/hooks/common/post-receive.mirrorpush 25libexec/gitolite/VREF/FILETYPE
26share/gitolite/hooks/common/update 26libexec/gitolite/VREF/MAX_NEWBIN_SIZE
27share/gitolite/hooks/common/update.secondary.sample 27libexec/gitolite/VREF/MERGE-CHECK
28share/gitolite/hooks/gitolite-admin/post-update 28libexec/gitolite/VREF/VOTES
 29libexec/gitolite/VREF/lock
 30libexec/gitolite/VREF/partial-copy
 31libexec/gitolite/commands/D
 32libexec/gitolite/commands/access
 33libexec/gitolite/commands/creator
 34libexec/gitolite/commands/desc
 35libexec/gitolite/commands/fork
 36libexec/gitolite/commands/git-config
 37libexec/gitolite/commands/help
 38libexec/gitolite/commands/htpasswd
 39libexec/gitolite/commands/info
 40libexec/gitolite/commands/list-dangling-repos
 41libexec/gitolite/commands/lock
 42libexec/gitolite/commands/mirror
 43libexec/gitolite/commands/perms
 44libexec/gitolite/commands/print-default-rc
 45libexec/gitolite/commands/push
 46libexec/gitolite/commands/sshkeys-lint
 47libexec/gitolite/commands/sskm
 48libexec/gitolite/commands/sudo
 49libexec/gitolite/commands/svnserve
 50libexec/gitolite/commands/symbolic-ref
 51libexec/gitolite/commands/writable
 52libexec/gitolite/gitolite
 53libexec/gitolite/gitolite-shell
 54libexec/gitolite/syntactic-sugar/continuation-lines
 55libexec/gitolite/syntactic-sugar/keysubdirs-as-groups
 56libexec/gitolite/triggers/partial-copy
 57libexec/gitolite/triggers/post-compile/ssh-authkeys
 58libexec/gitolite/triggers/post-compile/ssh-authkeys-shell-users
 59libexec/gitolite/triggers/post-compile/update-git-configs
 60libexec/gitolite/triggers/post-compile/update-git-daemon-access-list
 61libexec/gitolite/triggers/post-compile/update-gitweb-access-list
 62libexec/gitolite/triggers/renice
 63libexec/gitolite/triggers/upstream
 64share/gitolite
 65@pkgdir share/doc/gitolite

cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/gitolite/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gitolite/distinfo 2011/11/20 19:11:49 1.1.1.1
+++ pkgsrc/devel/gitolite/distinfo 2013/01/25 21:04:03 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1.1.1 2011/11/20 19:11:49 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2013/01/25 21:04:03 ryoon Exp $
2 2
3SHA1 (sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz) = 395f66b984073af9de43598e25ff9f828bd65f7c 3SHA1 (gitolite-3.04.tar.gz) = 6248e3afc0603104d9110148a49fff99538ee93c
4RMD160 (sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz) = 7b8963cdb309e99d9ddffacc8877286a736ab16c 4RMD160 (gitolite-3.04.tar.gz) = f7ee414c334ae6feed76c8da347280c5a5407943
5Size (sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz) = 240960 bytes 5Size (gitolite-3.04.tar.gz) = 113916 bytes
6SHA1 (patch-contrib_adc_watch) = bab42eb263900466aaa106a09d2bf3180be204ea 6SHA1 (patch-src_gitolite) = e0b2103f5e62ed4c46f99e9d6dc1c498d9e78773
7SHA1 (patch-src_gl-system-install) = 849d8a7b350f5e6ef4e35b35cdfd1cbcf05c964d 7SHA1 (patch-src_lib_Gitolite_Rc.pm) = a95c318597f90fb31c6fc792d403885458d2b78b

cvs diff -r1.4 -r1.5 pkgsrc/devel/gitolite/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gitolite/Makefile 2012/10/31 11:17:00 1.4
+++ pkgsrc/devel/gitolite/Makefile 2013/01/25 21:04:02 1.5
@@ -1,37 +1,66 @@ @@ -1,37 +1,66 @@
1# $NetBSD: Makefile,v 1.4 2012/10/31 11:17:00 asau Exp $ 1# $NetBSD: Makefile,v 1.5 2013/01/25 21:04:02 ryoon Exp $
2# 2#
3 3
4DISTNAME= sitaramc-gitolite-v2.2-0-g15b17d7 4DISTNAME= gitolite-3.04
5PKGNAME= ${DISTNAME:S/sitaramc-gitolite-v/gitolite-/:C/-0-.*//} 
6PKGREVISION= 1 
7CATEGORIES= devel net 5CATEGORIES= devel net
8MASTER_SITES= -https://github.com/sitaramc/gitolite/tarball/v2.2 6MASTER_SITES= -https://github.com/sitaramc/gitolite/archive/v3.04.tar.gz
9 7
10MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/sitaramc/gitolite/wiki 9HOMEPAGE= https://github.com/sitaramc/gitolite/wiki
12COMMENT= Gitolite allows you to host Git repositories easily and securely 10COMMENT= Gitolite allows you to host Git repositories easily and securely
13LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
14 12
15DEPENDS+= scmgit-base-[0-9]*:../../devel/scmgit-base 13DEPENDS+= scmgit-base>=1.6.6:../../devel/scmgit-base
16 14
17USE_LANGUAGES= # none 15USE_LANGUAGES= # none
18USE_TOOLS+= perl bash 16USE_TOOLS+= pax perl:run
19 17
20# Force using "curl" for fetching the distribution file. It is only available 18# Force using "curl" for fetching the distribution file. It is only available
21# over HTTPS and "curl" is the only fetch program which always supports HTTPS. 19# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
22FETCH_USING= curl 20FETCH_USING= curl
23 21
24WRKSRC= ${WRKDIR}/sitaramc-gitolite-0ffadc1 
25 
26NO_BUILD= yes 22NO_BUILD= yes
27 23
28REPLACE_PERL= src/gl-* src/sshkeys-lint hooks/common/update 24REPLACE_PERL= src/lib/* src/VREF/* src/triggers/* src/triggers/*/* \
29REPLACE_BASH= src/gl-* hooks/common/* 25 src/commands/* src/gitolite*
 26REPLACE_SH= src/VREF/* src/triggers/*
 27
 28SUBST_CLASSES+= prefix
 29SUBST_STAGE.prefix= pre-configure
 30SUBST_MESSAGE.prefix= Set PREFIX
 31SUBST_FILES.prefix= src/gitolite
 32SUBST_FILES.prefix+= src/lib/Gitolite/Rc.pm
 33SUBST_VARS.prefix= PREFIX
 34
 35INSTALLATION_DIRS+= bin lib \
 36 share/doc/gitolite \
 37 libexec/gitolite
 38
 39pre-install:
 40 ${FIND} ${WRKSRC} -type f \
 41 -name "*.orig" -exec ${RM} -f {} \;
30 42
31do-install: 43do-install:
32 ${RM} ${WRKSRC}/src/gl-system-install.orig 44 ${INSTALL_SCRIPT} ${WRKSRC}/src/gitolite ${DESTDIR}${PREFIX}/libexec/gitolite
33 ${WRKSRC}/src/gl-system-install ${PREFIX}/bin \ 45 ${INSTALL_SCRIPT} ${WRKSRC}/src/gitolite-shell ${DESTDIR}${PREFIX}/libexec/gitolite
34 ${PREFIX}/share/gitolite/conf ${PREFIX}/share/gitolite/hooks \ 46
35 ${DESTDIR} 47 cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../libexec/gitolite/gitolite gitolite
 48
 49 ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DESTDIR}${PREFIX}/share/gitolite
 50 ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/gitolite
 51 ${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/share/gitolite
 52
 53 cd ${WRKSRC}/src/lib && pax -rw -pmp Gitolite \
 54 ${DESTDIR}${PERL5_INSTALLVENDORARCH}
 55
 56 cd ${WRKSRC}/src && pax -rw -pmp triggers \
 57 ${DESTDIR}${PREFIX}/libexec/gitolite
 58 cd ${WRKSRC}/src && pax -rw -pmp syntactic-sugar \
 59 ${DESTDIR}${PREFIX}/libexec/gitolite
 60 cd ${WRKSRC}/src && pax -rw -pmp VREF \
 61 ${DESTDIR}${PREFIX}/libexec/gitolite
 62 cd ${WRKSRC}/src && pax -rw -pmp commands \
 63 ${DESTDIR}${PREFIX}/libexec/gitolite
36 64
 65.include "../../lang/perl5/dirs.mk"
37.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"