From 8a1d97cb06a8dfd0894354964a8d09b6eed7961f6059503c1451f9aaaf5c3eee Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Mon, 19 Jun 2023 21:11:56 +0000 Subject: [PATCH] try s390x OBS-URL: https://build.opensuse.org/package/show/security:privacy/rnp?expand=0&rev=23 --- rnp-v0.17.0-tests.patch | 34 ++++++++++++++++++++++++++++++++++ rnp.changes | 5 +++++ rnp.spec | 1 + 3 files changed, 40 insertions(+) create mode 100644 rnp-v0.17.0-tests.patch diff --git a/rnp-v0.17.0-tests.patch b/rnp-v0.17.0-tests.patch new file mode 100644 index 0000000..c689540 --- /dev/null +++ b/rnp-v0.17.0-tests.patch @@ -0,0 +1,34 @@ +From e69da980c1bc3d6096db6446a5e14cac924146fa Mon Sep 17 00:00:00 2001 +From: Andreas Stieger +Date: Mon, 19 Jun 2023 23:05:27 +0200 +Subject: [PATCH] Increase key expiry seconds in tests from 10s to 60s + +--- + src/tests/cli_tests.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/tests/cli_tests.py b/src/tests/cli_tests.py +index e6f5ed76..f0bcc757 100755 +--- a/src/tests/cli_tests.py ++++ b/src/tests/cli_tests.py +@@ -1997,14 +1997,14 @@ class Keystore(unittest.TestCase): + matches = re.findall(r'(key expiration time: 63072000 seconds \(730 days\))', out) + self.assertEqual(len(matches), 1) + +- # Expires in 10 seconds +- ret, out, _ = run_proc(RNPK, ['--homedir', RNPDIR, '--edit-key', '--set-expire', '10', 'primary_with_empty_password@rnp']) ++ # Expires in 60 seconds ++ ret, out, _ = run_proc(RNPK, ['--homedir', RNPDIR, '--edit-key', '--set-expire', '60', 'primary_with_empty_password@rnp']) + self.assertEqual(ret, 0) + self.assertRegex(out, r'(?s)^.*\[EXPIRES .*') + + ret, out, _ = run_proc(RNP, ['--list-packets', kpath]) + self.assertEqual(ret, 0) +- self.assertRegex(out, r'(?s)^.*key expiration time: 10 seconds \(0 days\).*') ++ self.assertRegex(out, r'(?s)^.*key expiration time: 60 seconds \(0 days\).*') + + # Expires in 10 hours + ret, out, _ = run_proc(RNPK, ['--homedir', RNPDIR, '--edit-key', '--set-expire', '10h', 'primary_with_empty_password@rnp']) +-- +2.41.0 + diff --git a/rnp.changes b/rnp.changes index 3f3fd5b..40a6e76 100644 --- a/rnp.changes +++ b/rnp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 19 21:10:24 UTC 2023 - Andreas Stieger + +- add rnp-v0.17.0-tests.patch + ------------------------------------------------------------------- Wed Jun 14 21:01:38 UTC 2023 - Andreas Stieger diff --git a/rnp.spec b/rnp.spec index f39709e..ff440fd 100644 --- a/rnp.spec +++ b/rnp.spec @@ -29,6 +29,7 @@ Source2: https://github.com/rnpgp/rnp/releases/download/v%{version}/%{nam Source3: https://www.rnpgp.org/openpgp_keys/31AF5A24D861EFCB7CB79A1924900CE0AEFB5417-50DA59D5B9134FA2DB1EB20CFB829AB5D0FE017F.asc#/%{name}.keyring Patch0: rnp-v0.17.0-disable-static.patch Patch2: rnp-v0.17.0-system-sexp.patch +Patch3: rnp-v0.17.0-tests.patch BuildRequires: cmake >= 3.18 BuildRequires: gcc-c++ BuildRequires: gpg2 >= 2.2