Index: head/devel/gitlab-shell/Makefile =================================================================== --- head/devel/gitlab-shell/Makefile (revision 466447) +++ head/devel/gitlab-shell/Makefile (revision 466448) @@ -1,39 +1,41 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 5.11.0 +PORTVERSION= 6.0.3 CATEGORIES= devel -MASTER_SITES= https://gitlab.com/gitlab-org/${PORTNAME}/repository/archive.tar.gz?ref=v${PORTVERSION}&dummy=/ -DISTNAME= ${PORTNAME}-v${PORTVERSION} LICENSE= MIT MAINTAINER= idefix@fechner.net COMMENT= GitLab Shell handles git commands for GitLab 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= ec2806f1f2ad10b7ec68b1835c54c11915387a6a + USERS= git GROUPS= git -post-extract: - @${MV} ${WRKDIR}/${DISTNAME}-* ${WRKDIR}/${DISTNAME} - post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample +do-build: + export GOCACHE=${WRKSRC}/go && ${WRKSRC}/bin/compile + pre-install: - ${WRKSRC}/bin/compile ${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: head/devel/gitlab-shell/distinfo =================================================================== --- head/devel/gitlab-shell/distinfo (revision 466447) +++ head/devel/gitlab-shell/distinfo (revision 466448) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516803476 -SHA256 (gitlab-shell-v5.11.0.tar.gz) = b63cba3452f82d719ebbc74a3cf95314d38051327dfe38def3fe6a04e56a9929 -SIZE (gitlab-shell-v5.11.0.tar.gz) = 714049 +TIMESTAMP = 1522769153 +SHA256 (gitlab-org-gitlab-shell-ec2806f1f2ad10b7ec68b1835c54c11915387a6a_GL0.tar.gz) = f68d6f6925e2d54e5ff8acac8c0b5f47ab5804492e363bb097fd3b19b7e405c2 +SIZE (gitlab-org-gitlab-shell-ec2806f1f2ad10b7ec68b1835c54c11915387a6a_GL0.tar.gz) = 782621 Index: head/devel/gitlab-shell/files/patch-config.yml.example =================================================================== --- head/devel/gitlab-shell/files/patch-config.yml.example (revision 466447) +++ head/devel/gitlab-shell/files/patch-config.yml.example (revision 466448) @@ -1,11 +1,20 @@ ---- config.yml.example.orig 2016-07-26 21:04:16 UTC +--- config.yml.example.orig 2018-02-06 17:56:45 UTC +++ config.yml.example -@@ -43,7 +43,7 @@ redis: +@@ -25,7 +25,7 @@ http_settings: + self_signed_cert: false + + # File used as authorized_keys for gitlab user +-auth_file: "/home/git/.ssh/authorized_keys" ++auth_file: "/usr/home/git/.ssh/authorized_keys" + + # File that contains the secret key for verifying access to GitLab. + # Default is .gitlab_shell_secret in the gitlab-shell directory. +@@ -37,7 +37,7 @@ auth_file: "/home/git/.ssh/authorized_ke # Log file. # Default is gitlab-shell.log in the root directory. -# log_file: "/home/git/gitlab-shell/gitlab-shell.log" +log_file: "/var/log/gitlab-shell/gitlab-shell.log" # Log level. INFO by default log_level: INFO Index: head/devel/gitlab-shell/pkg-plist =================================================================== --- head/devel/gitlab-shell/pkg-plist (revision 466447) +++ head/devel/gitlab-shell/pkg-plist (revision 466448) @@ -1,112 +1,90 @@ %%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%%/Makefile %%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-pack @(,,555) %%DATADIR%%/bin/gitaly-receive-pack @(,,555) %%DATADIR%%/bin/gitlab-keys -@(,,555) %%DATADIR%%/bin/gitlab-projects @(,,555) %%DATADIR%%/bin/gitlab-shell @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-keys-check @(,,555) %%DATADIR%%/bin/install @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_projects.rb -%%DATADIR%%/lib/gitlab_redis.rb -%%DATADIR%%/lib/gitlab_reference_counter.rb %%DATADIR%%/lib/gitlab_shell.rb %%DATADIR%%/lib/httpunix.rb %%DATADIR%%/lib/names_helper.rb %%DATADIR%%/lib/object_dirs_helper.rb -%%DATADIR%%/lib/vendor/redis/lib/redis.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/client.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/connection.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/connection/command_helper.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/connection/hiredis.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/connection/registry.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/connection/ruby.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/connection/synchrony.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/distributed.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/errors.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/hash_ring.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/pipeline.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/subscribe.rb -%%DATADIR%%/lib/vendor/redis/lib/redis/version.rb -%%DATADIR%%/spec/fixtures/gitlab_config_redis.yml %%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_projects_spec.rb -%%DATADIR%%/spec/gitlab_reference_counter_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