From 89786e192c44d8d14fc5fe59abd2fe5353368ab3 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 22 Aug 2022 16:46:26 -0400 Subject: [PATCH] Backport patch that adds F38 signing key (cherry picked from commit 82e936418194b41f6205379915aea83f937e388e) --- 0001-signing-keys-add-Fedora-38-key.patch | 52 +++++++++++++++++++++++ rust-coreos-installer.spec | 8 +++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 0001-signing-keys-add-Fedora-38-key.patch diff --git a/0001-signing-keys-add-Fedora-38-key.patch b/0001-signing-keys-add-Fedora-38-key.patch new file mode 100644 index 0000000..747bc8c --- /dev/null +++ b/0001-signing-keys-add-Fedora-38-key.patch @@ -0,0 +1,52 @@ +From 6c48395ba03426ddaa0090ea82a2c1aaa11da6cd Mon Sep 17 00:00:00 2001 +From: Dusty Mabe +Date: Mon, 22 Aug 2022 10:55:25 -0400 +Subject: [PATCH 1/2] signing-keys: add Fedora 38 key + +We branched F37 from rawhide so rawhide is now F38. +--- + src/signing-keys.asc | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +diff --git a/src/signing-keys.asc b/src/signing-keys.asc +index e61941f..32c3ec3 100644 +--- a/src/signing-keys.asc ++++ b/src/signing-keys.asc +@@ -121,3 +121,34 @@ tg+fuT+OFKWYdBFF7VkEA+wezHAznIP6TPyQXbBpkzE889/hOXy4BYs0wy8Bpda/ + Ve2Ba329f99dSCZKImi5DPCxJY4= + =ZmVd + -----END PGP PUBLIC KEY BLOCK----- ++ ++-----BEGIN PGP PUBLIC KEY BLOCK----- ++Comment: RPM-GPG-KEY-fedora-38-primary ++ ++mQINBGIC2cYBEADJye1aE0AR17qwj6wsHWlCQlcihmqkL8s4gbOk1IevBbH4iXJx ++lu6bN+NhTcCCX6eHmaL5Pwb/bpkMmLR+/r1D2cLDK24YzvN6kJnwRQUTf2dbqYmg ++mNBgIMm+kAabBZPwUHUzyQ9CT/WJpYr1OYu8JIkdxF35nrPewnnOUUqxqbi8fXRQ ++gskSLF8UveiOjFIqmWwlPwT1UtnevAaF80UGQlkwFvqjjh4b9vKY2gHMAQwt+wg5 ++HFFCSwSrnd88ZoDb3pKvDMeurYUiPzF5f2r+ziVkMuaSNckvp58uge7HvyqQPAdJ ++ZRswCCxhUAo9VqkNfB4Ud25ASyalk9jOE3HB8E35gFfPXvuX1n15THXNcwMEiybk ++Omne2YwXL8ShGNr5otjqywThMrrqcl2g/pJVTcpDHTR5Hn9YRp+GHlYLjyEr+/x7 ++xM19y9ca9GUiJqDbEREHcKKIhYiGmcIjjcJvei/3C/aM4pqeGFJBbVSnw3qeMxH/ ++6ArAMA1sAdShCkv2YjlcF0r4uoCjXdS3xrKLz9PSCquot7RySnOE9TZ7flfJll7Z ++q+lNaSeJg7FK8VWSUb9Lit6VEYVbzWKzespDDbujrHbFpydyq8gXurk7bSR2w0te ++gsmytQqT/w1z2bydgGF6SfY9Px0wuA8GQKr48l5Bhdc6+vHHFqPKzz0PVQARAQAB ++tDFGZWRvcmEgKDM4KSA8ZmVkb3JhLTM4LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v ++cmc+iQJOBBMBCAA4FiEEalG7q7o9VGe2FxIhgJqNfOsQtGQFAmIC2cYCGw8FCwkI ++BwIGFQoJCAsCBBYCAwECHgECF4AACgkQgJqNfOsQtGScyw/7BLmD4Fwi4QZY94zl ++vlJdNufZRavOemSIVVDHoCr8pQBAdrvoMypxJd5zM4ODIqFsjdYpFti+Tkeq4/4U ++25UoLPEOtU8UDt2uq7LqfdCxspaj7VyXAJIkpf7wEvLS4Jzo+YaMIlsd0dCrMXTM ++vhu4gKpBFW6C+gGlmuDyTJbyrf7ilytgVzVtIfRrT7XffylviIlZHwKm43UDjvzX ++YEl3EAFR1RjATwXMy2aJh7GCNsz+fKs+7YRKQUhpMF5un/2pyNJO+LbVGGwGZvga ++K9Kfsg/4r1ync4nDDD1dadKIHhobDeiJ9uZLoBvvVDz7Ywu7q/vv4zIPxstYBNq4 ++6fLKDtYXuJCK0EV9Qy4ox67t0UGlaRGH8y5YUqOI10xH7iQej0xWlSc8w2dKhPz8 ++z9XLv2OMK+PvqvflhFHhWkqEoQRqTu0TVD0fLLe4lqieJlqZcJqW0F9G/vNSSWmf ++POLa/Nim71gL2fPjCJOIRV4K/cJSyBmu5NchG7dHD5sUtJxZ4TFSuepaBZ8cPK1x ++e26TaCBqoUWgUXWmw+P89aOpYOJYEFfT/VAm2Ywn+c1EFUmD+30wQ7aP/RUFl94z ++n0BjqsWDnCKVFHydZ0TZSpeADmXMg2VYZPcp/cQR1KjoBoDxAscis7b1XPQUg7CB ++zquq5jBVAnsNIhs7g47GWKyDUJM= ++=aCLl ++-----END PGP PUBLIC KEY BLOCK----- +-- +2.32.0 + diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index 34bb5df..e4b41b9 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -12,7 +12,7 @@ Name: rust-%{crate} Version: 0.15.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -26,6 +26,9 @@ Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{drac # https://github.com/coreos/coreos-installer/pull/921 Patch0: fix-metadata.patch +# https://github.com/coreos/coreos-installer/pull/963 +Patch1: 0001-signing-keys-add-Fedora-38-key.patch + ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -180,6 +183,9 @@ from the initramfs. %endif %changelog +* Mon Aug 22 2022 Dusty Mabe - 0.15.0-5 +- Backport patch that adds F38 signing key + * Tue Aug 02 2022 Benjamin Gilbert - 0.15.0-4 - Fix build with rust-bytes 1.2.0