Index: head/devel/gitlab-shell/Makefile =================================================================== --- head/devel/gitlab-shell/Makefile (revision 499729) +++ head/devel/gitlab-shell/Makefile (revision 499730) @@ -1,41 +1,41 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 8.7.1 +PORTVERSION= 9.0.0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org 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= 6109b64ed81f80e90bf094ad1f1ded8f5e5f8324 +GL_COMMIT= ffe54c21ffc42c03bfbca0dd21e23ae956517c2c 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 .include Index: head/devel/gitlab-shell/distinfo =================================================================== --- head/devel/gitlab-shell/distinfo (revision 499729) +++ head/devel/gitlab-shell/distinfo (revision 499730) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553171073 -SHA256 (gitlab-org-gitlab-shell-6109b64ed81f80e90bf094ad1f1ded8f5e5f8324_GL0.tar.gz) = d013d35555f8dd004926366f6b9d66b46cce2e5ca3c89c9448d07903cb9a345b -SIZE (gitlab-org-gitlab-shell-6109b64ed81f80e90bf094ad1f1ded8f5e5f8324_GL0.tar.gz) = 2197505 +TIMESTAMP = 1555692196 +SHA256 (gitlab-org-gitlab-shell-ffe54c21ffc42c03bfbca0dd21e23ae956517c2c_GL0.tar.gz) = eadcca3192a783a5d66b51c0541ecd81b23e5e4a16bf96a934f99b5ca7541a52 +SIZE (gitlab-org-gitlab-shell-ffe54c21ffc42c03bfbca0dd21e23ae956517c2c_GL0.tar.gz) = 2200758 Index: head/devel/gitlab-shell/files/patch-config.yml.example =================================================================== --- head/devel/gitlab-shell/files/patch-config.yml.example (revision 499729) +++ head/devel/gitlab-shell/files/patch-config.yml.example (revision 499730) @@ -1,20 +1,20 @@ --- config.yml.example.orig 2018-11-28 23:06:49 UTC +++ config.yml.example @@ -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" ++auth_file: "/usr/local/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_keys" # 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 499729) +++ head/devel/gitlab-shell/pkg-plist (revision 499730) @@ -1,121 +1,119 @@ %%DATADIR%%/.codeclimate.yml %%DATADIR%%/.gitignore %%DATADIR%%/.gitlab-ci.yml %%DATADIR%%/.rubocop.yml %%DATADIR%%/.ruby-version %%DATADIR%%/CHANGELOG %%DATADIR%%/CONTRIBUTING.md %%DATADIR%%/Gemfile %%DATADIR%%/Gemfile.lock %%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/gitlab-shell-authorized-principals-check @(,,555) %%DATADIR%%/bin/gitlab-shell-ruby @(,,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/action.rb %%DATADIR%%/lib/action/custom.rb -%%DATADIR%%/lib/gitlab_access.rb +%%DATADIR%%/lib/console_helper.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_net/errors.rb -%%DATADIR%%/lib/gitlab_post_receive.rb %%DATADIR%%/lib/gitlab_shell.rb %%DATADIR%%/lib/hooks_utils.rb %%DATADIR%%/lib/httpunix.rb %%DATADIR%%/lib/http_helper.rb %%DATADIR%%/lib/object_dirs_helper.rb %%DATADIR%%/spec/action/custom_spec.rb -%%DATADIR%%/spec/gitlab_access_spec.rb +%%DATADIR%%/spec/console_helper_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_gitlab_shell_spec.rb %%DATADIR%%/spec/gitlab_shell_spec.rb +%%DATADIR%%/spec/gitlab_shell_two_factor_recovery_spec.rb %%DATADIR%%/spec/hooks_utils_spec.rb %%DATADIR%%/spec/httpunix_spec.rb %%DATADIR%%/spec/object_dirs_helper_spec.rb %%DATADIR%%/spec/spec_helper.rb +%%DATADIR%%/spec/support/gitlab_shell_setup.rb %%DATADIR%%/spec/support/gl_id_test_hook %%DATADIR%%/spec/support/http_unix_server.rb %%DATADIR%%/support/go-update-vendor %%DATADIR%%/spec/support/hook_fail %%DATADIR%%/spec/support/hook_ok %%DATADIR%%/spec/support/vcr.rb %%DATADIR%%/spec/support/webmock.rb %%DATADIR%%/spec/vcr_cassettes/allowed-pull.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found.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/custom-action-not-ok-json.yml %%DATADIR%%/spec/vcr_cassettes/custom-action-not-ok-not-json.yml %%DATADIR%%/spec/vcr_cassettes/custom-action-ok-not-json.yml %%DATADIR%%/spec/vcr_cassettes/custom-action-ok-with-message.yml %%DATADIR%%/spec/vcr_cassettes/custom-action-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-download.yml %%DATADIR%%/spec/vcr_cassettes/lfs-authenticate-ok-upload.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-pull-project-denied-401-text-html.yml %%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml %%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401.yml %%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml %%DATADIR%%/spec/vcr_cassettes/ssh-push-disabled.yml %%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml %%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml %%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401.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