git: 9178ac990844 - 2025Q4 - www/gitlab: fix regression from 5028178941fc081cd43354ea03ceda365a12f73d
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 26 Oct 2025 20:12:37 UTC
The branch 2025Q4 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9178ac990844a7724e5c121faf0e12dbd356040b
commit 9178ac990844a7724e5c121faf0e12dbd356040b
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-10-19 07:15:46 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-10-26 18:22:02 +0000
www/gitlab: fix regression from 5028178941fc081cd43354ea03ceda365a12f73d
this fixes a depedency conflict with rubygem-logger which was added into
package security/rubygem-omniauth which conflicts with rubygem-logger-gitlab
(cherry picked from commit 5c2597808c0577ebfe009a65b4ddf591510ee1fc)
---
net/Makefile | 1 +
net/rubygem-gitlab_omniauth-ldap-gitlab/Makefile | 23 ++++++++++++++++++++
net/rubygem-gitlab_omniauth-ldap-gitlab/distinfo | 3 +++
net/rubygem-gitlab_omniauth-ldap-gitlab/pkg-descr | 1 +
net/rubygem-omniauth-auth0-gitlab/Makefile | 3 ++-
net/rubygem-omniauth-github-gitlab/Makefile | 3 ++-
net/rubygem-omniauth-google-oauth2-gitlab/Makefile | 3 ++-
net/rubygem-omniauth-oauth2-gitlab/Makefile | 3 ++-
net/rubygem-omniauth_openid_connect/Makefile | 3 ++-
security/Makefile | 2 ++
.../rubygem-omniauth-atlassian-oauth2/Makefile | 4 ++--
security/rubygem-omniauth-gl/Makefile | 25 ++++++++++++++++++++++
security/rubygem-omniauth-gl/distinfo | 3 +++
security/rubygem-omniauth-gl/pkg-descr | 1 +
security/rubygem-omniauth-saml-gitlab/Makefile | 3 ++-
.../Makefile | 19 ++++++++++++++++
.../distinfo | 3 +++
.../pkg-descr | 1 +
www/gitlab/Makefile | 6 +++---
www/gitlab/Makefile.common | 2 +-
20 files changed, 100 insertions(+), 12 deletions(-)
diff --git a/net/Makefile b/net/Makefile
index a2ef4aa10d57..333cd74fa041 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1336,6 +1336,7 @@
SUBDIR += rubygem-gitlab-fog-azure-rm
SUBDIR += rubygem-gitlab-kas-grpc
SUBDIR += rubygem-gitlab_omniauth-ldap
+ SUBDIR += rubygem-gitlab_omniauth-ldap-gitlab
SUBDIR += rubygem-google-cloud-bigquery
SUBDIR += rubygem-google-cloud-bigtable
SUBDIR += rubygem-google-cloud-bigtable-admin-v2
diff --git a/net/rubygem-gitlab_omniauth-ldap-gitlab/Makefile b/net/rubygem-gitlab_omniauth-ldap-gitlab/Makefile
new file mode 100644
index 000000000000..01bc3496a74b
--- /dev/null
+++ b/net/rubygem-gitlab_omniauth-ldap-gitlab/Makefile
@@ -0,0 +1,23 @@
+PORTNAME= gitlab_omniauth-ldap
+PORTVERSION= 2.2.0
+PORTREVISION= 0
+CATEGORIES= net rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= LDAP strategy for OmniAuth
+WWW= https://gitlab.com/gitlab-org/omniauth-ldap
+
+LICENSE= MIT
+
+RUN_DEPENDS= rubygem-net-ldap>=0.16<1:net/rubygem-net-ldap \
+ rubygem-omniauth-gl>=1.3<3:security/rubygem-omniauth-gl \
+ rubygem-pyu-ruby-sasl>=0.0.3.3<0.1:security/rubygem-pyu-ruby-sasl \
+ rubygem-rubyntlm>=0.5<1:net/rubygem-rubyntlm
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/net/rubygem-gitlab_omniauth-ldap-gitlab/distinfo b/net/rubygem-gitlab_omniauth-ldap-gitlab/distinfo
new file mode 100644
index 000000000000..c58ac6a6327a
--- /dev/null
+++ b/net/rubygem-gitlab_omniauth-ldap-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1658815502
+SHA256 (rubygem/gitlab_omniauth-ldap-2.2.0.gem) = bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c
+SIZE (rubygem/gitlab_omniauth-ldap-2.2.0.gem) = 15360
diff --git a/net/rubygem-gitlab_omniauth-ldap-gitlab/pkg-descr b/net/rubygem-gitlab_omniauth-ldap-gitlab/pkg-descr
new file mode 100644
index 000000000000..cd376560a430
--- /dev/null
+++ b/net/rubygem-gitlab_omniauth-ldap-gitlab/pkg-descr
@@ -0,0 +1 @@
+A LDAP strategy for OmniAuth.
diff --git a/net/rubygem-omniauth-auth0-gitlab/Makefile b/net/rubygem-omniauth-auth0-gitlab/Makefile
index e841d04d397e..5f41c19943cb 100644
--- a/net/rubygem-omniauth-auth0-gitlab/Makefile
+++ b/net/rubygem-omniauth-auth0-gitlab/Makefile
@@ -1,5 +1,6 @@
PORTNAME= omniauth-auth0
PORTVERSION= 3.1.1
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -gitlab
@@ -10,7 +11,7 @@ WWW= https://github.com/auth0/omniauth-auth0
LICENSE= MIT
-RUN_DEPENDS= rubygem-omniauth>=2.0<3:security/rubygem-omniauth \
+RUN_DEPENDS= rubygem-omniauth-gl>=2.0<3:security/rubygem-omniauth-gl \
rubygem-omniauth-oauth2-gitlab>=1.4<2:net/rubygem-omniauth-oauth2-gitlab
USES= gem
diff --git a/net/rubygem-omniauth-github-gitlab/Makefile b/net/rubygem-omniauth-github-gitlab/Makefile
index 01f1054ca218..527adc4c8d86 100644
--- a/net/rubygem-omniauth-github-gitlab/Makefile
+++ b/net/rubygem-omniauth-github-gitlab/Makefile
@@ -1,5 +1,6 @@
PORTNAME= omniauth-github
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -gitlab
@@ -10,7 +11,7 @@ WWW= https://github.com/omniauth/omniauth-github
LICENSE= MIT
-RUN_DEPENDS= rubygem-omniauth>=2.0<3:security/rubygem-omniauth \
+RUN_DEPENDS= rubygem-omniauth-gl>=2.0<3:security/rubygem-omniauth-gl \
rubygem-omniauth-oauth2-gitlab>=1.8<2:net/rubygem-omniauth-oauth2-gitlab
USES= gem
diff --git a/net/rubygem-omniauth-google-oauth2-gitlab/Makefile b/net/rubygem-omniauth-google-oauth2-gitlab/Makefile
index 3e17f9c5b405..a1c37330a3df 100644
--- a/net/rubygem-omniauth-google-oauth2-gitlab/Makefile
+++ b/net/rubygem-omniauth-google-oauth2-gitlab/Makefile
@@ -1,5 +1,6 @@
PORTNAME= omniauth-google-oauth2
PORTVERSION= 1.1.2
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -gitlab
@@ -12,7 +13,7 @@ LICENSE= MIT
RUN_DEPENDS= rubygem-jwt>=2.0:www/rubygem-jwt \
rubygem-oauth2-gitlab>=2.0<3:net/rubygem-oauth2-gitlab \
- rubygem-omniauth>=2.0<3:security/rubygem-omniauth \
+ rubygem-omniauth-gl>=2.0<3:security/rubygem-omniauth-gl \
rubygem-omniauth-oauth2-gitlab>=1.8<2:net/rubygem-omniauth-oauth2-gitlab
USES= gem
diff --git a/net/rubygem-omniauth-oauth2-gitlab/Makefile b/net/rubygem-omniauth-oauth2-gitlab/Makefile
index d120f0f01af6..031ae569a0c8 100644
--- a/net/rubygem-omniauth-oauth2-gitlab/Makefile
+++ b/net/rubygem-omniauth-oauth2-gitlab/Makefile
@@ -1,5 +1,6 @@
PORTNAME= omniauth-oauth2
PORTVERSION= 1.8.0
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -gitlab
@@ -12,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
RUN_DEPENDS= rubygem-oauth2-gitlab>=1.4<3:net/rubygem-oauth2-gitlab \
- rubygem-omniauth>=1.9<3:security/rubygem-omniauth
+ rubygem-omniauth-gl>=1.9<3:security/rubygem-omniauth-gl
USES= gem
diff --git a/net/rubygem-omniauth_openid_connect/Makefile b/net/rubygem-omniauth_openid_connect/Makefile
index 18269cc29e33..801d04ad25f6 100644
--- a/net/rubygem-omniauth_openid_connect/Makefile
+++ b/net/rubygem-omniauth_openid_connect/Makefile
@@ -1,5 +1,6 @@
PORTNAME= omniauth_openid_connect
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -10,7 +11,7 @@ WWW= https://github.com/m0n9oose/omniauth_openid_connect
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= rubygem-omniauth>=1.9<3:security/rubygem-omniauth \
+RUN_DEPENDS= rubygem-omniauth-gl>=1.9<3:security/rubygem-omniauth-gl \
rubygem-openid_connect>=2.2<3:net/rubygem-openid_connect
USES= gem
diff --git a/security/Makefile b/security/Makefile
index 7066817c71ba..3a1c01a20c89 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1196,6 +1196,7 @@
SUBDIR += rubygem-omniauth-cas
SUBDIR += rubygem-omniauth-dingtalk-oauth2
SUBDIR += rubygem-omniauth-gitlab
+ SUBDIR += rubygem-omniauth-gl
SUBDIR += rubygem-omniauth-jwt
SUBDIR += rubygem-omniauth-multipassword
SUBDIR += rubygem-omniauth-multipassword2
@@ -1207,6 +1208,7 @@
SUBDIR += rubygem-omniauth-saml1
SUBDIR += rubygem-omniauth-shibboleth
SUBDIR += rubygem-omniauth-shibboleth-redux
+ SUBDIR += rubygem-omniauth-shibboleth-redux-gitlab
SUBDIR += rubygem-omniauth1
SUBDIR += rubygem-openssl
SUBDIR += rubygem-openssl-ccm
diff --git a/security/rubygem-omniauth-atlassian-oauth2/Makefile b/security/rubygem-omniauth-atlassian-oauth2/Makefile
index 84adfad8551b..2950bb0bf995 100644
--- a/security/rubygem-omniauth-atlassian-oauth2/Makefile
+++ b/security/rubygem-omniauth-atlassian-oauth2/Makefile
@@ -1,6 +1,6 @@
PORTNAME= omniauth-atlassian-oauth2
PORTVERSION= 0.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security rubygems
MASTER_SITES= RG
@@ -10,7 +10,7 @@ WWW= https://github.com/aguynamedben/omniauth-atlassian-oauth2
LICENSE= MIT
-RUN_DEPENDS= rubygem-omniauth>=1.1.1:security/rubygem-omniauth \
+RUN_DEPENDS= rubygem-omniauth-gl>=1.1.1:security/rubygem-omniauth-gl \
rubygem-omniauth-oauth2-gitlab>=1.5:net/rubygem-omniauth-oauth2-gitlab
USES= gem
diff --git a/security/rubygem-omniauth-gl/Makefile b/security/rubygem-omniauth-gl/Makefile
new file mode 100644
index 000000000000..ab0fee80121c
--- /dev/null
+++ b/security/rubygem-omniauth-gl/Makefile
@@ -0,0 +1,25 @@
+PORTNAME= omniauth
+PORTVERSION= 2.1.4
+CATEGORIES= security rubygems
+MASTER_SITES= RG
+# this port is a replacement for rubygem-omniauth which fixes depedency conflicts
+# normally suffix gitlab is used, but that package already exists, so use gl here
+PKGNAMESUFFIX= -gl
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Generalized Rack framework for multiple-provider authentication
+WWW= https://github.com/omniauth/omniauth
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS= rubygem-hashie>=3.4.6:devel/rubygem-hashie \
+ 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
+
+USES= cpe gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/security/rubygem-omniauth-gl/distinfo b/security/rubygem-omniauth-gl/distinfo
new file mode 100644
index 000000000000..c01bb1905045
--- /dev/null
+++ b/security/rubygem-omniauth-gl/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1759774917
+SHA256 (rubygem/omniauth-2.1.4.gem) = 42a05b0496f0d22e1dd85d42aaf602f064e36bb47a6826a27ab55e5ba608763c
+SIZE (rubygem/omniauth-2.1.4.gem) = 23552
diff --git a/security/rubygem-omniauth-gl/pkg-descr b/security/rubygem-omniauth-gl/pkg-descr
new file mode 100644
index 000000000000..af12500a727f
--- /dev/null
+++ b/security/rubygem-omniauth-gl/pkg-descr
@@ -0,0 +1 @@
+A generalized Rack framework for multiple-provider authentication.
diff --git a/security/rubygem-omniauth-saml-gitlab/Makefile b/security/rubygem-omniauth-saml-gitlab/Makefile
index df26eba1210b..f509842c6e31 100644
--- a/security/rubygem-omniauth-saml-gitlab/Makefile
+++ b/security/rubygem-omniauth-saml-gitlab/Makefile
@@ -1,5 +1,6 @@
PORTNAME= omniauth-saml
PORTVERSION= 2.2.4
+PORTREVISION= 1
CATEGORIES= security rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -gitlab
@@ -11,7 +12,7 @@ WWW= https://github.com/omniauth/omniauth-saml
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-omniauth>=2.1<3:security/rubygem-omniauth \
+RUN_DEPENDS= rubygem-omniauth-gl>=2.1<3:security/rubygem-omniauth-gl \
rubygem-ruby-saml-gitlab>=1.18<2:security/rubygem-ruby-saml-gitlab
USES= gem
diff --git a/security/rubygem-omniauth-shibboleth-redux-gitlab/Makefile b/security/rubygem-omniauth-shibboleth-redux-gitlab/Makefile
new file mode 100644
index 000000000000..bea66395f74c
--- /dev/null
+++ b/security/rubygem-omniauth-shibboleth-redux-gitlab/Makefile
@@ -0,0 +1,19 @@
+PORTNAME= omniauth-shibboleth-redux
+PORTVERSION= 2.0.0
+CATEGORIES= security rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= OmniAuth strategy for Shibboleth
+WWW= https://www.rubydoc.info/gems/omniauth-shibboleth-redux/2.0.0
+
+LICENSE= MIT
+
+RUN_DEPENDS= rubygem-omniauth-gl>=2.0:security/rubygem-omniauth-gl
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/security/rubygem-omniauth-shibboleth-redux-gitlab/distinfo b/security/rubygem-omniauth-shibboleth-redux-gitlab/distinfo
new file mode 100644
index 000000000000..b846c1942b39
--- /dev/null
+++ b/security/rubygem-omniauth-shibboleth-redux-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1687445435
+SHA256 (rubygem/omniauth-shibboleth-redux-2.0.0.gem) = e9b353fd103405fcc8549e8510b9cad857acf0b286d764fac5dba8a93ab8ffe1
+SIZE (rubygem/omniauth-shibboleth-redux-2.0.0.gem) = 11776
diff --git a/security/rubygem-omniauth-shibboleth-redux-gitlab/pkg-descr b/security/rubygem-omniauth-shibboleth-redux-gitlab/pkg-descr
new file mode 100644
index 000000000000..7b858f7c62ae
--- /dev/null
+++ b/security/rubygem-omniauth-shibboleth-redux-gitlab/pkg-descr
@@ -0,0 +1 @@
+OmniAuth Shibboleth strategies for OmniAuth 2.x
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index ee4f2c43159a..be55bcaf06ef 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -70,14 +70,14 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rexml>=3.4.1<3.5:textproc/rubygem-rexml \
rubygem-ruby-saml-gitlab>=1.18.1<2:security/rubygem-ruby-saml-gitlab \
rubygem-omniauth-saml-gitlab>=2.2.4<3:security/rubygem-omniauth-saml-gitlab \
- rubygem-omniauth>=2.1.3<3:security/rubygem-omniauth \
+ rubygem-omniauth-gl>=2.1.3<3:security/rubygem-omniauth-gl \
rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \
rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \
rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \
rubygem-omniauth-github-gitlab>=2.0.1<2.1:net/rubygem-omniauth-github-gitlab \
rubygem-omniauth-google-oauth2-gitlab>=1.1<2:net/rubygem-omniauth-google-oauth2-gitlab \
rubygem-omniauth-oauth2-generic-gitlab>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic-gitlab \
- rubygem-omniauth-shibboleth-redux>=2.0<3:security/rubygem-omniauth-shibboleth-redux \
+ rubygem-omniauth-shibboleth-redux-gitlab>=2.0<3:security/rubygem-omniauth-shibboleth-redux-gitlab \
rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \
rubygem-openid_connect>=2.3.1<2.4:net/rubygem-openid_connect \
rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
@@ -96,7 +96,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \
rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \
rubygem-gpgme>=2.0.25<2.1.0:security/rubygem-gpgme \
- rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \
+ rubygem-gitlab_omniauth-ldap-gitlab>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap-gitlab \
rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \
rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 9c6490ec0341..5337de72a2c5 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
GITLAB_VERSION= 18.3.4
-GITLAB_PORTREVISION= 0
+GITLAB_PORTREVISION= 2
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml