From owner-svn-ports-all@freebsd.org Wed Mar 3 09:27:37 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ED0E65644D8; Wed, 3 Mar 2021 09:27:37 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dr7vF6PM5z4tj2; Wed, 3 Mar 2021 09:27:37 +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 CE82726E61; Wed, 3 Mar 2021 09:27:37 +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 1239RbRB014307; Wed, 3 Mar 2021 09:27:37 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1239Ra3p014303; Wed, 3 Mar 2021 09:27:36 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202103030927.1239Ra3p014303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Wed, 3 Mar 2021 09:27:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567036 - 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: 567036 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 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: Wed, 03 Mar 2021 09:27:38 -0000 Author: mfechner Date: Wed Mar 3 09:27:36 2021 New Revision: 567036 URL: https://svnweb.freebsd.org/changeset/ports/567036 Log: Update to 13.16.1 which is required for gitlab-ce 13.9 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 Wed Mar 3 09:26:35 2021 (r567035) +++ head/devel/gitlab-shell/Makefile Wed Mar 3 09:27:36 2021 (r567036) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= gitlab-shell -PORTVERSION?= 13.15.1 -PORTREVISION?= 1 +PORTVERSION?= 13.16.1 +PORTREVISION?= 0 CATEGORIES= devel MAINTAINER?= mfechner@FreeBSD.org @@ -18,17 +18,17 @@ ALL_TARGET= build USE_GITLAB= yes GL_ACCOUNT?= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags -GL_COMMIT?= b82018ac61b724a195ab06a79d3e5d9811b0a2e7 +GL_COMMIT?= ce93aeae452661a0afbdadcba0377abc27646798 USERS= git GROUPS= git -INSTALL_TARGET= install-strip +#INSTALL_TARGET= install-strip # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-deps -# 36dd +# 38dd GH_TUPLE= \ DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ @@ -36,8 +36,10 @@ GH_TUPLE= \ HdrHistogram:hdrhistogram-go:3a0bb77429bd:codahale_hdrhistogram_go/vendor/github.com/codahale/hdrhistogram \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ + golang:crypto:8b5274cf687f:golang_crypto/vendor/golang.org/x/crypto \ golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ + golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \ golang:sys:86b910548bc1:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \ google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \ @@ -73,6 +75,7 @@ PLIST_FILES+= "@dir(git,,755) ${VARLOGDIR}" post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample ${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml + ${REINPLACE_CMD} -e 's|VERSION_STRING :=.*|VERSION_STRING := v${PORTVERSION}|g' ${WRKSRC}/Makefile # Build the go deps, use `pkg install modules2tuple` gomod-deps: patch Modified: head/devel/gitlab-shell/distinfo ============================================================================== --- head/devel/gitlab-shell/distinfo Wed Mar 3 09:26:35 2021 (r567035) +++ head/devel/gitlab-shell/distinfo Wed Mar 3 09:27:36 2021 (r567036) @@ -1,4 +1,4 @@ -TIMESTAMP = 1613137763 +TIMESTAMP = 1614010959 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 @@ -11,10 +11,14 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 SHA256 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045 SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732 +SHA256 (golang-crypto-8b5274cf687f_GH0.tar.gz) = 843a7219a66cdd64c7d2433b2e1624c8f4090382d4e88f8bf97cd31504af4abd +SIZE (golang-crypto-8b5274cf687f_GH0.tar.gz) = 1721870 SHA256 (golang-net-6afb5195e5aa_GH0.tar.gz) = e326d6b33545abf9db8bb622852d66e34f0957833e4c8839f8a01309b5aa263d SIZE (golang-net-6afb5195e5aa_GH0.tar.gz) = 1172285 SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 +SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393 +SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956 SHA256 (golang-sys-86b910548bc1_GH0.tar.gz) = d078511490f41a676d909de4f1a319ea332819b72c527f4ea735313cc9391e49 SIZE (golang-sys-86b910548bc1_GH0.tar.gz) = 1534522 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185 @@ -63,8 +67,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655 -SHA256 (gitlab-org-gitlab-shell-b82018ac61b724a195ab06a79d3e5d9811b0a2e7_GL0.tar.gz) = 15bfaab77e10e564a39491515c1b636f6d5c79721a8f9a9cf3d9131dd16d74ec -SIZE (gitlab-org-gitlab-shell-b82018ac61b724a195ab06a79d3e5d9811b0a2e7_GL0.tar.gz) = 92028 +SHA256 (gitlab-org-gitlab-shell-ce93aeae452661a0afbdadcba0377abc27646798_GL0.tar.gz) = fee6b6e765192e256943cb8a5719a503a2b07b8bc8668dabd92d9c8f4a4b3709 +SIZE (gitlab-org-gitlab-shell-ce93aeae452661a0afbdadcba0377abc27646798_GL0.tar.gz) = 94139 SHA256 (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 98d3cd87fb3feb8a14b5ac9e4a968e7a841cc3b309f997a2ba78aa8fd0b58c2d SIZE (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 3143193 SHA256 (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 4aa5c67e6b864d3e52705ac4401f47286af9af88c00fa338ef22a451db617011 Modified: head/devel/gitlab-shell/files/patch-config.yml.example ============================================================================== --- head/devel/gitlab-shell/files/patch-config.yml.example Wed Mar 3 09:26:35 2021 (r567035) +++ head/devel/gitlab-shell/files/patch-config.yml.example Wed Mar 3 09:27:36 2021 (r567036) @@ -1,4 +1,4 @@ ---- config.yml.example.orig 2020-06-01 04:40:32 UTC +--- config.yml.example.orig 2021-02-05 17:09:18 UTC +++ config.yml.example @@ -13,7 +13,7 @@ user: git # only listen on a Unix domain socket. For Unix domain sockets use @@ -7,18 +7,18 @@ -gitlab_url: "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" +gitlab_url: "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" - # See installation.md#using-https for additional HTTPS configuration details. - http_settings: -@@ -25,7 +25,7 @@ http_settings: + # When a http+unix:// is used in gitlab_url, this is the relative URL root to GitLab. + # Not used if gitlab_url is http:// or https://. +@@ -29,7 +29,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/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. -@@ -33,7 +33,7 @@ auth_file: "/home/git/.ssh/authorized_keys" + # SSL certificate dir where custom certificates can be placed + # https://golang.org/pkg/crypto/x509/ +@@ -45,7 +45,7 @@ auth_file: "/home/git/.ssh/authorized_keys" # Log file. # Default is gitlab-shell.log in the root directory. Modified: head/devel/gitlab-shell/pkg-plist ============================================================================== --- head/devel/gitlab-shell/pkg-plist Wed Mar 3 09:26:35 2021 (r567035) +++ head/devel/gitlab-shell/pkg-plist Wed Mar 3 09:27:36 2021 (r567036) @@ -15,6 +15,7 @@ @(,,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-sshd @(,,555) %%DATADIR%%/bin/install @sample %%DATADIR%%/config.yml.sample %%DATADIR%%/spec/gitlab_shell_authorized_keys_check_spec.rb