git: f41faa20a8c8 - main - www/gitlab-ce: fix build errors cause by dep upgrade

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Wed, 12 Oct 2022 17:49:26 UTC
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f41faa20a8c8ce8fa7570df000533542fa27dbec

commit f41faa20a8c8ce8fa7570df000533542fa27dbec
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-10-12 17:45:08 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2022-10-12 17:48:19 +0000

    www/gitlab-ce: fix build errors cause by dep upgrade
    
    Several dep upgrade of rubgems port broke the gitlab-ce port.
    The problem are reported by e.g.
    https://beefy16.nyi.freebsd.org/data/131amd64-default/d20a3cf7e848/logs/gitlab-ce-15.3.4_1.log
    
    and also by users.
    PR:             266963
---
 devel/rubygem-license_finder/Makefile              |  3 ++-
 .../rubygem-doorkeeper-openid_connect/Makefile     |  4 ++--
 www/Makefile                                       |  1 +
 www/rubygem-json-jwt115/Makefile                   | 25 ++++++++++++++++++++++
 www/rubygem-json-jwt115/distinfo                   |  3 +++
 www/rubygem-json-jwt115/pkg-descr                  |  2 ++
 6 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/devel/rubygem-license_finder/Makefile b/devel/rubygem-license_finder/Makefile
index 74d2231625cc..eea2074e64e8 100644
--- a/devel/rubygem-license_finder/Makefile
+++ b/devel/rubygem-license_finder/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	license_finder
 PORTVERSION=	7.0.1
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -12,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-bundler>=0:sysutils/rubygem-bundler \
 		rubygem-rubyzip>=1<3:archivers/rubygem-rubyzip \
-		rubygem-thor10>=1.0.1<1.1:devel/rubygem-thor10 \
+		rubygem-thor>=1.2.0<1.3:devel/rubygem-thor \
 		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>=1.1.9<1.2:textproc/rubygem-xml-simple
diff --git a/security/rubygem-doorkeeper-openid_connect/Makefile b/security/rubygem-doorkeeper-openid_connect/Makefile
index 790a945f1e82..a0598e982db2 100644
--- a/security/rubygem-doorkeeper-openid_connect/Makefile
+++ b/security/rubygem-doorkeeper-openid_connect/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	doorkeeper-openid_connect
 PORTVERSION=	1.7.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 
@@ -12,7 +12,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-doorkeeper>=5.2<5.6:security/rubygem-doorkeeper \
-		rubygem-json-jwt>=1.11:www/rubygem-json-jwt
+		rubygem-json-jwt115>=1.11:www/rubygem-json-jwt115
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/www/Makefile b/www/Makefile
index b1c6c7134da2..40394ace7634 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1979,6 +1979,7 @@
     SUBDIR += rubygem-jsbundling-rails
     SUBDIR += rubygem-jsobfu
     SUBDIR += rubygem-json-jwt
+    SUBDIR += rubygem-json-jwt115
     SUBDIR += rubygem-jwt
     SUBDIR += rubygem-kaminari
     SUBDIR += rubygem-kaminari-actionview
diff --git a/www/rubygem-json-jwt115/Makefile b/www/rubygem-json-jwt115/Makefile
new file mode 100644
index 000000000000..db5c835389d8
--- /dev/null
+++ b/www/rubygem-json-jwt115/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	json-jwt
+PORTVERSION=	1.15.3
+CATEGORIES=	www devel rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	115
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	JSON Web Token implementation in Ruby
+WWW=		https://github.com/nov/json-jwt
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-activesupport60>=4.2:devel/rubygem-activesupport60 \
+		rubygem-aes_key_wrap>=0:security/rubygem-aes_key_wrap \
+		rubygem-bindata>=0:devel/rubygem-bindata \
+		rubygem-httpclient>=0:www/rubygem-httpclient
+
+USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^1\.15
+.include <bsd.port.mk>
diff --git a/www/rubygem-json-jwt115/distinfo b/www/rubygem-json-jwt115/distinfo
new file mode 100644
index 000000000000..b4c8d97db882
--- /dev/null
+++ b/www/rubygem-json-jwt115/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1665595086
+SHA256 (rubygem/json-jwt-1.15.3.gem) = 66db4f14e538a774c15502a5b5b26b1f3e7585481bbb96df490aa74b5c2d6110
+SIZE (rubygem/json-jwt-1.15.3.gem) = 14848
diff --git a/www/rubygem-json-jwt115/pkg-descr b/www/rubygem-json-jwt115/pkg-descr
new file mode 100644
index 000000000000..da19344f7c9f
--- /dev/null
+++ b/www/rubygem-json-jwt115/pkg-descr
@@ -0,0 +1,2 @@
+JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and JSON
+Web Key) in Ruby