From nobody Wed Oct 12 17:49:26 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MngBt3Cp2z4ZPv1; Wed, 12 Oct 2022 17:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MngBt2ZR2z3d2Q; Wed, 12 Oct 2022 17:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665596966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bJeNrYkdE3T4nGwnvncF9Cv1JBUPr/bCHTaCK/oJFoc=; b=otdQmkYGKcBENbfHPMI10AoS4JlZOlzvn1vC81zjZ1f6e9Eb79W+Ji6VBsIrYZhwOSumng leiJnSDkMhEj7bdm3TqZqMwyRhnQ3R0XQ0oKmEO42N6dEv4L9IAufbE30HzEq6y8e5S8FK xJFURyGdfgYdgBzogxVltTMHD/wzPeT49CUUgkEu4jPaEFr6KQCfadouR53iGL80oPqJXA sM+KYkgaCaVItWkeidQJKzdF+H23e+HxdZUUYxLW3+Qau6oSUAgT+huiB9ACMjcahySbVm /x5veElFhdQWs7LPPhbFAsdcpKEZ4agszPoCNdN+UyWnfepdsnMXK+pz0yCYfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MngBt1d50z1NYh; Wed, 12 Oct 2022 17:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29CHnQDr083354; Wed, 12 Oct 2022 17:49:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CHnQtU083353; Wed, 12 Oct 2022 17:49:26 GMT (envelope-from git) Date: Wed, 12 Oct 2022 17:49:26 GMT Message-Id: <202210121749.29CHnQtU083353@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: f41faa20a8c8 - main - www/gitlab-ce: fix build errors cause by dep upgrade List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f41faa20a8c8ce8fa7570df000533542fa27dbec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665596966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bJeNrYkdE3T4nGwnvncF9Cv1JBUPr/bCHTaCK/oJFoc=; b=CidHmJ+NNMAfdF9ITIp14bTb4l2HGJNXxAaml/yQj75MRzZef5WYlBBVuMsskYBJka1x4Q zLbXWfB7ARgwm3b7v9x48nNuU4gkY+XQV6IaNxmIsF+/EQOuqasjiuY4k1gEs4y7ZGD7Jh 9ymAj03bGG98BUuRDWb3erHzYU+8JBBdtdUqHkjJEX5QsqD+c1l7JionsHv/bUl4dDoL3u 1u9nN3fs/FF1RMbRbrLBF3NQ7ajUj8RkPPcxAOTP4N7yazL9DBQPQmCgKcKOt4F6zwwcxN wqM7tqAF/GMMGJ2bb+E3CeSrPnjIY1M+xWxFNxLXB99AxvxTRutJrSlWniVVPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665596966; a=rsa-sha256; cv=none; b=emeSiuLl0iIN5tGl4mCU485iYlA2b0Dl+xLdE5Jh9LBqOPJDjVp3HfXqz2dYFDVwNht0AP AyVt0+/jyrPJhiD4hQ8/XLr/lXYpA3lxXT8x1UYW/B8ZMczXXG3R0e7DXDiuFwg6RQTfDZ 1sEP3zpXJUI5XEBR+rVKMcjhJhCWd7i2YPrxLOE2wjKBMMTlb3g4OKWI/xgWKVV3wemgUT yVRJp1FCy8yR0t1YoI6mxsHhRhA4oMQl/qaPbskljl/nZB77vlaDtGSNC9FP+tpmW6IJeE w5JheMMHrQ7R2hc78FL+uiP++Homl6RweIkL2j2qRbwhisHaY1qgXdfkQ0XCAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f41faa20a8c8ce8fa7570df000533542fa27dbec commit f41faa20a8c8ce8fa7570df000533542fa27dbec Author: Matthias Fechner AuthorDate: 2022-10-12 17:45:08 +0000 Commit: Matthias Fechner 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 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