Backport "signing-keys: regular Fedora cycle rotation of keys"
https://github.com/coreos/coreos-installer/pull/770
This commit is contained in:
Jonathan Lebon
parent
a40f5d4bc8
commit
74be28cf81
52
0001-signing-keys-add-Fedora-37-key.patch
Normal file
52
0001-signing-keys-add-Fedora-37-key.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
From 79cb9a91615831a20ee402c40db36bc38b6100cb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dusty Mabe <dusty@dustymabe.com>
|
||||||
|
Date: Wed, 9 Feb 2022 22:38:03 -0500
|
||||||
|
Subject: [PATCH 1/2] signing-keys: add Fedora 37 key
|
||||||
|
|
||||||
|
We branched F36 from rawhide so rawhide is now F37.
|
||||||
|
---
|
||||||
|
src/signing-keys.asc | 31 +++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 31 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/signing-keys.asc b/src/signing-keys.asc
|
||||||
|
index c993a10..62dd0aa 100644
|
||||||
|
--- a/src/signing-keys.asc
|
||||||
|
+++ b/src/signing-keys.asc
|
||||||
|
@@ -121,3 +121,34 @@ h+rqyjHJJeYlS2tMAQB1fmHB0LWhRhKYaOROAXFmUutFUxVVoigNCl8mV561DCz6
|
||||||
|
6/zy81ZGeyUGOEIZ1NFuoY0EhC8=
|
||||||
|
=KaIq
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
|
+
|
||||||
|
+-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
+Comment: RPM-GPG-KEY-fedora-37-primary
|
||||||
|
+
|
||||||
|
+mQINBGESvNwBEAC7HsCDTlugVeDSMFX6aW3zAPFMfvBssNj+89fdmbxcI9t7UY6f
|
||||||
|
+HvkkGziUET8e+9jB8R2/wXQCGOw1J+sfmwO4aN0LdVQjhKvVNj+F5jWt3m5FAIBa
|
||||||
|
+OTWS6Kvqw2ECTpH7fD86541eK3BuCni6d5U3PCd73t976FcUmpQ/1AthqMksM0Jz
|
||||||
|
+cJapvNmLTCR0NZ2XyyLmn/K1hgNXe8G5j0cSrJiY+Zpz5aQkT96j96Jm6W2A+tBI
|
||||||
|
+icU4n6V4vlj2TxmCumtXJGXGBGJnof/dCgh45aqi+sk5c429ns+5sooYcaEJojj6
|
||||||
|
+FYSITv10l+az6ZMJz/j61VYSkhMY8hQ4Wd+yL2JVzLE9N9V0L95sX1yEZ5ILmzwx
|
||||||
|
+oRKe4WHSBE6yMxNWobv7hmC+3ZC5mLPaEDS/g/0xuQj9Sy9eT2mhhFPxOv29YQ+P
|
||||||
|
+sC3zXHJMMT0tlGd72PVHQQ0JYONfMhcC+7AHGFGz8p4/wor2jIFG1ouqE6Lfzm8o
|
||||||
|
+XWZMYm3AydlrP/xkYaoWNE3jL/+dskSBr/Yz7ZzlkAqH9lb1HKnXQLTrw6gz6pmI
|
||||||
|
+KufSDXjEFNxnFI/9gMlshJtk5+QSDzezmxFm+NMviSvDUNAVIzrU1D84dauBYph4
|
||||||
|
+OrJVeECQHEotny/I53AdlVwLYB4TWkObzTs6vtV7Pz1TK2CmHpe3UW72xwARAQAB
|
||||||
|
+tDFGZWRvcmEgKDM3KSA8ZmVkb3JhLTM3LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
|
||||||
|
+cmc+iQJOBBMBCAA4FiEErLXuToMcdLt8Fo0n9VrT+1MjVSoFAmESvNwCGw8FCwkI
|
||||||
|
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ9VrT+1MjVSoPMhAAist7kK/YtcyBL/dt
|
||||||
|
+P55hPrkJT6Ay+e2Dvt4Pixe4iT32Y3jG12aoX2LY//mxVOOpV+EhXYTTb5aLt2Jj
|
||||||
|
+a8/qCKJFk7zuCOxa1hgdRcjoR7ZbU0lNjD9mMCax/YT9QafcaMEib/FlknP3g1SN
|
||||||
|
+GRSKLObTJd6BbtZXCE80JRIX+Dy6+/Oz7LXRXeKpiimhlXT1wuTaqAJEtuHdQvg7
|
||||||
|
+dkL4DzAJ2FiURVd5gvgo266WaCMafJjFRrSGHJm0c+V+0Z9NsuH80JbPm+rCUh5U
|
||||||
|
+E9PMyztqlqtldtqc1+aZ1iUbVuXY059BUmlAhmf5sAlBktY+hEabH/4kmfGccbBL
|
||||||
|
+TyBIn03Y9q9173okZSUe6q16m/hbbWI8dwkSpIADZbGGJbRi8PJpCg9y6KI355qD
|
||||||
|
+atE2irleoy6eXqpKa+uPTRBk7i/r6jDoA+u+tZyFfcEnwvSWP8cN1j5mNklvITZl
|
||||||
|
+YF1n5b3fejkZVdOmRZQNkyzMxYEd4UZFQZNYrx0nltAagRS8b5ikqNk2UTl+dyBG
|
||||||
|
+k9gLOSZhAa2JdmAqwe9rT69jaa4kZMLlxPPC3246s83t0s7lp7vF+zLPfPSvxpsU
|
||||||
|
+tg+fuT+OFKWYdBFF7VkEA+wezHAznIP6TPyQXbBpkzE889/hOXy4BYs0wy8Bpda/
|
||||||
|
+Ve2Ba329f99dSCZKImi5DPCxJY4=
|
||||||
|
+=ZmVd
|
||||||
|
+-----END PGP PUBLIC KEY BLOCK-----
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
54
0002-signing-keys-drop-Fedora-34-key.patch
Normal file
54
0002-signing-keys-drop-Fedora-34-key.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
From 8a9b353aa72fff0ebfee2f6abebb6566c103f383 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dusty Mabe <dusty@dustymabe.com>
|
||||||
|
Date: Wed, 9 Feb 2022 22:39:20 -0500
|
||||||
|
Subject: [PATCH 2/2] signing-keys: drop Fedora 34 key
|
||||||
|
|
||||||
|
---
|
||||||
|
src/signing-keys.asc | 31 -------------------------------
|
||||||
|
1 file changed, 31 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/signing-keys.asc b/src/signing-keys.asc
|
||||||
|
index 62dd0aa..e61941f 100644
|
||||||
|
--- a/src/signing-keys.asc
|
||||||
|
+++ b/src/signing-keys.asc
|
||||||
|
@@ -29,37 +29,6 @@ dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==
|
||||||
|
=zbHE
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
------BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
-Comment: RPM-GPG-KEY-fedora-34-primary
|
||||||
|
-
|
||||||
|
-mQINBF8sAZIBEADKYvLg/5FdLXcVryAFd7Q8qrJq23R7ebxUT1u48Dc8xrsfYJZq
|
||||||
|
-aMcna/xw47wZNyek4Z6YpzqfmnjR7H8yRH/1hAPi/ixYnA6DVL7O3eGE5lYGJzN3
|
||||||
|
-E2ILTzBOI9o/pavvtOqW9N5WIus8cqSdA921v8YPzr3/BTKgGqC9biOrMA+3sNoe
|
||||||
|
-U4T+dztLg20SyBTr/rBH0eui2p/ipvIRuJvHLTKTubR+yG804yupI69M6qFBDebT
|
||||||
|
-rm+CBmwVyj/DY/92LgvCgYqV/TL5FU4qvtyB6jd8JkEeaz/G7UmDRB5JqzKEu6TB
|
||||||
|
-N3SY7nwLiRpIaXet1TWVW/8UKSB2JvYt1LbZyEO82/QOIXxqvV6h3kuBI21RvURz
|
||||||
|
-VxEjRlvPRGHMZ80OoAQqNPkLnVTcX1eLj2ClbwoXCmXFSm72cCCt1SzcAmlaWh8E
|
||||||
|
-rXSUZfs7XqkBrbphXHZ1e6Vxjt/RyKC5doklfOhbuF8gJ31CPo/kuOjFrHGzOwgi
|
||||||
|
-Llec+GHGMfI/cUOu59qo3W85GHsntvEMk83QLkKjBInEYjZSAajp/lS4QF+SD4pl
|
||||||
|
-Qj6Vc1mMCmci61cXX5CcIl1YxNJZzUfZEZNbUjDajqGzkYJoG9n2yJB0w4OiqsAe
|
||||||
|
-ZCirmUIeDUNeI082epc4RFuV33hByGYY9kRWSyM+aCF6PYVISj4l1o9KcQARAQAB
|
||||||
|
-tDFGZWRvcmEgKDM0KSA8ZmVkb3JhLTM0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
|
||||||
|
-cmc+iQJOBBMBCAA4FiEEjFummQvbJuGfKhqAEWGuaUVxmjkFAl8sAZICGw8FCwkI
|
||||||
|
-BwIGFQoJCAsCBBYCAwECHgECF4AACgkQEWGuaUVxmjlVuA//QnMA02tydqwpM7r4
|
||||||
|
-WZ4OvlVqFWHhn3oDaBSwBvn6R1oC0MWbr79nnFDn3tpSkZDUdb7wyArmaF8kG8tI
|
||||||
|
-wit5xD/JAzqRBVa9z2hY3n1SFafU/hp3DwbGIL4vLUv3fRayCgWsGhGp0tZvDC9q
|
||||||
|
-PSvQZ675XpRG4pt/TGJB5gGXw7Jxoae/ffaJeblLLRDlSV/bKJt9sYpdu5InDG2i
|
||||||
|
-yIUHfamtYQtnENKL/bN6w7tU/IEgCHqxPmPRiJ0gTUAi5Yabp1+JHqskE85Hm2QF
|
||||||
|
-xMonX595Ry1yZzCjPGhCPAknJ4BhisXV+E/iV3Jyh8vxbJCo1//ygd1Xz8SkCuu/
|
||||||
|
-I0xPtFcVSIP2ikYpJwR2nwwQlLbQYIGCw/S1LV725oEYm/Z1xQ5zha2hBB+fxSwz
|
||||||
|
-7MHsD2XIHrP8NNwt3ywG3NV/BSSkvSSStGUNcQyGRi3O/x/BEIRtWRxgoNO9o3jE
|
||||||
|
-xtWFq3G5+gKY+wfYz/cTGlsWPDG7Fzx4lNisIGATKtLNqdedl7LASPK93z0XDdnS
|
||||||
|
-kfKF0HrT9rdzIKRu4xWatUVIq/65Gv7nsavdsRAQL/Y0jl6sjjQac/Te5J0fByHY
|
||||||
|
-6tGG1W0UWTd0rzFWitEZI/64/Bs83rGhjJNLqWXItZ5VqLe0TWzuxvRFLfM7oX8r
|
||||||
|
-n5Si4l7NpIJubWPqjPoCoP5lsS8=
|
||||||
|
-=V2FG
|
||||||
|
------END PGP PUBLIC KEY BLOCK-----
|
||||||
|
-
|
||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
Comment: RPM-GPG-KEY-fedora-35-primary
|
||||||
|
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
Name: rust-%{crate}
|
Name: rust-%{crate}
|
||||||
Version: 0.12.0
|
Version: 0.12.0
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Installer for Fedora CoreOS and RHEL CoreOS
|
Summary: Installer for Fedora CoreOS and RHEL CoreOS
|
||||||
|
|
||||||
# Upstream license specification: Apache-2.0
|
# Upstream license specification: Apache-2.0
|
||||||
@ -25,6 +25,8 @@ Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{drac
|
|||||||
|
|
||||||
# LTO causes OOM on Fedora armv7hl builders with Rust 1.57.0
|
# LTO causes OOM on Fedora armv7hl builders with Rust 1.57.0
|
||||||
Patch1: disable-lto.patch
|
Patch1: disable-lto.patch
|
||||||
|
Patch2: 0001-signing-keys-add-Fedora-37-key.patch
|
||||||
|
Patch3: 0002-signing-keys-drop-Fedora-34-key.patch
|
||||||
|
|
||||||
ExclusiveArch: %{rust_arches}
|
ExclusiveArch: %{rust_arches}
|
||||||
%if 0%{?rhel} && !0%{?eln}
|
%if 0%{?rhel} && !0%{?eln}
|
||||||
@ -193,6 +195,10 @@ from the initramfs.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 10 2022 Jonathan Lebon <jonathan@jlebon.com> - 0.12.0-4
|
||||||
|
- Backport "signing-keys: regular Fedora cycle rotation of keys"
|
||||||
|
https://github.com/coreos/coreos-installer/pull/770
|
||||||
|
|
||||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-3
|
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user