File gnupg.patch of Package perl-GnuPG-Interface

Overview Repositories Revisions Requests Users Attributes Meta

File gnupg.patch of Package perl-GnuPG-Interface

From 156256d63076e3b94700a87a99a6a6bf70fb5264 Mon Sep 17 00:00:00 2001
From: sunnavy <sunnavy@bestpractical.com>
Date: Tue, 12 Dec 2023 09:38:25 -0500
Subject: [PATCH] Update tests for gpg 2.3.8+

A few new flags were added to gpg 2.3.8+, and the new "R"
flag(Restricted encryption) broken tests.

See also gnupg commit 0988e49c45.
---
 t/get_public_keys.t         |  2 +-
 t/get_secret_keys.t         |  2 +-
 t/list_secret_keys.t        | 19 +++++++++++--------
 test/secret-keys/1.2.2.test | 13 +++++++++++++
 test/secret-keys/1.2.test   |  2 +-
 5 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 test/secret-keys/1.2.2.test

diff --git a/t/get_public_keys.t b/t/get_public_keys.t
index 300c81c..8d8eebf 100644
--- a/t/get_public_keys.t
+++ b/t/get_public_keys.t
@@ -181,7 +181,7 @@ TEST
         hex_id                   => 'ADB99D9C2E854A6B',
         creation_date            => 949813119,
         creation_date_string     => '2000-02-06',
-        usage_flags              => 'e',
+        usage_flags              => $gnupg->cmp_version($gnupg->version, '2.3.8') >= 0 ? 'er' : 'e',
         pubkey_data              => $subkey_pub_data,
       );
 
diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
index 5b4f97e..5fc2a57 100644
--- a/t/get_secret_keys.t
+++ b/t/get_secret_keys.t
@@ -87,7 +87,7 @@ TEST
         hex_id                   => 'ADB99D9C2E854A6B',
         creation_date            => 949813119,
         creation_date_string     => '2000-02-06',
-        usage_flags              => 'e',
+        usage_flags              => $gnupg->cmp_version($gnupg->version, '2.3.8') >= 0 ? 'er' : 'e',
         pubkey_data              => $subkey_pub_data,
       };
 
diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
index 13a7ae2..44af61f 100644
--- a/t/list_secret_keys.t
+++ b/t/list_secret_keys.t
@@ -45,17 +45,20 @@ TEST
 TEST
 {
     my $keylist;
-    if ($gnupg->cmp_version($gnupg->version, '2.1') < 0) {
-	$keylist = '0';
+    if ( $gnupg->cmp_version( $gnupg->version, '2.1' ) < 0 ) {
+        $keylist = '0';
+    }
+    elsif ( $gnupg->cmp_version( $gnupg->version, '2.1.11' ) <= 0 ) {
+        $keylist = '1';
+    }
+    elsif ( $gnupg->cmp_version( $gnupg->version, '2.3.8' ) < 0 ) {
+        $keylist = '2.2';
     }
     else {
-	if ($gnupg->cmp_version($gnupg->version, '2.1.11') <= 0) {
-	    $keylist = '1';
-	}
-	else {
-	    $keylist = '2';
-	}
+        $keylist = '2';
     }
+
+
     my @files_to_test = ( 'test/secret-keys/1.'.$keylist.'.test' );
 
     return file_match( $outfile, @files_to_test );
diff --git a/test/secret-keys/1.2.2.test b/test/secret-keys/1.2.2.test
new file mode 100644
index 0000000..42b27a1
--- /dev/null
+++ b/test/secret-keys/1.2.2.test
@@ -0,0 +1,13 @@
+test/gnupghome/pubring.kbx
+--------------------------
+sec   dsa1024 2000-02-06 [SCA]
+      93AFC4B1B0288A104996B44253AE596EF950DA9C
+uid           [ unknown] GnuPG test key (for testing purposes only)
+uid           [ unknown] Foo Bar (1)
+ssb   elg768 2000-02-06 [E]
+
+sec   rsa2048 2016-10-12 [SC]
+      278F850AA702911F1318F0A61B913CE9B6747DDC
+uid           [ unknown] GnuPG::Interface Test key <test@example.org>
+ssb   rsa2048 2016-10-12 [E]
+
diff --git a/test/secret-keys/1.2.test b/test/secret-keys/1.2.test
index 42b27a1..4f8bc23 100644
--- a/test/secret-keys/1.2.test
+++ b/test/secret-keys/1.2.test
@@ -4,7 +4,7 @@ sec   dsa1024 2000-02-06 [SCA]
       93AFC4B1B0288A104996B44253AE596EF950DA9C
 uid           [ unknown] GnuPG test key (for testing purposes only)
 uid           [ unknown] Foo Bar (1)
-ssb   elg768 2000-02-06 [E]
+ssb   elg768 2000-02-06 [ER]
 
 sec   rsa2048 2016-10-12 [SC]
       278F850AA702911F1318F0A61B913CE9B6747DDC

Places

File gnupg.patch of Package perl-GnuPG-Interface

Places