git: 0daf0b92152a - main - security/rubygem-devise-two-factor-rails61: Remove expired port

Reply: Alexey Dokuchaev : "Re: git: 0daf0b92152a - main - security/rubygem-devise-two-factor-rails61: Remove expired port"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Wed, 06 Dec 2023 12:37:47 UTC
The branch main has been updated by mfechner:

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

commit 0daf0b92152acfc2e2c26ff4420a0dafc6ee0527
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-12-06 12:36:52 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
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 <bsd.port.mk>
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<railties>.freeze, ["< 7.1"])
-   s.add_runtime_dependency(%q<activesupport>.freeze, ["< 7.1"])
--  s.add_runtime_dependency(%q<attr_encrypted>.freeze, [">= 1.3", "< 4", "!= 2"])
-+  s.add_runtime_dependency(%q<attr_encrypted>.freeze, [">= 1.3", "< 5", "!= 2"])
-   s.add_runtime_dependency(%q<devise>.freeze, ["~> 4.0"])
-   s.add_runtime_dependency(%q<rotp>.freeze, ["~> 6.0"])
-   s.add_development_dependency(%q<activemodel>.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