From c0e088c38d16a4a89b67b1f450ffc6463f04f6fb Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 21 Aug 2023 20:23:44 +0200
Subject: [PATCH 01/20] 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 44ecde5863dbccda4eef29832867d6d67ab48ea8 Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@fedoraproject.org>
Date: Thu, 7 Sep 2023 11:27:49 -0500
Subject: [PATCH 02/20] Revert upstream feature that uses sq >= 0.31.0

Signed-off-by: Michel Lind <salimma@fedoraproject.org>
---
 ...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 <salimma@fedoraproject.org>
+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 9d835e0719bd8f51c29f04c71b6d8b75cfa283a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 18 Sep 2023 14:58:02 +0200
Subject: [PATCH 03/20] 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)

[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 f174f54bff596898fcb548276f0b3ac6e3228b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 18 Sep 2023 15:00:54 +0200
Subject: [PATCH 04/20] Version 20230918

... (rhbz#2239389)

(cherry picked from commit 8ecc997ae3dac71c38312f93ffd35baa6dde0aae)
---
 .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 2a2d6fa4760be8dd63df3327115921b44a66e00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 17 Oct 2023 15:33:43 +0200
Subject: [PATCH 05/20] Version 20231017

... (rhbz#2243196)

(cherry picked from commit 08ca5376ddf327700a0560c1e4094cbf43fb7185)
---
 .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 5f378db399c9a8166b2a0fd26f23a3c2b52765d3 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 3 Nov 2023 18:46:24 +0100
Subject: [PATCH 06/20] 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 619dba03ba656322d67dcef3d0bcb5486163d789 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Tue, 14 Nov 2023 19:40:20 +0100
Subject: [PATCH 07/20] 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 f7eee61ed2d1d21946b4d50ccfe196100100db0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 21 Nov 2023 14:44:11 +0100
Subject: [PATCH 08/20] 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 5e0f6b1391d8600f37eaf01d49f05d0e710712ca Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sun, 3 Dec 2023 19:31:34 +0100
Subject: [PATCH 09/20] 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

From a1107196a3e7baa17b968537b9aab8137794dac4 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 13 Dec 2023 21:26:57 +0100
Subject: [PATCH 10/20] Version 20231207

... (rhbz#2253495)
---
 .gitignore             | 1 +
 archlinux-keyring.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9bc2a9c..fa4ea9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@
 /archlinux-keyring-20231026.tar.gz
 /archlinux-keyring-20231113.tar.gz
 /archlinux-keyring-20231130.tar.gz
+/archlinux-keyring-20231207.tar.gz
diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index 4a8988d..f09c929 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -1,5 +1,5 @@
 Name:           archlinux-keyring
-Version:        20231130
+Version:        20231207
 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 4f1ff28..360828e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (archlinux-keyring-20231130.tar.gz) = 76c495b73b5e3aa8a6bb4c934c75b99ee875a80cecc14426d3351a2bd6f47475ddcdbdb730a67adb00a859eddcc32b570e4335d6fa8717d2a90ba4f090782dbb
+SHA512 (archlinux-keyring-20231207.tar.gz) = e67a69922cc3bf708fabc5125d1c0168cb7b008ebe60a19f33d4f68524c00edd20641b779202b6cd9b843d1559f92256faedda10dbc92e4ef729f0b60cb39d35

From 79687b1f282d587c18916afd52e300b9afcc7adf Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 3 Jan 2024 10:02:56 +0100
Subject: [PATCH 11/20] Version 20231222

... (rhbz#2255663)
---
 .gitignore             | 1 +
 archlinux-keyring.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa4ea9c..dc6e408 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@
 /archlinux-keyring-20231113.tar.gz
 /archlinux-keyring-20231130.tar.gz
 /archlinux-keyring-20231207.tar.gz
+/archlinux-keyring-20231222.tar.gz
diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index f09c929..8d0dfdd 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -1,5 +1,5 @@
 Name:           archlinux-keyring
-Version:        20231207
+Version:        20231222
 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 360828e..03d0012 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (archlinux-keyring-20231207.tar.gz) = e67a69922cc3bf708fabc5125d1c0168cb7b008ebe60a19f33d4f68524c00edd20641b779202b6cd9b843d1559f92256faedda10dbc92e4ef729f0b60cb39d35
+SHA512 (archlinux-keyring-20231222.tar.gz) = ce765108abb36e7cdd08fe65344e85ececc95fd9f2b2c8cd3052e8859fe76afe20173590ee11e602ee89a55daf2ce1ce41db7339aa0f85832c9c4e9987ffdcac

From 110405c15efd96b6203c8d694d05f1d9b27d0193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 9 Feb 2024 12:31:07 +0100
Subject: [PATCH 12/20] Rework scriptlets to initialize the keyring

The scriptlet would only work if pacman was already installed when the
scriptlet was called. This would often be the case, but for example, the
user might even install pacman later in a separate transaction.

Let's switch to a %transfiletriggerin: this way we should be called in
all cases where pacman-key is available. We might be called more often
than necessary, but that should be fine too. pacman is updated rather
rarely.

(cherry picked from commit 9866da662c05380231d189e826c65078dede4b35)
---
 archlinux-keyring.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index 8d0dfdd..075cceb 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -48,10 +48,16 @@ ln --relative -s %{_datadir}/pacman/keyrings/archlinux.gpg %{buildroot}%{_keyrin
 %{_unitdir}/archlinux-keyring-wkd-sync.*
 %{_unitdir}/timers.target.wants/archlinux-keyring-wkd-sync.timer
 
-%post
-if [ -x /usr/bin/pacman-key ] && /usr/bin/pacman-key -l &>/dev/null; then
-    /usr/bin/pacman-key --populate archlinux || :
-    /usr/bin/pacman-key --updatedb || :
+%posttrans
+if [ $1 == 1 ] && [ -x /usr/bin/pacman-key ] && ! /usr/bin/pacman-key -l &>/dev/null; then
+    /usr/bin/pacman-key --init && \
+    /usr/bin/pacman-key --populate archlinux --updatedb || :
+fi
+
+%transfiletriggerin -- /usr/bin/pacman-key
+if [ -x /usr/bin/pacman-key ] && ! /usr/bin/pacman-key -l &>/dev/null; then
+    /usr/bin/pacman-key --init && \
+    /usr/bin/pacman-key --populate archlinux --updatedb || :
 fi
 
 %changelog

From 0edec7b972d71af047cbab23dfed161b7591282e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 9 Feb 2024 12:12:29 +0100
Subject: [PATCH 13/20] Version 20240208

... (rhbz#2263434)

(cherry picked from commit 3e3512daed04f867a271af32779cdb4889a93aa7)
---
 .gitignore             | 1 +
 archlinux-keyring.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc6e408..d909b1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@
 /archlinux-keyring-20231130.tar.gz
 /archlinux-keyring-20231207.tar.gz
 /archlinux-keyring-20231222.tar.gz
+/archlinux-keyring-20240208.tar.gz
diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index 075cceb..fc6d3d4 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -1,5 +1,5 @@
 Name:           archlinux-keyring
-Version:        20231222
+Version:        20240208
 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 03d0012..bbae4c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (archlinux-keyring-20231222.tar.gz) = ce765108abb36e7cdd08fe65344e85ececc95fd9f2b2c8cd3052e8859fe76afe20173590ee11e602ee89a55daf2ce1ce41db7339aa0f85832c9c4e9987ffdcac
+SHA512 (archlinux-keyring-20240208.tar.gz) = 47ab241044701821d00dfa83b15ebbe60c5d4aa004aebec2235fca42e4d65566533ee14b43db443ba03cc50a2078667c6126d8f740e55b8c910b334d52eff660

From ef1b8bbc0a83aaef314550e6d39da46efcf4f589 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 20 Mar 2024 17:20:47 +0100
Subject: [PATCH 14/20] Version 20240313

... (rhbz#2269408)

This also reshuffles the patch situation a bit, notably:
 - the patch for sq-keyring-linter is no longer necessary, since we have
   sequoia-sq >= 0.31.0 in all active Fedora releases
 - a new patch was added that reverts [0], since ATTOW in Fedora we have
   sequoia-sq 0.33.0 which is from before the keyring module was moved
   into the toolbox one; once Fedora gets sequoia-sq >= 0.34.0 this
   patch can be dropped

[0] https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/commit/10252b287d7d3bc338d0aa3e5d2e6c0fc6d1653d
---
 .gitignore                                    |  1 +
 ...yringctl-Adapt-to-CLI-churn-in-sequo.patch | 61 ++++++++++++
 ...x-keyring-revert_to_sq-keyring-linter.diff | 93 -------------------
 archlinux-keyring.spec                        |  5 +-
 sources                                       |  2 +-
 5 files changed, 66 insertions(+), 96 deletions(-)
 create mode 100644 0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch
 delete mode 100644 archlinux-keyring-revert_to_sq-keyring-linter.diff

diff --git a/.gitignore b/.gitignore
index d909b1e..877b407 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@
 /archlinux-keyring-20231207.tar.gz
 /archlinux-keyring-20231222.tar.gz
 /archlinux-keyring-20240208.tar.gz
+/archlinux-keyring-20240313.tar.gz
diff --git a/0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch b/0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch
new file mode 100644
index 0000000..09efe94
--- /dev/null
+++ b/0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch
@@ -0,0 +1,61 @@
+From 4b984f2583b05496585d8ed8cfab9f2dcb6827b8 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <frantisek@sumsal.cz>
+Date: Wed, 20 Mar 2024 17:14:46 +0100
+Subject: [PATCH] Revert "fix(libkeyringctl): Adapt to CLI churn in sequoia-sq
+ 0.34.0"
+
+Drop this once we have sequoia-sq 0.34.0 in Fedora.
+
+This reverts commit 10252b287d7d3bc338d0aa3e5d2e6c0fc6d1653d.
+---
+ libkeyringctl/sequoia.py | 6 +++---
+ libkeyringctl/verify.py  | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libkeyringctl/sequoia.py b/libkeyringctl/sequoia.py
+index 34206a5..1e73149 100644
+--- a/libkeyringctl/sequoia.py
++++ b/libkeyringctl/sequoia.py
+@@ -49,7 +49,7 @@ def keyring_split(working_dir: Path, keyring: Path, preserve_filename: bool = Fa
+     keyring_dir = Path(mkdtemp(dir=working_dir, prefix="keyring-")).absolute()
+ 
+     with cwd(keyring_dir):
+-        system(["sq", "toolbox", "keyring", "split", str(keyring)])
++        system(["sq", "keyring", "split", str(keyring)])
+ 
+     keyrings: List[Path] = list(natural_sort_path(keyring_dir.iterdir()))
+ 
+@@ -75,7 +75,7 @@ def keyring_merge(certificates: List[Path], output: Optional[Path] = None, force
+     The result if no output file has been used
+     """
+ 
+-    cmd = ["sq", "toolbox", "keyring", "merge"]
++    cmd = ["sq", "keyring", "merge"]
+     if force:
+         cmd.insert(1, "--force")
+     if output:
+@@ -103,7 +103,7 @@ def packet_split(working_dir: Path, certificate: Path) -> Iterable[Path]:
+     packet_dir = Path(mkdtemp(dir=working_dir, prefix="packet-")).absolute()
+ 
+     with cwd(packet_dir):
+-        system(["sq", "toolbox", "packet", "split", "--prefix", "''", str(certificate)])
++        system(["sq", "toolbox", "packet", "split", str(certificate)])
+     return natural_sort_path(packet_dir.iterdir())
+ 
+ 
+diff --git a/libkeyringctl/verify.py b/libkeyringctl/verify.py
+index 29c64d8..a0c582b 100644
+--- a/libkeyringctl/verify.py
++++ b/libkeyringctl/verify.py
+@@ -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", "toolbox", "keyring", "lint", f"{str(keyring_path)}"]), end="")
++                print(system(["sq", "keyring", "lint", f"{str(keyring_path)}"]), end="")
+ 
+ 
+ def verify_integrity(certificate: Path, all_fingerprints: Set[Fingerprint]) -> None:  # noqa: ignore=C901
+-- 
+2.44.0
+
diff --git a/archlinux-keyring-revert_to_sq-keyring-linter.diff b/archlinux-keyring-revert_to_sq-keyring-linter.diff
deleted file mode 100644
index ddad6f8..0000000
--- a/archlinux-keyring-revert_to_sq-keyring-linter.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-From a8e44708937708290e62ad66898119902fd6425f Mon Sep 17 00:00:00 2001
-From: Michel Lind <salimma@fedoraproject.org>
-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 fc6d3d4..6c4b5fe 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -1,9 +1,10 @@
 Name:           archlinux-keyring
-Version:        20240208
+Version:        20240313
 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
+# Revert this patch once we have sequoia-sq 0.34.0 in Fedora
+Patch:          0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch
 # see https://wiki.archlinux.org/index.php/Pacman-key for introduction
 License:        LicenseRef-Fedora-Public-Domain
 Summary:        GPG keys used by Arch Linux distribution to sign packages
diff --git a/sources b/sources
index bbae4c7..dc49c52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (archlinux-keyring-20240208.tar.gz) = 47ab241044701821d00dfa83b15ebbe60c5d4aa004aebec2235fca42e4d65566533ee14b43db443ba03cc50a2078667c6126d8f740e55b8c910b334d52eff660
+SHA512 (archlinux-keyring-20240313.tar.gz) = 8caedebccd31a62264cb7c5e8d4c7f3e326f018b6e9148ab31e19e58a60b64c0ee2a641090c77a40bcfba93ef4ce13132b721241a0404816b40e28da4fd36f9b

From 8651fd252c2b4975a0ba2e1a8dc37576345bc07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 27 Apr 2024 21:17:21 +0200
Subject: [PATCH 15/20] Drop now-needed patch for sequoia-sq

[skip changelog]

(cherry picked from commit a88ca31402acd6c44943796b6154136f08521b90)
(cherry picked from commit 6594ae2daa60e80d7c42f79c0cc830715ead54ac)
---
 ...yringctl-Adapt-to-CLI-churn-in-sequo.patch | 61 -------------------
 archlinux-keyring.spec                        |  2 -
 2 files changed, 63 deletions(-)
 delete mode 100644 0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch

diff --git a/0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch b/0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch
deleted file mode 100644
index 09efe94..0000000
--- a/0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4b984f2583b05496585d8ed8cfab9f2dcb6827b8 Mon Sep 17 00:00:00 2001
-From: Frantisek Sumsal <frantisek@sumsal.cz>
-Date: Wed, 20 Mar 2024 17:14:46 +0100
-Subject: [PATCH] Revert "fix(libkeyringctl): Adapt to CLI churn in sequoia-sq
- 0.34.0"
-
-Drop this once we have sequoia-sq 0.34.0 in Fedora.
-
-This reverts commit 10252b287d7d3bc338d0aa3e5d2e6c0fc6d1653d.
----
- libkeyringctl/sequoia.py | 6 +++---
- libkeyringctl/verify.py  | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libkeyringctl/sequoia.py b/libkeyringctl/sequoia.py
-index 34206a5..1e73149 100644
---- a/libkeyringctl/sequoia.py
-+++ b/libkeyringctl/sequoia.py
-@@ -49,7 +49,7 @@ def keyring_split(working_dir: Path, keyring: Path, preserve_filename: bool = Fa
-     keyring_dir = Path(mkdtemp(dir=working_dir, prefix="keyring-")).absolute()
- 
-     with cwd(keyring_dir):
--        system(["sq", "toolbox", "keyring", "split", str(keyring)])
-+        system(["sq", "keyring", "split", str(keyring)])
- 
-     keyrings: List[Path] = list(natural_sort_path(keyring_dir.iterdir()))
- 
-@@ -75,7 +75,7 @@ def keyring_merge(certificates: List[Path], output: Optional[Path] = None, force
-     The result if no output file has been used
-     """
- 
--    cmd = ["sq", "toolbox", "keyring", "merge"]
-+    cmd = ["sq", "keyring", "merge"]
-     if force:
-         cmd.insert(1, "--force")
-     if output:
-@@ -103,7 +103,7 @@ def packet_split(working_dir: Path, certificate: Path) -> Iterable[Path]:
-     packet_dir = Path(mkdtemp(dir=working_dir, prefix="packet-")).absolute()
- 
-     with cwd(packet_dir):
--        system(["sq", "toolbox", "packet", "split", "--prefix", "''", str(certificate)])
-+        system(["sq", "toolbox", "packet", "split", str(certificate)])
-     return natural_sort_path(packet_dir.iterdir())
- 
- 
-diff --git a/libkeyringctl/verify.py b/libkeyringctl/verify.py
-index 29c64d8..a0c582b 100644
---- a/libkeyringctl/verify.py
-+++ b/libkeyringctl/verify.py
-@@ -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", "toolbox", "keyring", "lint", f"{str(keyring_path)}"]), end="")
-+                print(system(["sq", "keyring", "lint", f"{str(keyring_path)}"]), end="")
- 
- 
- def verify_integrity(certificate: Path, all_fingerprints: Set[Fingerprint]) -> None:  # noqa: ignore=C901
--- 
-2.44.0
-
diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index 6c4b5fe..e444389 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -3,8 +3,6 @@ Version:        20240313
 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
-# Revert this patch once we have sequoia-sq 0.34.0 in Fedora
-Patch:          0001-Revert-fix-libkeyringctl-Adapt-to-CLI-churn-in-sequo.patch
 # see https://wiki.archlinux.org/index.php/Pacman-key for introduction
 License:        LicenseRef-Fedora-Public-Domain
 Summary:        GPG keys used by Arch Linux distribution to sign packages

From 8f7071ab4a1f950cf3dcfe9199a65dee630b0fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 27 Apr 2024 21:19:27 +0200
Subject: [PATCH 16/20] Version 20240427

... (rhbz#2277519)

(cherry picked from commit 3b4e0b0d8239403a368a5b771a1f3d22b8fbc8c2)
(cherry picked from commit e31a41046d56403609d63976a9961f013c829782)
---
 .gitignore             | 1 +
 archlinux-keyring.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 877b407..0c38a7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
 /archlinux-keyring-20231222.tar.gz
 /archlinux-keyring-20240208.tar.gz
 /archlinux-keyring-20240313.tar.gz
+/archlinux-keyring-20240427.tar.gz
diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index e444389..b2367d4 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -1,5 +1,5 @@
 Name:           archlinux-keyring
-Version:        20240313
+Version:        20240427
 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 dc49c52..cb0a47e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (archlinux-keyring-20240313.tar.gz) = 8caedebccd31a62264cb7c5e8d4c7f3e326f018b6e9148ab31e19e58a60b64c0ee2a641090c77a40bcfba93ef4ce13132b721241a0404816b40e28da4fd36f9b
+SHA512 (archlinux-keyring-20240427.tar.gz) = 05f61d6f6a4c2e2cc38fa030e37dd0b8e158171732901b08c51b7736f7797402065f778ddd5844dcc5e4595575c8a42b5801492c917825721d52b5f6ddfcc5cc

From df6d070d99c1e60b844c05187d571e61b1add1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Jun 2024 13:56:09 +0200
Subject: [PATCH 17/20] Version 20240520

... (rhbz#2277698)
---
 .gitignore             | 1 +
 archlinux-keyring.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c38a7c..ca0991e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
 /archlinux-keyring-20240208.tar.gz
 /archlinux-keyring-20240313.tar.gz
 /archlinux-keyring-20240427.tar.gz
+/archlinux-keyring-20240520.tar.gz
diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index b2367d4..6cc7d8c 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -1,5 +1,5 @@
 Name:           archlinux-keyring
-Version:        20240427
+Version:        20240520
 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 cb0a47e..6351f7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (archlinux-keyring-20240427.tar.gz) = 05f61d6f6a4c2e2cc38fa030e37dd0b8e158171732901b08c51b7736f7797402065f778ddd5844dcc5e4595575c8a42b5801492c917825721d52b5f6ddfcc5cc
+SHA512 (archlinux-keyring-20240520.tar.gz) = d4336eda7e3c09e62fb451fb70d4562658e5b16b5aed27a4c929c59490a9cdffc05cbc8709dbba6be7f2bfb7642a343ea33004c4ccf6d48c99e82c48c90fbec7

From fd2e4058575007e6cc721a88f705a829bd5d9e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 10 Jun 2024 12:43:06 +0200
Subject: [PATCH 18/20] Version 20240609

... (rhbz#2291115)
---
 .gitignore             | 1 +
 archlinux-keyring.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ca0991e..485ad6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@
 /archlinux-keyring-20240313.tar.gz
 /archlinux-keyring-20240427.tar.gz
 /archlinux-keyring-20240520.tar.gz
+/archlinux-keyring-20240609.tar.gz
diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index 6cc7d8c..a1441d3 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -1,5 +1,5 @@
 Name:           archlinux-keyring
-Version:        20240520
+Version:        20240609
 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 6351f7b..9ad8081 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (archlinux-keyring-20240520.tar.gz) = d4336eda7e3c09e62fb451fb70d4562658e5b16b5aed27a4c929c59490a9cdffc05cbc8709dbba6be7f2bfb7642a343ea33004c4ccf6d48c99e82c48c90fbec7
+SHA512 (archlinux-keyring-20240609.tar.gz) = 38848faad881f3714ad01387e8e486e98027168b927c746e1c50a1881d685a997c3e1953c900d2e0ae9e0cb05e7a5973939775d65e75c5c547b4fd7bc562eff7

From 028a9d0bad13d65c02f7edf02582cd9a471413b4 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 12 Jul 2024 16:40:24 +0200
Subject: [PATCH 19/20] Version 20240709

... (rhbz#2296950)
---
 .gitignore             | 1 +
 archlinux-keyring.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 485ad6e..55b9ab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@
 /archlinux-keyring-20240427.tar.gz
 /archlinux-keyring-20240520.tar.gz
 /archlinux-keyring-20240609.tar.gz
+/archlinux-keyring-20240709.tar.gz
diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index a1441d3..ec95c4e 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -1,5 +1,5 @@
 Name:           archlinux-keyring
-Version:        20240609
+Version:        20240709
 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 9ad8081..c168935 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (archlinux-keyring-20240609.tar.gz) = 38848faad881f3714ad01387e8e486e98027168b927c746e1c50a1881d685a997c3e1953c900d2e0ae9e0cb05e7a5973939775d65e75c5c547b4fd7bc562eff7
+SHA512 (archlinux-keyring-20240709.tar.gz) = 42c66cc3df37c621258e420eedea3c89b9ea52b8666864a7b16a295d949a4a46e47a4f35c3edc1aa1028fe3295d9737404e4d93f26f989f8430024cee4ec8edf

From 45e524cb2d17bad717a746783092b00e87c3be6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 24 Oct 2024 09:40:57 +0200
Subject: [PATCH 20/20] Version 20241015

... (rhbz#2319024)

(cherry picked from commit 0ca7c778e9d9427fca28ac31fdaccf9182bd23a2)
(cherry picked from commit 8b6ee5f7eb8e265cb1a12433125ea8194c2b20a6)
---
 .gitignore             | 1 +
 archlinux-keyring.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 55b9ab3..e27666f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@
 /archlinux-keyring-20240520.tar.gz
 /archlinux-keyring-20240609.tar.gz
 /archlinux-keyring-20240709.tar.gz
+/archlinux-keyring-20241015.tar.gz
diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec
index ec95c4e..ffdb1de 100644
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@@ -1,5 +1,5 @@
 Name:           archlinux-keyring
-Version:        20240709
+Version:        20241015
 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 c168935..cb11c9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (archlinux-keyring-20240709.tar.gz) = 42c66cc3df37c621258e420eedea3c89b9ea52b8666864a7b16a295d949a4a46e47a4f35c3edc1aa1028fe3295d9737404e4d93f26f989f8430024cee4ec8edf
+SHA512 (archlinux-keyring-20241015.tar.gz) = 9f042416951cee25cec65759fa2a9ea095cc5b8e650fc7dc070f0c319b50c8f082e45ef1cae6acb1350a0bd48112ee08283fc58c793c6e9c362b91bea42499e0