From nobody Tue Feb 15 15:33:04 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8029F194949D; Tue, 15 Feb 2022 15:33:04 +0000 (UTC) (envelope-from git@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 4JylTr39b7z3kvr; Tue, 15 Feb 2022 15:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644939184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=22imMyW/AgBPoTyUj9BA9qzcfKy/8aF3zNs7h8sJ120=; b=cO1swRWxnAsImJ15XzcpfA5QoE30iZxhiZmmTKvmMeXs8Tf8vPhl8MOSbu5HtCygEJ/Sus 0+ln3F+3rvMOaoHtt7u5ACM9JYmOJVyHG49wmkKjrmDlECs4GKq/a69v2h+5edpsGAqniv cnldMbULQXWDlbDnJiiZJFKAFP4p/nUxTJYc/f9NF1f1axp2ZeSbrPizPP8od3rzbomg08 8KCmheF4ZOLUqV0SllpVYZJXYKJtcoKcBd9Qj4DMZDYSDwYyh1qxaJmM62WYf80lYLiMPb Re1pbN+9/c862POXO3m9iDDRGZ5aPO/FJ6Za5VVDZBsIYXLBcw/ugkKwwxQo8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CC1F24FA0; Tue, 15 Feb 2022 15:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21FFX4r1030226; Tue, 15 Feb 2022 15:33:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21FFX4cw030225; Tue, 15 Feb 2022 15:33:04 GMT (envelope-from git) Date: Tue, 15 Feb 2022 15:33:04 GMT Message-Id: <202202151533.21FFX4cw030225@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 756202cc7b0e - main - www/gitlab-ce: bugfix update to 14.7.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 756202cc7b0e4dfc66f41e756eed9f3a38aec168 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644939184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=22imMyW/AgBPoTyUj9BA9qzcfKy/8aF3zNs7h8sJ120=; b=F6icf6ORw2wIqdA2uuSjz/7nTe7DThqIWeVIEUnPQGQs/ebgKPjVcP3l/SVWQfalP5/dG5 m8ZZkKiWNOU/sI3M3rn4/kBq5HcksFb0oaY2ocwl1+Ro7JpHhQfL9rXxdOc91fDdPJPtPL MZsMk3lGN+ogBbHCKDYDAZ/D6PkKzZHy8UOm0HU3ECd50mdiIiyyw1vuyWUSI2NOIt7IHD FwYQzpTeQEmZherGjPlhPAkty1TQ/bzX0iA8uyXg985UzZ1mP0NNYMTxbJcAyO75nwnaZP wSsTO8m7DtoF9KVS6E8W7Mg03nXDz4HX0tFt4AlLHMh19Y5cvWxlE7qv39utUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644939184; a=rsa-sha256; cv=none; b=nJ52wIcKvslXwugf4LasSenQ5R5nfSy8+toLdyzMDEnLYpUHMCzl8n0XbW0Sdbj+/9yQmV Ia83kSX9/Bkn5mxTAy5UOF5tF8W3VedVUsTFMmGzI2GjAhYOrQHpqky5p7v9fmAotg+Om5 sPeRMZorwRBMdCHZWq1M6zyz7DzI3lrZdEd/gtGdVJc3tizv8y3phDVcupIz6N5tvCBXfF wbavjEtQkterwWhr60ZTlauTh3W45nmhUJUxmnQOrSHhEPUC0Dmobly88MJeHZU2eTdF7M 1g4XIOicneT2Z4AfXt0l3KRiUh/MCi6X7HTD0z3V1EAXxiPldvYahXsH8cKW0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=756202cc7b0e4dfc66f41e756eed9f3a38aec168 commit 756202cc7b0e4dfc66f41e756eed9f3a38aec168 Author: Matthias Fechner AuthorDate: 2022-02-15 15:15:54 +0000 Commit: Matthias Fechner CommitDate: 2022-02-15 15:32:52 +0000 www/gitlab-ce: bugfix update to 14.7.3 Changelog: https://about.gitlab.com/releases/2022/02/08/gitlab-14-7-2-released/ https://about.gitlab.com/releases/2022/02/14/gitlab-14-7-3-released/ GitLab Community Edition and Enterprise Edition Create 14.7 What's New entry Fix cluster integration HTTP adapter Revert "Merge branch 'wc-gitaly-keepalive-limit' into 'master'" Fix broken mermaid diagrams GitLab Version - CE Admin Dashboard [RUN ALL RSPEC] [RUN AS-IF-FOSS] Geo: Fix verification failures of remote stored files Update to ruby-magic v0.5.4 Geo: Fix reverify object stored files Update PG runtime conf before restarting Ensure EE services are added when gitlab-ee::config recipe is included GitLab Community Edition and Enterprise Edition Properly exclude pending_destruction packages when creating one Update Import/Export ObjectBuilder for merge requests Fix Geo checksummable check failing when file is nil Update GitHub PRs Importer to force update repository Update Mattermost to 6.2.2 (GitLab 14.7) Specify fetch_workers config option to omnibus Update Omnibus to v8.2.1.7 --- devel/gitaly/Makefile | 4 ++-- devel/gitaly/distinfo | 6 +++--- www/gitlab-ce/Makefile | 6 +++--- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-workhorse/Makefile | 4 ++-- www/gitlab-workhorse/distinfo | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 5d0094c24ff7..60299e45e0b3 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 14.7.1 +DISTVERSION= 14.7.3 PORTREVISION= 0 CATEGORIES= devel @@ -49,7 +49,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 49e5d7a924dc86477c8c887f9ffeb41e41d546dc +GL_COMMIT= 9115228ca694cf94776a13d09afd654422a7d366 # for go dependencies USE_GITHUB= nodefault diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index d00ba33e2b02..26f7b1228828 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1643992157 +TIMESTAMP = 1644937754 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443 @@ -279,8 +279,8 @@ SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215 SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421 SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663 SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037 -SHA256 (gitlab-org-gitaly-49e5d7a924dc86477c8c887f9ffeb41e41d546dc_GL0.tar.gz) = 14301157db860aa667b2066d7555baedf719b5510014a92fae0dd959302926fc -SIZE (gitlab-org-gitaly-49e5d7a924dc86477c8c887f9ffeb41e41d546dc_GL0.tar.gz) = 3769455 +SHA256 (gitlab-org-gitaly-9115228ca694cf94776a13d09afd654422a7d366_GL0.tar.gz) = 5ef70a044657bb755aac0c2f09e8a88e879795be1dec33c23a6f66d4d9706bbf +SIZE (gitlab-org-gitaly-9115228ca694cf94776a13d09afd654422a7d366_GL0.tar.gz) = 3769473 SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516 SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 265755e99a56..3437dae08df3 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-ce -PORTVERSION= 14.7.1 +PORTVERSION= 14.7.3 PORTREVISION= 0 CATEGORIES= www devel @@ -175,7 +175,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-loofah>=2.9.0<3.0:textproc/rubygem-loofah \ rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \ rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \ - rubygem-ruby-magic>=0.5.3<1:devel/rubygem-ruby-magic \ + rubygem-ruby-magic>=0.5.4<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \ rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \ @@ -278,7 +278,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= c25c22ccd8cdf0ec66b7e91ad7f8edd4d3a4f86c +GL_COMMIT= 293f6bb322ba6f3aba63744cea1cc3c9d648aba0 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index d594b7c2b7cd..03780a6adaa4 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643991808 -SHA256 (gitlab-org-gitlab-foss-c25c22ccd8cdf0ec66b7e91ad7f8edd4d3a4f86c_GL0.tar.gz) = 946b41b80e60dba88de08568383f661dd4b0ca9ecef194d2db3fece48fb91199 -SIZE (gitlab-org-gitlab-foss-c25c22ccd8cdf0ec66b7e91ad7f8edd4d3a4f86c_GL0.tar.gz) = 101619516 +TIMESTAMP = 1644937608 +SHA256 (gitlab-org-gitlab-foss-293f6bb322ba6f3aba63744cea1cc3c9d648aba0_GL0.tar.gz) = bfa8cfa540b47dd665bce7fb2b7d36d686d238b1d10b974d765b4a25715d0406 +SIZE (gitlab-org-gitlab-foss-293f6bb322ba6f3aba63744cea1cc3c9d648aba0_GL0.tar.gz) = 101617590 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 959193c92b0f..00e8d6c57cb7 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-workhorse -PORTVERSION= 14.7.1 +PORTVERSION= 14.7.3 PORTREVISION= 0 CATEGORIES= www @@ -25,7 +25,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= c25c22ccd8cdf0ec66b7e91ad7f8edd4d3a4f86c +GL_COMMIT= 293f6bb322ba6f3aba63744cea1cc3c9d648aba0 # for go dependencies USE_GITHUB= nodefault diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index f498120fa993..edc902731d41 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1643992002 +TIMESTAMP = 1644937627 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443 @@ -199,8 +199,8 @@ SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5 SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010 -SHA256 (gitlab-org-gitlab-foss-c25c22ccd8cdf0ec66b7e91ad7f8edd4d3a4f86c_GL0.tar.gz) = 946b41b80e60dba88de08568383f661dd4b0ca9ecef194d2db3fece48fb91199 -SIZE (gitlab-org-gitlab-foss-c25c22ccd8cdf0ec66b7e91ad7f8edd4d3a4f86c_GL0.tar.gz) = 101619516 +SHA256 (gitlab-org-gitlab-foss-293f6bb322ba6f3aba63744cea1cc3c9d648aba0_GL0.tar.gz) = bfa8cfa540b47dd665bce7fb2b7d36d686d238b1d10b974d765b4a25715d0406 +SIZE (gitlab-org-gitlab-foss-293f6bb322ba6f3aba63744cea1cc3c9d648aba0_GL0.tar.gz) = 101617590 SHA256 (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 4c403ee52c1d42d54e9acd14026796782e8272e74c8eb7c3cedf9c924697647e SIZE (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 3703056 SHA256 (gitlab-org-golang-archive-zip-84007c99e03b62ee4dc62a94048d6e59552299d7_GL0.tar.gz) = 103a3e806657de5e2c7844326146c88490089fa8d07784270c359b5f5a8d06be