Re: git: 73b8be01a195 - main - www/gitlab-ce: upgrade to 14.4.2

Reply: Matthias Fechner : "Re: git: 73b8be01a195 - main - www/gitlab-ce: upgrade to 14.4.2"
In reply to: Matthias Fechner : "git: 73b8be01a195 - main - www/gitlab-ce: upgrade to 14.4.2"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Sat, 13 Nov 2021 16:50:43 UTC
Moin!

Fails to fetch 2.patch due to size mismatch

=> Attempting to fetch https://gitlab.com/mfechner/gitaly/-/merge_requests/2.patch
fetch: https://gitlab.com/mfechner/gitaly/-/merge_requests/2.patch: size unknown
fetch: https://gitlab.com/mfechner/gitaly/-/merge_requests/2.patch: size of remote file is not known
2.patch 54 kB 520 kBps 00s
=> Fetched file size mismatch (expected 55587, actual 55629)

--
Dima. (desktop, kde, x11, office, ports-secteam)@FreeBSD team
(fluffy@FreeBSD.org, https://t.me/dima_panov)

> On Saturday, Nov 13, 2021 at 5:47 PM, Matthias Fechner <mfechner@FreeBSD.org (mailto:mfechner@FreeBSD.org)> wrote:
> The branch main has been updated by mfechner:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=73b8be01a1957162d7635f299842c8bd29b691ca
>
> commit 73b8be01a1957162d7635f299842c8bd29b691ca
> Author: Matthias Fechner <mfechner@FreeBSD.org>
> AuthorDate: 2021-11-12 05:49:38 +0000
> Commit: Matthias Fechner <mfechner@FreeBSD.org>
> CommitDate: 2021-11-13 14:44:45 +0000
>
> www/gitlab-ce: upgrade to 14.4.2
>
> Changelog:
> https://about.gitlab.com/releases/2021/11/08/gitlab-14-4-2-released/
> ---
> devel/gitaly/Makefile | 8 ++++++--
> devel/gitaly/distinfo | 8 +++++---
> devel/gitaly/files/patch-ruby_Gemfile | 9 ---------
> www/gitlab-ce/Makefile | 4 ++--
> www/gitlab-ce/distinfo | 6 +++---
> www/gitlab-workhorse/Makefile | 4 ++--
> www/gitlab-workhorse/distinfo | 6 +++---
> 7 files changed, 21 insertions(+), 24 deletions(-)
>
> diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
> index 13d9bad28724..1eedb00b65dd 100644
> --- a/devel/gitaly/Makefile
> +++ b/devel/gitaly/Makefile
> @@ -1,8 +1,12 @@
> PORTNAME= gitaly
> -DISTVERSION= 14.4.1
> +DISTVERSION= 14.4.2
> PORTREVISION= 0
> CATEGORIES= devel
>
> +PATCH_SITES= https://gitlab.com/mfechner/gitaly/-/merge_requests/
> +# Make sure we have grpc files for grpc 1.41.0 available
> +PATCHFILES= 2.patch:-p1
> +
> MAINTAINER= mfechner@FreeBSD.org
> COMMENT= Smart reverse proxy for GitLab
>
> @@ -45,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= 735a55dc3d633b50c81fc1b69947a9774c40a658
> +GL_COMMIT= 00071e4ab87eaae7c4f68705613191046cd023be
>
> # for go dependencies
> USE_GITHUB= nodefault
> diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
> index c8e4938f6764..4043b095258e 100644
> --- a/devel/gitaly/distinfo
> +++ b/devel/gitaly/distinfo
> @@ -1,4 +1,4 @@
> -TIMESTAMP = 1635579522
> +TIMESTAMP = 1636801531
> 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
> @@ -267,9 +267,11 @@ 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-735a55dc3d633b50c81fc1b69947a9774c40a658_GL0.tar.gz) = 13d9d89eacb259fd1535631c9952c2cf129814d4977a34eb5576e2e84a17090f
> -SIZE (gitlab-org-gitaly-735a55dc3d633b50c81fc1b69947a9774c40a658_GL0.tar.gz) = 3704820
> +SHA256 (gitlab-org-gitaly-00071e4ab87eaae7c4f68705613191046cd023be_GL0.tar.gz) = c847a4d2f5996a68fc3d58de4a5793932dd06e945f48141d4d773c0c1168e574
> +SIZE (gitlab-org-gitaly-00071e4ab87eaae7c4f68705613191046cd023be_GL0.tar.gz) = 3704730
> 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
> SIZE (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = 171896
> +SHA256 (2.patch) = 3143aa6bda5ceb3c252931445ffb69bfca012420609eca2ed856347ed052fcb1
> +SIZE (2.patch) = 55587
> diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
> index dadd748f9300..231c2569c123 100644
> --- a/devel/gitaly/files/patch-ruby_Gemfile
> +++ b/devel/gitaly/files/patch-ruby_Gemfile
> @@ -1,14 +1,5 @@
> --- ruby/Gemfile.orig 2021-10-21 21:58:10 UTC
> +++ ruby/Gemfile
> -@@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.4.1'
> - gem 'rdoc', '~> 6.0'
> - gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
> - gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
> --gem 'grpc', '~> 1.30.2'
> -+gem 'grpc', '~> 1.30'
> - gem 'sentry-raven', '~> 3.0', require: false
> - gem 'faraday', '~> 1.0'
> - gem 'rbtrace', require: false
> @@ -19,15 +19,5 @@ gem 'gitlab-labkit', '~> 0.21.1'
> # This version needs to be in sync with GitLab CE/EE
> gem 'licensee', '~> 9.14.1'
> diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
> index ba2ba36b3755..6195812b8206 100644
> --- a/www/gitlab-ce/Makefile
> +++ b/www/gitlab-ce/Makefile
> @@ -1,7 +1,7 @@
> # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
>
> PORTNAME= gitlab-ce
> -PORTVERSION= 14.4.1
> +PORTVERSION= 14.4.2
> PORTREVISION= 0
> CATEGORIES= www devel
>
> @@ -271,7 +271,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= 1a23d731c9f1149b8be1f16a1d781490df288f18
> +GL_COMMIT= 1ce86e92f81869fc38ece6ae212b5ea9d5ffd405
>
> USERS= git
> GROUPS= git
> diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
> index cd3b2cfa683b..c970922dd18f 100644
> --- a/www/gitlab-ce/distinfo
> +++ b/www/gitlab-ce/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1635579320
> -SHA256 (gitlab-org-gitlab-foss-1a23d731c9f1149b8be1f16a1d781490df288f18_GL0.tar.gz) = 5f30bcbbc448b5cd08048131532e0aeff0428d03b7e25331913fa3614f2100d0
> -SIZE (gitlab-org-gitlab-foss-1a23d731c9f1149b8be1f16a1d781490df288f18_GL0.tar.gz) = 94874743
> +TIMESTAMP = 1636563242
> +SHA256 (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd405_GL0.tar.gz) = c7c26d75cce1030d6f8a61ae8b81ca6bfc92910eb30b0a1941ab6ac4f45b45e7
> +SIZE (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd405_GL0.tar.gz) = 94877267
> diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
> index e38d753bea2c..11f14b0ad246 100644
> --- a/www/gitlab-workhorse/Makefile
> +++ b/www/gitlab-workhorse/Makefile
> @@ -1,7 +1,7 @@
> # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
>
> PORTNAME= gitlab-workhorse
> -PORTVERSION= 14.4.1
> +PORTVERSION= 14.4.2
> PORTREVISION= 0
> CATEGORIES= www
>
> @@ -23,7 +23,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= 1a23d731c9f1149b8be1f16a1d781490df288f18
> +GL_COMMIT= 1ce86e92f81869fc38ece6ae212b5ea9d5ffd405
>
> # for go dependencies
> USE_GITHUB= nodefault
> diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
> index 045bd570a552..c1124b5a6e22 100644
> --- a/www/gitlab-workhorse/distinfo
> +++ b/www/gitlab-workhorse/distinfo
> @@ -1,4 +1,4 @@
> -TIMESTAMP = 1635579452
> +TIMESTAMP = 1636563263
> 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-1a23d731c9f1149b8be1f16a1d781490df288f18_GL0.tar.gz) = 5f30bcbbc448b5cd08048131532e0aeff0428d03b7e25331913fa3614f2100d0
> -SIZE (gitlab-org-gitlab-foss-1a23d731c9f1149b8be1f16a1d781490df288f18_GL0.tar.gz) = 94874743
> +SHA256 (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd405_GL0.tar.gz) = c7c26d75cce1030d6f8a61ae8b81ca6bfc92910eb30b0a1941ab6ac4f45b45e7
> +SIZE (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd405_GL0.tar.gz) = 94877267
> SHA256 (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 4c403ee52c1d42d54e9acd14026796782e8272e74c8eb7c3cedf9c924697647e
> SIZE (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 3703056
> SHA256 (gitlab-org-labkit-9205b46eea68f47a36cefa783a306476f0b2dbfd_GL0.tar.gz) = c957c444298dd0f9ade07cb643d03e455dcc28d24bd203ead8d241bf50c6df57