Date: Thu, 13 Jun 2024 06:46:28 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 236005a0bf03 - main - www/gitlab: security and patch update to 17.0.2 Message-ID: <202406130646.45D6kSOH073467@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=236005a0bf036c335a4069564b1a71f99fee2812 commit 236005a0bf036c335a4069564b1a71f99fee2812 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-06-13 06:24:45 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-06-13 06:46:17 +0000 www/gitlab: security and patch update to 17.0.2 Changes: https://about.gitlab.com/releases/2024/06/12/patch-release-gitlab-17-0-2-released/ Security: 92cd1c03-2940-11ef-bc02-001b217b3468 --- devel/gitaly/Makefile | 4 ++-- devel/gitaly/distinfo | 10 +++++----- net/gitlab-agent/Makefile | 2 +- net/gitlab-agent/distinfo | 10 +++++----- net/rubygem-gitaly/Makefile | 2 +- net/rubygem-gitaly/distinfo | 6 +++--- www/gitlab-pages/Makefile | 3 +-- www/gitlab-pages/distinfo | 10 +++++----- www/gitlab-workhorse/Makefile | 2 +- www/gitlab-workhorse/distinfo | 10 +++++----- www/gitlab/Makefile | 9 ++++----- www/gitlab/distinfo | 14 ++++++-------- 12 files changed, 39 insertions(+), 43 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index e029fda19327..9f47d617a852 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly DISTVERSIONPREFIX= v -DISTVERSION= 17.0.1 +DISTVERSION= 17.0.2 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.45.0:devel/git +MY_DEPENDS= git>=2.45.2:devel/git BUILD_DEPENDS= bash>0:shells/bash \ ${LOCALBASE}/bin/cmake:devel/cmake-core \ pcre2>0:devel/pcre2 \ diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 0becf61bead0..f5f564c4720d 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1716389346 -SHA256 (go/devel_gitaly/gitaly-v17.0.1/go.mod) = b3bc1c564079168d4d922a5dbde5fc43db3775820f008dd0266a6f5f10644015 -SIZE (go/devel_gitaly/gitaly-v17.0.1/go.mod) = 10988 -SHA256 (go/devel_gitaly/gitaly-v17.0.1/gitaly-v17.0.1.tar.bz2) = 51e02c89b8d7f9315bd86590bbb670374372013b1f5e746931679527404fb01e -SIZE (go/devel_gitaly/gitaly-v17.0.1/gitaly-v17.0.1.tar.bz2) = 2614140 +TIMESTAMP = 1718214632 +SHA256 (go/devel_gitaly/gitaly-v17.0.2/go.mod) = b3bc1c564079168d4d922a5dbde5fc43db3775820f008dd0266a6f5f10644015 +SIZE (go/devel_gitaly/gitaly-v17.0.2/go.mod) = 10988 +SHA256 (go/devel_gitaly/gitaly-v17.0.2/gitaly-v17.0.2.tar.bz2) = 2f126b510d4162ea71790a5146aeeaf27b89586fd8cc339a9179203705d39170 +SIZE (go/devel_gitaly/gitaly-v17.0.2/gitaly-v17.0.2.tar.bz2) = 2614756 diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index 2c2dd65d6f37..521b0c7892a5 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-agent -PORTVERSION= 17.0.1 +PORTVERSION= 17.0.2 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 1859016679c7..5e5cecd4d83d 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1716389490 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.0.1/v17.0.1.mod) = d8774eb02565f5c192d37fbc7caacd3d27dbcabcbebecd5b4afcb5b32d3e0776 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.0.1/v17.0.1.mod) = 7042 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.0.1/v17.0.1.zip) = 25af3e7c8fe08ae6c3918fc83c906e31f63fd84ffc74af8340cf7405b97b3ca3 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.0.1/v17.0.1.zip) = 1213271 +TIMESTAMP = 1718214492 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.0.2/v17.0.2.mod) = d8774eb02565f5c192d37fbc7caacd3d27dbcabcbebecd5b4afcb5b32d3e0776 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.0.2/v17.0.2.mod) = 7042 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.0.2/v17.0.2.zip) = 64e038ac3050143cca21ead1772992a9e0c265d7cbccdd18b613adb0e16c5910 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.0.2/v17.0.2.zip) = 1213651 diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index a13706444ea2..2208231628d5 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -PORTVERSION= 17.0.0 +PORTVERSION= 17.0.2 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo index d8bed00816e9..e3f78f01b2d2 100644 --- a/net/rubygem-gitaly/distinfo +++ b/net/rubygem-gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716140999 -SHA256 (rubygem/gitaly-17.0.0.gem) = f5f81334251197ccf89408d65ee5ffbbb2190008b942e091882c5b604b56db83 -SIZE (rubygem/gitaly-17.0.0.gem) = 47616 +TIMESTAMP = 1718255090 +SHA256 (rubygem/gitaly-17.0.2.gem) = ecd1cdf097318652e0df7eb661f7c1689f8734b0fa36dade52fb0799fe4fba82 +SIZE (rubygem/gitaly-17.0.2.gem) = 47616 diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index c3538c0371bf..58aad29b9741 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,7 +1,6 @@ PORTNAME= gitlab-pages -PORTVERSION= 17.0.1 +PORTVERSION= 17.0.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= www MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/ DISTFILES+= go.mod diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 68a81c0ea0d6..2eec34d46fc7 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1716389433 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.0.1/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba -SIZE (go/www_gitlab-pages/gitlab-pages-v17.0.1/go.mod) = 3328 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.0.1/gitlab-pages-v17.0.1.tar.bz2) = 267fb6896568a97588fdee6e11046b7a47c3addd1df98713c923fa8c5ec8763d -SIZE (go/www_gitlab-pages/gitlab-pages-v17.0.1/gitlab-pages-v17.0.1.tar.bz2) = 212478 +TIMESTAMP = 1718200352 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.0.2/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba +SIZE (go/www_gitlab-pages/gitlab-pages-v17.0.2/go.mod) = 3328 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.0.2/gitlab-pages-v17.0.2.tar.bz2) = 86ef71741ad2d7b0c67ff5cb27ff7f5308f644e3628b4ecf9f7fb5bdea46c3b0 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.0.2/gitlab-pages-v17.0.2.tar.bz2) = 212490 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 3ccfba5f6a9e..066db0058e20 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 17.0.1 +PORTVERSION= 17.0.2 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index b6a37e3086d1..13be207f587e 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1716389311 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.0.1/go.mod) = 01accf76d651c177faba180d5d544c1509d3af644af5acb5a7c40268b744f99e -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.0.1/go.mod) = 7030 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.0.1/gitlab-foss-v17.0.1.tar.bz2) = 74ce36a22fea3ab4fe32de2bb121c4f36f36bdd07c88591d3a4c4e84d83e08d5 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.0.1/gitlab-foss-v17.0.1.tar.bz2) = 103813147 +TIMESTAMP = 1718200568 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.0.2/go.mod) = 01accf76d651c177faba180d5d544c1509d3af644af5acb5a7c40268b744f99e +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.0.2/go.mod) = 7030 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.0.2/gitlab-foss-v17.0.2.tar.bz2) = 5c9ecf120949a6281f334a4b217dc06090dd9df7452715445a9c6a4846c0ebb4 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.0.2/gitlab-foss-v17.0.2.tar.bz2) = 103822940 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index e5e773e2a4ae..1f78cde83c83 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -1,17 +1,16 @@ PORTNAME= gitlab-${FLAVOR:Uce} -PORTVERSION= 17.0.1 +PORTVERSION= 17.0.2 DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee .endif -PORTREVISION= 3 CATEGORIES= www devel # include patch to fix database migration #https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560.patch -PATCH_SITES= https://gitlab.com/gitlab-org/gitlab/-/merge_requests/ -PATCHFILES+= 153560.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560 +#PATCH_SITES= https://gitlab.com/gitlab-org/gitlab/-/merge_requests/ +#PATCHFILES+= 153560.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560 MAINTAINER= mfechner@FreeBSD.org COMMENT= Web GUI for managing git repositories @@ -260,7 +259,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \ - rubygem-gitaly>=17.0.0.pre.rc2<17.1:net/rubygem-gitaly \ + rubygem-gitaly>=${PORTVERSION}:net/rubygem-gitaly \ rubygem-kas-grpc>=0.5.0,1<0.6.0,1:net/rubygem-kas-grpc \ rubygem-grpc>=1.63.0<2:net/rubygem-grpc \ rubygem-google-protobuf>=3.25.3<4:devel/rubygem-google-protobuf \ diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index fe6d47ab3e3e..3e11ae092df3 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,8 +1,6 @@ -TIMESTAMP = 1716389412 -SHA256 (gitlab-foss-v17.0.1.tar.bz2) = 74ce36a22fea3ab4fe32de2bb121c4f36f36bdd07c88591d3a4c4e84d83e08d5 -SIZE (gitlab-foss-v17.0.1.tar.bz2) = 103813147 -SHA256 (153560.patch) = 1303cf562fac571b092395cae264544156547ad15a99a9fdac3b27e7083b2027 -SIZE (153560.patch) = 1404 -TIMESTAMP = 1716389467 -SHA256 (gitlab-v17.0.1-ee.tar.bz2) = c450508a6630d01bf72271ca34de0fdde30dc6c0ef5bb7bf9bb89e492f26c1ee -SIZE (gitlab-v17.0.1-ee.tar.bz2) = 111371005 +TIMESTAMP = 1718200096 +SHA256 (gitlab-foss-v17.0.2.tar.bz2) = 5c9ecf120949a6281f334a4b217dc06090dd9df7452715445a9c6a4846c0ebb4 +SIZE (gitlab-foss-v17.0.2.tar.bz2) = 103822940 +TIMESTAMP = 1718200096 +SHA256 (gitlab-v17.0.2-ee.tar.bz2) = 9c14bca4de9c90af68c2b4aa617f4ddbd02585359f033f96a44661ad5e99f813 +SIZE (gitlab-v17.0.2-ee.tar.bz2) = 111378936
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406130646.45D6kSOH073467>