Index: branches/2018Q2/devel/gitlab-shell/Makefile =================================================================== --- branches/2018Q2/devel/gitlab-shell/Makefile (revision 471806) +++ branches/2018Q2/devel/gitlab-shell/Makefile (revision 471807) @@ -1,41 +1,43 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 6.0.4 +PORTVERSION= 7.1.2 CATEGORIES= devel -LICENSE= MIT - MAINTAINER= idefix@fechner.net COMMENT= GitLab Shell handles git commands for GitLab +LICENSE= MIT + BUILD_DEPENDS= gem:devel/ruby-gems \ go>=1.5.3:lang/go USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags -GL_COMMIT= 6feee1ccc265c765181533bbc719f91c364de2b3 +GL_COMMIT= 3a83767f650f996ef37382a21d05d8ed99873aa1 USERS= git GROUPS= git + +INSTALL_TARGET=install-strip post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample do-build: export GOCACHE=${WRKSRC}/go && ${WRKSRC}/bin/compile pre-install: ${RM} -rf ${WRKSRC}/go ${RM} -rf ${WRKSRC}/go_build do-install: @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) @${MKDIR} ${STAGEDIR}/var/log/gitlab-shell ${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-upload-pack ${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-receive-pack .include Index: branches/2018Q2/devel/gitlab-shell/distinfo =================================================================== --- branches/2018Q2/devel/gitlab-shell/distinfo (revision 471806) +++ branches/2018Q2/devel/gitlab-shell/distinfo (revision 471807) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523369483 -SHA256 (gitlab-org-gitlab-shell-6feee1ccc265c765181533bbc719f91c364de2b3_GL0.tar.gz) = bb1d7702c1c7177f36e09e77da081e90f145d786635d33b5c9e85bdc9387b2a2 -SIZE (gitlab-org-gitlab-shell-6feee1ccc265c765181533bbc719f91c364de2b3_GL0.tar.gz) = 773179 +TIMESTAMP = 1524408426 +SHA256 (gitlab-org-gitlab-shell-3a83767f650f996ef37382a21d05d8ed99873aa1_GL0.tar.gz) = 6db5b6c4d0269d2510841add69bf78690ef67534fe5f83fb131fa1368a8d011d +SIZE (gitlab-org-gitlab-shell-3a83767f650f996ef37382a21d05d8ed99873aa1_GL0.tar.gz) = 1547242 Index: branches/2018Q2/devel/gitlab-shell/pkg-plist =================================================================== --- branches/2018Q2/devel/gitlab-shell/pkg-plist (revision 471806) +++ branches/2018Q2/devel/gitlab-shell/pkg-plist (revision 471807) @@ -1,90 +1,91 @@ %%DATADIR%%/.codeclimate.yml %%DATADIR%%/.gitignore %%DATADIR%%/.gitlab-ci.yml -%%DATADIR%%/.rspec %%DATADIR%%/.rubocop.yml %%DATADIR%%/CHANGELOG %%DATADIR%%/CONTRIBUTING.md %%DATADIR%%/Gemfile %%DATADIR%%/Gemfile.lock %%DATADIR%%/Guardfile %%DATADIR%%/LICENSE %%DATADIR%%/README.md %%DATADIR%%/VERSION @(,,555) %%DATADIR%%/bin/authorized_keys @(,,555) %%DATADIR%%/bin/check @(,,555) %%DATADIR%%/bin/compile @(,,555) %%DATADIR%%/bin/create-hooks +@(,,555) %%DATADIR%%/bin/gitaly-upload-archive @(,,555) %%DATADIR%%/bin/gitaly-upload-pack @(,,555) %%DATADIR%%/bin/gitaly-receive-pack @(,,555) %%DATADIR%%/bin/gitlab-keys @(,,555) %%DATADIR%%/bin/gitlab-shell @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-keys-check @(,,555) %%DATADIR%%/bin/install +@(,,555) %%DATADIR%%/bin/test-logger @sample %%DATADIR%%/config.yml.sample @(,,555) %%DATADIR%%/hooks/post-receive @(,,555) %%DATADIR%%/hooks/pre-receive @(,,555) %%DATADIR%%/hooks/update %%DATADIR%%/lib/gitlab_access.rb %%DATADIR%%/lib/gitlab_access_status.rb %%DATADIR%%/lib/gitlab_config.rb %%DATADIR%%/lib/gitlab_custom_hook.rb %%DATADIR%%/lib/gitlab_init.rb %%DATADIR%%/lib/gitlab_keys.rb %%DATADIR%%/lib/gitlab_lfs_authentication.rb %%DATADIR%%/lib/gitlab_logger.rb %%DATADIR%%/lib/gitlab_metrics.rb %%DATADIR%%/lib/gitlab_net.rb %%DATADIR%%/lib/gitlab_post_receive.rb %%DATADIR%%/lib/gitlab_shell.rb %%DATADIR%%/lib/httpunix.rb %%DATADIR%%/lib/names_helper.rb %%DATADIR%%/lib/object_dirs_helper.rb %%DATADIR%%/spec/gitlab_access_spec.rb %%DATADIR%%/spec/gitlab_config_spec.rb %%DATADIR%%/spec/gitlab_custom_hook_spec.rb %%DATADIR%%/spec/gitlab_keys_spec.rb %%DATADIR%%/spec/gitlab_lfs_authentication_spec.rb %%DATADIR%%/spec/gitlab_logger_spec.rb %%DATADIR%%/spec/gitlab_metrics_spec.rb %%DATADIR%%/spec/gitlab_net_spec.rb %%DATADIR%%/spec/gitlab_post_receive_spec.rb %%DATADIR%%/spec/gitlab_shell_authorized_keys_check_spec.rb %%DATADIR%%/spec/gitlab_shell_spec.rb %%DATADIR%%/spec/httpunix_spec.rb %%DATADIR%%/spec/names_helper_spec.rb %%DATADIR%%/spec/object_dirs_helper_spec.rb %%DATADIR%%/spec/spec_helper.rb %%DATADIR%%/spec/support/gl_id_test_hook %%DATADIR%%/spec/support/hook_fail %%DATADIR%%/spec/support/hook_ok %%DATADIR%%/spec/vcr_cassettes/allowed-pull.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push.yml %%DATADIR%%/spec/vcr_cassettes/broadcast_message-none.yml %%DATADIR%%/spec/vcr_cassettes/broadcast_message-ok.yml %%DATADIR%%/spec/vcr_cassettes/check-ok.yml %%DATADIR%%/spec/vcr_cassettes/discover-ok.yml %%DATADIR%%/spec/vcr_cassettes/http-pull-disabled.yml %%DATADIR%%/spec/vcr_cassettes/http-push-disabled.yml %%DATADIR%%/spec/vcr_cassettes/lfs-authenticate-ok.yml %%DATADIR%%/spec/vcr_cassettes/notify-post-receive.yml %%DATADIR%%/spec/vcr_cassettes/post-receive-not-found.yml %%DATADIR%%/spec/vcr_cassettes/post-receive.yml %%DATADIR%%/spec/vcr_cassettes/pre-receive-not-found.yml %%DATADIR%%/spec/vcr_cassettes/pre-receive.yml %%DATADIR%%/spec/vcr_cassettes/ssh-key-not-found.yml %%DATADIR%%/spec/vcr_cassettes/ssh-key-not-implemented.yml %%DATADIR%%/spec/vcr_cassettes/ssh-key-ok.yml %%DATADIR%%/spec/vcr_cassettes/ssh-pull-disabled.yml %%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied.yml %%DATADIR%%/spec/vcr_cassettes/ssh-push-disabled.yml %%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-with-user.yml %%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied.yml %%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml %%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes.yml %%DATADIR%%/support/go-format %%DATADIR%%/support/go-test %%DATADIR%%/support/go_build.rb %%DATADIR%%/support/rewrite-hooks.sh %%DATADIR%%/support/truncate_repositories.sh @dir(git,,755) /var/log/gitlab-shell Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 471806) +++ branches/2018Q2 (revision 471807) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r469939