From 91ad24107e6212e61e59bd67c5badbe065f69c9a Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 22 Aug 2022 16:46:26 -0400 Subject: [PATCH 1/5] 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 e912346..c932d19 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -12,7 +12,7 @@ Name: rust-%{crate} Version: 0.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -23,6 +23,9 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{dracutcommit}/coreos-installer-dracut-%{dracutshortcommit}.tar.gz +# https://github.com/coreos/coreos-installer/pull/963 +Patch0: 0001-signing-keys-add-Fedora-38-key.patch + ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -184,6 +187,9 @@ from the initramfs. %endif %changelog +* Mon Aug 22 2022 Dusty Mabe - 0.15.0-2 +- Backport patch that adds F38 signing key + * Fri Jun 17 2022 Michael Armijo - 0.15.0-1 - New release - Install non-binary files using Makefile install targets From 6c040c2b34596e6761081739d007942e14935e7e Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 22 Aug 2022 21:25:02 -0400 Subject: [PATCH 2/5] Revert "Backport patch that adds F38 signing key" This reverts commit 91ad24107e6212e61e59bd67c5badbe065f69c9a. Need to do some other backports from the `rawhide` branch first. --- 0001-signing-keys-add-Fedora-38-key.patch | 52 ----------------------- rust-coreos-installer.spec | 8 +--- 2 files changed, 1 insertion(+), 59 deletions(-) delete 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 deleted file mode 100644 index 747bc8c..0000000 --- a/0001-signing-keys-add-Fedora-38-key.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 c932d19..e912346 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -12,7 +12,7 @@ Name: rust-%{crate} Version: 0.15.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -23,9 +23,6 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{dracutcommit}/coreos-installer-dracut-%{dracutshortcommit}.tar.gz -# https://github.com/coreos/coreos-installer/pull/963 -Patch0: 0001-signing-keys-add-Fedora-38-key.patch - ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -187,9 +184,6 @@ from the initramfs. %endif %changelog -* Mon Aug 22 2022 Dusty Mabe - 0.15.0-2 -- Backport patch that adds F38 signing key - * Fri Jun 17 2022 Michael Armijo - 0.15.0-1 - New release - Install non-binary files using Makefile install targets From b45977108dcc031c566db3db1432f1e1e7589a85 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 9 Jul 2022 22:05:00 -0400 Subject: [PATCH 3/5] Fix build with rust-regex 1.6.0 (cherry picked from commit aeb1acd874e9dae6604fdb1a9d93631e5bcee301) --- fix-metadata.patch | 11 +++++++++++ rust-coreos-installer.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 fix-metadata.patch diff --git a/fix-metadata.patch b/fix-metadata.patch new file mode 100644 index 0000000..d460dd9 --- /dev/null +++ b/fix-metadata.patch @@ -0,0 +1,11 @@ +--- coreos-installer-0.15.0/Cargo.toml.old 2022-07-09 22:02:48.471859927 -0400 ++++ coreos-installer-0.15.0/Cargo.toml 2022-07-09 22:02:59.727862917 -0400 +@@ -114,7 +114,7 @@ + version = ">= 0.3, < 0.5" + + [dependencies.regex] +-version = ">= 1.4, < 1.6" ++version = ">= 1.4, < 2" + + [dependencies.reqwest] + version = ">= 0.10, < 0.12" diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index e912346..cf60465 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -12,7 +12,7 @@ Name: rust-%{crate} Version: 0.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -23,6 +23,9 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{dracutcommit}/coreos-installer-dracut-%{dracutshortcommit}.tar.gz +# https://github.com/coreos/coreos-installer/pull/921 +Patch0: fix-metadata.patch + ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -184,6 +187,9 @@ from the initramfs. %endif %changelog +* Mon Aug 22 Dusty Mabe - 0.15.0-2 +- Fix build with rust-regex 1.6.0 + * Fri Jun 17 2022 Michael Armijo - 0.15.0-1 - New release - Install non-binary files using Makefile install targets From f5ab6f0c98a3e32e87ce090ff2821a97c4aaff8a Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 1 Aug 2022 23:17:42 -0400 Subject: [PATCH 4/5] Fix build with rust-bytes 1.2.0 (cherry picked from commit ff1e39138a29f1cf27fc91b7c734c08c5d1d333a) --- fix-metadata.patch | 13 +++++++++++-- rust-coreos-installer.spec | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fix-metadata.patch b/fix-metadata.patch index d460dd9..90142ed 100644 --- a/fix-metadata.patch +++ b/fix-metadata.patch @@ -1,5 +1,14 @@ ---- coreos-installer-0.15.0/Cargo.toml.old 2022-07-09 22:02:48.471859927 -0400 -+++ coreos-installer-0.15.0/Cargo.toml 2022-07-09 22:02:59.727862917 -0400 +--- coreos-installer-0.15.0/Cargo.toml.orig 2022-08-01 23:12:48.053388050 -0400 ++++ coreos-installer-0.15.0/Cargo.toml 2022-08-01 23:13:09.555427984 -0400 +@@ -68,7 +68,7 @@ + version = ">= 3.1.0, < 5.0.0" + + [dependencies.bytes] +-version = ">= 1.0.1, < 1.2.0" ++version = ">= 1.0.1, < 2" + + [dependencies.clap] + version = "3.1" @@ -114,7 +114,7 @@ version = ">= 0.3, < 0.5" diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index cf60465..bc7d33e 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -188,6 +188,7 @@ from the initramfs. %changelog * Mon Aug 22 Dusty Mabe - 0.15.0-2 +- Fix build with rust-bytes 1.2.0 - Fix build with rust-regex 1.6.0 * Fri Jun 17 2022 Michael Armijo - 0.15.0-1 From 0ad5b4d507d3a248920fa0f217dc75844811111d Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 22 Aug 2022 16:46:26 -0400 Subject: [PATCH 5/5] 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 | 4 ++ 2 files changed, 56 insertions(+) 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 bc7d33e..d733cff 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -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 @@ -190,6 +193,7 @@ from the initramfs. * Mon Aug 22 Dusty Mabe - 0.15.0-2 - Fix build with rust-bytes 1.2.0 - Fix build with rust-regex 1.6.0 +- Backport patch that adds F38 signing key * Fri Jun 17 2022 Michael Armijo - 0.15.0-1 - New release