From nobody Wed Dec 06 12:37:47 2023 X-Original-To: dev-commits-ports-all@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 4SlcPR4MW3z53NjC; Wed, 6 Dec 2023 12:37:47 +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 4SlcPR3sbkz3brL; Wed, 6 Dec 2023 12:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701866267; 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=wwQFqqnq70ljIxZQ/gDaQuo0ekFxhB1lUJ+OKCkFJAg=; b=lqoKk01/Hh5Qi4Q6LkX2uOHAXbd7iWtflwVxxKBjz3JKUhyoghcJbdXfeeue/PFIzDwG2k enlGLTx/NWrPZR7PAxMcadR5fd0kvAZHbh0ke6eY2b2+JsIp80Ea0++nQdhMoSeIHltYh5 dKkupgYFUnmikT6Ccd/dgvuxiwvLV9gf7Wg4ADyy+u03JyzBndk4u6HKalQjPXbPQQfF5C ptl3WIZ83Z5sIUs9HPkM/KBZG+mHASD+mjQGqjfiElL1x+Lmkwjd6e7MNRvSw/jVcwd8Hl yUS2uAAMKyNi5W6m132suF4pAZZSBIOcyS5BNdghYOymM3Xz7cOteVKPw5z0Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701866267; a=rsa-sha256; cv=none; b=pUaXUFvSfbpLM8tsHL2YDU4F5h3LKsuGCWTgjKadiv9/OR6CaPqwS+C/DY9hyTuxTlqts/ TQopq6jJsGGiW0lw+AkbMtJhHRBJcmcVlBD2a0NuUzMXXzPRRZyMok1j0vNZ9X5VGxELe8 BkZ3/KBCuRuXeWJ8AjLHlv6hXcQ8qklFndp61M81VCLJyFTjPxXQ42JMgdR+ChPJ3MYVR4 0FchVzhGGg+wav655himkiPTahQr6DmsfIoAFpd6aUjAUISI4OIX4khAvHJchmf55/6PLs lDJUvjgtEz0v46jjCYvCB+ipvUgpucq9Nc1g4qlwuoCN0vV1ae/1gwyoHGd5xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701866267; 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=wwQFqqnq70ljIxZQ/gDaQuo0ekFxhB1lUJ+OKCkFJAg=; b=oRMhN2mZgeuemZdF8hgGgaAeIKzj5H777bqx0x9/7C9yqCHZEw3k9yACDohrKJcoGL9Cze 6No1g6FCeTOc0aQvEUvT2z/JDn6gWvFGmWnTuH3KmZpf9Jqxqhgg2VeN7tESvL/6UuXH7i GcNLDsP2A1gfKDrlbb42m85KxKLt+4WXVbHxSU0BN/41eZbD1nTpXZiuyQ9QywFL2JZ35v DEtpNZ0IGM4VMaKV8gAzrCTdrpuK2dZ+D7HRMRqyN2SdKb6nhwMhQmg+u0peAneVePriA7 fJApxtuJ9c7Cgu4WNJ1MBmXS7RyPiS7PfVAVDcpdB1kTru0V+n1uswNT5tGsTg== 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 4SlcPR2yGvztR6; Wed, 6 Dec 2023 12:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6CblZx033631; Wed, 6 Dec 2023 12:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6Cbl8v033628; Wed, 6 Dec 2023 12:37:47 GMT (envelope-from git) Date: Wed, 6 Dec 2023 12:37:47 GMT Message-Id: <202312061237.3B6Cbl8v033628@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: 0daf0b92152a - main - security/rubygem-devise-two-factor-rails61: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 0daf0b92152acfc2e2c26ff4420a0dafc6ee0527 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0daf0b92152acfc2e2c26ff4420a0dafc6ee0527 commit 0daf0b92152acfc2e2c26ff4420a0dafc6ee0527 Author: Matthias Fechner AuthorDate: 2023-12-06 12:36:52 +0000 Commit: Matthias Fechner CommitDate: 2023-12-06 12:37:39 +0000 security/rubygem-devise-two-factor-rails61: Remove expired port security/rubygem-devise-two-factor-rails61 --- MOVED | 1 + security/Makefile | 1 - .../rubygem-devise-two-factor-rails61/Makefile | 25 ----------- .../rubygem-devise-two-factor-rails61/distinfo | 3 -- .../files/patch-attr_encrypted | 48 ---------------------- .../rubygem-devise-two-factor-rails61/pkg-descr | 1 - 6 files changed, 1 insertion(+), 78 deletions(-) diff --git a/MOVED b/MOVED index 81b7f34f3ab1..245dd82f52b8 100644 --- a/MOVED +++ b/MOVED @@ -8172,3 +8172,4 @@ net-im/jggtrans||2023-12-05|Has expired: Upstream last release was in 2014 polish/tleenx2||2023-12-05|Has expired: Last upstream release was in 2004 polish/libtlen||2023-12-05|Has expired: Last upstream release was in 2004 devel/rubygem-font-awesome-rails-rails50|devel/rubygem-font-awesome-rails-rails60|2023-12-06|Obsolete, use devel/rubygem-font-awesome-rails-rails60 instead +security/rubygem-devise-two-factor-rails61|security/rubygem-devise-two-factor-rails70|2023-12-06|Obsolete, use security/rubygem-devise-two-factor-rails70 instead diff --git a/security/Makefile b/security/Makefile index d2572882601f..3addc90ba881 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1096,7 +1096,6 @@ SUBDIR += rubygem-declarative_policy SUBDIR += rubygem-devise-two-factor SUBDIR += rubygem-devise-two-factor-rails5 - SUBDIR += rubygem-devise-two-factor-rails61 SUBDIR += rubygem-devise-two-factor-rails70 SUBDIR += rubygem-devise-two-factor41-rails70 SUBDIR += rubygem-devise_pam_authenticatable2 diff --git a/security/rubygem-devise-two-factor-rails61/Makefile b/security/rubygem-devise-two-factor-rails61/Makefile deleted file mode 100644 index 560958696121..000000000000 --- a/security/rubygem-devise-two-factor-rails61/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -PORTNAME= devise-two-factor -PORTVERSION= 4.0.2 -PORTREVISION= 1 -CATEGORIES= security rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails61 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Barebones two-factor authentication with Devise -WWW= https://github.com/tinfoil/devise-two-factor - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= rubygem-activesupport61>=0<7.1:devel/rubygem-activesupport61 \ - rubygem-attr_encrypted>=3<5:security/rubygem-attr_encrypted \ - rubygem-devise-rails61>=4.0<5:devel/rubygem-devise-rails61 \ - rubygem-railties61>=0<7.1:www/rubygem-railties61 \ - rubygem-rotp>=6.0<7:devel/rubygem-rotp - -USES= gem - -NO_ARCH= yes - -.include diff --git a/security/rubygem-devise-two-factor-rails61/distinfo b/security/rubygem-devise-two-factor-rails61/distinfo deleted file mode 100644 index a50db85a2e58..000000000000 --- a/security/rubygem-devise-two-factor-rails61/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1649083406 -SHA256 (rubygem/devise-two-factor-4.0.2.gem) = 6548d2696ed090d27046f888f4fa7380f151e0f823902d46fd9b91e7d0cac511 -SIZE (rubygem/devise-two-factor-4.0.2.gem) = 30208 diff --git a/security/rubygem-devise-two-factor-rails61/files/patch-attr_encrypted b/security/rubygem-devise-two-factor-rails61/files/patch-attr_encrypted deleted file mode 100644 index 10b05cbe309f..000000000000 --- a/security/rubygem-devise-two-factor-rails61/files/patch-attr_encrypted +++ /dev/null @@ -1,48 +0,0 @@ ---- devise-two-factor.gemspec.orig 2023-05-07 17:19:51 UTC -+++ devise-two-factor.gemspec -@@ -23,7 +23,7 @@ Gem::Specification.new do |s| - - s.add_runtime_dependency(%q.freeze, ["< 7.1"]) - s.add_runtime_dependency(%q.freeze, ["< 7.1"]) -- s.add_runtime_dependency(%q.freeze, [">= 1.3", "< 4", "!= 2"]) -+ s.add_runtime_dependency(%q.freeze, [">= 1.3", "< 5", "!= 2"]) - s.add_runtime_dependency(%q.freeze, ["~> 4.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 6.0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) ---- spec/devise/models/two_factor_authenticatable_spec.rb.orig 2023-05-07 17:23:37 UTC -+++ spec/devise/models/two_factor_authenticatable_spec.rb -@@ -64,15 +64,31 @@ describe ::Devise::Models::TwoFactorAuthenticatable do - - describe 'otp_secret options' do - it 'should be of the key' do -- expect(subject.encrypted_attributes[:otp_secret][:key]).to eq('test-key'*8) -+ if attr_encrypted_is_rails_seven_compatible? -+ expect(subject.attr_encrypted_encrypted_attributes[:otp_secret][:key]).to eq('test-key'*8) -+ else -+ expect(subject.encrypted_attributes[:otp_secret][:key]).to eq('test-key'*8) -+ end - end - - it 'should be of the mode' do -- expect(subject.encrypted_attributes[:otp_secret][:mode]).to eq(:per_attribute_iv_and_salt) -+ if attr_encrypted_is_rails_seven_compatible? -+ expect(subject.attr_encrypted_encrypted_attributes[:otp_secret][:mode]).to eq(:per_attribute_iv_and_salt) -+ else -+ expect(subject.encrypted_attributes[:otp_secret][:mode]).to eq(:per_attribute_iv_and_salt) -+ end - end - - it 'should be of the mode' do -- expect(subject.encrypted_attributes[:otp_secret][:algorithm]).to eq('aes-256-cbc') -+ if attr_encrypted_is_rails_seven_compatible? -+ expect(subject.attr_encrypted_encrypted_attributes[:otp_secret][:algorithm]).to eq('aes-256-cbc') -+ else -+ expect(subject.encrypted_attributes[:otp_secret][:algorithm]).to eq('aes-256-cbc') -+ end -+ end -+ -+ def attr_encrypted_is_rails_seven_compatible? -+ Gem::Version.new(AttrEncrypted::Version.string) >= Gem::Version.new('4.0.0') - end - end - end diff --git a/security/rubygem-devise-two-factor-rails61/pkg-descr b/security/rubygem-devise-two-factor-rails61/pkg-descr deleted file mode 100644 index 316de9a9d77e..000000000000 --- a/security/rubygem-devise-two-factor-rails61/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Barebones two-factor authentication with Devise