Re: git: a02d4231df08 - main - www/gitlab-ce: security update to 16.5.1

Reply: Matthias Fechner : "Re: git: a02d4231df08 - main - www/gitlab-ce: security update to 16.5.1"
In reply to: Matthias Fechner : "git: a02d4231df08 - main - www/gitlab-ce: security update to 16.5.1"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_freebsd.org>
Date: Sat, 04 Nov 2023 17:03:39 UTC
01.11.2023 13:58, Matthias Fechner пишет:
> The branch main has been updated by mfechner:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=a02d4231df08abb82d6c6b9295bb0d2422686616
>
> commit a02d4231df08abb82d6c6b9295bb0d2422686616
> Author:     Matthias Fechner <mfechner@FreeBSD.org>
> AuthorDate: 2023-11-01 08:05:08 +0000
> Commit:     Matthias Fechner <mfechner@FreeBSD.org>
> CommitDate: 2023-11-01 10:58:37 +0000
>
>      www/gitlab-ce: security update to 16.5.1
>      
>      Changelog:
>      https://about.gitlab.com/releases/2023/10/31/security-release-gitlab-16-5-1-16-4-2-16-3-6-released/
>      
>      Security:       a612c25f-788a-11ee-8d57-001b217b3468
> ---
>   devel/gitaly/Makefile         |  2 +-
>   devel/gitaly/distinfo         | 10 +++++-----
>   www/gitlab-ce/Makefile        |  3 +--
>   www/gitlab-ce/distinfo        |  6 +++---
>   www/gitlab-pages/Makefile     |  2 +-
>   www/gitlab-pages/distinfo     | 10 +++++-----
>   www/gitlab-workhorse/Makefile |  2 +-
>   www/gitlab-workhorse/distinfo | 10 +++++-----
>   8 files changed, 22 insertions(+), 23 deletions(-)
>
> diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
> index b2e84e3c1aa6..ac355ce4c2ef 100644
> --- a/devel/gitaly/Makefile
> +++ b/devel/gitaly/Makefile
> @@ -1,5 +1,5 @@
>   PORTNAME=	gitaly
> -DISTVERSION=	16.5.0
> +DISTVERSION=	16.5.1
>   DISTVERSIONPREFIX=	v
>   CATEGORIES=	devel
>   
> diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
> index 1153c25f4580..9ad68b5338af 100644
> --- a/devel/gitaly/distinfo
> +++ b/devel/gitaly/distinfo
> @@ -1,5 +1,5 @@
> -TIMESTAMP = 1698069958
> -SHA256 (go/devel_gitaly/gitaly-v16.5.0/go.mod) = c228a15141524a153c43ebc1b79a26cbe18baaf6e7966f5ca718557047a3bf18
> -SIZE (go/devel_gitaly/gitaly-v16.5.0/go.mod) = 10529
> -SHA256 (go/devel_gitaly/gitaly-v16.5.0/gitaly-v16.5.0.tar.bz2) = 3a67b2b6a43638768cbadd46364b22e765730fb48ebfd2dc44b5c3f316b02837
> -SIZE (go/devel_gitaly/gitaly-v16.5.0/gitaly-v16.5.0.tar.bz2) = 2484568
> +TIMESTAMP = 1698824662
> +SHA256 (go/devel_gitaly/gitaly-v16.5.1/go.mod) = c228a15141524a153c43ebc1b79a26cbe18baaf6e7966f5ca718557047a3bf18
> +SIZE (go/devel_gitaly/gitaly-v16.5.1/go.mod) = 10529
> +SHA256 (go/devel_gitaly/gitaly-v16.5.1/gitaly-v16.5.1.tar.bz2) = 9b0363908e76414ca95e193505b4c503b366d8adbd29b7eb5bb7be52a03f9430
> +SIZE (go/devel_gitaly/gitaly-v16.5.1/gitaly-v16.5.1.tar.bz2) = 2484724
> diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
> index a3ed69be12c9..0b9d61f93d25 100644
> --- a/www/gitlab-ce/Makefile
> +++ b/www/gitlab-ce/Makefile
> @@ -1,6 +1,5 @@
>   PORTNAME=	gitlab-ce
> -PORTVERSION=	16.5.0
> -PORTREVISION=	1
> +PORTVERSION=	16.5.1
>   DISTVERSIONPREFIX=	v
>   CATEGORIES=	www devel
>   
> diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
> index fe10fced991b..712458a2c824 100644
> --- a/www/gitlab-ce/distinfo
> +++ b/www/gitlab-ce/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1698065244
> -SHA256 (gitlab-foss-v16.5.0.tar.bz2) = 5b9091e9d815e102fd858d258cf65640a5774d34a5a79906b5f27e03ae235848
> -SIZE (gitlab-foss-v16.5.0.tar.bz2) = 92735315
> +TIMESTAMP = 1698824612
> +SHA256 (gitlab-foss-v16.5.1.tar.bz2) = 2c19faf78e80761d5c67790967d6c743c1beea1c47d2ae69814a794b92a12ce3
> +SIZE (gitlab-foss-v16.5.1.tar.bz2) = 92734138
> diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
> index 9e2d7062484a..a5b558a82c4d 100644
> --- a/www/gitlab-pages/Makefile
> +++ b/www/gitlab-pages/Makefile
> @@ -1,5 +1,5 @@
>   PORTNAME=	gitlab-pages
> -PORTVERSION=	16.5.0
> +PORTVERSION=	16.5.1
>   DISTVERSIONPREFIX=	v
>   CATEGORIES=	www
>   MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
> diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
> index 4d1d5e49eae0..25c25068ec12 100644
> --- a/www/gitlab-pages/distinfo
> +++ b/www/gitlab-pages/distinfo
> @@ -1,5 +1,5 @@
> -TIMESTAMP = 1698070007
> -SHA256 (go/www_gitlab-pages/gitlab-pages-v16.5.0/go.mod) = 896ed13d735e4b95bdedd317e789dd6429222d38c651f1baae0bed413d5602a6
> -SIZE (go/www_gitlab-pages/gitlab-pages-v16.5.0/go.mod) = 2931
> -SHA256 (go/www_gitlab-pages/gitlab-pages-v16.5.0/gitlab-pages-v16.5.0.tar.bz2) = b0dccaf2648e9cf67da9bb0438d0f7186b1fc7231d78a8d9c62671e4c5ff279a
> -SIZE (go/www_gitlab-pages/gitlab-pages-v16.5.0/gitlab-pages-v16.5.0.tar.bz2) = 203573
> +TIMESTAMP = 1698824640
> +SHA256 (go/www_gitlab-pages/gitlab-pages-v16.5.1/go.mod) = 896ed13d735e4b95bdedd317e789dd6429222d38c651f1baae0bed413d5602a6
> +SIZE (go/www_gitlab-pages/gitlab-pages-v16.5.1/go.mod) = 2931
> +SHA256 (go/www_gitlab-pages/gitlab-pages-v16.5.1/gitlab-pages-v16.5.1.tar.bz2) = b46864767334aadba6b9e85b5505df266a6360f06611cd17fbc35ba05df355c5
> +SIZE (go/www_gitlab-pages/gitlab-pages-v16.5.1/gitlab-pages-v16.5.1.tar.bz2) = 203554
> diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
> index 91ac2df6c4a9..305f104283fa 100644
> --- a/www/gitlab-workhorse/Makefile
> +++ b/www/gitlab-workhorse/Makefile
> @@ -1,5 +1,5 @@
>   PORTNAME=	gitlab-workhorse
> -PORTVERSION=	16.5.0
> +PORTVERSION=	16.5.1
>   DISTVERSIONPREFIX=	v
>   CATEGORIES=	www
>   
> diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
> index bb99c94ea116..7026c2d75a25 100644
> --- a/www/gitlab-workhorse/distinfo
> +++ b/www/gitlab-workhorse/distinfo
> @@ -1,5 +1,5 @@
> -TIMESTAMP = 1698065153
> -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.5.0/go.mod) = 98d1e08c1c106673b32c20697c616efeca50d2b698293aa282fd75be90e89b82
> -SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.5.0/go.mod) = 6781
> -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.5.0/gitlab-foss-v16.5.0.tar.bz2) = 5b9091e9d815e102fd858d258cf65640a5774d34a5a79906b5f27e03ae235848
> -SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.5.0/gitlab-foss-v16.5.0.tar.bz2) = 92735315
> +TIMESTAMP = 1698824556
> +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.5.1/go.mod) = 98d1e08c1c106673b32c20697c616efeca50d2b698293aa282fd75be90e89b82
> +SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.5.1/go.mod) = 6781
> +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.5.1/gitlab-foss-v16.5.1.tar.bz2) = 2c19faf78e80761d5c67790967d6c743c1beea1c47d2ae69814a794b92a12ce3
> +SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.5.1/gitlab-foss-v16.5.1.tar.bz2) = 92734138

Hi!

Can you please update www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off:
--- Gemfile.orig
+++ Gemfile
@@ -96,7 +96,7 @@

  # Kerberos authentication. EE-only
  gem 'gssapi', '~> 1.3.1', group: :kerberos # rubocop:todo 
Gemfile/MissingFeatureCategory
-gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo 
Gemfile/MissingFeatureCategory
+#gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo 
Gemfile/MissingFeatureCategory

  # Spam and anti-bot protection
  gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' # rubocop:todo 
Gemfile/MissingFeatureCategory

Or I can commit it self if you allow me to do this.

-- 
Best regards,
Vladimir Druzenko