git: 1908b780ae8b - main - www/gitlab: further isolate port from rexml gem
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Dec 2024 11:49:35 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1908b780ae8b3998248c85105ab5253d80224692
commit 1908b780ae8b3998248c85105ab5253d80224692
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-12-26 11:36:54 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-12-26 11:49:27 +0000
www/gitlab: further isolate port from rexml gem
---
devel/Makefile | 2 ++
devel/rubygem-CFPropertyList-gitlab/Makefile | 22 +++++++++++++++++
devel/rubygem-CFPropertyList-gitlab/distinfo | 3 +++
devel/rubygem-CFPropertyList-gitlab/pkg-descr | 3 +++
devel/rubygem-license_finder-gitlab/Makefile | 32 +++++++++++++++++++++++++
devel/rubygem-license_finder-gitlab/distinfo | 3 +++
devel/rubygem-license_finder-gitlab/pkg-descr | 4 ++++
net/Makefile | 1 +
net/rubygem-fog-aliyun-gitlab/Makefile | 25 +++++++++++++++++++
net/rubygem-fog-aliyun-gitlab/distinfo | 3 +++
net/rubygem-fog-aliyun-gitlab/pkg-descr | 1 +
security/Makefile | 2 ++
security/rubygem-omniauth-saml-gitlab/Makefile | 21 ++++++++++++++++
security/rubygem-omniauth-saml-gitlab/distinfo | 3 +++
security/rubygem-omniauth-saml-gitlab/pkg-descr | 1 +
security/rubygem-ruby-saml-gitlab/Makefile | 22 +++++++++++++++++
security/rubygem-ruby-saml-gitlab/distinfo | 3 +++
security/rubygem-ruby-saml-gitlab/pkg-descr | 1 +
textproc/Makefile | 1 +
textproc/rubygem-kramdown-gitlab/Makefile | 3 ++-
textproc/rubygem-xml-simple-gitlab/Makefile | 20 ++++++++++++++++
textproc/rubygem-xml-simple-gitlab/distinfo | 3 +++
textproc/rubygem-xml-simple-gitlab/pkg-descr | 3 +++
www/gitlab/Makefile | 10 ++++----
www/gitlab/Makefile.common | 2 +-
25 files changed, 187 insertions(+), 7 deletions(-)
diff --git a/devel/Makefile b/devel/Makefile
index 22c1fd941f57..c59d7177c085 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -6389,6 +6389,7 @@
SUBDIR += ruby-setup.rb
SUBDIR += ruby-subversion
SUBDIR += rubygem-CFPropertyList
+ SUBDIR += rubygem-CFPropertyList-gitlab
SUBDIR += rubygem-abstract
SUBDIR += rubygem-actionpack-action_caching
SUBDIR += rubygem-actionpack-page_caching
@@ -7483,6 +7484,7 @@
SUBDIR += rubygem-librarianp
SUBDIR += rubygem-libyajl2
SUBDIR += rubygem-license_finder
+ SUBDIR += rubygem-license_finder-gitlab
SUBDIR += rubygem-licensee
SUBDIR += rubygem-licensee-gitlab
SUBDIR += rubygem-listen
diff --git a/devel/rubygem-CFPropertyList-gitlab/Makefile b/devel/rubygem-CFPropertyList-gitlab/Makefile
new file mode 100644
index 000000000000..818044f72514
--- /dev/null
+++ b/devel/rubygem-CFPropertyList-gitlab/Makefile
@@ -0,0 +1,22 @@
+PORTNAME= CFPropertyList
+PORTVERSION= 3.0.7
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Read, write and manipulate both binary and XML property lists
+WWW= https://github.com/ckruse/CFPropertyList
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \
+ rubygem-nkf>=0:net/rubygem-nkf \
+ rubygem-rexml-gitlab>=0:textproc/rubygem-rexml-gitlab
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-CFPropertyList-gitlab/distinfo b/devel/rubygem-CFPropertyList-gitlab/distinfo
new file mode 100644
index 000000000000..0fac69849593
--- /dev/null
+++ b/devel/rubygem-CFPropertyList-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1708449578
+SHA256 (rubygem/CFPropertyList-3.0.7.gem) = c45721614aca8d5eb6fa216f2ec28ec38de1a94505e9766a20e98745492c3c4c
+SIZE (rubygem/CFPropertyList-3.0.7.gem) = 18432
diff --git a/devel/rubygem-CFPropertyList-gitlab/pkg-descr b/devel/rubygem-CFPropertyList-gitlab/pkg-descr
new file mode 100644
index 000000000000..d86ad890798c
--- /dev/null
+++ b/devel/rubygem-CFPropertyList-gitlab/pkg-descr
@@ -0,0 +1,3 @@
+CFPropertyList implements class to read, manipulate and write both XML and
+binary property list files (plist(5)) as defined by Apple. Have a look at
+CFPropertyList::List for more documentation.
diff --git a/devel/rubygem-license_finder-gitlab/Makefile b/devel/rubygem-license_finder-gitlab/Makefile
new file mode 100644
index 000000000000..5cc2075fb4d5
--- /dev/null
+++ b/devel/rubygem-license_finder-gitlab/Makefile
@@ -0,0 +1,32 @@
+PORTNAME= license_finder
+PORTVERSION= 7.0.1
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Generate, verify and enforce software licenses
+WWW= https://github.com/pivotal/LicenseFinder
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-bundler>=0:sysutils/rubygem-bundler \
+ rubygem-rubyzip>=1<3:archivers/rubygem-rubyzip \
+ rubygem-thor12>=1.2.0<1.3:devel/rubygem-thor12 \
+ rubygem-tomlrb>=1.3<2.1:textproc/rubygem-tomlrb \
+ rubygem-with_env>=1.1.0<1.1.1:devel/rubygem-with_env \
+ rubygem-xml-simple-gitlab>=1.1.9<1.2:textproc/rubygem-xml-simple-gitlab
+
+USES= gem python:run shebangfix
+
+NO_ARCH= yes
+
+SHEBANG_FILES= dlf \
+ bin/license_finder_pip.py \
+ ci/scripts/*.sh
+
+PLIST_FILES= bin/license_finder \
+ bin/license_finder_pip.py
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-license_finder-gitlab/distinfo b/devel/rubygem-license_finder-gitlab/distinfo
new file mode 100644
index 000000000000..cfd360555de1
--- /dev/null
+++ b/devel/rubygem-license_finder-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1664810286
+SHA256 (rubygem/license_finder-7.0.1.gem) = 0b22c9567e2a8b102c7245da49ebeddaec60f66d237d2bb91b9feddf5d242f6a
+SIZE (rubygem/license_finder-7.0.1.gem) = 172544
diff --git a/devel/rubygem-license_finder-gitlab/pkg-descr b/devel/rubygem-license_finder-gitlab/pkg-descr
new file mode 100644
index 000000000000..375da5304893
--- /dev/null
+++ b/devel/rubygem-license_finder-gitlab/pkg-descr
@@ -0,0 +1,4 @@
+LicenseFinder works with your package managers to find dependencies,
+detect the licenses of the packages in them, compare those licenses
+against a user-defined list of permitted licenses, and give you an
+actionable exception report.
diff --git a/net/Makefile b/net/Makefile
index 6d02b02a8954..2ca0481b0cce 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1288,6 +1288,7 @@
SUBDIR += rubygem-epp-client-secdns
SUBDIR += rubygem-epp-client-smallregistry
SUBDIR += rubygem-fog-aliyun
+ SUBDIR += rubygem-fog-aliyun-gitlab
SUBDIR += rubygem-fog-atmos
SUBDIR += rubygem-fog-aws
SUBDIR += rubygem-fog-aws328
diff --git a/net/rubygem-fog-aliyun-gitlab/Makefile b/net/rubygem-fog-aliyun-gitlab/Makefile
new file mode 100644
index 000000000000..4156d19c5dca
--- /dev/null
+++ b/net/rubygem-fog-aliyun-gitlab/Makefile
@@ -0,0 +1,25 @@
+PORTNAME= fog-aliyun
+PORTVERSION= 0.4.0
+CATEGORIES= net rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Module for the 'fog' gem to support aliyun OSS/ECS
+WWW= https://github.com/fog/fog-aliyun
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS= rubygem-addressable>=2.8.0<2.9:www/rubygem-addressable \
+ rubygem-aliyun-sdk>=0.8.0<0.9:devel/rubygem-aliyun-sdk \
+ rubygem-fog-core>=0:devel/rubygem-fog-core \
+ rubygem-fog-json>=0:devel/rubygem-fog-json \
+ rubygem-ipaddress>=0.8<1:net/rubygem-ipaddress \
+ rubygem-xml-simple-gitlab>=1.1<2:textproc/rubygem-xml-simple-gitlab
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/net/rubygem-fog-aliyun-gitlab/distinfo b/net/rubygem-fog-aliyun-gitlab/distinfo
new file mode 100644
index 000000000000..840c552090d7
--- /dev/null
+++ b/net/rubygem-fog-aliyun-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1676989219
+SHA256 (rubygem/fog-aliyun-0.4.0.gem) = 8f2334604beb781eafbb9cd5f50141fbb2c7eb77c7f2b01f45c2e04db0e5cc38
+SIZE (rubygem/fog-aliyun-0.4.0.gem) = 46592
diff --git a/net/rubygem-fog-aliyun-gitlab/pkg-descr b/net/rubygem-fog-aliyun-gitlab/pkg-descr
new file mode 100644
index 000000000000..9514ffa8d504
--- /dev/null
+++ b/net/rubygem-fog-aliyun-gitlab/pkg-descr
@@ -0,0 +1 @@
+Fog::Aliyun is a module for the fog gem to support aliyun OSS/ECS.
diff --git a/security/Makefile b/security/Makefile
index 65023d0113b4..17651eb2c4e1 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1195,6 +1195,7 @@
SUBDIR += rubygem-omniauth-oauth2-generic-gitlab
SUBDIR += rubygem-omniauth-rails_csrf_protection
SUBDIR += rubygem-omniauth-saml
+ SUBDIR += rubygem-omniauth-saml-gitlab
SUBDIR += rubygem-omniauth-saml1
SUBDIR += rubygem-omniauth-shibboleth
SUBDIR += rubygem-omniauth-shibboleth-redux
@@ -1240,6 +1241,7 @@
SUBDIR += rubygem-ruby-hmac
SUBDIR += rubygem-ruby-rc4
SUBDIR += rubygem-ruby-saml
+ SUBDIR += rubygem-ruby-saml-gitlab
SUBDIR += rubygem-safety_net_attestation
SUBDIR += rubygem-scrypt
SUBDIR += rubygem-securecompare
diff --git a/security/rubygem-omniauth-saml-gitlab/Makefile b/security/rubygem-omniauth-saml-gitlab/Makefile
new file mode 100644
index 000000000000..eaf53aa5838e
--- /dev/null
+++ b/security/rubygem-omniauth-saml-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= omniauth-saml
+PORTVERSION= 2.2.1
+CATEGORIES= security rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= OmniAuth strategy for SAML
+WWW= https://github.com/omniauth/omniauth-saml
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS= rubygem-omniauth>=2.1<3:security/rubygem-omniauth \
+ rubygem-ruby-saml-gitlab>=1.17<2:security/rubygem-ruby-saml-gitlab
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/security/rubygem-omniauth-saml-gitlab/distinfo b/security/rubygem-omniauth-saml-gitlab/distinfo
new file mode 100644
index 000000000000..c5b4ddc6d22b
--- /dev/null
+++ b/security/rubygem-omniauth-saml-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1726548208
+SHA256 (rubygem/omniauth-saml-2.2.1.gem) = 8abb6bf8d38a50f52c7cc905d32877c7b2c79dbc9c225fcc3d3e56723411d602
+SIZE (rubygem/omniauth-saml-2.2.1.gem) = 17408
diff --git a/security/rubygem-omniauth-saml-gitlab/pkg-descr b/security/rubygem-omniauth-saml-gitlab/pkg-descr
new file mode 100644
index 000000000000..3e96d5b4bb53
--- /dev/null
+++ b/security/rubygem-omniauth-saml-gitlab/pkg-descr
@@ -0,0 +1 @@
+A generic SAML strategy for OmniAuth
diff --git a/security/rubygem-ruby-saml-gitlab/Makefile b/security/rubygem-ruby-saml-gitlab/Makefile
new file mode 100644
index 000000000000..f56dced3ac6d
--- /dev/null
+++ b/security/rubygem-ruby-saml-gitlab/Makefile
@@ -0,0 +1,22 @@
+PORTNAME= ruby-saml
+PORTVERSION= 1.17.0
+CATEGORIES= security rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= SAML toolkit for Ruby on Rails
+WWW= https://developers.onelogin.com/saml/ruby \
+ https://github.com/SAML-Toolkits/ruby-saml
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-nokogiri>=1.13.10:textproc/rubygem-nokogiri \
+ rubygem-rexml-gitlab>=0:textproc/rubygem-rexml-gitlab
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/security/rubygem-ruby-saml-gitlab/distinfo b/security/rubygem-ruby-saml-gitlab/distinfo
new file mode 100644
index 000000000000..b4adc796086c
--- /dev/null
+++ b/security/rubygem-ruby-saml-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1726081909
+SHA256 (rubygem/ruby-saml-1.17.0.gem) = 0419839ba3312d255e35fe3cc7ae155e4a241fd468796caebcf61164aa01b8a9
+SIZE (rubygem/ruby-saml-1.17.0.gem) = 76800
diff --git a/security/rubygem-ruby-saml-gitlab/pkg-descr b/security/rubygem-ruby-saml-gitlab/pkg-descr
new file mode 100644
index 000000000000..cd4444c8806e
--- /dev/null
+++ b/security/rubygem-ruby-saml-gitlab/pkg-descr
@@ -0,0 +1 @@
+SAML toolkit for Ruby on Rails
diff --git a/textproc/Makefile b/textproc/Makefile
index 2dbdd52b4b75..ef074d45f281 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -2009,6 +2009,7 @@
SUBDIR += rubygem-wikicloth
SUBDIR += rubygem-wikicloth081
SUBDIR += rubygem-xml-simple
+ SUBDIR += rubygem-xml-simple-gitlab
SUBDIR += rubygem-ya2yaml
SUBDIR += rubygem-yard
SUBDIR += rubygem-yard-chef
diff --git a/textproc/rubygem-kramdown-gitlab/Makefile b/textproc/rubygem-kramdown-gitlab/Makefile
index 9a15100f7518..87b0733d2a6a 100644
--- a/textproc/rubygem-kramdown-gitlab/Makefile
+++ b/textproc/rubygem-kramdown-gitlab/Makefile
@@ -1,5 +1,6 @@
PORTNAME= kramdown
PORTVERSION= 2.4.0
+PORTREVISION= 1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -gitlab
@@ -11,7 +12,7 @@ WWW= https://kramdown.gettalong.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= rubygem-rexml>=0:textproc/rubygem-rexml
+RUN_DEPENDS= rubygem-rexml-gitlab>=0:textproc/rubygem-rexml-gitlab
USES= cpe gem
diff --git a/textproc/rubygem-xml-simple-gitlab/Makefile b/textproc/rubygem-xml-simple-gitlab/Makefile
new file mode 100644
index 000000000000..9b08289123c4
--- /dev/null
+++ b/textproc/rubygem-xml-simple-gitlab/Makefile
@@ -0,0 +1,20 @@
+PORTNAME= xml-simple
+PORTVERSION= 1.1.9
+CATEGORIES= textproc rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Ruby take off of p5-XML-Simple
+WWW= https://github.com/maik/xml-simple
+
+LICENSE= BSD2CLAUSE RUBY
+LICENSE_COMB= dual
+
+RUN_DEPENDS= rubygem-rexml-gitlab>=0:textproc/rubygem-rexml-gitlab
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-xml-simple-gitlab/distinfo b/textproc/rubygem-xml-simple-gitlab/distinfo
new file mode 100644
index 000000000000..81582a03964a
--- /dev/null
+++ b/textproc/rubygem-xml-simple-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1664810653
+SHA256 (rubygem/xml-simple-1.1.9.gem) = d21131e519c86f1a5bc2b6d2d57d46e6998e47f18ed249b25cad86433dbd695d
+SIZE (rubygem/xml-simple-1.1.9.gem) = 12288
diff --git a/textproc/rubygem-xml-simple-gitlab/pkg-descr b/textproc/rubygem-xml-simple-gitlab/pkg-descr
new file mode 100644
index 000000000000..85dc99b842fb
--- /dev/null
+++ b/textproc/rubygem-xml-simple-gitlab/pkg-descr
@@ -0,0 +1,3 @@
+Class XmlSimple offers an easy API to read and write XML. It is a Ruby
+translation of Grant McLean's Perl module XML::Simple. Simply put,
+it automatically converts XML documents into a Ruby Hash.
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 6e27c4048a38..aaf3551a7042 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -65,7 +65,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-doorkeeper-openid_connect>=1.8.10<2:security/rubygem-doorkeeper-openid_connect \
rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \
rubygem-rexml-gitlab>=3.3.2<3.4:textproc/rubygem-rexml-gitlab \
- rubygem-ruby-saml>=1.17.0<1.18:security/rubygem-ruby-saml \
+ rubygem-ruby-saml-gitlab>=1.17.0<1.18:security/rubygem-ruby-saml-gitlab \
rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \
rubygem-omniauth-auth0-gitlab>=3.1.0<3.2.0:net/rubygem-omniauth-auth0-gitlab \
rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \
@@ -73,7 +73,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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-saml>=2.2.1<3:security/rubygem-omniauth-saml \
+ rubygem-omniauth-saml-gitlab>=2.2.1<3:security/rubygem-omniauth-saml-gitlab \
rubygem-omniauth-shibboleth-redux>=2.0<3:security/rubygem-omniauth-shibboleth-redux \
rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \
rubygem-openid_connect>=2.3.0<2.4:net/rubygem-openid_connect \
@@ -113,7 +113,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \
rubygem-fog-google-gitlab>=1.24.1<1.25:net/rubygem-fog-google-gitlab \
rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \
- rubygem-fog-aliyun>=0.4<1.0:net/rubygem-fog-aliyun \
+ rubygem-fog-aliyun-gitlab>=0.4<1.0:net/rubygem-fog-aliyun-gitlab \
rubygem-gitlab-fog-azure-rm>=2.2.0<2.3:net/rubygem-gitlab-fog-azure-rm \
rubygem-google-apis-storage_v1-gitlab>=0.29<1:devel/rubygem-google-apis-storage_v1-gitlab \
rubygem-google-cloud-storage-gitlab>=1.45.0<1.46:net/rubygem-google-cloud-storage-gitlab \
@@ -252,7 +252,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \
rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
rubygem-gitlab-dangerfiles>=4.8.0<4.9:devel/rubygem-gitlab-dangerfiles \
- rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
+ rubygem-license_finder-gitlab>=7.0.0<8:devel/rubygem-license_finder-gitlab \
rubygem-rspec>=3.0<4:devel/rubygem-rspec \
rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \
rubygem-faraday-multipart>=1.0<2:www/rubygem-faraday-multipart \
@@ -303,7 +303,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \
rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
rubygem-devfile>=0.1.1<0.2:net/rubygem-devfile \
- rubygem-CFPropertyList>=3.0.0<3.1:devel/rubygem-CFPropertyList \
+ rubygem-CFPropertyList-gitlab>=3.0.0<3.1:devel/rubygem-CFPropertyList-gitlab \
rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \
rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index ee9e90787a11..59f82d99c2a1 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
GITLAB_VERSION= 17.7.0
-GITLAB_PORTREVISION= 1
+GITLAB_PORTREVISION= 2
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml