git: a23cee176f7b - main - www/gitlab: fix regressions caused by puma upgrade
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 19 Oct 2025 12:16:03 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a23cee176f7b174d32c095b6aa1b68062e5c431e
commit a23cee176f7b174d32c095b6aa1b68062e5c431e
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-10-19 12:14:53 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-10-19 12:15:59 +0000
www/gitlab: fix regressions caused by puma upgrade
This fixes following commits:
99b692d10ed32c6a02eaaa3727400379d4692aa6
0f92b5ebfd3b3336f58a715ecf171f7e716788d5
074a308471c1dc05251985907e260a632141c3b3
PR: 289973
---
www/Makefile | 1 +
www/gitlab/Makefile | 2 +-
www/gitlab/Makefile.common | 2 +-
www/rubygem-puma-gitlab/Makefile | 21 +++++++++++++++++++++
www/rubygem-puma-gitlab/distinfo | 3 +++
www/rubygem-puma-gitlab/pkg-descr | 7 +++++++
6 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/www/Makefile b/www/Makefile
index b402998e0907..5eff8b7ceac7 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2340,6 +2340,7 @@
SUBDIR += rubygem-protocol-rack
SUBDIR += rubygem-protocol-websocket
SUBDIR += rubygem-puma
+ SUBDIR += rubygem-puma-gitlab
SUBDIR += rubygem-puma6
SUBDIR += rubygem-puma_worker_killer
SUBDIR += rubygem-pusher-client
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 9a674b7489c2..2cdcd8c88360 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -168,7 +168,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \
rubygem-rack22>=2.2.17,3<2.3,3:www/rubygem-rack22 \
rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
- rubygem-puma6>=6.6.1<6.6.2:www/rubygem-puma6 \
+ rubygem-puma-gitlab>=6.6.1<6.6.2:www/rubygem-puma-gitlab \
rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
rubygem-state_machines-activerecord-gitlab>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord-gitlab \
rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 5337de72a2c5..d7451fad1606 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
GITLAB_VERSION= 18.3.4
-GITLAB_PORTREVISION= 2
+GITLAB_PORTREVISION= 3
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml
diff --git a/www/rubygem-puma-gitlab/Makefile b/www/rubygem-puma-gitlab/Makefile
new file mode 100644
index 000000000000..708eb2ece461
--- /dev/null
+++ b/www/rubygem-puma-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= puma
+PORTVERSION= 6.6.1
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Fast, multithreaded and highly concurrent ruby web server
+WWW= https://puma.io/ \
+ https://github.com/puma/puma
+
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-nio4r>=2.0<3:devel/rubygem-nio4r
+
+USES= cpe gem ssl
+
+PLIST_FILES= bin/puma bin/pumactl
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-puma-gitlab/distinfo b/www/rubygem-puma-gitlab/distinfo
new file mode 100644
index 000000000000..42714ba48d5a
--- /dev/null
+++ b/www/rubygem-puma-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1755676001
+SHA256 (rubygem/puma-6.6.1.gem) = b9b56e4a4ea75d1bfa6d9e1972ee2c9f43d0883f011826d914e8e37b3694ea1e
+SIZE (rubygem/puma-6.6.1.gem) = 239104
diff --git a/www/rubygem-puma-gitlab/pkg-descr b/www/rubygem-puma-gitlab/pkg-descr
new file mode 100644
index 000000000000..c8af03bb0c08
--- /dev/null
+++ b/www/rubygem-puma-gitlab/pkg-descr
@@ -0,0 +1,7 @@
+Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
+Ruby/Rack applications. Puma is intended for use in both development and
+production environments. In order to get the best throughput, it is highly
+recommended that you use a Ruby implementation with real threads like Rubinius
+or JRuby.
+
+See also: https://github.com/puma/puma