From owner-svn-ports-all@freebsd.org Tue Apr 23 08:08:39 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DE8115923A7; Tue, 23 Apr 2019 08:08:39 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B61A194DE6; Tue, 23 Apr 2019 08:08:38 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A91E9219EE; Tue, 23 Apr 2019 08:08:38 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3N88cF6006283; Tue, 23 Apr 2019 08:08:38 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3N88btc006278; Tue, 23 Apr 2019 08:08:37 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201904230808.x3N88btc006278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Tue, 23 Apr 2019 08:08:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499730 - in head/devel/gitlab-shell: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/devel/gitlab-shell: . files X-SVN-Commit-Revision: 499730 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B61A194DE6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2019 08:08:39 -0000 Author: mfechner Date: Tue Apr 23 08:08:37 2019 New Revision: 499730 URL: https://svnweb.freebsd.org/changeset/ports/499730 Log: Upgrade to 9.0.0 which is required for Gitlab 11.10 upgrade. Modified: head/devel/gitlab-shell/Makefile head/devel/gitlab-shell/distinfo head/devel/gitlab-shell/files/patch-config.yml.example head/devel/gitlab-shell/pkg-plist Modified: head/devel/gitlab-shell/Makefile ============================================================================== --- head/devel/gitlab-shell/Makefile Tue Apr 23 08:07:38 2019 (r499729) +++ head/devel/gitlab-shell/Makefile Tue Apr 23 08:08:37 2019 (r499730) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 8.7.1 +PORTVERSION= 9.0.0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -16,7 +16,7 @@ BUILD_DEPENDS= gem:devel/ruby-gems \ 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 Modified: head/devel/gitlab-shell/distinfo ============================================================================== --- head/devel/gitlab-shell/distinfo Tue Apr 23 08:07:38 2019 (r499729) +++ head/devel/gitlab-shell/distinfo Tue Apr 23 08:08:37 2019 (r499730) @@ -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 Modified: head/devel/gitlab-shell/files/patch-config.yml.example ============================================================================== --- head/devel/gitlab-shell/files/patch-config.yml.example Tue Apr 23 08:07:38 2019 (r499729) +++ head/devel/gitlab-shell/files/patch-config.yml.example Tue Apr 23 08:08:37 2019 (r499730) @@ -5,7 +5,7 @@ # 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. Modified: head/devel/gitlab-shell/pkg-plist ============================================================================== --- head/devel/gitlab-shell/pkg-plist Tue Apr 23 08:07:38 2019 (r499729) +++ head/devel/gitlab-shell/pkg-plist Tue Apr 23 08:08:37 2019 (r499730) @@ -30,10 +30,9 @@ @(,,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 @@ -41,29 +40,28 @@ %%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