git: 8755d7109c4d - main - security/rubygem-doorkeeper-openid_connect: update to 1.8.5

The branch main has been updated by mfechner:

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

commit 8755d7109c4d743b808cdbdc70617e0041a9e051
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-03-26 14:36:36 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2023-03-26 15:07:51 +0000

    security/rubygem-doorkeeper-openid_connect: update to 1.8.5
    
    v1.8.5 (2023-02-02)
    
        [#186] Simplify gem configuration reusing Doorkeeper configuration option DSL (thanks to @nbulaj).
        [#182] Drop support for Ruby 2.6 and Rails 5 (thanks to @sato11).
        [#188] Fix dookeeper-jwt compatibility (thanks to @zavan).
    
    v1.8.4 (2023-02-01)
    
        [#177] Replace json-jwt with ruby-jwt to align with doorkeeper-jwt (thanks to @kristof-mattei).
        [#185] Don't call active_record_options for Doorkeeper >= 5.6.3 (thanks to @zavan).
        [#183] Stop render consent screen when user is not logged-in (thanks to @nov).
    
    Changelog:
    https://github.com/doorkeeper-gem/doorkeeper-openid_connect/blob/master/CHANGELOG.md
    
    Fixes also a problem with www/gitlab-ce:
    rake aborted!
    NoMethodError: undefined method `active_record_options' for #<Doorkeeper::Config:0x000000081fb0f0c8 @orm=:active_record, @default_generator_method=:hex, @authenticate_resource_owner=#<Proc:0x000000081fb0ed80 /usr/local/www/gitlab-ce/config/initializers/doorkeeper.rb:13>, @resource_owner_from_credentials=#<Proc:0x000000081fb0ec68 /usr/local/www/gitlab-ce/config/initializers/doorkeeper.rb:25>, @refresh_token_enabled=true, @enforce_configured_scopes=true, @force_ssl_in_redirect_uri=false, @forbid_redirect_uri=#<Proc:0x000000081fb0ea10 /usr/local/www/gitlab-ce/config/initializers/doorkeeper.rb:67>, @enable_application_owner=true, @default_scopes=#<Doorkeeper::OAuth::Scopes:0x000000081fb17e30 @scopes=["api"]>, @optional_scopes=#<Doorkeeper::OAuth::Scopes:0x000000081fb177f0 @scopes=["read_api", "read_user", "read_repository", "write_repository", "sudo", "openid", "profile", "email"]>, @access_token_methods=[:from_access_token_param, :from_bearer_authorization, :from_bearer_param], @tok
 en_secret_strategy=Gitlab::DoorkeeperSecretStoring::Token::Pbkdf2Sha512, @token_secret_fallback_strategy=Doorkeeper::SecretStoring::Plain, @application_secret_strategy=Gitlab::DoorkeeperSecretStoring::Secret::Pbkdf2Sha512, @application_secret_fallback_strategy=Doorkeeper::SecretStoring::Plain, @grant_flows=["authorization_code", "password", "client_credentials"], @skip_authorization=#<Proc:0x000000081fb1ce58 /usr/local/www/gitlab-ce/config/initializers/doorkeeper.rb:109>, @base_controller="::Gitlab::BaseDoorkeeperController", @skip_client_authentication_for_password_grant=true, @application_model=Doorkeeper::Application(id: integer, name: string, uid: string, secret: string, redirect_uri: text, scopes: string, created_at: datetime, updated_at: datetime, owner_id: integer, owner_type: string, trusted: boolean, confidential: boolean, expire_access_tokens: boolean), @access_grant_model=Doorkeeper::AccessGrant(id: integer, resource_owner_id: integer, application_id: integer, token: stri
 ng, expires_in: integer, redirect_uri: text,!
  created_at: datetime, revoked_at: datetime, scopes: string, code_challenge: text, code_challenge_method: text), @access_token_model=Doorkeeper::AccessToken(id: integer, resource_owner_id: integer, application_id: integer, token: string, refresh_token: string, expires_in: integer, revoked_at: datetime, created_at: datetime, scopes: string)>
    
              if Doorkeeper.configuration.active_record_options[:establish_connection]
                                         ^^^^^^^^^^^^^^^^^^^^^^
    /usr/local/www/gitlab-ce/config/environment.rb:7:in `<top (required)>'
    Tasks: TOP => db:migrate => db:load_config => environment
    (See full trace by running task with --trace)
---
 security/rubygem-doorkeeper-openid_connect/Makefile | 4 ++--
 security/rubygem-doorkeeper-openid_connect/distinfo | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/security/rubygem-doorkeeper-openid_connect/Makefile b/security/rubygem-doorkeeper-openid_connect/Makefile
index 795d48250dee..c0ac485d6ddb 100644
--- a/security/rubygem-doorkeeper-openid_connect/Makefile
+++ b/security/rubygem-doorkeeper-openid_connect/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	doorkeeper-openid_connect
-PORTVERSION=	1.8.3
+PORTVERSION=	1.8.5
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 
@@ -11,7 +11,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-doorkeeper>=5.5<5.7:security/rubygem-doorkeeper \
-		rubygem-json-jwt115>=1.11:www/rubygem-json-jwt115
+		rubygem-jwt>=2.5:www/rubygem-jwt
 
 USES=		gem
 
diff --git a/security/rubygem-doorkeeper-openid_connect/distinfo b/security/rubygem-doorkeeper-openid_connect/distinfo
index 94f4d93529e8..c5a68b7551a1 100644
--- a/security/rubygem-doorkeeper-openid_connect/distinfo
+++ b/security/rubygem-doorkeeper-openid_connect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674282035
-SHA256 (rubygem/doorkeeper-openid_connect-1.8.3.gem) = 0df2e714508f1f43fdb4669e97b38b90d365a072908427416da943a1a8e00b6e
-SIZE (rubygem/doorkeeper-openid_connect-1.8.3.gem) = 24576
+TIMESTAMP = 1679840565
+SHA256 (rubygem/doorkeeper-openid_connect-1.8.5.gem) = d4ee57687945402843c948cee399c758cdddf04468c42b1fb02a8800dd0627f6
+SIZE (rubygem/doorkeeper-openid_connect-1.8.5.gem) = 24064