Date: Sun, 26 Oct 2025 20:12:39 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: d06aca5f112e - 2025Q4 - www/gitlab: security and bugfix update to 18.3.5 Message-ID: <202510262012.59QKCdh6088634@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2025Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=d06aca5f112e84f1e966d7d11b70370ca81e29cb commit d06aca5f112e84f1e966d7d11b70370ca81e29cb Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2025-10-22 16:23:36 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2025-10-26 18:22:57 +0000 www/gitlab: security and bugfix update to 18.3.5 Changes: https://about.gitlab.com/releases/2025/10/22/patch-release-gitlab-18-5-1-released/ Security: f741ea93-af61-11f0-98b5-2cf05da270f3 (cherry picked from commit 9b4801f0c224430f80963f81f4e2c1db511909d8) --- databases/Makefile | 3 +++ .../rubygem-redis-actionpack-rails-gitlab/Makefile | 3 ++- databases/rubygem-redis-clustering-gitlab/Makefile | 21 ++++++++++++++++++++ databases/rubygem-redis-clustering-gitlab/distinfo | 3 +++ .../rubygem-redis-clustering-gitlab/pkg-descr | 2 ++ databases/rubygem-redis-gitlab/Makefile | 23 ++++++++++++++++++++++ databases/rubygem-redis-gitlab/distinfo | 3 +++ databases/rubygem-redis-gitlab/pkg-descr | 1 + databases/rubygem-redis-namespace-gitlab/Makefile | 20 +++++++++++++++++++ databases/rubygem-redis-namespace-gitlab/distinfo | 3 +++ databases/rubygem-redis-namespace-gitlab/pkg-descr | 3 +++ devel/Makefile | 1 + devel/gitaly/distinfo | 14 ++++++------- devel/rubygem-gitlab-labkit/Makefile | 3 ++- devel/rubygem-redis-store-gitlab/Makefile | 21 ++++++++++++++++++++ devel/rubygem-redis-store-gitlab/distinfo | 3 +++ devel/rubygem-redis-store-gitlab/pkg-descr | 2 ++ mail/rubygem-gitlab-mail_room/Makefile | 5 +++-- net/gitlab-agent/distinfo | 10 +++++----- net/rubygem-gitlab-kas-grpc/distinfo | 6 +++--- www/gitlab-pages/distinfo | 10 +++++----- www/gitlab-workhorse/distinfo | 10 +++++----- www/gitlab/Makefile | 4 ++-- www/gitlab/Makefile.common | 4 ++-- www/gitlab/distinfo | 12 +++++------ www/rubygem-coverband/Makefile | 3 ++- www/rubygem-redis-rack-gitlab/Makefile | 3 ++- 27 files changed, 155 insertions(+), 41 deletions(-) diff --git a/databases/Makefile b/databases/Makefile index 44c684d221db..7d01ffb47d8c 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1051,7 +1051,10 @@ SUBDIR += rubygem-redis-client SUBDIR += rubygem-redis-cluster-client SUBDIR += rubygem-redis-clustering + SUBDIR += rubygem-redis-clustering-gitlab + SUBDIR += rubygem-redis-gitlab SUBDIR += rubygem-redis-namespace + SUBDIR += rubygem-redis-namespace-gitlab SUBDIR += rubygem-redis-namespace110 SUBDIR += rubygem-ruby-mysql SUBDIR += rubygem-sdbm diff --git a/databases/rubygem-redis-actionpack-rails-gitlab/Makefile b/databases/rubygem-redis-actionpack-rails-gitlab/Makefile index 98ca3d2728bd..18264b58bca9 100644 --- a/databases/rubygem-redis-actionpack-rails-gitlab/Makefile +++ b/databases/rubygem-redis-actionpack-rails-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= redis-actionpack PORTVERSION= 5.5.0 +PORTREVISION= 1 CATEGORIES= databases rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails-gitlab @@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-actionpack-gitlab>=5:www/rubygem-actionpack-gitlab \ rubygem-redis-rack-gitlab>=2.1.0<4:www/rubygem-redis-rack-gitlab \ - rubygem-redis-store>=1.1.0<2:devel/rubygem-redis-store + rubygem-redis-store-gitlab>=1.1.0<2:devel/rubygem-redis-store-gitlab USES= gem diff --git a/databases/rubygem-redis-clustering-gitlab/Makefile b/databases/rubygem-redis-clustering-gitlab/Makefile new file mode 100644 index 000000000000..67d4c4078806 --- /dev/null +++ b/databases/rubygem-redis-clustering-gitlab/Makefile @@ -0,0 +1,21 @@ +PORTNAME= redis-clustering +PORTVERSION= 5.4.0 +CATEGORIES= databases rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Ruby client that tries to match Redis Cluster API +WWW= https://github.com/redis/redis-rb/tree/master/cluster + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-redis-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-redis-gitlab \ + rubygem-redis-cluster-client>=0.10.0:databases/rubygem-redis-cluster-client + +USES= gem + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/databases/rubygem-redis-clustering-gitlab/distinfo b/databases/rubygem-redis-clustering-gitlab/distinfo new file mode 100644 index 000000000000..957cbeffe287 --- /dev/null +++ b/databases/rubygem-redis-clustering-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1761132444 +SHA256 (rubygem/redis-clustering-5.4.0.gem) = 7ce18063700cf30f2248c7553592bfb2b62a1d76216c65a8d2c8c75e4274563b +SIZE (rubygem/redis-clustering-5.4.0.gem) = 10240 diff --git a/databases/rubygem-redis-clustering-gitlab/pkg-descr b/databases/rubygem-redis-clustering-gitlab/pkg-descr new file mode 100644 index 000000000000..a66f60bdc61c --- /dev/null +++ b/databases/rubygem-redis-clustering-gitlab/pkg-descr @@ -0,0 +1,2 @@ +Redis::Cluster is a Ruby client that tries to match Redis' Cluster API +one-to-one, while still providing an idiomatic interface. diff --git a/databases/rubygem-redis-gitlab/Makefile b/databases/rubygem-redis-gitlab/Makefile new file mode 100644 index 000000000000..a5ed522ed148 --- /dev/null +++ b/databases/rubygem-redis-gitlab/Makefile @@ -0,0 +1,23 @@ +PORTNAME= redis +PORTVERSION= 5.4.0 +CATEGORIES= databases rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Ruby client library for Redis, the key value storage server +WWW= https://github.com/redis/redis-rb + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-redis-client>=0.22.0:databases/rubygem-redis-client + +USES= gem + +NO_ARCH= yes + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/build + +.include <bsd.port.mk> diff --git a/databases/rubygem-redis-gitlab/distinfo b/databases/rubygem-redis-gitlab/distinfo new file mode 100644 index 000000000000..479c110c7efa --- /dev/null +++ b/databases/rubygem-redis-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1761132344 +SHA256 (rubygem/redis-5.4.0.gem) = 798900d869418a9fc3977f916578375b45c38247a556b61d58cba6bb02f7d06b +SIZE (rubygem/redis-5.4.0.gem) = 52736 diff --git a/databases/rubygem-redis-gitlab/pkg-descr b/databases/rubygem-redis-gitlab/pkg-descr new file mode 100644 index 000000000000..060aad72bc9b --- /dev/null +++ b/databases/rubygem-redis-gitlab/pkg-descr @@ -0,0 +1 @@ +rubygem-redis is a Ruby client library for the Redis key-value store. diff --git a/databases/rubygem-redis-namespace-gitlab/Makefile b/databases/rubygem-redis-namespace-gitlab/Makefile new file mode 100644 index 000000000000..42a10c08e37e --- /dev/null +++ b/databases/rubygem-redis-namespace-gitlab/Makefile @@ -0,0 +1,20 @@ +PORTNAME= redis-namespace +PORTVERSION= 1.10.0 +CATEGORIES= databases rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Ruby client class for Redis with namespace support +WWW= https://github.com/resque/redis-namespace + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-redis-gitlab>=4:databases/rubygem-redis-gitlab + +USES= gem + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/databases/rubygem-redis-namespace-gitlab/distinfo b/databases/rubygem-redis-namespace-gitlab/distinfo new file mode 100644 index 000000000000..7d1bd17eab1c --- /dev/null +++ b/databases/rubygem-redis-namespace-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1703587662 +SHA256 (rubygem/redis-namespace-1.10.0.gem) = 2c1c6ea7c6c5e343e75b9bee3aa4c265e364a5b9966507397467af2bb3758d94 +SIZE (rubygem/redis-namespace-1.10.0.gem) = 19456 diff --git a/databases/rubygem-redis-namespace-gitlab/pkg-descr b/databases/rubygem-redis-namespace-gitlab/pkg-descr new file mode 100644 index 000000000000..017c90780e16 --- /dev/null +++ b/databases/rubygem-redis-namespace-gitlab/pkg-descr @@ -0,0 +1,3 @@ +Adds a Redis::Namespace class which can be used to namespace calls to Redis. +This is useful when using a single instance of Redis with multiple, different +applications. diff --git a/devel/Makefile b/devel/Makefile index c06e21021fd1..4692b84bca5e 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -7854,6 +7854,7 @@ SUBDIR += rubygem-redis-activesupport-rails60 SUBDIR += rubygem-redis-activesupport-rails61 SUBDIR += rubygem-redis-store + SUBDIR += rubygem-redis-store-gitlab SUBDIR += rubygem-redlock SUBDIR += rubygem-redlock1 SUBDIR += rubygem-redmine_plugin_support diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index be2dbb72a868..b099496bc405 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1760008254 -SHA256 (go/devel_gitaly/gitaly-v18.3.4/go.mod) = 163e0c24ae7263540250f58c84b9a0197cf6be768dab99b21dd463cc1a4659bc -SIZE (go/devel_gitaly/gitaly-v18.3.4/go.mod) = 13011 -SHA256 (go/devel_gitaly/gitaly-v18.3.4/gitaly-v18.3.4.tar.bz2) = a28d60675e3681d41caf867a13153c3709dc90e9a5be31bfefc289f74309b144 -SIZE (go/devel_gitaly/gitaly-v18.3.4/gitaly-v18.3.4.tar.bz2) = 4558106 -SHA256 (go/devel_gitaly/gitaly-v18.3.4/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 -SIZE (go/devel_gitaly/gitaly-v18.3.4/git-v2.50.0.tar.bz2) = 9249878 +TIMESTAMP = 1761126609 +SHA256 (go/devel_gitaly/gitaly-v18.3.5/go.mod) = 163e0c24ae7263540250f58c84b9a0197cf6be768dab99b21dd463cc1a4659bc +SIZE (go/devel_gitaly/gitaly-v18.3.5/go.mod) = 13011 +SHA256 (go/devel_gitaly/gitaly-v18.3.5/gitaly-v18.3.5.tar.bz2) = b65e63c288e3682223262333d5056a114aea08410925aca249bd5d7418b986eb +SIZE (go/devel_gitaly/gitaly-v18.3.5/gitaly-v18.3.5.tar.bz2) = 4557618 +SHA256 (go/devel_gitaly/gitaly-v18.3.5/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 +SIZE (go/devel_gitaly/gitaly-v18.3.5/git-v2.50.0.tar.bz2) = 9249878 diff --git a/devel/rubygem-gitlab-labkit/Makefile b/devel/rubygem-gitlab-labkit/Makefile index 87a3bbc35575..b87ee81d914f 100644 --- a/devel/rubygem-gitlab-labkit/Makefile +++ b/devel/rubygem-gitlab-labkit/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-labkit PORTVERSION= 0.39.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -18,7 +19,7 @@ RUN_DEPENDS= rubygem-actionpack-gitlab>=5<8.1:www/rubygem-actionpack-gitlab \ rubygem-opentracing>=0.4<1:devel/rubygem-opentracing \ rubygem-pg_query>=6.1.0<7:databases/rubygem-pg_query \ rubygem-prometheus-client-mmap>=1.2.8<1.3:devel/rubygem-prometheus-client-mmap \ - rubygem-redis>3.0.0<6.0.0:databases/rubygem-redis + rubygem-redis-gitlab>3.0.0<6.0.0:databases/rubygem-redis-gitlab USES= gem diff --git a/devel/rubygem-redis-store-gitlab/Makefile b/devel/rubygem-redis-store-gitlab/Makefile new file mode 100644 index 000000000000..773cb856202b --- /dev/null +++ b/devel/rubygem-redis-store-gitlab/Makefile @@ -0,0 +1,21 @@ +PORTNAME= redis-store +PORTVERSION= 1.11.0 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Namespaced Redis stores for Ruby web frameworks +WWW= https://redis-store.org/redis-store/ \ + https://github.com/redis-store/redis-store + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/MIT-LICENSE + +RUN_DEPENDS= rubygem-redis-gitlab>=4<6:databases/rubygem-redis-gitlab + +USES= gem + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/devel/rubygem-redis-store-gitlab/distinfo b/devel/rubygem-redis-store-gitlab/distinfo new file mode 100644 index 000000000000..52ee9cf94f8a --- /dev/null +++ b/devel/rubygem-redis-store-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1724084822 +SHA256 (rubygem/redis-store-1.11.0.gem) = edc4f3e239dcd1fdd9905584e6b1e623a84618e14436e6e8a07c70891008eda4 +SIZE (rubygem/redis-store-1.11.0.gem) = 27136 diff --git a/devel/rubygem-redis-store-gitlab/pkg-descr b/devel/rubygem-redis-store-gitlab/pkg-descr new file mode 100644 index 000000000000..6233c917129f --- /dev/null +++ b/devel/rubygem-redis-store-gitlab/pkg-descr @@ -0,0 +1,2 @@ +Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web +frameworks. diff --git a/mail/rubygem-gitlab-mail_room/Makefile b/mail/rubygem-gitlab-mail_room/Makefile index 03f95cd1e342..009cdaf82117 100644 --- a/mail/rubygem-gitlab-mail_room/Makefile +++ b/mail/rubygem-gitlab-mail_room/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-mail_room PORTVERSION= 0.0.27 +PORTREVISION= 1 CATEGORIES= mail rubygems MASTER_SITES= RG @@ -13,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-jwt>=2.0:www/rubygem-jwt \ rubygem-net-imap>=0.2.1:mail/rubygem-net-imap \ rubygem-oauth2-gitlab>=1.4.4<3:net/rubygem-oauth2-gitlab \ - rubygem-redis>=5<6:databases/rubygem-redis \ - rubygem-redis-namespace110>=1.8.2:databases/rubygem-redis-namespace110 + rubygem-redis-gitlab>=5<6:databases/rubygem-redis-gitlab \ + rubygem-redis-namespace-gitlab>=1.8.2:databases/rubygem-redis-namespace-gitlab USES= gem diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 760e8974f535..5bb530eb8a42 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760008255 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.3.4/v18.3.4.mod) = 2ec01cce9df32ed086dd50ebf5d7d120d6edffe83b9ea78dbfba19d1e92d77d2 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.3.4/v18.3.4.mod) = 10172 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.3.4/v18.3.4.zip) = 5dabb72e31f961d5792026dee08992550ddc44a19cfb1c0a1bfe9afaf7ece058 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.3.4/v18.3.4.zip) = 1790427 +TIMESTAMP = 1761126616 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.3.5/v18.3.5.mod) = 2ec01cce9df32ed086dd50ebf5d7d120d6edffe83b9ea78dbfba19d1e92d77d2 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.3.5/v18.3.5.mod) = 10172 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.3.5/v18.3.5.zip) = 0cb526c472e87831c2a2c97c34004a420fa4a58726999ec4ab6537f27524c575 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.3.5/v18.3.5.zip) = 1790545 diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo index c923c6085884..1f1c80a1bf50 100644 --- a/net/rubygem-gitlab-kas-grpc/distinfo +++ b/net/rubygem-gitlab-kas-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760008270 -SHA256 (rubygem/gitlab-kas-grpc-18.3.4.gem) = 3a9f7d4f7ed848ed4b2e7de4a833e18821b2949dd5c2e2c03287961ff846d189 -SIZE (rubygem/gitlab-kas-grpc-18.3.4.gem) = 10752 +TIMESTAMP = 1761126631 +SHA256 (rubygem/gitlab-kas-grpc-18.3.5.gem) = 0bff5fc48f431f463c017133492908dece35ba9a911a283147fc83741ec2be89 +SIZE (rubygem/gitlab-kas-grpc-18.3.5.gem) = 10752 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 8b55fdde3070..73f31046db7a 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760008257 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.3.4/go.mod) = f009bb2f145a5e8bfa40069b413d54c6212f0062253d9de94dc93e61b93b2a96 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.3.4/go.mod) = 3436 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.3.4/gitlab-pages-v18.3.4.tar.bz2) = deb178bb803807fbbff6ee783b83cab0911fd896ae2bd7792f52a6582caa87f8 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.3.4/gitlab-pages-v18.3.4.tar.bz2) = 236398 +TIMESTAMP = 1761126618 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.3.5/go.mod) = f009bb2f145a5e8bfa40069b413d54c6212f0062253d9de94dc93e61b93b2a96 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.3.5/go.mod) = 3436 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.3.5/gitlab-pages-v18.3.5.tar.bz2) = 38b55ec6e2a9c0b63522e83ff7480654531d5bc206fb0a4f7fb5916c74081b38 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.3.5/gitlab-pages-v18.3.5.tar.bz2) = 236409 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 5d94bf6f2ab7..9ef1833c0df6 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760008269 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.3.4/go.mod) = a06961ad67888e3ff8e8fe5485b13d3ba413f783085338f35617899c0ff9df46 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.3.4/go.mod) = 9331 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.3.4/gitlab-foss-v18.3.4.tar.bz2) = 7dc2674dd29204f3ad154cb90f31eb91b4549f78a4a45d32401faee70be76136 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.3.4/gitlab-foss-v18.3.4.tar.bz2) = 122267479 +TIMESTAMP = 1761126630 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.3.5/go.mod) = a06961ad67888e3ff8e8fe5485b13d3ba413f783085338f35617899c0ff9df46 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.3.5/go.mod) = 9331 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.3.5/gitlab-foss-v18.3.5.tar.bz2) = a3fdaee042b98938b6b0d663d297f50b3f7468741b1def98895f991be5cb7fb2 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.3.5/gitlab-foss-v18.3.5.tar.bz2) = 122289928 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 77fd23293101..1e7f110d2dd8 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -182,10 +182,10 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.13.0<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=1.1.3:devel/rubygem-device_detector \ - rubygem-redis>=5.4.1<5.5:databases/rubygem-redis \ + rubygem-redis-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-gitlab \ rubygem-redis-client>=0.25.1<1:databases/rubygem-redis-client \ rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \ - rubygem-redis-clustering>=5.4.1<5.5:databases/rubygem-redis-clustering \ + rubygem-redis-clustering-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-clustering-gitlab \ rubygem-connection_pool>=2.5.3<2.6:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \ rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index d7451fad1606..f8a74c64788b 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ -GITLAB_VERSION= 18.3.4 -GITLAB_PORTREVISION= 3 +GITLAB_VERSION= 18.3.5 +GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index d96db7593374..1ac0e8dc35ce 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1760008203 -SHA256 (gitlab-foss-v18.3.4.tar.bz2) = 7dc2674dd29204f3ad154cb90f31eb91b4549f78a4a45d32401faee70be76136 -SIZE (gitlab-foss-v18.3.4.tar.bz2) = 122267479 -TIMESTAMP = 1760008249 -SHA256 (gitlab-v18.3.4-ee.tar.bz2) = a7febfcce3f98d8cf46714631032b7f43c3df057a24d92491f6d57cc32b385da -SIZE (gitlab-v18.3.4-ee.tar.bz2) = 138182651 +TIMESTAMP = 1761126561 +SHA256 (gitlab-foss-v18.3.5.tar.bz2) = a3fdaee042b98938b6b0d663d297f50b3f7468741b1def98895f991be5cb7fb2 +SIZE (gitlab-foss-v18.3.5.tar.bz2) = 122289928 +TIMESTAMP = 1761126604 +SHA256 (gitlab-v18.3.5-ee.tar.bz2) = 27d8c7de165fe25714305a070707626635f5d9f397837a86279b1ac875576732 +SIZE (gitlab-v18.3.5-ee.tar.bz2) = 138198849 diff --git a/www/rubygem-coverband/Makefile b/www/rubygem-coverband/Makefile index 2e1e1e7adbc2..53bf6b9cf467 100644 --- a/www/rubygem-coverband/Makefile +++ b/www/rubygem-coverband/Makefile @@ -1,5 +1,6 @@ PORTNAME= coverband PORTVERSION= 6.1.5 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG @@ -11,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \ - rubygem-redis>=3.0:databases/rubygem-redis + rubygem-redis-gitlab>=3.0:databases/rubygem-redis-gitlab USES= gem shebangfix diff --git a/www/rubygem-redis-rack-gitlab/Makefile b/www/rubygem-redis-rack-gitlab/Makefile index f330ace9ea51..dd44fd2612b4 100644 --- a/www/rubygem-redis-rack-gitlab/Makefile +++ b/www/rubygem-redis-rack-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= redis-rack PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -13,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-rack-session10>=0.2.0:www/rubygem-rack-session10 \ - rubygem-redis-store>=1.2<2:devel/rubygem-redis-store + rubygem-redis-store-gitlab>=1.2<2:devel/rubygem-redis-store-gitlab USES= gemhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510262012.59QKCdh6088634>