From 6624948537a62d3092edb62c9b4d99964ac8358d Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 17 Feb 2023 17:44:26 -0500 Subject: [PATCH] Backport patch that adds the F39 signing key I.e. https://github.com/coreos/coreos-installer/pull/1113. For https://github.com/coreos/fedora-coreos-config/pull/2246#issuecomment-1435353921. Note I clipped the part of the patch that updates the release notes since it conflicted and it didn't seem worth resolving since we don't package it. --- 0001-signing-keys-add-Fedora-39-key.patch | 53 +++++++++++++++++++++++ rust-coreos-installer.spec | 8 +++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0001-signing-keys-add-Fedora-39-key.patch diff --git a/0001-signing-keys-add-Fedora-39-key.patch b/0001-signing-keys-add-Fedora-39-key.patch new file mode 100644 index 0000000..1c875a1 --- /dev/null +++ b/0001-signing-keys-add-Fedora-39-key.patch @@ -0,0 +1,53 @@ +From 4d56a2f6379ec69e2c5376ec5373be8c4b64d69e Mon Sep 17 00:00:00 2001 +From: Aashish Radhakrishnan +Date: Wed, 15 Feb 2023 17:54:20 -0500 +Subject: [PATCH] signing-keys: add Fedora 39 key We branched F38 from rawhide + so rawhide is now F39. + +--- + docs/release-notes.md | 2 ++ + src/signing-keys.asc | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+) + +diff --git a/src/signing-keys.asc b/src/signing-keys.asc +index 4f93010..90593b4 100644 +--- a/src/signing-keys.asc ++++ b/src/signing-keys.asc +@@ -121,3 +121,34 @@ n0BjqsWDnCKVFHydZ0TZSpeADmXMg2VYZPcp/cQR1KjoBoDxAscis7b1XPQUg7CB + zquq5jBVAnsNIhs7g47GWKyDUJM= + =aCLl + -----END PGP PUBLIC KEY BLOCK----- ++ ++-----BEGIN PGP PUBLIC KEY BLOCK----- ++Comment: RPM-GPG-KEY-fedora-39-primary ++ ++mQINBGLykg8BEADURjKtgQpQNoluifXia+U3FuqGCTQ1w7iTqx1UvNhLX6tb9Qjy ++l/vjl1iXxucrd2JBnrT/21BdtaABhu2hPy7bpcGEkG8MDinAMZBzcyzHcS/JiGHZ ++d/YmMWQUgbDlApbxFSGWiXMgT0Js5QdcywHI5oiCmV0lkZ+khZ4PkVWmk6uZgYWf ++JOG5wp5TDPnoYXlA4CLb6hu2691aDm9b99XYqEjhbeIzS9bFQrdrQzRMKyzLr8NW ++s8Pq2tgyzu8txlWdBXJyAMKldTPstqtygLL9UUdo7CIQQzWqeDbAnv+WdOmiI/hR ++etbbwNV+thkLJz0WD90C2L3JEeUJX5Qa4oPvfNLDeCKmJFEFUTCEdm0AYoQDjLJQ ++3d3q9M09thXO/jYM0cSnJDclssLNsNWfjJAerLadLwNnYRuralw7f74QSLYdJAJU ++SFShBlctWKnlhQ7ehockqtgXtWckkqPZZjGiMXwHde9b9Yyi+VqtUQWxSWny+9g9 ++6tcoa3AdnmpqSTHQxYajD0EGXJ0z0NXfqxkI0lo8UxzypEBy4sARZ4XhTU73Zwk0 ++LGhEUHlfyxXgRs6RRvM2UIoo+gou2M9rn/RWkhuHJNSfgrM0BmIBCjhjwGiS33Qh ++ysLDWJMdch8lsu1fTmLEFQrOB93oieOJQ0Ysi5gQY8TOT+oZvVi9pSMJuwARAQAB ++tDFGZWRvcmEgKDM5KSA8ZmVkb3JhLTM5LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v ++cmc+iQJOBBMBCAA4FiEE6PI5lvIyGGQMtEy+dc9axBi450wFAmLykg8CGw8FCwkI ++BwIGFQoJCAsCBBYCAwECHgECF4AACgkQdc9axBi450yd4w//ZtghbZX5KFstOdBS ++rcbBfCK9zmRvzeejzGl6lPKfqwx7OOHYxFlRa9MYLl8QG7Aq6yRRWzzEHiSb0wJw ++WXz5tbkAmV/fpS4wnb3FDArD44u317UAnaU+UlhgK1g62lwI2dGpvTSvohMBMeBY ++B5aBd+sLi3UtiSRM2XhxvxaWwr/oFLjKDukgrPQzeV3F/XdxGhSz/GZUVFVprcrB ++h/dIo4k0Za7YVRhlVM0coOIcKbcjxAK9CCZ8+jtdIh3/BN5zJ0RFMgqSsrWYWeft ++BI3KWLbyMfRwEtp7xSi17WXbRfsSoqwIVgP+RCSaAdVuiYs/GCRsT3ydYcDvutuJ ++YZoE53yczemM/1HZZFI04zI7KBsKm9NFH0o4K2nBWuowBm59iFvWHFpX6em54cq4 ++45NwY01FkSQUqntfqCWFSowwFHAZM4gblOikq2B5zHoIntCiJlPGuaJiVSw9ZpEc +++IEQfmXJjKGSkMbU9tmNfLR9skVQJizMTtoUQ12DWC+14anxnnR2hxnhUDAabV6y ++J5dGeb/ArmxQj3IMrajdNwjuk9GMeMSSS2EMY8ryOuYwRbFhBOLhGAnmM5OOSUxv ++A4ipWraXDW0bK/wXI7yHMkc6WYrdV3SIXEqJBTp7npimv3JC+exWEbTLcgvV70FP ++X55M9nDtzUSayJuEcfFP2c9KQCE= ++=J4qZ ++-----END PGP PUBLIC KEY BLOCK----- +-- +2.39.1 + diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index 3855245..834ad49 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -12,7 +12,7 @@ Name: rust-%{crate} Version: 0.16.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -27,6 +27,9 @@ Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{drac # https://github.com/coreos/coreos-installer/pull/1019 Patch0: mbrman-0.5.0.patch +# https://github.com/coreos/coreos-installer/pull/1113 +Patch1: 0001-signing-keys-add-Fedora-39-key.patch + ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -185,6 +188,9 @@ from the initramfs. %endif %changelog +* Fri Feb 17 2023 Jonathan Lebon - 0.16.1-5 +- Backport patch that adds F39 signing key + * Sat Feb 04 2023 Fabio Valentini - 0.16.1-4 - Rebuild for fixed frame pointer compiler flags in Rust RPM macros.