From f63487466b168c752adb99dd4a697aed9caa6713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Dec 2024 10:56:17 +0100 Subject: [PATCH 1/6] Version 20241203 ... (rhbz#2330133) (cherry picked from commit 44fc02e66d8ab85db0966729c5806cf37ece6897) The patch for sq-0.39 is reverted. The update has already been built, but is not stable yet. This reverted will need to be dropped later. (cherry picked from commit a458ca041cb71c4dba421cefd49a1667490d9223) --- archlinux-keyring.spec | 9 ++++++--- sources | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 988bc3c..f2ea504 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,8 +1,10 @@ Name: archlinux-keyring -Version: 20241015 +Version: 20241203 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 +Source: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz +Patch: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/commit/1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.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 @@ -32,7 +34,8 @@ developers into an RPM package to allow for safe and convenient installation on Fedora systems. %prep -%autosetup -p1 +%setup -q +%patch -P0 -R -p1 %if 0%{?el9} sed -i 's|/usr/bin/env python3|/usr/bin/env python3.11|' keyringctl %endif diff --git a/sources b/sources index cb11c9d..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -SHA512 (archlinux-keyring-20241015.tar.gz) = 9f042416951cee25cec65759fa2a9ea095cc5b8e650fc7dc070f0c319b50c8f082e45ef1cae6acb1350a0bd48112ee08283fc58c793c6e9c362b91bea42499e0 From 78333f4d7081f00473236234e92d0ddfaef18727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Dec 2024 11:41:02 +0100 Subject: [PATCH 2/6] Upload sources [skip changelog] --- .gitignore | 1 + ...2bddcd847c0dc05ac4899867f2c76a8838b8.patch | 151 ++++++++++++++++++ sources | 1 + 3 files changed, 153 insertions(+) create mode 100644 1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.patch diff --git a/.gitignore b/.gitignore index e27666f..c0067f4 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /archlinux-keyring-20240609.tar.gz /archlinux-keyring-20240709.tar.gz /archlinux-keyring-20241015.tar.gz +/archlinux-keyring-20241203.tar.gz diff --git a/1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.patch b/1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.patch new file mode 100644 index 0000000..4167eb4 --- /dev/null +++ b/1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.patch @@ -0,0 +1,151 @@ +From 1b5d2bddcd847c0dc05ac4899867f2c76a8838b8 Mon Sep 17 00:00:00 2001 +From: David Runge +Date: Fri, 1 Nov 2024 12:28:54 +0100 +Subject: [PATCH] fix: Adapt use of sq to sequoia-sq 0.39.0 + +Add various fixes, as +- the output format of `sq toolbox packet split` changed (again) +- the CLI of `sq toolbox packet split` changed (again) +- the useless warning message on stderr now covers two lines and + interferes with parsing of `sq toolbox packet dump` output +- the global option `--force` was renamed to `--overwrite` +- the `sq key generate` subcommand introduced a mandatory `--rev-cert` + option +- the `pki certify` subcommand was moved to `pki vouch certify` and + introduced mandatory options for our use-case (`--certifier-file`, + `--cert-file`, `--userid`) + +Signed-off-by: David Runge +--- + libkeyringctl/keyring.py | 12 ++++++------ + libkeyringctl/sequoia.py | 14 +++++++------- + libkeyringctl/util.py | 3 ++- + tests/test_sequoia.py | 4 ++-- + 4 files changed, 17 insertions(+), 16 deletions(-) + +diff --git a/libkeyringctl/keyring.py b/libkeyringctl/keyring.py +index e4342c17..9937783a 100644 +--- a/libkeyringctl/keyring.py ++++ b/libkeyringctl/keyring.py +@@ -56,12 +56,12 @@ PACKET_FILENAME_DATETIME_FORMAT: str = "%Y-%m-%d_%H-%M-%S" + class PacketType(Enum): + """All understood OpenPGP packet types and the file endings as output by `sq packet split`""" + +- PUBLIC_KEY = "Public-Key Packet" +- USER_ID = "User ID Packet" +- USER_ATTRIBUTE = "User Attribute Packet" +- PUBLIC_SUBKEY = "Public-Subkey Packet" +- SECRET_KEY = "Secret-Key Packet" +- SIGNATURE = "Signature Packet" ++ PUBLIC_KEY = "Public-Key-Packet" ++ USER_ID = "User-ID-Packet" ++ USER_ATTRIBUTE = "User-Attribute-Packet" ++ PUBLIC_SUBKEY = "Public-Subkey-Packet" ++ SECRET_KEY = "Secret-Key-Packet" ++ SIGNATURE = "Signature-Packet" + + + def is_pgp_fingerprint(string: str) -> bool: +diff --git a/libkeyringctl/sequoia.py b/libkeyringctl/sequoia.py +index 4de264b6..1a432a45 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", "toolbox", "keyring", "split", "--prefix", "''", str(keyring)]) + + keyrings: List[Path] = list(natural_sort_path(keyring_dir.iterdir())) + +@@ -77,7 +77,7 @@ def keyring_merge(certificates: List[Path], output: Optional[Path] = None, force + + cmd = ["sq", "toolbox", "keyring", "merge"] + if force: +- cmd.insert(1, "--force") ++ cmd.insert(1, "--overwrite") + if output: + cmd += ["--output", str(output)] + cmd += [str(cert) for cert in sorted(certificates)] +@@ -123,7 +123,7 @@ def packet_join(packets: List[Path], output: Optional[Path] = None, force: bool + + cmd = ["sq", "toolbox", "packet", "join"] + if force: +- cmd.insert(1, "--force") ++ cmd.insert(1, "--overwrite") + packets_str = list(map(lambda path: str(path), packets)) + cmd.extend(packets_str) + cmd.extend(["--output", str(output)]) +@@ -174,7 +174,7 @@ def packet_dump(packet: Path) -> str: + The contents of the packet dump + """ + +- return system(["sq", "toolbox", "packet", "dump", str(packet)]) ++ return system(["sq", "toolbox", "packet", "dump", str(packet)], ignore_stderr=True) + + + def packet_dump_field(packet: Path, query: str) -> str: +@@ -319,7 +319,7 @@ def key_generate(uids: List[Uid], outfile: Path) -> str: + cmd = ["sq", "key", "generate", "--without-password"] + for uid in uids: + cmd.extend(["--userid", str(uid)]) +- cmd.extend(["--output", str(outfile)]) ++ cmd.extend(["--output", str(outfile), "--rev-cert", f"{str(outfile)}.rev"]) + return system(cmd) + + +@@ -357,8 +357,8 @@ def certify(key: Path, certificate: Path, uid: Uid, output: Optional[Path]) -> s + The result of the certification in case output is None + """ + +- cmd = ["sq", "pki", "certify"] ++ cmd = ["sq", "pki", "vouch", "certify"] + if output: + cmd.extend(["--output", str(output)]) +- cmd.extend(["--certifier-file", str(key), str(certificate), uid]) ++ cmd.extend(["--certifier-file", str(key), "--cert-file", str(certificate), "--userid", uid]) + return system(cmd) +diff --git a/libkeyringctl/util.py b/libkeyringctl/util.py +index 79b95d0f..c9d7bedb 100644 +--- a/libkeyringctl/util.py ++++ b/libkeyringctl/util.py +@@ -104,6 +104,7 @@ def system( + _stdin: Optional[IO[AnyStr]] = None, + exit_on_error: bool = False, + env: Optional[Dict[str, str]] = None, ++ ignore_stderr: bool = False, + ) -> str: + """Execute a command using check_output + +@@ -126,7 +127,7 @@ def system( + env = {"HOME": environ["HOME"], "PATH": environ["PATH"], "LANG": "en_US.UTF-8"} + + try: +- return check_output(cmd, stderr=STDOUT, stdin=_stdin, env=env).decode() ++ return check_output(cmd, stderr=None if ignore_stderr else STDOUT, stdin=_stdin, env=env).decode() + except CalledProcessError as e: + stderr.buffer.write(e.stdout) + print_stack() +diff --git a/tests/test_sequoia.py b/tests/test_sequoia.py +index 1fbd5dce..b7d36d89 100644 +--- a/tests/test_sequoia.py ++++ b/tests/test_sequoia.py +@@ -107,7 +107,7 @@ def test_packet_join(system_mock: Mock, output: Optional[Path], force: bool) -> + for packet in packets: + assert str(packet) in args[0] + if force: +- assert "--force" == args[0][1] ++ assert "--overwrite" == args[0][1] + if output: + assert "--output" in args[0] and str(output) in args[0] + +@@ -365,4 +365,4 @@ def test_certify(system_mock: Mock, output: Optional[Path]) -> None: + assert sequoia.certify(key=Path("key"), certificate=Path("cert"), uid=Uid("uid"), output=output) == "return" + name, args, kwargs = system_mock.mock_calls[0] + if output: +- assert str(output) == args[0][-5] ++ assert str(output) == args[0][5] +-- +GitLab + diff --git a/sources b/sources index e69de29..a4437f5 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (archlinux-keyring-20241203.tar.gz) = ef680d29f80b874f4175856e7e77ac28e19a8fa53e555f217d5eaf4ac42af3ee770a77f96eb353804b29dc7fecf1426a4a274f074387021263e76ba076126c40 From 92c70df51d61e0e5c78b4e62b86bc76e0312a994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 11 Jun 2025 17:04:50 +0200 Subject: [PATCH 3/6] Version 20250430.1 ... (rhbz#2363106) (cherry picked from commit 20a4fd8bf1272fc2824e1cdeb6bf592c971e537c) --- .gitignore | 5 + ...2bddcd847c0dc05ac4899867f2c76a8838b8.patch | 151 ------------------ archlinux-keyring.spec | 4 +- sources | 3 +- 4 files changed, 8 insertions(+), 155 deletions(-) delete mode 100644 1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.patch diff --git a/.gitignore b/.gitignore index c0067f4..208fb06 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,8 @@ /archlinux-keyring-20240709.tar.gz /archlinux-keyring-20241015.tar.gz /archlinux-keyring-20241203.tar.gz +/archlinux-keyring-20241203.tar.gz.sig +/archlinux-keyring-20250123.tar.gz.sig +/archlinux-keyring-20250123.tar.gz +/archlinux-keyring-20250430.1.tar.gz +/archlinux-keyring-20250430.1.tar.gz.sig diff --git a/1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.patch b/1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.patch deleted file mode 100644 index 4167eb4..0000000 --- a/1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 1b5d2bddcd847c0dc05ac4899867f2c76a8838b8 Mon Sep 17 00:00:00 2001 -From: David Runge -Date: Fri, 1 Nov 2024 12:28:54 +0100 -Subject: [PATCH] fix: Adapt use of sq to sequoia-sq 0.39.0 - -Add various fixes, as -- the output format of `sq toolbox packet split` changed (again) -- the CLI of `sq toolbox packet split` changed (again) -- the useless warning message on stderr now covers two lines and - interferes with parsing of `sq toolbox packet dump` output -- the global option `--force` was renamed to `--overwrite` -- the `sq key generate` subcommand introduced a mandatory `--rev-cert` - option -- the `pki certify` subcommand was moved to `pki vouch certify` and - introduced mandatory options for our use-case (`--certifier-file`, - `--cert-file`, `--userid`) - -Signed-off-by: David Runge ---- - libkeyringctl/keyring.py | 12 ++++++------ - libkeyringctl/sequoia.py | 14 +++++++------- - libkeyringctl/util.py | 3 ++- - tests/test_sequoia.py | 4 ++-- - 4 files changed, 17 insertions(+), 16 deletions(-) - -diff --git a/libkeyringctl/keyring.py b/libkeyringctl/keyring.py -index e4342c17..9937783a 100644 ---- a/libkeyringctl/keyring.py -+++ b/libkeyringctl/keyring.py -@@ -56,12 +56,12 @@ PACKET_FILENAME_DATETIME_FORMAT: str = "%Y-%m-%d_%H-%M-%S" - class PacketType(Enum): - """All understood OpenPGP packet types and the file endings as output by `sq packet split`""" - -- PUBLIC_KEY = "Public-Key Packet" -- USER_ID = "User ID Packet" -- USER_ATTRIBUTE = "User Attribute Packet" -- PUBLIC_SUBKEY = "Public-Subkey Packet" -- SECRET_KEY = "Secret-Key Packet" -- SIGNATURE = "Signature Packet" -+ PUBLIC_KEY = "Public-Key-Packet" -+ USER_ID = "User-ID-Packet" -+ USER_ATTRIBUTE = "User-Attribute-Packet" -+ PUBLIC_SUBKEY = "Public-Subkey-Packet" -+ SECRET_KEY = "Secret-Key-Packet" -+ SIGNATURE = "Signature-Packet" - - - def is_pgp_fingerprint(string: str) -> bool: -diff --git a/libkeyringctl/sequoia.py b/libkeyringctl/sequoia.py -index 4de264b6..1a432a45 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", "toolbox", "keyring", "split", "--prefix", "''", str(keyring)]) - - keyrings: List[Path] = list(natural_sort_path(keyring_dir.iterdir())) - -@@ -77,7 +77,7 @@ def keyring_merge(certificates: List[Path], output: Optional[Path] = None, force - - cmd = ["sq", "toolbox", "keyring", "merge"] - if force: -- cmd.insert(1, "--force") -+ cmd.insert(1, "--overwrite") - if output: - cmd += ["--output", str(output)] - cmd += [str(cert) for cert in sorted(certificates)] -@@ -123,7 +123,7 @@ def packet_join(packets: List[Path], output: Optional[Path] = None, force: bool - - cmd = ["sq", "toolbox", "packet", "join"] - if force: -- cmd.insert(1, "--force") -+ cmd.insert(1, "--overwrite") - packets_str = list(map(lambda path: str(path), packets)) - cmd.extend(packets_str) - cmd.extend(["--output", str(output)]) -@@ -174,7 +174,7 @@ def packet_dump(packet: Path) -> str: - The contents of the packet dump - """ - -- return system(["sq", "toolbox", "packet", "dump", str(packet)]) -+ return system(["sq", "toolbox", "packet", "dump", str(packet)], ignore_stderr=True) - - - def packet_dump_field(packet: Path, query: str) -> str: -@@ -319,7 +319,7 @@ def key_generate(uids: List[Uid], outfile: Path) -> str: - cmd = ["sq", "key", "generate", "--without-password"] - for uid in uids: - cmd.extend(["--userid", str(uid)]) -- cmd.extend(["--output", str(outfile)]) -+ cmd.extend(["--output", str(outfile), "--rev-cert", f"{str(outfile)}.rev"]) - return system(cmd) - - -@@ -357,8 +357,8 @@ def certify(key: Path, certificate: Path, uid: Uid, output: Optional[Path]) -> s - The result of the certification in case output is None - """ - -- cmd = ["sq", "pki", "certify"] -+ cmd = ["sq", "pki", "vouch", "certify"] - if output: - cmd.extend(["--output", str(output)]) -- cmd.extend(["--certifier-file", str(key), str(certificate), uid]) -+ cmd.extend(["--certifier-file", str(key), "--cert-file", str(certificate), "--userid", uid]) - return system(cmd) -diff --git a/libkeyringctl/util.py b/libkeyringctl/util.py -index 79b95d0f..c9d7bedb 100644 ---- a/libkeyringctl/util.py -+++ b/libkeyringctl/util.py -@@ -104,6 +104,7 @@ def system( - _stdin: Optional[IO[AnyStr]] = None, - exit_on_error: bool = False, - env: Optional[Dict[str, str]] = None, -+ ignore_stderr: bool = False, - ) -> str: - """Execute a command using check_output - -@@ -126,7 +127,7 @@ def system( - env = {"HOME": environ["HOME"], "PATH": environ["PATH"], "LANG": "en_US.UTF-8"} - - try: -- return check_output(cmd, stderr=STDOUT, stdin=_stdin, env=env).decode() -+ return check_output(cmd, stderr=None if ignore_stderr else STDOUT, stdin=_stdin, env=env).decode() - except CalledProcessError as e: - stderr.buffer.write(e.stdout) - print_stack() -diff --git a/tests/test_sequoia.py b/tests/test_sequoia.py -index 1fbd5dce..b7d36d89 100644 ---- a/tests/test_sequoia.py -+++ b/tests/test_sequoia.py -@@ -107,7 +107,7 @@ def test_packet_join(system_mock: Mock, output: Optional[Path], force: bool) -> - for packet in packets: - assert str(packet) in args[0] - if force: -- assert "--force" == args[0][1] -+ assert "--overwrite" == args[0][1] - if output: - assert "--output" in args[0] and str(output) in args[0] - -@@ -365,4 +365,4 @@ def test_certify(system_mock: Mock, output: Optional[Path]) -> None: - assert sequoia.certify(key=Path("key"), certificate=Path("cert"), uid=Uid("uid"), output=output) == "return" - name, args, kwargs = system_mock.mock_calls[0] - if output: -- assert str(output) == args[0][-5] -+ assert str(output) == args[0][5] --- -GitLab - diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index f2ea504..65a55f9 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,9 +1,8 @@ Name: archlinux-keyring -Version: 20241203 +Version: 20250430.1 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz -Patch: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/commit/1b5d2bddcd847c0dc05ac4899867f2c76a8838b8.patch # see https://wiki.archlinux.org/index.php/Pacman-key for introduction License: LicenseRef-Fedora-Public-Domain @@ -35,7 +34,6 @@ installation on Fedora systems. %prep %setup -q -%patch -P0 -R -p1 %if 0%{?el9} sed -i 's|/usr/bin/env python3|/usr/bin/env python3.11|' keyringctl %endif diff --git a/sources b/sources index a4437f5..7ea2837 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (archlinux-keyring-20241203.tar.gz) = ef680d29f80b874f4175856e7e77ac28e19a8fa53e555f217d5eaf4ac42af3ee770a77f96eb353804b29dc7fecf1426a4a274f074387021263e76ba076126c40 +SHA512 (archlinux-keyring-20250430.1.tar.gz) = 774f357e0b620f38780ffc1d9724e7206b0d5d3edef47af4b92e1850a0f1bb2859c57387d13a60cf016e4fa144d1e0b28c42a80295dc5f114d7dd01972c2753e +SHA512 (archlinux-keyring-20250430.1.tar.gz.sig) = fab150fe178f948061893e306144ee4f4a276cd76af0078e75a92a79dd6471a1496106362d6a3e726a00b4becdf3e789f3e9b949b073002b166dbcfc63c934b9 From 161ae0947f7c3d9019bdfabbea84e71a14db11fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 17 Jul 2025 15:29:39 +0200 Subject: [PATCH 4/6] Version 20250716 ... (rhbz#2376804) (cherry picked from commit bd81c16ae01fe315c5e44ce0ad6c465d1641a0a6) --- .gitignore | 2 ++ archlinux-keyring.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 208fb06..8b7aa6b 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,5 @@ /archlinux-keyring-20250123.tar.gz /archlinux-keyring-20250430.1.tar.gz /archlinux-keyring-20250430.1.tar.gz.sig +/archlinux-keyring-20250716.tar.gz +/archlinux-keyring-20250716.tar.gz.sig diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 65a55f9..de7442b 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20250430.1 +Version: 20250716 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 7ea2837..8519d8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (archlinux-keyring-20250430.1.tar.gz) = 774f357e0b620f38780ffc1d9724e7206b0d5d3edef47af4b92e1850a0f1bb2859c57387d13a60cf016e4fa144d1e0b28c42a80295dc5f114d7dd01972c2753e -SHA512 (archlinux-keyring-20250430.1.tar.gz.sig) = fab150fe178f948061893e306144ee4f4a276cd76af0078e75a92a79dd6471a1496106362d6a3e726a00b4becdf3e789f3e9b949b073002b166dbcfc63c934b9 +SHA512 (archlinux-keyring-20250716.tar.gz) = a2f14cc8bff1e3421d0cc46cbaf091d13a30be1eb4e4c6fc52bbf3c6dc2783cdd3e5e5faa90568b2f0669301970c2fc34e580384d6090793bfe63878287d6ab8 +SHA512 (archlinux-keyring-20250716.tar.gz.sig) = a422e01e5ea28723cfce0d781d29242dfda9fd541bdd652234ff4fc33cd63489f5d8dfc09b8e3937d92ee7c6323e87f1477e69f8ee12e353bdb124b18f36f9c0 From efea935a5abfdfb8e83f104362f967d4a3428f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 11 Aug 2025 12:52:35 +0200 Subject: [PATCH 5/6] Version 20250807.1 ... (rhbz#2387052) (cherry picked from commit 2f8cf7d3c2268df74f03bf946a4c0fc815a79715) (cherry picked from commit bdb9a68c443074a6e41989893ac7cc13b3a95602) --- .gitignore | 2 ++ archlinux-keyring.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b7aa6b..7cc2b01 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,5 @@ /archlinux-keyring-20250430.1.tar.gz.sig /archlinux-keyring-20250716.tar.gz /archlinux-keyring-20250716.tar.gz.sig +/archlinux-keyring-20250807.1.tar.gz +/archlinux-keyring-20250807.1.tar.gz.sig diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index de7442b..3e2f9a0 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20250716 +Version: 20250807.1 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 8519d8a..c4d0954 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (archlinux-keyring-20250716.tar.gz) = a2f14cc8bff1e3421d0cc46cbaf091d13a30be1eb4e4c6fc52bbf3c6dc2783cdd3e5e5faa90568b2f0669301970c2fc34e580384d6090793bfe63878287d6ab8 -SHA512 (archlinux-keyring-20250716.tar.gz.sig) = a422e01e5ea28723cfce0d781d29242dfda9fd541bdd652234ff4fc33cd63489f5d8dfc09b8e3937d92ee7c6323e87f1477e69f8ee12e353bdb124b18f36f9c0 +SHA512 (archlinux-keyring-20250807.1.tar.gz) = 6ebc880fe45ddd9856b0c3e5ee794598ca4aa09be5f7e43ba13607ade576062486c699d263e7270c3bf396502ee4a1cfd513baa9b01d79bebed23b59651452b4 +SHA512 (archlinux-keyring-20250807.1.tar.gz.sig) = 7b44752041512dca9d3fc4fbe6b1e5d4c38b36ab503764015bf6ddab656a8d216cb79f07a882751e0a77d7358a5b843fa6fb64eef2963d18a81e68dabd2c206b From af4a264c0896ccb6413f703a239728b5a6e482e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Oct 2025 22:31:18 +0200 Subject: [PATCH 6/6] Version 20251012 ... (rhbz#2400066) (cherry picked from commit 34d38452856a67ad0567c8f6160fd9b3eae5d317) --- .gitignore | 2 ++ archlinux-keyring.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7cc2b01..5435c5f 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ /archlinux-keyring-20250716.tar.gz.sig /archlinux-keyring-20250807.1.tar.gz /archlinux-keyring-20250807.1.tar.gz.sig +/archlinux-keyring-20251012.tar.gz +/archlinux-keyring-20251012.tar.gz.sig diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 3e2f9a0..89fbe21 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20250807.1 +Version: 20251012 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index c4d0954..936a097 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (archlinux-keyring-20250807.1.tar.gz) = 6ebc880fe45ddd9856b0c3e5ee794598ca4aa09be5f7e43ba13607ade576062486c699d263e7270c3bf396502ee4a1cfd513baa9b01d79bebed23b59651452b4 -SHA512 (archlinux-keyring-20250807.1.tar.gz.sig) = 7b44752041512dca9d3fc4fbe6b1e5d4c38b36ab503764015bf6ddab656a8d216cb79f07a882751e0a77d7358a5b843fa6fb64eef2963d18a81e68dabd2c206b +SHA512 (archlinux-keyring-20251012.tar.gz) = 7cd838b27f2444933d8f4cd812942c761e8d31daddfde046199b98fe66ffc86e50cdcb9337f63bffb7d8d52f76c546d83f7b6c2409d831c1a771a7562c51910a +SHA512 (archlinux-keyring-20251012.tar.gz.sig) = ba239f957f55ed9fee0c0a16fb48aa3a2e855eceb571b9fdf73dc9e3a7d317e3649fe288b83f1dcfc7de97915922decc09b4e6c622531ee6e15008e9cc632f11