Date: Sat, 17 Jan 2026 08:16:14 +0000 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: eda0e0e1ef9a - main - www/gitlab: fix regression from 1a85e2e5e957e2a49ffb3c6563b7430d9902202b Message-ID: <696b454e.f5f5.6dd873d9@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=eda0e0e1ef9a459a971fab2a730568bf7656aa60 commit eda0e0e1ef9a459a971fab2a730568bf7656aa60 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2026-01-17 07:06:03 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2026-01-17 08:16:10 +0000 www/gitlab: fix regression from 1a85e2e5e957e2a49ffb3c6563b7430d9902202b Gitlab requires hashie < 5.1 --- devel/Makefile | 2 ++ devel/rubygem-hashie-gitlab/Makefile | 20 ++++++++++++++++++++ devel/rubygem-hashie-gitlab/distinfo | 3 +++ devel/rubygem-hashie-gitlab/pkg-descr | 9 +++++++++ devel/rubygem-snaky_hash-gitlab/Makefile | 21 +++++++++++++++++++++ devel/rubygem-snaky_hash-gitlab/distinfo | 3 +++ devel/rubygem-snaky_hash-gitlab/pkg-descr | 7 +++++++ net/rubygem-oauth2-gitlab/Makefile | 3 ++- security/rubygem-omniauth-gl/Makefile | 3 ++- .../rubygem-elasticsearch-model-gitlab/Makefile | 4 ++-- www/gitlab/Makefile | 2 +- 11 files changed, 72 insertions(+), 5 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index 5ba5708140aa..0aac73eb41d8 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -7550,6 +7550,7 @@ SUBDIR += rubygem-hashdiff SUBDIR += rubygem-hashery SUBDIR += rubygem-hashie + SUBDIR += rubygem-hashie-gitlab SUBDIR += rubygem-hashie-forbidden_attributes SUBDIR += rubygem-health_check SUBDIR += rubygem-health_check-rails-gitlab @@ -8067,6 +8068,7 @@ SUBDIR += rubygem-slow_enumerator_tools SUBDIR += rubygem-smart_properties SUBDIR += rubygem-snaky_hash + SUBDIR += rubygem-snaky_hash-gitlab SUBDIR += rubygem-snowplow-tracker SUBDIR += rubygem-soap4r SUBDIR += rubygem-solve diff --git a/devel/rubygem-hashie-gitlab/Makefile b/devel/rubygem-hashie-gitlab/Makefile new file mode 100644 index 000000000000..7987b760ad08 --- /dev/null +++ b/devel/rubygem-hashie-gitlab/Makefile @@ -0,0 +1,20 @@ +PORTNAME= hashie +PORTVERSION= 5.0.0 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Simple collection of useful Hash extensions +WWW= https://github.com/hashie/hashie + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab + +USES= gem + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/devel/rubygem-hashie-gitlab/distinfo b/devel/rubygem-hashie-gitlab/distinfo new file mode 100644 index 000000000000..61140c04e79f --- /dev/null +++ b/devel/rubygem-hashie-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1768552629 +SHA256 (rubygem/hashie-5.0.0.gem) = 9d6c4e51f2a36d4616cbc8a322d619a162d8f42815a792596039fc95595603da +SIZE (rubygem/hashie-5.0.0.gem) = 54784 diff --git a/devel/rubygem-hashie-gitlab/pkg-descr b/devel/rubygem-hashie-gitlab/pkg-descr new file mode 100644 index 000000000000..633aa0cf4d5c --- /dev/null +++ b/devel/rubygem-hashie-gitlab/pkg-descr @@ -0,0 +1,9 @@ +Hashie is available as a RubyGem which extend Hashes and make them more useful. + +- Hashie::Mash: gives simple pseudo-object functionality that can be built from + hashes and easily extended +- Hashie::Dash: has a discrete set of defined properties and only those + properties may be set on the hash. +- Hashie::Trash: a Dash that allows you to translate keys on initialization. +- Hashie::Clash: allows you to easily construct complex hashes using method + notation chaining. diff --git a/devel/rubygem-snaky_hash-gitlab/Makefile b/devel/rubygem-snaky_hash-gitlab/Makefile new file mode 100644 index 000000000000..a11c75dd9247 --- /dev/null +++ b/devel/rubygem-snaky_hash-gitlab/Makefile @@ -0,0 +1,21 @@ +PORTNAME= snaky_hash +PORTVERSION= 2.0.3 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Hashie::Mash joint to make \#snakelife better +WWW= https://gitlab.com/oauth-xx/snaky_hash + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-hashie-gitlab>=0.1.0<6:devel/rubygem-hashie-gitlab \ + rubygem-version_gem>=1.1.8<3:devel/rubygem-version_gem + +USES= gem + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/devel/rubygem-snaky_hash-gitlab/distinfo b/devel/rubygem-snaky_hash-gitlab/distinfo new file mode 100644 index 000000000000..b35d046b6c89 --- /dev/null +++ b/devel/rubygem-snaky_hash-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1748495991 +SHA256 (rubygem/snaky_hash-2.0.3.gem) = 25a3d299566e8153fb02fa23fd9a9358845950f7a523ddbbe1fa1e0d79a6d456 +SIZE (rubygem/snaky_hash-2.0.3.gem) = 31232 diff --git a/devel/rubygem-snaky_hash-gitlab/pkg-descr b/devel/rubygem-snaky_hash-gitlab/pkg-descr new file mode 100644 index 000000000000..1ffd03c68b5c --- /dev/null +++ b/devel/rubygem-snaky_hash-gitlab/pkg-descr @@ -0,0 +1,7 @@ +SnakyHash gem is used by the oauth and oauth2 gems, and others, to normalize +hash keys and lookups, and provide a nice psuedo-object interface. + +It has its roots in the Rash (specifically the rash_alt flavor), which is a +special Mash, made popular by the hashie gem. + +Classes that include SnakyHash::Snake should inherit from Hashie::Mash. diff --git a/net/rubygem-oauth2-gitlab/Makefile b/net/rubygem-oauth2-gitlab/Makefile index d687b86a9cda..78ecfaae1108 100644 --- a/net/rubygem-oauth2-gitlab/Makefile +++ b/net/rubygem-oauth2-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= oauth2 PORTVERSION= 2.0.18 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -16,7 +17,7 @@ RUN_DEPENDS= rubygem-faraday-gitlab>=0.17.3<4:www/rubygem-faraday-gitlab \ rubygem-logger-gitlab>=1.2<2:devel/rubygem-logger-gitlab \ rubygem-multi_xml>=0.5<1:textproc/rubygem-multi_xml \ rubygem-rack>=1.2,3<4,3:www/rubygem-rack \ - rubygem-snaky_hash>=2.0.3<3:devel/rubygem-snaky_hash \ + rubygem-snaky_hash-gitlab>=2.0.3<3:devel/rubygem-snaky_hash-gitlab \ rubygem-version_gem>=1.1.9<2:devel/rubygem-version_gem USES= gem diff --git a/security/rubygem-omniauth-gl/Makefile b/security/rubygem-omniauth-gl/Makefile index ab0fee80121c..27effdf64204 100644 --- a/security/rubygem-omniauth-gl/Makefile +++ b/security/rubygem-omniauth-gl/Makefile @@ -1,5 +1,6 @@ PORTNAME= omniauth PORTVERSION= 2.1.4 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG # this port is a replacement for rubygem-omniauth which fixes depedency conflicts @@ -13,7 +14,7 @@ WWW= https://github.com/omniauth/omniauth LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-hashie>=3.4.6:devel/rubygem-hashie \ +RUN_DEPENDS= rubygem-hashie-gitlab>=3.4.6:devel/rubygem-hashie-gitlab \ rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab \ rubygem-rack>=2.2.3,3:www/rubygem-rack \ rubygem-rack-protection3>=0:www/rubygem-rack-protection3 diff --git a/textproc/rubygem-elasticsearch-model-gitlab/Makefile b/textproc/rubygem-elasticsearch-model-gitlab/Makefile index 36eadaa530da..ed4af9d5e11d 100644 --- a/textproc/rubygem-elasticsearch-model-gitlab/Makefile +++ b/textproc/rubygem-elasticsearch-model-gitlab/Makefile @@ -1,6 +1,6 @@ PORTNAME= elasticsearch-model PORTVERSION= 7.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-activesupport-gitlab>=3:devel/rubygem-activesupport-gitlab \ rubygem-elasticsearch-gitlab>=7<8:textproc/rubygem-elasticsearch-gitlab \ - rubygem-hashie>=0:devel/rubygem-hashie + rubygem-hashie-gitlab>=0:devel/rubygem-hashie-gitlab USES= gem diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 7e6e299358e5..46663a013874 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -110,7 +110,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-graphql>=2.5.11<2.6:devel/rubygem-graphql \ rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \ rubygem-ffaker>=2.25.0<3:devel/rubygem-ffaker \ - rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \ + rubygem-hashie-gitlab>=5.0.0<5.1:devel/rubygem-hashie-gitlab \ rubygem-kaminari-rails-gitlab>=1.2.2<1.3:www/rubygem-kaminari-rails-gitlab \ rubygem-hamlit-gitlab>=3.0.3<3.1:www/rubygem-hamlit-gitlab \ rubygem-carrierwave-gitlab>=1.3.4<2.0:www/rubygem-carrierwave-gitlab \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?696b454e.f5f5.6dd873d9>