From 66dc6086f65f6434361c759d177110e5a6c4c77b Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Fri, 30 Sep 2022 10:11:24 +0200 Subject: [PATCH 01/21] Version 20220927 (#2130137) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2a9181e..925a39d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /archlinux-keyring-20220424.tar.gz /archlinux-keyring-20220727.tar.gz /archlinux-keyring-20220831.tar.gz +/archlinux-keyring-20220927.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index e782785..6d9d751 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20220831 +Version: 20220927 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 14a7e86..386b9ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20220831.tar.gz) = e753914d0202ec96fc1c6978e8413f93999ca31e70594c42e1dd4c40c1e635208e61b5f32840bd5f1265503213784cb8eb3668464efe1fb477ed080be533b19e +SHA512 (archlinux-keyring-20220927.tar.gz) = aabe2da1177845e8bf2892cd2e701cceb187297771a32a24ba902f20bf61f212a8e9798f184cf978364ba81851de64512b27d22aeb50078e4f72366a126257ae From 73b0ffe85ec887821ab1d340a03298069d935663 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 14 Nov 2022 19:52:59 +0100 Subject: [PATCH 02/21] Version 20221110 (#2141851) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 925a39d..111d7a5 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /archlinux-keyring-20220727.tar.gz /archlinux-keyring-20220831.tar.gz /archlinux-keyring-20220927.tar.gz +/archlinux-keyring-20221110.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 6d9d751..932bbb8 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20220927 +Version: 20221110 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 386b9ff..0686577 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20220927.tar.gz) = aabe2da1177845e8bf2892cd2e701cceb187297771a32a24ba902f20bf61f212a8e9798f184cf978364ba81851de64512b27d22aeb50078e4f72366a126257ae +SHA512 (archlinux-keyring-20221110.tar.gz) = 4c99413eeac53e5475206bfd0a1c817b9721c4f878eadf44181deda6ef5198b49731ce58f923f195fb01236e40cd9156d9112574ce5b11fa3ed9165a85a4e6df From cddc357467e06f3aac7301eb3520287665f32ede Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sat, 26 Nov 2022 20:57:08 +0100 Subject: [PATCH 03/21] Version 20221123 (#2145118) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 111d7a5..9455464 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /archlinux-keyring-20220831.tar.gz /archlinux-keyring-20220927.tar.gz /archlinux-keyring-20221110.tar.gz +/archlinux-keyring-20221123.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 932bbb8..44d1fbc 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20221110 +Version: 20221123 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 0686577..c38e7e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20221110.tar.gz) = 4c99413eeac53e5475206bfd0a1c817b9721c4f878eadf44181deda6ef5198b49731ce58f923f195fb01236e40cd9156d9112574ce5b11fa3ed9165a85a4e6df +SHA512 (archlinux-keyring-20221123.tar.gz) = cdc2bf8ac6aa3c6003ada96c1b1bfad3ef7de4cec36ad9a2c690a8d0ea460a5b7b0382285526dd401de1f8e47f7986f1816c1c51d07a99e6bfa1bcf516467a84 From 2aa99047039b47abda66c99f17d91a44f4e3f92c Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 15 Dec 2022 10:04:33 +0100 Subject: [PATCH 04/21] Run integrity & consistency checks --- archlinux-keyring.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 44d1fbc..5e4f6cb 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -32,6 +32,9 @@ installation on Fedora systems. %build +%check +make check + %install %make_install PREFIX=%{_prefix} mkdir -p %{buildroot}%{_keyringsdir}/ From 0f8ba8076d4f9773834987ae90a92588c655f0c6 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 15 Dec 2022 10:07:29 +0100 Subject: [PATCH 05/21] Version 20221213 (#2153046) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9455464..603ce79 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /archlinux-keyring-20220927.tar.gz /archlinux-keyring-20221110.tar.gz /archlinux-keyring-20221123.tar.gz +/archlinux-keyring-20221213.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 5e4f6cb..0ec2322 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20221123 +Version: 20221213 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index c38e7e7..e86abdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20221123.tar.gz) = cdc2bf8ac6aa3c6003ada96c1b1bfad3ef7de4cec36ad9a2c690a8d0ea460a5b7b0382285526dd401de1f8e47f7986f1816c1c51d07a99e6bfa1bcf516467a84 +SHA512 (archlinux-keyring-20221213.tar.gz) = cd57a8bb7081d2470eddec68913e64958d4e4b82d0ddcf549cde5aaf29b0c2f85e61aa5afe23b1e996c99530bb5ce43a628044b67f45edcfcebac385f2559b4c From 7e05a5449de8770a7cdb15e785630b1162e3d928 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 27 Dec 2022 12:25:01 +0100 Subject: [PATCH 06/21] Version 20221220 (#2154797) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 603ce79..e059163 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /archlinux-keyring-20221110.tar.gz /archlinux-keyring-20221123.tar.gz /archlinux-keyring-20221213.tar.gz +/archlinux-keyring-20221220.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 0ec2322..4d1b749 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20221213 +Version: 20221220 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index e86abdb..e4fb85c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20221213.tar.gz) = cd57a8bb7081d2470eddec68913e64958d4e4b82d0ddcf549cde5aaf29b0c2f85e61aa5afe23b1e996c99530bb5ce43a628044b67f45edcfcebac385f2559b4c +SHA512 (archlinux-keyring-20221220.tar.gz) = 0ad4545c050abecea9e76ce3e1d9dd0cdb420da8fb62113bc3c696d4ff870490ea5b02f010da89331c981d4a68fada315224fbcc3292ada668bd64ceda299c1c From 6193938a17884c1d6dec080fc8df6cd27ffc157c Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 16 Feb 2023 12:56:31 +0100 Subject: [PATCH 07/21] Version 20230130 (#2165491) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e059163..b66f9af 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /archlinux-keyring-20221123.tar.gz /archlinux-keyring-20221213.tar.gz /archlinux-keyring-20221220.tar.gz +/archlinux-keyring-20230130.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 4d1b749..fc7bebc 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20221220 +Version: 20230130 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index e4fb85c..22e6e3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20221220.tar.gz) = 0ad4545c050abecea9e76ce3e1d9dd0cdb420da8fb62113bc3c696d4ff870490ea5b02f010da89331c981d4a68fada315224fbcc3292ada668bd64ceda299c1c +SHA512 (archlinux-keyring-20230130.tar.gz) = 3b11efad5566dcf338516badeceb3bdb95d12dc660705f0613a9a8c3e64cab9e599e4df64e3c70e094cadb80136890e51f56822c5edf23ad83e90fe703209983 From 91aefec8d559d7e9cf44769bfe15a75d9d86049f Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 28 Feb 2023 20:11:15 +0100 Subject: [PATCH 08/21] Version 20230225 (#2172640) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b66f9af..7549d1d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /archlinux-keyring-20221213.tar.gz /archlinux-keyring-20221220.tar.gz /archlinux-keyring-20230130.tar.gz +/archlinux-keyring-20230225.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index fc7bebc..1a19b6e 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20230130 +Version: 20230225 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 22e6e3c..b3001e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230130.tar.gz) = 3b11efad5566dcf338516badeceb3bdb95d12dc660705f0613a9a8c3e64cab9e599e4df64e3c70e094cadb80136890e51f56822c5edf23ad83e90fe703209983 +SHA512 (archlinux-keyring-20230225.tar.gz) = 38a5bf5908546380f4f11b467b99bd47d82920e91a2cedc030d2603003412a8679ad55f73620ec97d6a02b56efd7595864785a2ff581492f6f63f9cc132a32cf From 539e084481b35d5f2bf4448757d756e6621b5304 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Fri, 24 Mar 2023 13:06:02 +0100 Subject: [PATCH 09/21] Version 20230320 (#2180086) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7549d1d..38a0a34 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /archlinux-keyring-20221220.tar.gz /archlinux-keyring-20230130.tar.gz /archlinux-keyring-20230225.tar.gz +/archlinux-keyring-20230320.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 1a19b6e..78f154c 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20230225 +Version: 20230320 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index b3001e5..75c66d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230225.tar.gz) = 38a5bf5908546380f4f11b467b99bd47d82920e91a2cedc030d2603003412a8679ad55f73620ec97d6a02b56efd7595864785a2ff581492f6f63f9cc132a32cf +SHA512 (archlinux-keyring-20230320.tar.gz) = c35369db7adbaa6712a001bca6345680c0d52a4184544e29b982bf36d7cfe165954ed889703aabc8f07cede1990a03036cbab81d1668f41c88ada59bdf63f1d2 From c725b11bb6cce1f832089494f7c46b809e94231e Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 8 May 2023 21:12:11 +0200 Subject: [PATCH 10/21] Version 20230504 (#2193100) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 38a0a34..f38d77a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /archlinux-keyring-20230130.tar.gz /archlinux-keyring-20230225.tar.gz /archlinux-keyring-20230320.tar.gz +/archlinux-keyring-20230504.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 78f154c..ffd8ed4 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20230320 +Version: 20230504 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 75c66d8..29fd354 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230320.tar.gz) = c35369db7adbaa6712a001bca6345680c0d52a4184544e29b982bf36d7cfe165954ed889703aabc8f07cede1990a03036cbab81d1668f41c88ada59bdf63f1d2 +SHA512 (archlinux-keyring-20230504.tar.gz) = 0551fc3c1f395d3bc6e64ad402b4eaf87ca9dada52fb2d11bc46a62af458048071716fac9a207908041ea48fc44546e48ce02e6cc0b38bac17ee19dbfa34a6c6 From 499470c4d9eff9a2bc49e71547c5eed46a6cde21 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sat, 1 Jul 2023 09:49:38 +0200 Subject: [PATCH 11/21] Version 20230629 (#2218594) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f38d77a..cb22758 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /archlinux-keyring-20230225.tar.gz /archlinux-keyring-20230320.tar.gz /archlinux-keyring-20230504.tar.gz +/archlinux-keyring-20230629.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index ffd8ed4..5a95b30 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20230504 +Version: 20230629 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 29fd354..1d06116 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230504.tar.gz) = 0551fc3c1f395d3bc6e64ad402b4eaf87ca9dada52fb2d11bc46a62af458048071716fac9a207908041ea48fc44546e48ce02e6cc0b38bac17ee19dbfa34a6c6 +SHA512 (archlinux-keyring-20230629.tar.gz) = 9aafecaf48d2850a1d9fbc7f27931c7bc2c37cc702937aa49424792cdcb201ea30e7e51aaed23e05efb5320a0241c0cdc225a79aed09a6f3f5be9d1f3a262cbf From eb4ccd0db572aad4a0083037452a457ed2ce5b0a Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 9 Jul 2023 22:53:32 +0200 Subject: [PATCH 12/21] Version 20230704 (#2219535) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cb22758..6b0c65a 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /archlinux-keyring-20230320.tar.gz /archlinux-keyring-20230504.tar.gz /archlinux-keyring-20230629.tar.gz +/archlinux-keyring-20230704.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 5a95b30..16f44e2 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20230629 +Version: 20230704 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 1d06116..985d420 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230629.tar.gz) = 9aafecaf48d2850a1d9fbc7f27931c7bc2c37cc702937aa49424792cdcb201ea30e7e51aaed23e05efb5320a0241c0cdc225a79aed09a6f3f5be9d1f3a262cbf +SHA512 (archlinux-keyring-20230704.tar.gz) = b441f14217e000a0c9d892206ea64d414eaf0966c17133588a99b10fdf1da4cfd1a2b47d880aa05cb49211baaf3b7d333448903c1decdc0cc5c9dd89becf2480 From 4d99d08fa561731fea087648926c983d2ca0df34 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 21 Aug 2023 20:23:44 +0200 Subject: [PATCH 13/21] Version 20230821 (#2233045) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6b0c65a..7bc8fcd 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /archlinux-keyring-20230504.tar.gz /archlinux-keyring-20230629.tar.gz /archlinux-keyring-20230704.tar.gz +/archlinux-keyring-20230821.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 16f44e2..53f8a16 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20230704 +Version: 20230821 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 985d420..18f5e02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230704.tar.gz) = b441f14217e000a0c9d892206ea64d414eaf0966c17133588a99b10fdf1da4cfd1a2b47d880aa05cb49211baaf3b7d333448903c1decdc0cc5c9dd89becf2480 +SHA512 (archlinux-keyring-20230821.tar.gz) = efa6b1ddeca97d18c697f2bfecb75073d1d03bf16c3736ff1e44590f9931b005d50a296744072ecb694a001404bb880607d1f1009c33d8017a7b177800b89ece From 6f9caaccc2c21f608819aa87b4583442261b5453 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Thu, 7 Sep 2023 11:27:49 -0500 Subject: [PATCH 14/21] Revert upstream feature that uses sq >= 0.31.0 Signed-off-by: Michel Lind --- ...x-keyring-revert_to_sq-keyring-linter.diff | 93 +++++++++++++++++++ archlinux-keyring.spec | 3 +- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 archlinux-keyring-revert_to_sq-keyring-linter.diff diff --git a/archlinux-keyring-revert_to_sq-keyring-linter.diff b/archlinux-keyring-revert_to_sq-keyring-linter.diff new file mode 100644 index 0000000..ddad6f8 --- /dev/null +++ b/archlinux-keyring-revert_to_sq-keyring-linter.diff @@ -0,0 +1,93 @@ +From a8e44708937708290e62ad66898119902fd6425f Mon Sep 17 00:00:00 2001 +From: Michel Lind +Date: Thu, 7 Sep 2023 11:11:00 -0500 +Subject: [PATCH] Revert "feat: Replace sq-keyring-linter with sq >= 0.31.0" + +For use in distribution packages where sq has not been updated + +This reverts commit 3365f8607cadf4c5e87b8e5d582cdbb021c0d267. +--- + README.md | 3 ++- + libkeyringctl/ci.py | 2 +- + libkeyringctl/cli.py | 2 +- + libkeyringctl/verify.py | 6 +++--- + 4 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/README.md b/README.md +index 102e9c3..f409fc5 100644 +--- a/README.md ++++ b/README.md +@@ -24,11 +24,12 @@ Build: + Runtime: + + * python +-* sequoia-sq >= 0.31.0 ++* sequoia-sq + + Optional: + + * hopenpgp-tools (verify) ++* sq-keyring-linter (verify) + * git (ci) + + ## Usage +diff --git a/libkeyringctl/ci.py b/libkeyringctl/ci.py +index 7200709..31b0210 100644 +--- a/libkeyringctl/ci.py ++++ b/libkeyringctl/ci.py +@@ -10,7 +10,7 @@ from .verify import verify + + + def ci(working_dir: Path, keyring_root: Path, project_root: Path) -> None: +- """Verify certificates against modern expectations using `sq keyring lint` and hokey ++ """Verify certificates against modern expectations using sq-keyring-linter and hokey + + Currently only newly added certificates will be checked against the expectations as existing + keys are not all fully compatible with those assumptions. +diff --git a/libkeyringctl/cli.py b/libkeyringctl/cli.py +index 020f64b..3334c17 100644 +--- a/libkeyringctl/cli.py ++++ b/libkeyringctl/cli.py +@@ -118,7 +118,7 @@ verify_parser.add_argument( + ) + verify_parser.add_argument("--no-lint-hokey", dest="lint_hokey", action="store_false", help="Do not run hokey lint") + verify_parser.add_argument( +- "--no-lint-sq-keyring", dest="lint_sq_keyring", action="store_false", help="Do not run sq keyring lint" ++ "--no-lint-sq-keyring", dest="lint_sq_keyring", action="store_false", help="Do not run sq-keyring-linter" + ) + verify_parser.set_defaults(lint_hokey=True, lint_sq_keyring=True) + +diff --git a/libkeyringctl/verify.py b/libkeyringctl/verify.py +index a0c582b..5b7fc7d 100644 +--- a/libkeyringctl/verify.py ++++ b/libkeyringctl/verify.py +@@ -29,7 +29,7 @@ def verify( # noqa: ignore=C901 + lint_hokey: bool = True, + lint_sq_keyring: bool = True, + ) -> None: +- """Verify certificates against modern expectations using `sq keyring lint` and hokey ++ """Verify certificates against modern expectations using sq-keyring-linter and hokey + + Parameters + ---------- +@@ -38,7 +38,7 @@ def verify( # noqa: ignore=C901 + sources: A list of username, fingerprint or directories from which to read PGP packet information + (defaults to `keyring_root`) + lint_hokey: Whether to run hokey lint +- lint_sq_keyring: Whether to run sq keyring lint ++ lint_sq_keyring: Whether to run sq-keyring-linter + """ + + if not sources: +@@ -71,7 +71,7 @@ def verify( # noqa: ignore=C901 + keyring_fd = Popen(("sq", "dearmor", f"{str(keyring_path)}"), stdout=PIPE) + print(system(["hokey", "lint"], _stdin=keyring_fd.stdout), end="") + if lint_sq_keyring: +- print(system(["sq", "keyring", "lint", f"{str(keyring_path)}"]), end="") ++ print(system(["sq-keyring-linter", f"{str(keyring_path)}"]), end="") + + + def verify_integrity(certificate: Path, all_fingerprints: Set[Fingerprint]) -> None: # noqa: ignore=C901 +-- +2.41.0 + diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 53f8a16..460ae90 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -3,6 +3,7 @@ Version: 20230821 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz +Patch: archlinux-keyring-revert_to_sq-keyring-linter.diff # see https://wiki.archlinux.org/index.php/Pacman-key for introduction License: Public Domain Summary: GPG keys used by Arch distribution to sign packages @@ -28,7 +29,7 @@ developers into an RPM package to allow for safe and convenient installation on Fedora systems. %prep -%setup -q +%autosetup -p1 %build From 5a9880ee4d85149109945d551a13591ef41b2c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 18 Sep 2023 14:58:02 +0200 Subject: [PATCH 15/21] Use rhbz# in message This way bodhi should be able to link the update to the bug automatically. The bug number is moved from the git commit title to the body. We don't really need this clutter in the git log, it is only useful in the %changelog so that bodhi can pick it up. (cherry picked from commit a71f4e415db51aad3bf011ec2a2ceedc99ab78cb) (cherry picked from commit 9d835e0719bd8f51c29f04c71b6d8b75cfa283a4) (cherry picked from commit 315aabbfd5c505dda8ccc12bdc2fa67b34713191) [skip changelog] --- version-update.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/version-update.sh b/version-update.sh index 0f45f2d..dee64dc 100755 --- a/version-update.sh +++ b/version-update.sh @@ -32,7 +32,9 @@ if [ "$sum1" != "$sum2" ]; then fi git add *.spec -git commit -a -m "Version $version (#$bug)" +git commit -a -m "Version $version + +... (rhbz#$bug)" if [ "$args" = "-u" ]; then git push From 7adbd1113b8b19d5da7310ecda94da1079cd49ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 18 Sep 2023 15:00:54 +0200 Subject: [PATCH 16/21] Version 20230918 ... (rhbz#2239389) (cherry picked from commit 8ecc997ae3dac71c38312f93ffd35baa6dde0aae) (cherry picked from commit f174f54bff596898fcb548276f0b3ac6e3228b76) (cherry picked from commit 26b2e080508effba7ec3c5a83bb2b547cc6d2b37) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7bc8fcd..aa9dc2b 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /archlinux-keyring-20230629.tar.gz /archlinux-keyring-20230704.tar.gz /archlinux-keyring-20230821.tar.gz +/archlinux-keyring-20230918.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 460ae90..fce273c 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20230821 +Version: 20230918 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 18f5e02..374769e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230821.tar.gz) = efa6b1ddeca97d18c697f2bfecb75073d1d03bf16c3736ff1e44590f9931b005d50a296744072ecb694a001404bb880607d1f1009c33d8017a7b177800b89ece +SHA512 (archlinux-keyring-20230918.tar.gz) = b9b28160769c367a2ab2af645e9a6873a0e835e038ae658940cfbc9aa82347067ad807548e2155d1a05e3c7ef15957ed641f9b21ef11385f15fc8c0a6df74497 From bf8e226ec030d935f11b2558b1e75a7adcb09073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 17 Oct 2023 15:33:43 +0200 Subject: [PATCH 17/21] Version 20231017 ... (rhbz#2243196) (cherry picked from commit 08ca5376ddf327700a0560c1e4094cbf43fb7185) (cherry picked from commit 2a2d6fa4760be8dd63df3327115921b44a66e00d) (cherry picked from commit 4c5722ada71bd457346f0f8323b2653c6c37b3aa) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aa9dc2b..42cb46f 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /archlinux-keyring-20230704.tar.gz /archlinux-keyring-20230821.tar.gz /archlinux-keyring-20230918.tar.gz +/archlinux-keyring-20231017.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index fce273c..cbd0249 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20230918 +Version: 20231017 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 374769e..482664a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230918.tar.gz) = b9b28160769c367a2ab2af645e9a6873a0e835e038ae658940cfbc9aa82347067ad807548e2155d1a05e3c7ef15957ed641f9b21ef11385f15fc8c0a6df74497 +SHA512 (archlinux-keyring-20231017.tar.gz) = da445bbb275a815e416f1ca5404e2b36357450e60f51b86500dc7866f14c26a158e2b963fa707a18cec33ae093ff5fd02b1b06771c7f2c3e0d10a7c29a973f57 From 3325120ae73b9b3ce4e0597ea6d6486567014935 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Fri, 3 Nov 2023 18:46:24 +0100 Subject: [PATCH 18/21] Version 20231026 ... (rhbz#2246326) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 42cb46f..88bb037 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /archlinux-keyring-20230821.tar.gz /archlinux-keyring-20230918.tar.gz /archlinux-keyring-20231017.tar.gz +/archlinux-keyring-20231026.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index cbd0249..da2d03b 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20231017 +Version: 20231026 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 482664a..07294db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20231017.tar.gz) = da445bbb275a815e416f1ca5404e2b36357450e60f51b86500dc7866f14c26a158e2b963fa707a18cec33ae093ff5fd02b1b06771c7f2c3e0d10a7c29a973f57 +SHA512 (archlinux-keyring-20231026.tar.gz) = 190042d0fd6deddfd97da857f21acaa7b89cf66bf8e34f48f2d61aaecc8636d935c591fee63bb36f70920fed0f036018cbf05dca93758b5a969d2ae5b68c055b From 948ab3dc5e09ccb910effc377ffcb73388056e31 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 14 Nov 2023 19:40:20 +0100 Subject: [PATCH 19/21] Version 20231113 ... (rhbz#2248590) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 88bb037..bb1ab28 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /archlinux-keyring-20230918.tar.gz /archlinux-keyring-20231017.tar.gz /archlinux-keyring-20231026.tar.gz +/archlinux-keyring-20231113.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index da2d03b..e522ea7 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20231026 +Version: 20231113 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 07294db..e48b4b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20231026.tar.gz) = 190042d0fd6deddfd97da857f21acaa7b89cf66bf8e34f48f2d61aaecc8636d935c591fee63bb36f70920fed0f036018cbf05dca93758b5a969d2ae5b68c055b +SHA512 (archlinux-keyring-20231113.tar.gz) = e72d28fa48755bc85a8f5a38ec1731bca3af191dc3be4619700d3fbd711ae570804c727ef12344d5e2ec82c03a4afbb7309da25ebb4a59491f9367cb154c4a05 From 9cac4c4b72636e3fe7963df081d0b26126758089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 21 Nov 2023 14:44:11 +0100 Subject: [PATCH 20/21] Convert license tag to SPDX --- archlinux-keyring.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index e522ea7..9630f2b 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -5,8 +5,8 @@ Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz Patch: archlinux-keyring-revert_to_sq-keyring-linter.diff # see https://wiki.archlinux.org/index.php/Pacman-key for introduction -License: Public Domain -Summary: GPG keys used by Arch distribution to sign packages +License: LicenseRef-Fedora-Public-Domain +Summary: GPG keys used by Arch Linux distribution to sign packages BuildArch: noarch BuildRequires: keyrings-filesystem From c9d0190f0ece231d76708d08ec3c3d1c577dce9b Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 3 Dec 2023 19:31:34 +0100 Subject: [PATCH 21/21] Version 20231130 ... (rhbz#2252233) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bb1ab28..9bc2a9c 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /archlinux-keyring-20231017.tar.gz /archlinux-keyring-20231026.tar.gz /archlinux-keyring-20231113.tar.gz +/archlinux-keyring-20231130.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 9630f2b..4a8988d 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20231113 +Version: 20231130 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index e48b4b5..4f1ff28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20231113.tar.gz) = e72d28fa48755bc85a8f5a38ec1731bca3af191dc3be4619700d3fbd711ae570804c727ef12344d5e2ec82c03a4afbb7309da25ebb4a59491f9367cb154c4a05 +SHA512 (archlinux-keyring-20231130.tar.gz) = 76c495b73b5e3aa8a6bb4c934c75b99ee875a80cecc14426d3351a2bd6f47475ddcdbdb730a67adb00a859eddcc32b570e4335d6fa8717d2a90ba4f090782dbb