From c0a5a042fea9ec86f473ce57efb788f2bdc22c95 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 8 Feb 2022 19:20:57 +0100 Subject: [PATCH 01/38] Setup for rawhide being F37 Signed-off-by: Tomas Hrcka --- fedora-repos.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index a15e729..dd28bbd 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ -%global rawhide_release 36 +%global rawhide_release 37 %global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos -Version: 36 -Release: 0.3%{?eln:.eln%{eln}} +Version: 37 +Release: 0.1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -392,6 +392,9 @@ rm -f "$TMPRING" %changelog +* Tue Feb 08 2022 Tomas Hrcka - 37-0.1 +- Setup for rawhide being F37 + * Tue Aug 17 2021 Tomas Hrcka - 36-0.3 - Remove spurious space in RPM-GPG-KEY-fedora-37-primary (cgwalters) From ef1ca697853912a73e5af9a05084792c101f53e8 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 8 Feb 2022 16:09:51 -0500 Subject: [PATCH 02/38] Setup for rawhide being F37 Adding F38 key Signed-off-by: Mohan Boddu --- RPM-GPG-KEY-fedora-38-primary | 29 +++++++++++++++++++++++++++++ fedora-repos.spec | 1 + 2 files changed, 30 insertions(+) create mode 100644 RPM-GPG-KEY-fedora-38-primary diff --git a/RPM-GPG-KEY-fedora-38-primary b/RPM-GPG-KEY-fedora-38-primary new file mode 100644 index 0000000..ac2db41 --- /dev/null +++ b/RPM-GPG-KEY-fedora-38-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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----- diff --git a/fedora-repos.spec b/fedora-repos.spec index dd28bbd..cf0671a 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -394,6 +394,7 @@ rm -f "$TMPRING" %changelog * Tue Feb 08 2022 Tomas Hrcka - 37-0.1 - Setup for rawhide being F37 +- Adding F38 key * Tue Aug 17 2021 Tomas Hrcka - 36-0.3 - Remove spurious space in RPM-GPG-KEY-fedora-37-primary (cgwalters) From b7b688230c3bdb51906ed4b45f1a2ee5d705dc3e Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 8 Feb 2022 16:18:27 -0500 Subject: [PATCH 03/38] Setup for rawhide being F37 Adding F38 key Signed-off-by: Mohan Boddu --- fedora-repos.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-repos.spec b/fedora-repos.spec index cf0671a..a75e3ed 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -77,6 +77,7 @@ Source54: RPM-GPG-KEY-fedora-34-primary Source55: RPM-GPG-KEY-fedora-35-primary Source56: RPM-GPG-KEY-fedora-36-primary Source57: RPM-GPG-KEY-fedora-37-primary +Source58: RPM-GPG-KEY-fedora-38-primary # When bumping Rawhide to fN, create N+1 key (and update archmap). (This # ensures users have the next future key installed and referenced, even if they # don't update very often. This will smooth out Rawhide N->N+1 transition for them). From c68fb81c5d94e0771c9c4ba3facb599715b4ab24 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 8 Feb 2022 16:26:37 -0500 Subject: [PATCH 04/38] Setup for rawhide being F37 Adding F38 key Signed-off-by: Mohan Boddu --- archmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archmap b/archmap index bb70c63..fbd1689 100644 --- a/archmap +++ b/archmap @@ -81,3 +81,5 @@ fedora-35-primary: x86_64 armhfp aarch64 ppc64le s390x fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x fedora-37-primary: x86_64 armhfp aarch64 ppc64le s390x + +fedora-38-primary: x86_64 armhfp aarch64 ppc64le s390x From c581f6b90210eee33a6a0f4c6f3f8df40bf5f6b8 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 25 May 2022 11:19:08 -0400 Subject: [PATCH 05/38] Rework ELN repos Previously, it was expected that ELN repositories could be supplemented with Rawhide repositories. It turns out that this causes difficult-to-identify conflicts. This patch disables all other Fedora repos when built for ELN. Signed-off-by: Stephen Gallagher --- fedora-eln.repo | 312 ++++++++++++++++++++++++++++++++++++++++++++++ fedora-repos.spec | 33 +++-- 2 files changed, 336 insertions(+), 9 deletions(-) diff --git a/fedora-eln.repo b/fedora-eln.repo index 7992bf6..0cadc0e 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -94,3 +94,315 @@ type=rpm gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch skip_if_unavailable=False + + + +[eln-crb] +name=Fedora - ELN CRB - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=AUTO_VALUE +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-crb-debuginfo] +name=Fedora - ELN CRB - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/$basearch/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-crb-source] +name=Fedora - ELN CRB - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + + + +[eln-extras] +name=Fedora - ELN Extras - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=AUTO_VALUE +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-extras-debuginfo] +name=Fedora - ELN Extras - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-extras-source] +name=Fedora - ELN Extras - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + + + +[eln-ha] +name=Fedora - ELN HighAvailability - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=AUTO_VALUE +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-ha-debuginfo] +name=Fedora - ELN HighAvailability - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-ha-source] +name=Fedora - ELN HighAvailability - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + + + +[eln-rs] +name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=AUTO_VALUE +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-rs-debuginfo] +name=Fedora - ELN ResilientStorage - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-rs-source] +name=Fedora - ELN ResilientStorage - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + + + +[eln-rt] +name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=AUTO_VALUE +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-rt-debuginfo] +name=Fedora - ELN RT - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-rt-source] +name=Fedora - ELN RT - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + + + +[eln-nfv] +name=Fedora - ELN NFV - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=AUTO_VALUE +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-nfv-debuginfo] +name=Fedora - ELN NFV - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-nfv-source] +name=Fedora - ELN NFV - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + + + +[eln-sap] +name=Fedora - ELN SAP - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=AUTO_VALUE +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-sap-debuginfo] +name=Fedora - ELN SAP - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-sap-source] +name=Fedora - ELN SAP - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + + + +[eln-saphana] +name=Fedora - ELN SAPHANA - Developmental packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=AUTO_VALUE +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-saphana-debuginfo] +name=Fedora - ELN SAPHANA - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False + +[eln-saphana-source] +name=Fedora - ELN SAPHANA - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch +skip_if_unavailable=False diff --git a/fedora-repos.spec b/fedora-repos.spec index a75e3ed..dc33a68 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -149,12 +149,11 @@ where client's system will pull OSTree updates. %package eln Summary: ELN repo definitions -Requires: fedora-repos-rawhide = %{version}-%{release} %description eln This package provides repository files for ELN (Enterprise Linux Next) -packages that can be installed atop Rawhide. Note that these packages are -experimental and should not be used in a production environment. +packages. Note that these packages are experimental and should not be used +in a production environment. %prep @@ -199,18 +198,26 @@ for file in %{_sourcedir}/fedora*repo ; do done # Enable or disable repos based on current release cycle state. -%if %{rawhide_release} == %{version} +%if 0%{?eln} +rawhide_enabled=0 +stable_enabled=0 +testing_enabled=0 +archive_enabled=0 +eln_enabled=1 +%elif %{rawhide_release} == %{version} rawhide_enabled=1 stable_enabled=0 testing_enabled=0 archive_enabled=0 +eln_enabled=0 %else rawhide_enabled=0 stable_enabled=1 testing_enabled=%{updates_testing_enabled} archive_enabled=1 +eln_enabled=0 %endif -for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1 done for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo; do @@ -222,6 +229,9 @@ done for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-archive.repo; do sed -i "s/^enabled=AUTO_VALUE$/enabled=${archive_enabled}/" $repo || exit 1 done +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-eln*.repo; do + sed -i "s/^enabled=AUTO_VALUE$/enabled=${eln_enabled}/" $repo || exit 1 +done # Adjust Rawhide repo files to include Rawhide+1 GPG key. # This is necessary for the period when Rawhide gets bumped to N+1 and packages @@ -260,16 +270,21 @@ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/*.repo; do done # Make sure correct repos were enabled/disabled -enabled_repos=(fedora-cisco-openh264) +enabled_repos=() disabled_repos=() -%if %{rawhide_release} == %{version} -enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln) + +%if 0%{?eln} +enabled_repos+=(fedora-eln) +disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \ + fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular) +%elif %{rawhide_release} == %{version} +enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-cisco-openh264) disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \ fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular) %else enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \ fedora-updates-modular) -disabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln) +disabled_repos+=(fedora-rawhide fedora-rawhide-modular) %if %{updates_testing_enabled} enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular) %else From 650506b268b9c7cbea372bcf297353636814e52f Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 25 May 2022 14:25:47 -0400 Subject: [PATCH 06/38] Update changelog for ELN Signed-off-by: Stephen Gallagher --- fedora-repos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index dc33a68..fd246d7 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 37 -Release: 0.1%{?eln:.eln%{eln}} +Release: 0.2%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -408,6 +408,9 @@ rm -f "$TMPRING" %changelog +* Wed May 25 2022 Stephen Gallagher - 37-0.2 +- Rework Fedora ELN repositories + * Tue Feb 08 2022 Tomas Hrcka - 37-0.1 - Setup for rawhide being F37 - Adding F38 key From 18976ae7228070670d502d956454371d9b6a49cf Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 8 Jun 2022 09:04:49 -0400 Subject: [PATCH 07/38] ELN: don't enable layered product repos by default Signed-off-by: Stephen Gallagher --- fedora-eln.repo | 12 ++++++------ fedora-repos.spec | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fedora-eln.repo b/fedora-eln.repo index 0cadc0e..c2c1275 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -179,7 +179,7 @@ skip_if_unavailable=False name=Fedora - ELN HighAvailability - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=AUTO_VALUE +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -218,7 +218,7 @@ skip_if_unavailable=False name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=AUTO_VALUE +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -257,7 +257,7 @@ skip_if_unavailable=False name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=AUTO_VALUE +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -296,7 +296,7 @@ skip_if_unavailable=False name=Fedora - ELN NFV - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=AUTO_VALUE +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -335,7 +335,7 @@ skip_if_unavailable=False name=Fedora - ELN SAP - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=AUTO_VALUE +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -374,7 +374,7 @@ skip_if_unavailable=False name=Fedora - ELN SAPHANA - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=AUTO_VALUE +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 diff --git a/fedora-repos.spec b/fedora-repos.spec index fd246d7..bd99376 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 37 -Release: 0.2%{?eln:.eln%{eln}} +Release: 0.3%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -408,6 +408,9 @@ rm -f "$TMPRING" %changelog +* Wed Jun 08 2022 Stephen Gallagher - 37-0.3 +- ELN: don't enable layered product repos by default + * Wed May 25 2022 Stephen Gallagher - 37-0.2 - Rework Fedora ELN repositories From bcab1c7770a44a5cda4d33fc9bfc0431b6ee789d Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 19:15:28 +0200 Subject: [PATCH 08/38] Rawhide is now f38 Signed-off-by: Tomas Hrcka --- RPM-GPG-KEY-fedora-39-primary | 29 +++++++++++++++++++++++++++++ fedora-repos.spec | 11 ++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 RPM-GPG-KEY-fedora-39-primary diff --git a/RPM-GPG-KEY-fedora-39-primary b/RPM-GPG-KEY-fedora-39-primary new file mode 100644 index 0000000..2dc618a --- /dev/null +++ b/RPM-GPG-KEY-fedora-39-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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----- \ No newline at end of file diff --git a/fedora-repos.spec b/fedora-repos.spec index bd99376..911037b 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ -%global rawhide_release 37 +%global rawhide_release 38 %global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos -Version: 37 -Release: 0.3%{?eln:.eln%{eln}} +Version: 38 +Release: 0.1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -78,6 +78,7 @@ Source55: RPM-GPG-KEY-fedora-35-primary Source56: RPM-GPG-KEY-fedora-36-primary Source57: RPM-GPG-KEY-fedora-37-primary Source58: RPM-GPG-KEY-fedora-38-primary +Source59: RPM-GPG-KEY-fedora-39-primary # When bumping Rawhide to fN, create N+1 key (and update archmap). (This # ensures users have the next future key installed and referenced, even if they # don't update very often. This will smooth out Rawhide N->N+1 transition for them). @@ -408,6 +409,10 @@ rm -f "$TMPRING" %changelog +* Tue Aug 09 2022 Tomas Hrcka - 38-0.1 +- Setup for rawhide being F38 +- Adding F39 key + * Wed Jun 08 2022 Stephen Gallagher - 37-0.3 - ELN: don't enable layered product repos by default From 0ff935aa0778db448ad7bf6cb8aacecdd7e4d25c Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 20:03:01 +0200 Subject: [PATCH 09/38] update archmap Signed-off-by: Tomas Hrcka --- archmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archmap b/archmap index fbd1689..75d0b42 100644 --- a/archmap +++ b/archmap @@ -83,3 +83,5 @@ fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x fedora-37-primary: x86_64 armhfp aarch64 ppc64le s390x fedora-38-primary: x86_64 armhfp aarch64 ppc64le s390x + +fedora-39-primary: x86_64 armhfp aarch64 ppc64le s390x From 9b26c4efa4f355d66ede7e017341f5ae6ac3cb34 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 21:04:29 +0200 Subject: [PATCH 10/38] Drop armhfp from archmap on f38,f39 Signed-off-by: Tomas Hrcka --- archmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archmap b/archmap index 75d0b42..a525cda 100644 --- a/archmap +++ b/archmap @@ -82,6 +82,6 @@ fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x fedora-37-primary: x86_64 armhfp aarch64 ppc64le s390x -fedora-38-primary: x86_64 armhfp aarch64 ppc64le s390x +fedora-38-primary: x86_64 aarch64 ppc64le s390x -fedora-39-primary: x86_64 armhfp aarch64 ppc64le s390x +fedora-39-primary: x86_64 aarch64 ppc64le s390x From c1334044edeef17d7b1bf2549b039551a751b7bb Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 21:21:40 +0200 Subject: [PATCH 11/38] BUmp release Signed-off-by: Tomas Hrcka --- fedora-repos.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 911037b..d796478 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -28,7 +28,6 @@ Source6: fedora-cisco-openh264.repo Source7: fedora-updates-archive.repo Source8: fedora-eln.repo - Source10: RPM-GPG-KEY-fedora-7-primary Source11: RPM-GPG-KEY-fedora-8-primary Source12: RPM-GPG-KEY-fedora-8-primary-original From eca46ac31a00cb7f21029dfd394fc86131de7141 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 21:23:58 +0200 Subject: [PATCH 12/38] Bump release Signed-off-by: Tomas Hrcka --- fedora-repos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index d796478..475d42e 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 38 -Release: 0.1%{?eln:.eln%{eln}} +Release: 0.2%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ From 3b053dfff1942804baed33a9de527d3e2c025161 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 15 Aug 2022 11:04:42 -0400 Subject: [PATCH 13/38] Fix RPM-GPG-KEY-fedora-39-primary - Remove blank space from line - Add newline to the end of the file This was previously throwing this error: ``` $ sudo rpm --import ./RPM-GPG-KEY-fedora-39-x86_64 error: ./RPM-GPG-KEY-fedora-39-x86_64: key 1 not an armored public key ``` --- RPM-GPG-KEY-fedora-39-primary | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RPM-GPG-KEY-fedora-39-primary b/RPM-GPG-KEY-fedora-39-primary index 2dc618a..3c27a91 100644 --- a/RPM-GPG-KEY-fedora-39-primary +++ b/RPM-GPG-KEY-fedora-39-primary @@ -1,5 +1,5 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- - + mQINBGLykg8BEADURjKtgQpQNoluifXia+U3FuqGCTQ1w7iTqx1UvNhLX6tb9Qjy l/vjl1iXxucrd2JBnrT/21BdtaABhu2hPy7bpcGEkG8MDinAMZBzcyzHcS/JiGHZ d/YmMWQUgbDlApbxFSGWiXMgT0Js5QdcywHI5oiCmV0lkZ+khZ4PkVWmk6uZgYWf @@ -26,4 +26,4 @@ J5dGeb/ArmxQj3IMrajdNwjuk9GMeMSSS2EMY8ryOuYwRbFhBOLhGAnmM5OOSUxv A4ipWraXDW0bK/wXI7yHMkc6WYrdV3SIXEqJBTp7npimv3JC+exWEbTLcgvV70FP X55M9nDtzUSayJuEcfFP2c9KQCE= =J4qZ ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file +-----END PGP PUBLIC KEY BLOCK----- From f1bd9712f80d2a8dee4b469e4c6e2b3a8dc33ae8 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 16 Aug 2022 21:55:19 -0400 Subject: [PATCH 14/38] Bump release, update changelog --- fedora-repos.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 475d42e..4a2c669 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 38 -Release: 0.2%{?eln:.eln%{eln}} +Release: 0.3%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -408,6 +408,12 @@ rm -f "$TMPRING" %changelog +* Tue Aug 16 2022 Adam Williamson - 38.0-3 +- Fix RPM-GPG-KEY-fedora-39-primary (dustymabe) + +* Tue Aug 09 2022 Tomas Hrcka - 38-0.2 +- Drop armhfp from archmap on f38,f39 + * Tue Aug 09 2022 Tomas Hrcka - 38-0.1 - Setup for rawhide being F38 - Adding F39 key From f2cbb4bb926df42720899375b18652192f0d6f65 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 16 Aug 2022 22:47:08 -0400 Subject: [PATCH 15/38] Add a check that RPM can import the same keys as GPG `rpm --import` seems to be stricter than `gpg --import` on white space issues - gpg imported the problematic Fedora 39 key file that was just fixed fine, but rpm refused it. So let's check that `rpm --import` works on all the keys we check `gpg --import` on too. Signed-off-by: Adam Williamson --- fedora-repos.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 4a2c669..19e0312 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -17,7 +17,7 @@ Requires: fedora-repos-rawhide = %{version}-%{release} Requires: fedora-gpg-keys >= %{version}-%{release} BuildArch: noarch # Required by %%check -BuildRequires: gnupg sed +BuildRequires: gnupg sed rpm Source1: archmap Source2: fedora.repo @@ -357,14 +357,17 @@ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do done <<< "$gpg_lines" done -# Check arch keys exists on supported architectures +# Check arch keys exists on supported architectures, and RPM considers +# them valid TMPRING=$(mktemp) +DBPATH=$(mktemp -d) for VER in %{version} %{rawhide_release} ${rawhide_next}; do echo -n > "$TMPRING" for ARCH in $(sed -ne "s/^fedora-${VER}-primary://p" %{_sourcedir}/archmap) do gpg --no-default-keyring --keyring="$TMPRING" \ --import $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-$VER-$ARCH + rpm --dbpath "$DBPATH" --import $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-$VER-$ARCH --test done # Ensure some arch key was imported gpg --no-default-keyring --keyring="$TMPRING" --list-keys | grep -A 2 '^pub\s' From 25754d7fa96657ceabbaa8da84c0fb7ac9d5dab0 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Wed, 25 Jan 2023 13:54:51 +0100 Subject: [PATCH 16/38] Add fedora 40 key Signed-off-by: Tomas Hrcka --- RPM-GPG-KEY-fedora-40-primary | 29 +++++++++++++++++++++++++++++ fedora-repos.spec | 6 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-40-primary diff --git a/RPM-GPG-KEY-fedora-40-primary b/RPM-GPG-KEY-fedora-40-primary new file mode 100644 index 0000000..19238f7 --- /dev/null +++ b/RPM-GPG-KEY-fedora-40-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGPQTCwBEADFUL0EQLzwpKHtlPkacVI156F2LnWp6K69g/6yzllidHI3b7EV +QgQ9/Kdou6wNuOahNKa6WcEi6grEXexD7pAcu4xdRUp79XxQy5pC7Aq2/Dwf0vRL +2y0kqof+C7iSzhHsfLoaqKKeh2njAo1KLZXYTHAWAMbXEyO/FJevaHLXe2+yYd7j +luD58gyXgGDXXJ2lymLqs2jobjWdmGPNZGFl36RP3Dnk0FpbdH78kyIIsc2foYuF +00rnuumwCtK3V58VOZo6IkaYk2irdyeetmJjVHwLHwJB3EaAwGy9Z2oAH3LxxFfk +rQb0DH0Nzb3fpEziopOOqSi+6guV4RHUKAkCUMu+Mo5XwFVPUAIfNRTVqoIaEasC +WO26lhkB87wwIvyb/TPGSeh6laHPRf0QOUOLkugdkSHoaJFWoTCcu9Y4aeDpf+ZQ +fMVmkJNRS1tXONgz+pDk1rro/tNrkusYG18xjvSZTB0P0C4b4+jgK5l7me0NU6G3 +Ww/hIng5lxWfXgE9bpxlN834v1xy5Z3v17guJu1ec/jzKzQQ4356wyegXURjYoWe +awcnK1S+9gxivnkOk1bGLNxrEh5vB6PDcI1VQ1ECH50EHyvE1IXJDaaStdAkacv2 +qHcd15CnlBW1LYFj0CHs/sGu9FD0iSF95OVRX4gjg9Wa4f8KvtEO/f+FeQARAQAB +tDFGZWRvcmEgKDQwKSA8ZmVkb3JhLTQwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQJOBBMBCAA4FiEEEV35rvhXhT7oRF0KBydwfqFbecwFAmPQTCwCGw8FCwkI +BwIGFQoJCAsCBBYCAwECHgECF4AACgkQBydwfqFbecxJOw//XaoJG3zN01bVM63H +nFmMW/EnLzKrZqH8ZNq8CP9ycoc4q8SYcMprHKG9jufzj5/FhtpYecp3kBMpSYHt +Vu46LS9NajJDwdfvUMezVbieNIQ8icTR5s5IUYFlc47eG6PRe3k0n5fOPcIb6q82 +byrK3dQnanOcVdoGU7QO9LAAHO9hg0zgZa0MxQAlDQov3dZcr7u7qGcQmU5JzcRS +JgfDxHxDuMjmq6Kd0/UwD00kd2ptZgRls0ntXdm9CZGtQ/Q0baJ3eRzccpd/8bxy +RWF9MnOdmV6ojcFKYECjEzcuheUlcKQH9rLkeBSfgrIlK3L7LG8bg5ouZLdx17rQ +XABNQGmJTaGAiEnS/48G3roMS8R7fhUljcKr6t63QQQJ2qWdPvI6EMC2xKZsLHK4 +XiUvrmJpUprvEQSKBUOf/2zuXDBshtAnoKh7h5aG+TvozL4yNG5DKpSH3MRj1E43 +KoMsP/GN/X5h+vJnvhiCWxNMPP81Op0czBAgukBm627FTnsvieJOOrzyxb1s75+W +56gJombmhzUfzr88AYY9mFy7diTw/oldDZcfwa8rvOAGJVDlyr2hqkLoGl+5jPex +slt3NF4caE/wP9wPMgFRkmMOr8eiRhjlWLrO6mQdBp7Qsj3kEXioP+CZ1cv/sbaK +4DM7VidB4PLrMFQMaf0LpjpC2DM= +=wOl2 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/fedora-repos.spec b/fedora-repos.spec index 19e0312..c02a038 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 38 -Release: 0.3%{?eln:.eln%{eln}} +Release: 0.4%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -78,6 +78,7 @@ Source56: RPM-GPG-KEY-fedora-36-primary Source57: RPM-GPG-KEY-fedora-37-primary Source58: RPM-GPG-KEY-fedora-38-primary Source59: RPM-GPG-KEY-fedora-39-primary +Source60: RPM-GPG-KEY-fedora-40-primary # When bumping Rawhide to fN, create N+1 key (and update archmap). (This # ensures users have the next future key installed and referenced, even if they # don't update very often. This will smooth out Rawhide N->N+1 transition for them). @@ -411,6 +412,9 @@ rm -f "$TMPRING" %changelog +* Wed Jan 25 2023 Tomas Hrcka - 38-0.4 +- Add RPM-GPG-KEY-fedora-40-primary + * Tue Aug 16 2022 Adam Williamson - 38.0-3 - Fix RPM-GPG-KEY-fedora-39-primary (dustymabe) From b0742b9e487ec6f71dd5cfb98f9c7fe174310cff Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Sun, 29 Jan 2023 14:21:37 +0100 Subject: [PATCH 17/38] Update archmap for f40 key Signed-off-by: Tomas Hrcka --- archmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archmap b/archmap index a525cda..ccfa584 100644 --- a/archmap +++ b/archmap @@ -85,3 +85,5 @@ fedora-37-primary: x86_64 armhfp aarch64 ppc64le s390x fedora-38-primary: x86_64 aarch64 ppc64le s390x fedora-39-primary: x86_64 aarch64 ppc64le s390x + +fedora-40-primary: x86_64 aarch64 ppc64le s390x From 043010400f007c9f7167c9411d4463f4c2f08b9e Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Wed, 8 Feb 2023 22:07:13 +0100 Subject: [PATCH 18/38] Rawhide is now f39 Signed-off-by: Tomas Hrcka --- fedora-repos.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index c02a038..9fdda40 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ -%global rawhide_release 38 +%global rawhide_release 39 %global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos -Version: 38 -Release: 0.4%{?eln:.eln%{eln}} +Version: 39 +Release: 0.1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -412,6 +412,9 @@ rm -f "$TMPRING" %changelog +* Wed Feb 08 2023 Tomas Hrcka - 39-0.1 +- Setup for rawhide being F39 + * Wed Jan 25 2023 Tomas Hrcka - 38-0.4 - Add RPM-GPG-KEY-fedora-40-primary From 93b2c8add81f2d6f83874ce53b080adbc4fe6826 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 18 Feb 2023 10:45:08 -0800 Subject: [PATCH 19/38] Add f38/f39 ima certs I'm not sure the directory ( /etc/pki/rpm-ima ) or the format is whats destired here as I have not had time to play with IMA. Hopefully the cert or the pem or the der are one the desired format here. Happy to adjust with feedback from IMA users any of this. CC: @pbrobinson @puiterwijk @fche Signed-off-by: Kevin Fenzi --- fedora-38-ima.cert | 11 +++++++++++ fedora-38-ima.der | Bin 0 -> 427 bytes fedora-38-ima.pem | 4 ++++ fedora-39-ima.cert | 11 +++++++++++ fedora-39-ima.der | Bin 0 -> 426 bytes fedora-39-ima.pem | 4 ++++ fedora-repos.spec | 18 +++++++++++++++++- 7 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 fedora-38-ima.cert create mode 100644 fedora-38-ima.der create mode 100644 fedora-38-ima.pem create mode 100644 fedora-39-ima.cert create mode 100644 fedora-39-ima.der create mode 100644 fedora-39-ima.pem diff --git a/fedora-38-ima.cert b/fedora-38-ima.cert new file mode 100644 index 0000000..e0d2819 --- /dev/null +++ b/fedora-38-ima.cert @@ -0,0 +1,11 @@ +-----BEGIN CERTIFICATE----- +MIIBpzCCASygAwIBAgIBKjAKBggqhkjOPQQDAzAbMRkwFwYDVQQDExBGZWRvcmEg +MzggSU1BIENBMCAXDTIzMDIxODE4MDMxNloYDzIwNTMwMjE4MTgwMzE2WjAcMRow +GAYDVQQDExFGZWRvcmEgMzggSU1BIEtleTBZMBMGByqGSM49AgEGCCqGSM49AwEH +A0IABI+RFc41GuD1tyN2P0U5C4H4z9xJbuAMinV18SJXVulVYt0DBKT+Xme5WZpQ +dvPdkBaW1jCzSeI15T3oTIKjYL6jXjBcMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgw +FoAU7MSMKFJGsKYZxjsInt2Dp7i3db8wKwYJYIZIAYb4QgENBB5JTUEgc2lnbmF0 +dXJlIHZlcmlmaWNhdGlvbiBrZXkwCgYIKoZIzj0EAwMDaQAwZgIxAKMa1pxV4PM9 +BSRqnYWpLg2bfunWRo2fsqn/HaI7qdLZZTUivtSWcTJFif7c5YHWggIxAIgZnzog +XLA6WvFbmimjFNjQCKnxuvo/f2OzbK2JPj7XofpJrhf0frL2Cb1r7novgw== +-----END CERTIFICATE----- diff --git a/fedora-38-ima.der b/fedora-38-ima.der new file mode 100644 index 0000000000000000000000000000000000000000..238ae6c307633da1965ba194ab4d40c39d26318f GIT binary patch literal 427 zcmXqLVq9*}#Hh1?nTe5!iBZddi;Y98&EuRc3p2BUw4tPdI2&^)3$w6*TWU&vQKEve zg@UKAqk^-efr2=%k+Ff1p@pG^fw7@klmx$#fhn?pfsCP)fdoXmAgXrn)JlU$17S9H zuvJWqP&=6!*_oXfSo$Z5o->tt@O8U#nZ2tecjJ%qcRceR@N|`yepCt%dl{N^mzibB zzqs_Bk+TBIKHr@nHtm|hX3s~aPiZuq#(;;7IaF4dk?}tZlL3Q)Jcy^v zB4HrbAoAu&k4BK&hGmk+tU2c0ZC<`(d+B}yZ8pw?HV?+OA5M(CEOH<(7H6jCC6<&H zr7D!A7GdTr6_q0>{da iyMEc%CvVPK+i7Qaec><9b>d&@HhtsVoBggzzZn3_$CG~m literal 0 HcmV?d00001 diff --git a/fedora-38-ima.pem b/fedora-38-ima.pem new file mode 100644 index 0000000..e323fa2 --- /dev/null +++ b/fedora-38-ima.pem @@ -0,0 +1,4 @@ +-----BEGIN PUBLIC KEY----- +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEj5EVzjUa4PW3I3Y/RTkLgfjP3Elu +4AyKdXXxIldW6VVi3QMEpP5eZ7lZmlB2892QFpbWMLNJ4jXlPehMgqNgvg== +-----END PUBLIC KEY----- diff --git a/fedora-39-ima.cert b/fedora-39-ima.cert new file mode 100644 index 0000000..78c7bb4 --- /dev/null +++ b/fedora-39-ima.cert @@ -0,0 +1,11 @@ +-----BEGIN CERTIFICATE----- +MIIBpjCCASygAwIBAgIBKjAKBggqhkjOPQQDAzAbMRkwFwYDVQQDExBGZWRvcmEg +MzkgSU1BIENBMCAXDTIzMDIxODE4MDQxNloYDzIwNTMwMjE4MTgwNDE2WjAcMRow +GAYDVQQDExFGZWRvcmEgMzkgSU1BIEtleTBZMBMGByqGSM49AgEGCCqGSM49AwEH +A0IABPVBlbhn8Lz9PLD0LqpySa9jgxZTdImp2xbyMes+L91MntWFKj5hR86He9kN +87KphPuso6WdRPDLf4ouarSaNdGjXjBcMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgw +FoAUpxQ+y2TQxMrznQx9xDhFRthT/1IwKwYJYIZIAYb4QgENBB5JTUEgc2lnbmF0 +dXJlIHZlcmlmaWNhdGlvbiBrZXkwCgYIKoZIzj0EAwMDaAAwZQIxALJAz24hm4Lu +P9eFeAyCGKjWdqrBIAh2Ec7kUpkALqvfZHZhP/qhhqAxKEOO6v66ZgIwYObLdWmX +TGN2JGRLY6KwcUoprXAECTYGX9HjGqv2/7xrt7hCSwqjpIr29XXOi2mv +-----END CERTIFICATE----- diff --git a/fedora-39-ima.der b/fedora-39-ima.der new file mode 100644 index 0000000000000000000000000000000000000000..0d13baa62d75c2fc8404a539c9e554a8a3dc33ec GIT binary patch literal 426 zcmXqLVq9j>#Hh1?nTe5!iBZddi;Y98&EuRc3p2BUw4tPdI2&^)3$w6*TWU&vQKEve zrGlrgqk^-efr2=%k+Ff1p@pG^fr+76lmx$#fhn?pfsCP)fdoXmAgXrn)JlU$17S9H zuvJWqP&=6!*_oXfSiU+=-I4xb&tIDjU-VWLd9F`x77H%vTzOmUli_PS{kuN%uC{8~ zCAyz$ufECqdDF_4-)j~xo$K=9bbXgz)|OeO7Z=AF#2E0fF^9?uGcx{XVKQJakO%RU zStJa^8bp?h*qu(faOBkIxjeN;EL`1g1pf~*&}QRIX!Brf`{BgM%OVHzVsU1AUSdgU zQK~{&YEfodW^!UlW`3SRc4{SZ7%^us7^E^8GHh}7D)c)(V~`i51t%RvlE} zC=)#QBxojs-s<})Wr_B`7Pc)g)Nt;5^>0@ilR?6>)1{fyeUi&mQoNHFZ7B58TwB1x hX~q_R@v+qEZ~ymXZ{OkM&9!(**SD{w=ejf30|211lY0OF literal 0 HcmV?d00001 diff --git a/fedora-39-ima.pem b/fedora-39-ima.pem new file mode 100644 index 0000000..2856eb1 --- /dev/null +++ b/fedora-39-ima.pem @@ -0,0 +1,4 @@ +-----BEGIN PUBLIC KEY----- +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE9UGVuGfwvP08sPQuqnJJr2ODFlN0 +ianbFvIx6z4v3Uye1YUqPmFHzod72Q3zsqmE+6yjpZ1E8Mt/ii5qtJo10Q== +-----END PUBLIC KEY----- diff --git a/fedora-repos.spec b/fedora-repos.spec index 9fdda40..d8e41e0 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 39 -Release: 0.1%{?eln:.eln%{eln}} +Release: 0.2%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -93,6 +93,14 @@ Source150: RPM-GPG-KEY-fedora-iot-2019 Source151: fedora.conf Source152: fedora-compose.conf +# ima certs +Source500: fedora-38-ima.cert +Source501: fedora-38-ima.der +Source502: fedora-38-ima.pem +Source503: fedora-39-ima.cert +Source504: fedora-39-ima.der +Source505: fedora-39-ima.pem + %description Fedora package repository files for yum and dnf along with gpg public keys. @@ -192,6 +200,10 @@ done ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora popd +# Install the ima keys +install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-ima +install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/pki/rpm-ima/ + # Install repo files install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d for file in %{_sourcedir}/fedora*repo ; do @@ -400,6 +412,7 @@ rm -f "$TMPRING" %files -n fedora-gpg-keys %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/RPM-GPG-KEY-* +/etc/pki/rpm-ima/fedora*ima* %files ostree @@ -412,6 +425,9 @@ rm -f "$TMPRING" %changelog +* Sat Feb 18 2023 Kevin Fenzi - 39-0.2 +- Include IMA public certs. + * Wed Feb 08 2023 Tomas Hrcka - 39-0.1 - Setup for rawhide being F39 From 00b35f8d4288e7f4360992a47da43a8d2d96fe7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 10 Jul 2023 17:54:56 +0200 Subject: [PATCH 20/38] Drop fedora-repos-modular and fedora-repos-rawhide-modular packages https://fedoraproject.org/wiki/Changes/RetireModularity --- RPM-GPG-KEY-fedora-modularity | 29 ------------ fedora-modular.repo | 36 --------------- fedora-rawhide-modular.repo | 57 ----------------------- fedora-repos.spec | 71 +++++++++-------------------- fedora-updates-modular.repo | 36 --------------- fedora-updates-testing-modular.repo | 36 --------------- 6 files changed, 21 insertions(+), 244 deletions(-) delete mode 100644 RPM-GPG-KEY-fedora-modularity delete mode 100644 fedora-modular.repo delete mode 100644 fedora-rawhide-modular.repo delete mode 100644 fedora-updates-modular.repo delete mode 100644 fedora-updates-testing-modular.repo diff --git a/RPM-GPG-KEY-fedora-modularity b/RPM-GPG-KEY-fedora-modularity deleted file mode 100644 index 99b0291..0000000 --- a/RPM-GPG-KEY-fedora-modularity +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBFkbN5MBEAC9zjfb8joJxrX0eawhKizSZlKnAaNXhGeg5NauRy2t34BVosbO -e1z5tohrV7OAhB1X97ZkrsKg0ENTwlTYn/DI/bTU0Z+OG/bp7Fj07jMuYEcobKCq -5BkspPaW9pHZ/Z070ZZxPpccWvGt1WD/KIno1J98Hszh+KvpDOW9voLdOc0KBvrw -gZuAUB53Cjljeb6x871IFjF0UgvuPlklF7GlOU8mN9OoMDGUU8lr9qhYSkdFz9Us -NyHLWDi3ySHYWF7L7NdOKE+5j1emy1kNt5gaTr6XTPOhfvq8VZHZA/AXLRGB9TkQ -W6/VNzBbiEV7GT6ypDjHQ0ir0N+M0CZtOOBEIwToDWj/8pSO+onT/ChCxO0o0o96 -zjKPcPocxlVZE31klARMsHfG8Oi6uw1oHEfQH60yZYwCdA2GRu3OK6N/t/tqXH96 -WfOh2AjPiHvYf8Wuli1l2OMGj7Uzo6oxuS4nzB1zz4G1KEGDZbned0o65fcxi0+4 -B8pAvnucBI+AE78HaR9/ehAsI2P7KMP6WiKPO5BfELq2wC4bWaZbROqUuGgQ6wwK -4C6oP27ug9n/ce5GlHTPNenAeC8rtUGCWv+2XayHdAG4rHB5VLDywyD+/6bwhVM4 -gPIzKkm7exR+mylwsNiXl7gwBgdNdal4p2rY0hJuLwsx4lLFHXFVjFRtxwARAQAB -tEhNb2R1bGFyIEZlZG9yYSAoZmVkb3JhLW1vZHVsYXJpdHkpIDxmZWRvcmEtbW9k -dWxhcml0eUBmZWRvcmFwcm9qZWN0Lm9yZz6JAj4EEwECACgFAlkbN5MCGw8FCSis -we0GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEFvBtSejzE5i6f8P/1AeJgzC -GDBFKE2RLlZXtqDv+khlBeSVVRrfLyiJNjEnUFq6X6XhDDb8ldZq4JpUB0sy8Eux -NBef3n1Yw67XY5ZWOdDgo+ci2yeog7Ch5Hv59jvwpwnOnsc8/JOUwAz4EkxjloUh -YV3afXKFOM15HAKFRJ/OerKQSy0KWHsd9KWIgBEOb5FAwrH86n3zLuuAUnjsiE7V -kXh2zxehuD+rv35u17CL3H5R3tO3V1xzw4oAMoIspuJxipBB2+nXN6A1iFw1yQA8 -5g91tUmJ+6jwLYpNhhgqkPCy/3j05Ut+hyP2TfVushGfwphXc3cg8UWbRA1OgzXS -A9VoVwp/lcud4NlJ2OXIvCALgCcYrEQ/hxEROeqNHGsijgQ+1TEbh5fqbSOn3aZf -dYp03ADkJvvS1a9U7f+dCpiUNXemj6nfCT5BsKtUx59GUdZrrfSMbtsbeuwHyWRp -LAUJyfckeck85DBzzqzdjO+vpZCvcOloORCwMKHyM4JwqlW66Atkl3NnnVSFy/XD -axzUVmuyFC9FkE3y/ySzyuvz7szMuh2Eb7bOZIieidmIEHyIWSzUV0yAp0x/kL+m -dDd9eU7zoDJg2OP52kp5+kTrrpviBoSMZEfZ1qHuFWlW0S53d3U9r6Q0UR8Mcp9X -wpBnI/lOAxRdO7Gth1pRlzZOIiZYJfBx0IDp -=kX7M ------END PGP PUBLIC KEY BLOCK----- diff --git a/fedora-modular.repo b/fedora-modular.repo deleted file mode 100644 index f511170..0000000 --- a/fedora-modular.repo +++ /dev/null @@ -1,36 +0,0 @@ -[fedora-modular] -name=Fedora Modular $releasever - $basearch -#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=AUTO_VALUE -countme=1 -metadata_expire=AUTO_VALUE -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Debug -#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch -enabled=0 -metadata_expire=AUTO_VALUE -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-modular-source] -name=Fedora Modular $releasever - Source -#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch -enabled=0 -metadata_expire=AUTO_VALUE -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo deleted file mode 100644 index d4ecfa1..0000000 --- a/fedora-rawhide-modular.repo +++ /dev/null @@ -1,57 +0,0 @@ -# These packages are untested and still under development. This -# repository is used for development of new releases. -# -# This repository can see significant daily turnover and major -# functionality changes which cause unexpected problems with other -# development packages. Please use these packages if you want to work -# with the Fedora developers by testing these new development packages. -# -# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription -# Required) is available as a discussion forum for -# testing and troubleshooting for development packages in conjunction -# with new test releases. -# -# More information is available at http://fedoraproject.org/wiki/Testing -# -# Reproducible and reportable issues should be filed at -# http://bugzilla.redhat.com/. -# -# Product: Fedora -# Version: rawhide-modular - -[rawhide-modular] -name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release -#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch -enabled=AUTO_VALUE -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE -skip_if_unavailable=False - -[rawhide-modular-debuginfo] -name=Fedora - Modular Rawhide - Debug -#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE -skip_if_unavailable=False - -[rawhide-modular-source] -name=Fedora - Modular Rawhide - Source -#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE -skip_if_unavailable=False diff --git a/fedora-repos.spec b/fedora-repos.spec index d8e41e0..4ee194a 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,13 +4,14 @@ Summary: Fedora package repositories Name: fedora-repos Version: 39 -Release: 0.2%{?eln:.eln%{eln}} +Release: 0.3%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ Provides: fedora-repos(%{version}) = %{release} Requires: system-release(%{version}) Obsoletes: fedora-repos < 33-0.7 +Obsoletes: fedora-repos-modular < 39-0.3 %if %{rawhide_release} == %{version} Requires: fedora-repos-rawhide = %{version}-%{release} %endif @@ -83,12 +84,6 @@ Source60: RPM-GPG-KEY-fedora-40-primary # ensures users have the next future key installed and referenced, even if they # don't update very often. This will smooth out Rawhide N->N+1 transition for them). -Source100: fedora-modular.repo -Source101: fedora-updates-modular.repo -Source102: fedora-updates-testing-modular.repo -Source103: fedora-rawhide-modular.repo -Source104: RPM-GPG-KEY-fedora-modularity - Source150: RPM-GPG-KEY-fedora-iot-2019 Source151: fedora.conf Source152: fedora-compose.conf @@ -104,21 +99,11 @@ Source505: fedora-39-ima.pem %description Fedora package repository files for yum and dnf along with gpg public keys. -%package modular -Summary: Fedora modular package repositories -Requires: fedora-repos = %{version}-%{release} -%if %{rawhide_release} == %{version} -Requires: fedora-repos-rawhide-modular = %{version}-%{release} -%endif -Obsoletes: fedora-repos < 33-0.7 - -%description modular -This package provides the repo definitions with modular packages. - %package rawhide Summary: Rawhide repo definitions Requires: fedora-repos = %{version}-%{release} Obsoletes: fedora-repos-rawhide < 33-0.7 +Obsoletes: fedora-repos-rawhide-modular < 39-0.3 %description rawhide This package provides the rawhide repo definitions. @@ -132,15 +117,6 @@ This package provides the repo definition for the updates archive repo. It is a package repository that contains any RPM that has made it to stable in Bodhi and been available in the Fedora updates repo in the past. -%package rawhide-modular -Summary: Rawhide modular repo definitions -Requires: fedora-repos = %{version}-%{release} -Requires: fedora-repos-rawhide = %{version}-%{release} -Obsoletes: fedora-repos-rawhide < 33-0.7 - -%description rawhide-modular -This package provides the rawhide modular repo definitions. - %package -n fedora-gpg-keys Summary: Fedora RPM keys @@ -233,10 +209,10 @@ eln_enabled=0 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1 done -for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo; do +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-updates}.repo; do sed -i "s/^enabled=AUTO_VALUE$/enabled=${stable_enabled}/" $repo || exit 1 done -for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing.repo; do sed -i "s/^enabled=AUTO_VALUE$/enabled=${testing_enabled}/" $repo || exit 1 done for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-archive.repo; do @@ -262,7 +238,7 @@ expire_value='6h' %else expire_value='7d' %endif -for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora.repo; do sed -i "/^metadata_expire=/ s/AUTO_VALUE/${expire_value}/" \ $repo || exit 1 done @@ -288,20 +264,19 @@ disabled_repos=() %if 0%{?eln} enabled_repos+=(fedora-eln) -disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \ - fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular) +disabled_repos+=(fedora fedora-updates fedora-updates-archive \ + fedora-updates-testing) %elif %{rawhide_release} == %{version} -enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-cisco-openh264) -disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \ - fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular) +enabled_repos+=(fedora-rawhide fedora-cisco-openh264) +disabled_repos+=(fedora fedora-updates fedora-updates-archive \ + fedora-updates-testing) %else -enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \ - fedora-updates-modular) -disabled_repos+=(fedora-rawhide fedora-rawhide-modular) +enabled_repos+=(fedora fedora-updates fedora-updates-archive) +disabled_repos+=(fedora-rawhide) %if %{updates_testing_enabled} -enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular) +enabled_repos+=(fedora-updates-testing) %else -disabled_repos+=(fedora-updates-testing fedora-updates-testing-modular) +disabled_repos+=(fedora-updates-testing) %endif %endif @@ -320,7 +295,7 @@ done # Make sure updates-testing is not enabled in a Final (stable) release %if "%{release}" >= "1" -for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing.repo; do if grep -q 'enabled=1' $repo; then echo "ERROR: Repo $repo should be disabled in a stable release, but it isn't" exit 1 @@ -334,7 +309,7 @@ expire_value='6h' %else expire_value='7d' %endif -for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora.repo; do lines=$(grep '^metadata_expire=' $repo | sort | uniq) if [ "$(echo "$lines" | wc -l)" -ne 1 ]; then echo "ERROR: Non-matching metadata_expire lines in $repo: $lines" @@ -394,20 +369,12 @@ rm -f "$TMPRING" %config(noreplace) /etc/yum.repos.d/fedora-updates.repo %config(noreplace) /etc/yum.repos.d/fedora-updates-testing.repo -%files modular -%config(noreplace) /etc/yum.repos.d/fedora-modular.repo -%config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo -%config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo - %files archive %config(noreplace) /etc/yum.repos.d/fedora-updates-archive.repo %files rawhide %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo -%files rawhide-modular -%config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo - %files -n fedora-gpg-keys %dir /etc/pki/rpm-gpg @@ -425,6 +392,10 @@ rm -f "$TMPRING" %changelog +* Mon Jul 10 2023 Miro Hrončok - 39-0.3 +- Drop fedora-repos-modular and fedora-repos-rawhide-modular packages +- https://fedoraproject.org/wiki/Changes/RetireModularity + * Sat Feb 18 2023 Kevin Fenzi - 39-0.2 - Include IMA public certs. diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo deleted file mode 100644 index f5350a0..0000000 --- a/fedora-updates-modular.repo +++ /dev/null @@ -1,36 +0,0 @@ -[updates-modular] -name=Fedora Modular $releasever - $basearch - Updates -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch -enabled=AUTO_VALUE -countme=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Updates - Debug -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-modular-source] -name=Fedora Modular $releasever - Updates Source -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo deleted file mode 100644 index 3b9bfca..0000000 --- a/fedora-updates-testing-modular.repo +++ /dev/null @@ -1,36 +0,0 @@ -[updates-testing-modular] -name=Fedora Modular $releasever - $basearch - Test Updates -#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch -enabled=AUTO_VALUE -countme=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Test Updates Debug -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-modular-source] -name=Fedora Modular $releasever - Test Updates Source -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False From f484cf0e39b5d4f849a0421604df6df408a5d412 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 21 Jul 2023 16:47:53 +0100 Subject: [PATCH 21/38] Update IMA keys location for kernel/dracut Signed-off-by: Peter Robinson --- fedora-repos.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 4ee194a..0075850 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 39 -Release: 0.3%{?eln:.eln%{eln}} +Release: 0.4%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -119,6 +119,7 @@ stable in Bodhi and been available in the Fedora updates repo in the past. %package -n fedora-gpg-keys Summary: Fedora RPM keys +Requires: filesystem >= 3.18-6 %description -n fedora-gpg-keys This package provides the RPM signature keys. @@ -177,8 +178,7 @@ ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora popd # Install the ima keys -install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-ima -install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/pki/rpm-ima/ +install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/keys/ima/ # Install repo files install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d @@ -379,7 +379,7 @@ rm -f "$TMPRING" %files -n fedora-gpg-keys %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/RPM-GPG-KEY-* -/etc/pki/rpm-ima/fedora*ima* +/etc/keys/ima/fedora*ima* %files ostree @@ -392,6 +392,9 @@ rm -f "$TMPRING" %changelog +* Fri Jul 21 2023 Peter Robinson - 39-0.4 +- Update IMA keys location for kernel/dracut + * Mon Jul 10 2023 Miro Hrončok - 39-0.3 - Drop fedora-repos-modular and fedora-repos-rawhide-modular packages - https://fedoraproject.org/wiki/Changes/RetireModularity From df643a05c576d3b381bc091bbbc6f60db59a65c1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 23 Jul 2023 21:37:07 +0100 Subject: [PATCH 22/38] create IMA directory even though it should be there Signed-off-by: Peter Robinson --- fedora-repos.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-repos.spec b/fedora-repos.spec index 0075850..9f294ce 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -178,6 +178,7 @@ ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora popd # Install the ima keys +install -d -m 755 $RPM_BUILD_ROOT/etc/keys/ima install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/keys/ima/ # Install repo files From c910586362f233ac874c6a2fadb77ecacff9c73f Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Tue, 8 Aug 2023 11:05:02 +0530 Subject: [PATCH 23/38] Rawhide is now f40 Signed-off-by: Samyak Jain --- fedora-repos.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 9f294ce..3b24e6b 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ -%global rawhide_release 39 +%global rawhide_release 40 %global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos -Version: 39 -Release: 0.4%{?eln:.eln%{eln}} +Version: 40 +Release: 0.1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -393,6 +393,9 @@ rm -f "$TMPRING" %changelog +* Tue Aug 08 2023 Samyak Jain - 40-0.1 +- Setup for rawhide being F40 + * Fri Jul 21 2023 Peter Robinson - 39-0.4 - Update IMA keys location for kernel/dracut From 53f6d1a7bd0b89ad7bccd95e8b4d52b5774e7420 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Tue, 8 Aug 2023 22:04:46 +0530 Subject: [PATCH 24/38] Add fedora 41 key Signed-off-by: Samyak Jain --- RPM-GPG-KEY-fedora-41-primary | 29 +++++++++++++++++++++++++++++ archmap | 2 ++ fedora-repos.spec | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 RPM-GPG-KEY-fedora-41-primary diff --git a/RPM-GPG-KEY-fedora-41-primary b/RPM-GPG-KEY-fedora-41-primary new file mode 100644 index 0000000..30afc1a --- /dev/null +++ b/RPM-GPG-KEY-fedora-41-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGTSYSwBEACTHP7OFONk+1B1awJeYToUFMVbYZIjNvj9M7zwf5vzH52FlpXX +dsbs1AWh6NUe0zV1J5JjCGiI24Vjacysg7L2zsbgT48vVv3mXrXorjYOzT/cxsAh +7PNhEx+OevKzAx3oy0Ok27c11Dz0W4ynwVy80gB6XHI2rd04v74TiC0xQYlxj1Sh +j6irdLmHMD/NtTCWmCM7MRf91UcC4rk6JOap715UKey2fk1h/wylv0guMP3o+CpG +jxDHENkfl/GsWCSYBaHec7o5/qg5RoAkN5NImVI00CqiEO1WHPBaCJalgwbuQCiW +006jwVDHJHRoufS85PEKaY9yqd5Fr76kdqCLsf3Ys9yxGVfOTvCaKOa+ElWBo+i6 +yOtEO6Qp1Qd5spomBJ+FVPjU89lR9aDnvxIVX7X6zu638qV0K3Lb2HKmqiVG6ccJ +IdxNVXJAekvu7ypwvRzEc0mGgfkZ47flaj7X8SxiebbXhYWdqRBF0rMYc7ppkbCp +5NsD+KJilkfeOGb7VK6Rx5vXmySiNCb9GqN51KRl4Z1qllrc/Q1k5CCMt3AUq0hv +1fwK3eFGtd4/YgF9LoZ0tW8WFZ6h/zWnRvJ/SDBPhtovoSpxptCd18MWiakwvwW0 +sxueKFlctdDjW1a/gri3V4RdTOZbr0AqDjGGcYndt/oxMeLxaK9qvs2xIQARAQAB +tDFGZWRvcmEgKDQxKSA8ZmVkb3JhLTQxLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQJOBBMBCAA4FiEERmzy2LYLwwV6qUU+0GIkYumdatEFAmTSYSwCGw8FCwkI +BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ0GIkYumdatFHIQ//bTSVGDvJGmUxgHJw +MnGM2G6Rc9PNAKuXbh6t4qsrRKp22pWNnMmqqcGaoiBxKP989a2cJgIVP49SsC4C +ewaafEYhsitUtKagx6z3F7UObnvQpOz5U5iFcJCvRDtC4FXq+VkMdhT09zMZY4Ey +ia29bV1B1R7pe7yXh6l3WyVj9AAXUSEBR/OsakaYEMzScLnROBEU1YbWR9iHsc7M +rEsqju8tVUh1XAqIqJgLW3VrKs0g0nDVR0rBc8aDhrtVfylwWVl61gHsPFJfAkjj +OPgvQgThrhlCWo23EZSk/Hj8YRrnhUbEDnk+Z3Xv5Uyl1kxGRk5dGBnv+7u3CKvV +G6sU3tPtna/8rFblfKSMZIPhzTADdsUZ88Fn9pZkfqgPi8LZ4sS8vHtaykZmbfj6 +t9a2mBYJQ+/pxiH8olzyhKMdNyesLPeQmESgwM/qlJ+b2Hbogwuuzp8o2JMezxIe +CAwLoPh+hxMPGnBRklh6Vj5R5z29wIZd6pKCavVRfJ+ON94wuOSEofhBfQNZIIFV +jagEbk60iksysxsObfVEHFhtGnZCEgCRC87BfX6tzIIDv23Zs4Bv9gcaaRXTAml2 +kZXktduHkV9q3hhcoha5FgGSe244C4GsMUkWCsZtuN6tevUPo+n2ZZAA7ikQ768r +Iz9rPOI8/Ra7qnwSlNIVnkTb9bc= +=e2ew +-----END PGP PUBLIC KEY BLOCK----- diff --git a/archmap b/archmap index ccfa584..02b1a72 100644 --- a/archmap +++ b/archmap @@ -87,3 +87,5 @@ fedora-38-primary: x86_64 aarch64 ppc64le s390x fedora-39-primary: x86_64 aarch64 ppc64le s390x fedora-40-primary: x86_64 aarch64 ppc64le s390x + +fedora-41-primary: x86_64 aarch64 ppc64le s390x \ No newline at end of file diff --git a/fedora-repos.spec b/fedora-repos.spec index 3b24e6b..8b13d03 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -80,6 +80,8 @@ Source57: RPM-GPG-KEY-fedora-37-primary Source58: RPM-GPG-KEY-fedora-38-primary Source59: RPM-GPG-KEY-fedora-39-primary Source60: RPM-GPG-KEY-fedora-40-primary +Source61: RPM-GPG-KEY-fedora-41-primary + # When bumping Rawhide to fN, create N+1 key (and update archmap). (This # ensures users have the next future key installed and referenced, even if they # don't update very often. This will smooth out Rawhide N->N+1 transition for them). From 99301fd94d5595a63e2920de90e8e98abd457468 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 15 Aug 2023 15:07:16 -0400 Subject: [PATCH 25/38] Add definition for the OpenH264 source repository --- fedora-cisco-openh264.repo | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo index 02150d9..e65c565 100644 --- a/fedora-cisco-openh264.repo +++ b/fedora-cisco-openh264.repo @@ -20,3 +20,13 @@ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=True +[fedora-cisco-openh264-source] +name=Fedora $releasever openh264 (From Cisco) - $basearch - Source +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-source-$releasever&arch=$basearch +type=rpm +enabled=0 +metadata_expire=14d +repo_gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=True From 4c67fac3aa8f7f9f8712297a2612cef1b9bed06e Mon Sep 17 00:00:00 2001 From: Sandro Bonazzola Date: Wed, 27 Sep 2023 12:05:18 +0200 Subject: [PATCH 26/38] Allow to install ELN without Rawhide repos Signed-off-by: Sandro Bonazzola --- fedora-repos.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 8b13d03..b8e5341 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 40 -Release: 0.1%{?eln:.eln%{eln}} +Release: 0.2%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -136,7 +136,9 @@ where client's system will pull OSTree updates. %package eln -Summary: ELN repo definitions +Summary: ELN repo definitions +Requires: fedora-gpg-keys >= %{version}-%{release} +Requires: system-release(%{version}) %description eln This package provides repository files for ELN (Enterprise Linux Next) @@ -395,6 +397,9 @@ rm -f "$TMPRING" %changelog +* Wed Sep 27 2023 Sandro Bonazzola - 40-0.2 +- Allow ELN installation without Rawhide repos + * Tue Aug 08 2023 Samyak Jain - 40-0.1 - Setup for rawhide being F40 From fa181f3426341fa8d303e496094a95ab925b7ec7 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Tue, 13 Feb 2024 02:14:38 +0530 Subject: [PATCH 27/38] Rawhide is now f41 Signed-off-by: Samyak Jain --- fedora-repos.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index b8e5341..70d54ad 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ -%global rawhide_release 40 +%global rawhide_release 41 %global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos -Version: 40 -Release: 0.2%{?eln:.eln%{eln}} +Version: 41 +Release: 0.1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -397,6 +397,9 @@ rm -f "$TMPRING" %changelog +* Tue Feb 13 2024 Samyak Jain - 41-0.1 +- Setup for rawhide being F41 + * Wed Sep 27 2023 Sandro Bonazzola - 40-0.2 - Allow ELN installation without Rawhide repos From d10a092adbcf0e0b2d7e4f05311255c805c878b5 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Tue, 13 Feb 2024 02:20:12 +0530 Subject: [PATCH 28/38] Add fedora 42 key Signed-off-by: Samyak Jain --- RPM-GPG-KEY-fedora-42-primary | 29 +++++++++++++++++++++++++++++ archmap | 4 +++- fedora-repos.spec | 1 + 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-42-primary diff --git a/RPM-GPG-KEY-fedora-42-primary b/RPM-GPG-KEY-fedora-42-primary new file mode 100644 index 0000000..c8da319 --- /dev/null +++ b/RPM-GPG-KEY-fedora-42-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGXKg9EBEACvsAjRcllcH6mVReU/0hi5YnwqulP7gNgUM4jYPiqucF51g0oW +MbFk0VjDn3QXjrwLNLtj4oxsU+E6OW0jl1732qvjUJ9geEZBuidyFZgq0CCn9K8d +661dPDjN/DzWWogFhnDySFHRLdh6dYCuu75/HKSIVfCud2IFCvT7Bhk4AOpxv4c7 +mmX874LFgi49jkAYC0M6UbJ9o3KSCndipf/k0ra2g9dGacqlPfn3PMiTszPDr99d +o4qZ5dVZYC6Sna8GjNhN7b/2xLGQuzdd9LHgPHC/PX7XsvBLu42rqi3q0umJBtjZ +CyFxF5Dp0VMwmVfrKFZOHvVsGjPLrxomLU16/EDzIrw6cHikdQKLf4sl0rX0m8j0 +PNAGOSDmE9YgByiPo12CGMOuAvsDUI0JID4p4WqpBShTBuiIrITn8XVTCOQ+tKq9 +dE/qI+mm2hnZjJajM2UWfKE0mVH4SDOiSilgKR/h5HuLZqwtYXFExDZsAcxaLfRB +KCrIOyJdpV7YIj8PaP89XeycHM2MaIfwdHSx3Pz39zZNzi6vJkLj9SWdQT7lOvZx +xTQ3dK0Rcpjx+rGHgihMT4yBd+JO9mZS3ghNGbypYnNn/mohPOAxguXuPuPRj00o +C7C3lIEEL/hZXZbN1SuiopZjxbU/x/5lO8n0Un1GCzynObPDvpDLTjsdKQARAQAB +tDFGZWRvcmEgKDQyKSA8ZmVkb3JhLTQyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQJOBBMBCAA4FiEEsPSVBFj2nhFQxsXtyKxJFhBe+UQFAmXKg9ECGw8FCwkI +BwIGFQoJCAsCBBYCAwECHgECF4AACgkQyKxJFhBe+US4mQ//e4gIGhA6TJuEqrVP +gKtSnDawIj30TGbkXIywECtKCu9N8anTlkU2/XSKGyE3ZDdKDO77O11382Ci1xJg +CpdbqKg4G02ecEKT1Dtng37gt55SkhffQ0EeDb3Zl+Pu5qohHQUiMzio4B4q8n0H +D+L9klQ3I1rLmymguBRd34jQH/z025GE2SBbCpDnQCChZT7Fq1D/onOQgC6skN6Q +E2dvYqOnSlHkkfuVlRRYoLNmynxHKlL6VZkiM7m1zKi7cMEK63mKJQ3jH3Mc9grh ++OwBDxOjx5UoYMeYqq7oXyTPKvvf6ssuHtjWM3tNkyi5R1nB+4SHMttrbt2pLMSH +Jg6pNXoLAP8ahlvxdgVRjgN/6OMC/DwXnLxippelBXXDyBnwVd8/WohbJDcq7e5t +dymZpRsNxzhWSuwbHzeJY1DKtePhbjblShLjxTzLnS4GBPJV5TXpHkZWgQmz2aA0 +CHV47j37P6kAOEtsJkJUWWz+/Rx1N5Mm5lxvghaAzlTBtwQhRgl9Y8kCTznG40QQ +64N2FOrcExUJmujLRISDjM2Ps9MtBlbYs7H4JDziX4jpNyvhVAbEdjbzVfL5oi35 +l+K/QRtQJnt78qhLpNNB7SdQkNmD8eMeXF7mA/MH6eFM88hF4l6NeKklyMIa5thg +LFx0UyEgoLXDBg+thUzby61gnA8= +=OCXB +-----END PGP PUBLIC KEY BLOCK----- diff --git a/archmap b/archmap index 02b1a72..60abb09 100644 --- a/archmap +++ b/archmap @@ -88,4 +88,6 @@ fedora-39-primary: x86_64 aarch64 ppc64le s390x fedora-40-primary: x86_64 aarch64 ppc64le s390x -fedora-41-primary: x86_64 aarch64 ppc64le s390x \ No newline at end of file +fedora-41-primary: x86_64 aarch64 ppc64le s390x + +fedora-42-primary: x86_64 aarch64 ppc64le s390x diff --git a/fedora-repos.spec b/fedora-repos.spec index 70d54ad..669cb28 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -81,6 +81,7 @@ Source58: RPM-GPG-KEY-fedora-38-primary Source59: RPM-GPG-KEY-fedora-39-primary Source60: RPM-GPG-KEY-fedora-40-primary Source61: RPM-GPG-KEY-fedora-41-primary +Source62: RPM-GPG-KEY-fedora-42-primary # When bumping Rawhide to fN, create N+1 key (and update archmap). (This # ensures users have the next future key installed and referenced, even if they From 75550b9fdae227e98652c037d84e0067cf0fa16c Mon Sep 17 00:00:00 2001 From: Coiby Xu Date: Tue, 7 May 2024 16:46:02 +0800 Subject: [PATCH 29/38] Add IMA certs Add Fedora IMA certs, - The code-signing keys /etc/keys/ima/* are supposed to be read by the dracut integrity module and other user space tools - The CA key /usr/share/ima/ca.der is supposed to be built into the kernel Note the dracut integrity module only reads a DER cert and will error if given other formats, Failed to d2i_X509_fp key file: /sysroot/etc/keys/ima/fedora-39-ima.pem openssl: error:068000A8:asn1 encoding routines::wrong tag openssl: error:0688010A:asn1 encoding routines::nested asn1 error Signed-off-by: Coiby Xu --- fedora-39-ima.der | Bin 426 -> 446 bytes fedora-40-ima.der | Bin 0 -> 445 bytes fedora-41-ima.der | Bin 0 -> 444 bytes fedora-42-ima.der | Bin 0 -> 444 bytes fedora-ima-ca.der | Bin 0 -> 408 bytes fedora-repos.spec | 28 +++++++++++++++++----------- 6 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 fedora-40-ima.der create mode 100644 fedora-41-ima.der create mode 100644 fedora-42-ima.der create mode 100644 fedora-ima-ca.der diff --git a/fedora-39-ima.der b/fedora-39-ima.der index 0d13baa62d75c2fc8404a539c9e554a8a3dc33ec..7396f87bf84946d5eeae16ae352994061d69ee3c 100644 GIT binary patch delta 365 zcmZ3*ypOrwpowvpK@(&A0%j&gCMFS){Gj@84}ADcHYZJ+F7hx-=r>~=ev!j8WIIoe3fvJI+k)e@^k#UqbuaOxN z*Feiq!$1w9Qy!|**isClJ3l2=w>UFBFEcM)Avv|EWMXAZeW^jQfiN3$sH`dr56B7H zY>cd|?99vtJRm_~M#ldvOa=@Fd>|e_h{wXr#NJ>a3*z&!h_Q%>2Bj@o{Hpryop}~_ zH%>Zq$)Y>K&Oja{t;`}}Al4wVVgZj~ntiMNocvE=9z~BU)-z>mz&-27!py?#$zb5d zq{whZ^AK0o6j|N;j}Mofow%;N{LwDCZ)=NZE-&F!?Cw6M%cRIK=WB`ur~k9l-&DG? aGTa_9|Gcqab^TPyi4*t5vp%0LeFFgG)@$eh delta 350 zcmdnTyo$NrpowvrK@+3S0%j&gCMHHL11>fWtu~Kywk*ud2GWL-2I6eYp)Ab80&b}( z`9+Be#+C}6zK#mcjs^FISMh2$H0tPaMQU($b?SiP`5C#FEmYRE4tCqRh0+0@ilR?6>)1{fyeUi&mQoNHFZ7B58TwB1xX~q_R@v+qEZ~ymXZ{OkM&9!(* N*SD{w=ejf30|2u@Z(;xd diff --git a/fedora-40-ima.der b/fedora-40-ima.der new file mode 100644 index 0000000000000000000000000000000000000000..ae6c11151d6c0f929898ebb9011e786f16de3e38 GIT binary patch literal 445 zcmXqLV%%xa#2CMTnTe5!NyNl5G5kZ4&awaVyo*XYyrb_hzHB$(V&l+i^EhYA!pveI zVJK!G!p0oR!py_#mYR}Zl&Ik8>!{%DXdoxfYh+?zYG7t$Xk=_^6eZ4UWQN2w&@$98 zP=n}{hw3yjfN0K7N!2aROwY^AOIJuvEh;gHG!SNE2iwWS2(_GM8I zy7_bc5BTR8^`E^pS@p@v7Aco42KQ>0J4ZTg+pu{_m*werhR)pOdbW>Vi#oqr_Ibq{ z27@o^@tr|s5{pX>iVcL>m_ub%S$IG`(`I92Wo2h(HsApX3NtePXJIm6FyI66_(41t zW+wIq16dHCk420{MECuohgUUj8}!=AENUuQ<*-=6Yo38TNLrai!a%G+WW@p=!!-L= z`#Jfa!aRx|SFC5s)<6zJW)B7fS0+V<+5Ar*3(u{y{BpnDSMjE$^|?RI$&0l&RzCgi uQnYHtoyklJ(mPF`@ZFbLv(P5IrsIp+e%)oOd)IDXlGmhUvZHeLs{a7}B91!% literal 0 HcmV?d00001 diff --git a/fedora-41-ima.der b/fedora-41-ima.der new file mode 100644 index 0000000000000000000000000000000000000000..4f8787e4ea6f8a5ecbcde1c14bf9376078c26cea GIT binary patch literal 444 zcmXqLV%%ZS#2CMTnTe5!Nkm+^p#SUFvNwyQ>hcz>l3{jjn$vE;#m1r4=5fxJg_*@b z!cfdWgpE0rg_(!fEj1;-C{e-F*HOXQ(Lhd|*T}@c)WFQh(8$=(G)kP;$P9^Vpk=6G zpa#(?57lX62+^FMlB!#rnVy%Km#&bUT2x{XX&}tT4z`nt5o$RzBRjJb1Isd#De>lK zF9r6zUZ0V1;lkw4?vWfE^UIm~MB7epJbQKPM&m>8X4igP@`=~d_U9^tLmM5E#9e#V zZm(8&zv!I0+=RuY2E_)#Y|Npusw_MppJ}r(va+%>GaK-L1cezH|FbX|Fc|QGc>Ew9 z3o{dYgMloF&&MLhA|l%TerNxockCR-7Z)u_%Y5FRTViS;50X}9kuVTz5LvN+$1u&l z)qYO?r!bGA#}(_DvNe#yklCHVz=cV{K=rJ7_f-j__0jtyzJAi3;_+>2udnSzr+T%` uQ=B`+Q@fAAz@nU!1q3IYI}Z;bu` literal 0 HcmV?d00001 diff --git a/fedora-42-ima.der b/fedora-42-ima.der new file mode 100644 index 0000000000000000000000000000000000000000..11b8cd8936bb03d2130e610856260694aacf2aa7 GIT binary patch literal 444 zcmXqLV%%ZS#2CMTnTe5!NknR9Mn2MrKG{11&=h z12u?Fd8kekBZ%hwlvLf~%=Em>ymW=+)S?oDNCROucCejHj8My&8QGbg7+6}i3-}3j zFtuBBDJ(Dv3;$-PK0iw8*w;gKd-t~8+!OX)&D!Bx!e2Y4t`C0h4o|un!+*zy*5!Gr zIz-BC)CkBwvbfZs*g%+#IaF4ag$Lv_Z8k<$R(57)10Il|FeBrC7A6A*13nOsAH-u} zW@2wJkOlGiSj1RF7A`$<;wEdzgL5(LCm*VRVov&?wZuRkB(2OMVIbBZvSI;`VVZrb z{ha(yVID<~E7mh*YaoXqvpa)<3zLGed~xLFbzcHL|NE(EzkBn{tl7;k_O|3r5&WyP s*S6jxlSx5Vs9RmB&%FKj?3?$E{Vy8jUSC?>)3tEfpHNA@Z5AOn0clc;V*mgE literal 0 HcmV?d00001 diff --git a/fedora-ima-ca.der b/fedora-ima-ca.der new file mode 100644 index 0000000000000000000000000000000000000000..f75acb694daa9b9e359963ac42ce1ce1bc9771c7 GIT binary patch literal 408 zcmXqLVw_^o#Av;MnTe5!NyKdGOR?^<`@hpXC44trXPUW1*(ltAi;Y98&EuRc3p0y> zgrS&$2pe-K3o{R|TWU&vQKEvUucLyqqk)__uaSv?sezf1p`nF|S(G@hF^Fpd<>Jv9 zX&}tT4z_`b5o#4PBRjJb1B?1Zk$<<}$4qLUEEazC`;h|gx$5WqtQ_KgTx;Nu(D`JS zp8w~u$SkQhCtj#){$^&*34f(`djGvQP1UZ`Uw8iBC%HJ;Akl!IjX6|Sn33^63#$P$ zBjbMqK9B%ENPvZziIL4f7R2Xc5n~Zqv4F=g&A!!sPX4DbkD|vF>zT4O4CF!5$}AEF zVhz|8AcYUJJA;7>lY;dA4=wScmp+|#R$a&cR^~`rXK%ol*@=%Y$= 3.18-6 %description -n fedora-gpg-keys This package provides the RPM signature keys. - %package ostree Summary: OSTree specific files @@ -182,9 +180,11 @@ done ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora popd -# Install the ima keys +# Install the IMA certs install -d -m 755 $RPM_BUILD_ROOT/etc/keys/ima -install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/keys/ima/ +install -m 644 %{_sourcedir}/fedora*ima.der $RPM_BUILD_ROOT/etc/keys/ima/ +install -d -m 755 $RPM_BUILD_ROOT/usr/share/ima/ +install -m 644 %{_sourcedir}/fedora-ima-ca.der $RPM_BUILD_ROOT/usr/share/ima/ca.der # Install repo files install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d @@ -385,7 +385,10 @@ rm -f "$TMPRING" %files -n fedora-gpg-keys %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/RPM-GPG-KEY-* + +# ima-certs /etc/keys/ima/fedora*ima* +/usr/share/ima/ca.der %files ostree @@ -398,6 +401,9 @@ rm -f "$TMPRING" %changelog +* Wed May 08 2024 Coiby Xu - 41-0.2 +- add/update IMA certs + * Tue Feb 13 2024 Samyak Jain - 41-0.1 - Setup for rawhide being F41 From f645199628cd52bd8723f854780880b57af8bb68 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Sat, 10 Aug 2024 18:38:01 +0530 Subject: [PATCH 30/38] Add Fedora 43 key Signed-off-by: Samyak Jain --- RPM-GPG-KEY-fedora-43-primary | 29 +++++++++++++++++++++++++++++ archmap | 2 ++ fedora-repos.spec | 6 +++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-43-primary diff --git a/RPM-GPG-KEY-fedora-43-primary b/RPM-GPG-KEY-fedora-43-primary new file mode 100644 index 0000000..7be8eef --- /dev/null +++ b/RPM-GPG-KEY-fedora-43-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGa23M8BEAC47NwKLi/g2S9I2p5JtUbJ0y3m2St9zqkSENmYw/+R+WKvaP3S +KSFQF3Qi6pqGXJ88ADJUkFYpOGGyoc0dieLCmIPqtWbwGvBVMxBRBeU3+hClwbSQ +sysVnr8VxUwidfsIjNJavCZwB0ZoZbxdCPMQMOgQyTLX4OI/uKlPUzeymDHwxjb/ +tllflSTOGtdYe3giRzidxN+xbCb6UoXkl0+lJEFbsmp41O5D/Ur5N05lBrsEXoDu +Fr99Kfv3Av7f3JfzDlkqC/EhmfxZEZvWj3hRdAfi2fFmtVcrdLfGIpQg6Y2Baphp +PhaHqKl9zD5GWqu5GSXGoLaGXusBvwBKjS/g+VLo7pJfMsUF3sUduJNG3UThAsrp +QLV3wQz0AMHVElRErOWdBDY0ddAKLPL7/mtxj39pGEpZ/dNtQkzgm7VCdP10QnQZ +rwR2l8k7CPu0pylPCXmXvKFWV1uv9RnztlWY6BRmufKn+lJsN3Blh7ndi5rlCjR6 +mHVrQD/l6+8VmSD3/mDnbEXPyzBkSY5D1wpR7M5VXN5jVHROc4ZA5M88SyI48ESG +NmeAwtGar45/X+wG47+EC4+JXpNO7BQrEvHgJxBdyoQ6KLDrEaqn/OQpxB4Gfmcv +SwkWDpSk8wFm/pGlFK6J4b+ba7eOetW+aXrWSiFB1sTAg0OY+gds67OpWQARAQAB +tDFGZWRvcmEgKDQzKSA8ZmVkb3JhLTQzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQJSBBMBCAA8FiEExufwgc+A4TFGZ26IgptgZjFkVTEFAma23M8CGw8FCwkI +BwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEIKbYGYxZFUxagQP/RYWw5j0Gfvv +lWkDQTjTVAnHtbKuQLYM13Lx5d3W1k0g6Xdrolf4yPjh4YPYVQDXksB4i6ULLbMo +8u46UCPMQwCXTd3Ax9imYn+V74Isl/CkBbKQD9YfSJjhW3mSlPa27jo2uhqpdV0S +xp05NWYnWrZN+GbtCUs1+rNTBevagOURtlZ8f0iPVRA/PxWzpjbRaGrCHlIYc3JO +GKLUuQueLvOUg2pP8dtpll7S3xUe5Abyq2ifT34T0wHi6hJA3bfpXo1uNXRvGrNw +gbJ7V6P7ioTcvyhS1h4zjelKFyvTnOKOy5D08HKmvTMWZQWEL7kDNymh1jMV7Abg +4TPp808EiPF1GGAzXU56feaURSvIuix3MkjhGZsSQQH2kkkEIzq6j/EwmpyEMW38 +dtql4T2bVS/cTk/hRaqUKZlyrsL657g/4mFA1wDDM3895fYkHOpYF4JZ9SeDrhuc +TgpC7/TW55l6vSiFtnQvcMfjpfCA6mCA4b75k+/xG9RxxBnYU0qVuUo/8pON31yQ +D2AM2v7WbJBYVRYLlqPrkAZU5fe7+2wY7P7N0IAPwVA0TFJ1x6as3Kezdi/304mg +oC98DBLjHaUpX2bTxKMtCzlmeqPiwtyNkA9O9IQO7qQzArBKxmAgof4wblN5SL8i +fsjiJUqsK/gTYwJ744I/tzxOy5FXjA7z +=Bqds +-----END PGP PUBLIC KEY BLOCK----- diff --git a/archmap b/archmap index 60abb09..9132863 100644 --- a/archmap +++ b/archmap @@ -91,3 +91,5 @@ fedora-40-primary: x86_64 aarch64 ppc64le s390x fedora-41-primary: x86_64 aarch64 ppc64le s390x fedora-42-primary: x86_64 aarch64 ppc64le s390x + +fedora-43-primary: x86_64 aarch64 ppc64le s390x diff --git a/fedora-repos.spec b/fedora-repos.spec index b02dffd..ee402ae 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 41 -Release: 0.2%{?eln:.eln%{eln}} +Release: 0.3%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -82,6 +82,7 @@ Source59: RPM-GPG-KEY-fedora-39-primary Source60: RPM-GPG-KEY-fedora-40-primary Source61: RPM-GPG-KEY-fedora-41-primary Source62: RPM-GPG-KEY-fedora-42-primary +Source63: RPM-GPG-KEY-fedora-43-primary # When bumping Rawhide to fN, create N+1 key (and update archmap). (This # ensures users have the next future key installed and referenced, even if they @@ -401,6 +402,9 @@ rm -f "$TMPRING" %changelog +* Sat Aug 10 2024 Samyak Jain - 41-0.3 +- Add RPM-GPG-KEY-fedora-43-primary + * Wed May 08 2024 Coiby Xu - 41-0.2 - add/update IMA certs From bb7211a8fb0c2fc8b5c3478b45b4bd30bc8317d6 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Sun, 11 Aug 2024 17:31:05 +0530 Subject: [PATCH 31/38] Rawhide is now f42 Signed-off-by: Samyak Jain --- fedora-repos.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index ee402ae..cd4f420 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ -%global rawhide_release 41 +%global rawhide_release 42 %global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos -Version: 41 -Release: 0.3%{?eln:.eln%{eln}} +Version: 42 +Release: 0.1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -402,6 +402,9 @@ rm -f "$TMPRING" %changelog +* Tue Aug 13 2024 Samyak Jain - 42-0.1 +- Setup for rawhide being F42 + * Sat Aug 10 2024 Samyak Jain - 41-0.3 - Add RPM-GPG-KEY-fedora-43-primary From afda15d92a2f1ada94cb55e74de1732523f2b45e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 18 Sep 2024 13:58:39 -0400 Subject: [PATCH 32/38] Use mirror links for ELN repositories MirrorManager support for ELN was added in https://github.com/fedora-infra/mirrormanager2/issues/382 Signed-off-by: Stephen Gallagher --- fedora-eln.repo | 120 +++++++++++++++++++++++----------------------- fedora-repos.spec | 5 +- 2 files changed, 64 insertions(+), 61 deletions(-) diff --git a/fedora-eln.repo b/fedora-eln.repo index c2c1275..ffcde5f 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -21,8 +21,8 @@ [eln-baseos] name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/BaseOS/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-baseos-1&arch=$basearch enabled=AUTO_VALUE countme=1 metadata_expire=6h @@ -34,8 +34,8 @@ skip_if_unavailable=False [eln-baseos-debuginfo] name=Fedora - ELN BaseOS - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/BaseOS/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-baseos-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -46,8 +46,8 @@ skip_if_unavailable=False [eln-baseos-source] name=Fedora - ELN BaseOS - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/BaseOS/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-baseos-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -60,8 +60,8 @@ skip_if_unavailable=False [eln-appstream] name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/AppStream/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-appstream-1&arch=$basearch enabled=AUTO_VALUE countme=1 metadata_expire=6h @@ -73,8 +73,8 @@ skip_if_unavailable=False [eln-appstream-debuginfo] name=Fedora - ELN AppStream - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/AppStream/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-appstream-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -85,8 +85,8 @@ skip_if_unavailable=False [eln-appstream-source] name=Fedora - ELN AppStream - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/AppStream/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-appstream-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -99,8 +99,8 @@ skip_if_unavailable=False [eln-crb] name=Fedora - ELN CRB - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/CRB/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-crb-1&arch=$basearch enabled=AUTO_VALUE countme=1 metadata_expire=6h @@ -112,8 +112,8 @@ skip_if_unavailable=False [eln-crb-debuginfo] name=Fedora - ELN CRB - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/CRB/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-crb-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -124,8 +124,8 @@ skip_if_unavailable=False [eln-crb-source] name=Fedora - ELN CRB - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/CRB/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-crb-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -138,8 +138,8 @@ skip_if_unavailable=False [eln-extras] name=Fedora - ELN Extras - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/Extras/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-extras-1&arch=$basearch enabled=AUTO_VALUE countme=1 metadata_expire=6h @@ -151,8 +151,8 @@ skip_if_unavailable=False [eln-extras-debuginfo] name=Fedora - ELN Extras - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/Extras/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-extras-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -163,8 +163,8 @@ skip_if_unavailable=False [eln-extras-source] name=Fedora - ELN Extras - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/Extras/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-extras-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -177,8 +177,8 @@ skip_if_unavailable=False [eln-ha] name=Fedora - ELN HighAvailability - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/HighAvailability/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-highavailability-1&arch=$basearch enabled=0 countme=1 metadata_expire=6h @@ -190,8 +190,8 @@ skip_if_unavailable=False [eln-ha-debuginfo] name=Fedora - ELN HighAvailability - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/HighAvailability/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-highavailability-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -202,8 +202,8 @@ skip_if_unavailable=False [eln-ha-source] name=Fedora - ELN HighAvailability - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/HighAvailability/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-highavailability-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -216,8 +216,8 @@ skip_if_unavailable=False [eln-rs] name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/ResilientStorage/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-1&arch=$basearch enabled=0 countme=1 metadata_expire=6h @@ -229,8 +229,8 @@ skip_if_unavailable=False [eln-rs-debuginfo] name=Fedora - ELN ResilientStorage - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/ResilientStorage/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -241,8 +241,8 @@ skip_if_unavailable=False [eln-rs-source] name=Fedora - ELN ResilientStorage - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/ResilientStorage/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -255,8 +255,8 @@ skip_if_unavailable=False [eln-rt] name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/RT/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-rt-1&arch=$basearch enabled=0 countme=1 metadata_expire=6h @@ -268,8 +268,8 @@ skip_if_unavailable=False [eln-rt-debuginfo] name=Fedora - ELN RT - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/RT/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-rt-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -280,8 +280,8 @@ skip_if_unavailable=False [eln-rt-source] name=Fedora - ELN RT - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/RT/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-rt-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -294,8 +294,8 @@ skip_if_unavailable=False [eln-nfv] name=Fedora - ELN NFV - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/NFV/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-nfv-1&arch=$basearch enabled=0 countme=1 metadata_expire=6h @@ -307,8 +307,8 @@ skip_if_unavailable=False [eln-nfv-debuginfo] name=Fedora - ELN NFV - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/NFV/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-nfv-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -319,8 +319,8 @@ skip_if_unavailable=False [eln-nfv-source] name=Fedora - ELN NFV - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/NFV/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-nfv-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -333,8 +333,8 @@ skip_if_unavailable=False [eln-sap] name=Fedora - ELN SAP - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/SAP/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-sap-1&arch=$basearch enabled=0 countme=1 metadata_expire=6h @@ -346,8 +346,8 @@ skip_if_unavailable=False [eln-sap-debuginfo] name=Fedora - ELN SAP - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/SAP/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-sap-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -358,8 +358,8 @@ skip_if_unavailable=False [eln-sap-source] name=Fedora - ELN SAP - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/SAP/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-sap-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -372,8 +372,8 @@ skip_if_unavailable=False [eln-saphana] name=Fedora - ELN SAPHANA - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +#baseurl=https://download.example/pub/eln/1/SAPHANA/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-saphana-1&arch=$basearch enabled=0 countme=1 metadata_expire=6h @@ -385,8 +385,8 @@ skip_if_unavailable=False [eln-saphana-debuginfo] name=Fedora - ELN SAPHANA - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +#baseurl=https://download.example/pub/eln/1/SAPHANA/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-saphana-debug-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 @@ -397,8 +397,8 @@ skip_if_unavailable=False [eln-saphana-source] name=Fedora - ELN SAPHANA - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +#baseurl=https://download.example/pub/eln/1/SAPHANA/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-saphana-source-1&arch=$basearch enabled=0 metadata_expire=6h repo_gpgcheck=0 diff --git a/fedora-repos.spec b/fedora-repos.spec index cd4f420..79a87f6 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 42 -Release: 0.1%{?eln:.eln%{eln}} +Release: 0.2%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -402,6 +402,9 @@ rm -f "$TMPRING" %changelog +* Wed Sep 18 2024 Stephen Gallagher - 42-0.2 +- Use mirror links for ELN + * Tue Aug 13 2024 Samyak Jain - 42-0.1 - Setup for rawhide being F42 From 4926368a33afb98e06cae5d6103652239773d29e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 22 Oct 2024 08:22:17 -0400 Subject: [PATCH 33/38] ELN: Drop ResilientStorage https://github.com/fedora-eln/eln/issues/205 Signed-off-by: Stephen Gallagher --- fedora-eln.repo | 39 --------------------------------------- fedora-repos.spec | 5 ++++- 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/fedora-eln.repo b/fedora-eln.repo index ffcde5f..bbc2ade 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -214,45 +214,6 @@ skip_if_unavailable=False -[eln-rs] -name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release -#baseurl=https://download.example/pub/eln/1/ResilientStorage/$basearch/os/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-1&arch=$basearch -enabled=0 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch -skip_if_unavailable=False - -[eln-rs-debuginfo] -name=Fedora - ELN ResilientStorage - Debug -#baseurl=https://download.example/pub/eln/1/ResilientStorage/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-debug-1&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch -skip_if_unavailable=False - -[eln-rs-source] -name=Fedora - ELN ResilientStorage - Source -#baseurl=https://download.example/pub/eln/1/ResilientStorage/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-source-1&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch -skip_if_unavailable=False - - - [eln-rt] name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release #baseurl=https://download.example/pub/eln/1/RT/$basearch/os/ diff --git a/fedora-repos.spec b/fedora-repos.spec index 79a87f6..71fdf8e 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 42 -Release: 0.2%{?eln:.eln%{eln}} +Release: 0.3%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -402,6 +402,9 @@ rm -f "$TMPRING" %changelog +* Tue Oct 22 2024 Stephen Gallagher - 42-0.3 +- ELN: Drop ResilientStorage + * Wed Sep 18 2024 Stephen Gallagher - 42-0.2 - Use mirror links for ELN From c16bb969068a8b9439595016ffe2681d4abf55cb Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Wed, 15 Jan 2025 10:32:40 +0530 Subject: [PATCH 34/38] Add Fedora 44 key Signed-off-by: Samyak Jain --- RPM-GPG-KEY-fedora-44-primary | 29 +++++++++++++++++++++++++++++ archmap | 2 ++ fedora-repos.spec | 6 +++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-44-primary diff --git a/RPM-GPG-KEY-fedora-44-primary b/RPM-GPG-KEY-fedora-44-primary new file mode 100644 index 0000000..f859ab3 --- /dev/null +++ b/RPM-GPG-KEY-fedora-44-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGeGrzsBEAC4UV5Ij9oz6h6abEKIRoiezttFfnLhwOAfE9tWtfIFMRmhY91u +L88PKf12n2xHBd3oc5ahBzGeTBhaMV+VJAppoQMSOIMI5q966D9GQ0LkJT+E5bwn +xGRJKp7qccevh2KFOUt2vHtFskhDOuAIupoKfo5FgI9PkvAVBsrUpO/22yjNv0V/ +aeDXxZhRX8m/8FKJ77VcZtBRPcp7M41bCmW9gV9IDpD81hAdTjYoQr1Y3KU0FTm5 +W4l1mf9mZcKMskOk08TyzQeC2YRB20EYRK439XCGJ4P7BFiOl96EbPpky2pHe2FV +AvX474o3QEecTK3KxZrsRjmXOqpjRPy5YyMfKEYBM9j3zBDvpDFk79Mfuw5n2Nr5 +U4Wn/rqfhKLUKkfpfCow97nzq8NqynwS09yVobIfjHCKRtjwun6ife+s7R4L2nAu +rTWPAHqzIjjW5nnjaFtoSulIadVKx+KibKajA6gRAc6K7xMyMTHfqZeTAIcawvX6 +h2d/nd8xCfogM5FTI5obNSUVNaMv5vQg6vcV1fb6oRgodF0Bi+1dssq5EMQpHFJM +nIQ5NVwuzSjCLt3X2mWUp0mfIt2K9oBpBct12uXho7Nm1bSC5UFNYsvw+rj6vTqZ +ilK9pyfcYmELv7a/NPkyuACsBFGoc66nBfrEvk57kW9FaJK9mjSqGftykQARAQAB +tDFGZWRvcmEgKDQ0KSA8ZmVkb3JhLTQ0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQJSBBMBCAA8FiEENvYS3PJ/fRpIqDXk2/z3HG2fkKYFAmeGrzsCGw8FCwkI +BwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJENv89xxtn5CmIU0P/iaFVxJjVi4P +yu8A04PbdGy2vuBBCceIjYn5HaMDwJMRjdJT6uMS494pSKNEl/JJ8K5rRdigfUV1 +2Z22X3kI5aNb4k2wpaPg5Xq0JQS9FvG4Pjm//kNy5WplmEA8HVg4MVkvySWiXay4 ++tkCelhE8aQDstYEm3uh+lZ6udgoInfprwFMn6H+8RXkakTW1z5NkuAA8PpMDA9o +SOFc4Hk6bhE6exEp4VNwBEkxwh4z9CGjarlXL4QEyM1UK60vtbXIHVjITjFfKVQP +j6ifdn5X69oSuK+1mUFXEV+l9pc1mVjTVTwOrG3EMBsoekFyICp1pPtfMo1dxBed +R8BFHqQFsFdmIG+59ycFznFOXzDRfaVn6OTEAk7T8nDqnpe/T4GlybLYic6KMKcM +nbMLaJZjHZ97qJb5Scpsd1TWB5TDERi4VPB7NAVC/EwxMPC3IJUbRej/s05gNjg0 ++2yyuV/U/DDnNGWnLTJDFLUaE8HhQBMvNSfmdMA47mo5CCuYmpzX/3M9vlVsv8/R +xJBxFLIj9VFCPFNgXPeu9gyyytXeWgsIpDzMNJil9tgbBuQ1dX5GFMkWtK/kPexM +KfiSU0JgJFfFSm0OKI/KXcRlbA1zP3IF+2YwbL+P5ePinHsDiAPLCQt/dWgw2tfB +ZZLj9c3Ukew6Qobuy3V1knl564qQ6wjf +=1m7R +-----END PGP PUBLIC KEY BLOCK----- diff --git a/archmap b/archmap index 9132863..c3a4cb1 100644 --- a/archmap +++ b/archmap @@ -93,3 +93,5 @@ fedora-41-primary: x86_64 aarch64 ppc64le s390x fedora-42-primary: x86_64 aarch64 ppc64le s390x fedora-43-primary: x86_64 aarch64 ppc64le s390x + +fedora-44-primary: x86_64 aarch64 ppc64le s390x diff --git a/fedora-repos.spec b/fedora-repos.spec index 71fdf8e..6a105fc 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 42 -Release: 0.3%{?eln:.eln%{eln}} +Release: 0.4%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -83,6 +83,7 @@ Source60: RPM-GPG-KEY-fedora-40-primary Source61: RPM-GPG-KEY-fedora-41-primary Source62: RPM-GPG-KEY-fedora-42-primary Source63: RPM-GPG-KEY-fedora-43-primary +Source64: RPM-GPG-KEY-fedora-44-primary # When bumping Rawhide to fN, create N+1 key (and update archmap). (This # ensures users have the next future key installed and referenced, even if they @@ -402,6 +403,9 @@ rm -f "$TMPRING" %changelog +* Wed Jan 10 2025 Samyak Jain - 42-0.4 +- Add RPM-GPG-KEY-fedora-44-primary + * Tue Oct 22 2024 Stephen Gallagher - 42-0.3 - ELN: Drop ResilientStorage From 68215b07bee9c0f0edcadebfd650f66652626dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Polakovi=C4=8D?= Date: Fri, 31 Jan 2025 14:50:54 +0100 Subject: [PATCH 35/38] Rawhide is now F43 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrik Polakovič --- fedora-repos.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 6a105fc..103b112 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ -%global rawhide_release 42 +%global rawhide_release 43 %global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos -Version: 42 -Release: 0.4%{?eln:.eln%{eln}} +Version: 43 +Release: 0.1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -403,6 +403,9 @@ rm -f "$TMPRING" %changelog +* Fri Jan 31 2025 Patrik Polakovic - 43-0.1 +- Rawhide is now F43 + * Wed Jan 10 2025 Samyak Jain - 42-0.4 - Add RPM-GPG-KEY-fedora-44-primary From 373b64b71b2d87a2079a1aa3b556d359b7310ce1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 13 Mar 2025 15:46:53 -0700 Subject: [PATCH 36/38] Add fedora-43/44 ima signing files These are needed by IMA to verify files. It's the ima cert signed by the fedorasigulca. Signed-off-by: Kevin Fenzi --- fedora-43-ima.der | Bin 0 -> 431 bytes fedora-44-ima.der | Bin 0 -> 445 bytes fedora-repos.spec | 7 ++++++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 fedora-43-ima.der create mode 100644 fedora-44-ima.der diff --git a/fedora-43-ima.der b/fedora-43-ima.der new file mode 100644 index 0000000000000000000000000000000000000000..00cdae106d486d64f3f2153cdbbaff0ee593a193 GIT binary patch literal 431 zcmXqLVq9&|#2B=InTe5!Nu-Q_i&Ijci2fYj`SHb}Z&y`32>D>Z#m1r4=5fxJg_*@b z!cfdWgpE0rg_(!fEj1;-C{e-F*HOXQ(Lhd|*T~es*wEO>$k@`@EJ~c$$Q+4lAZsXX zAPLba1l4I`4Az{ST2x{XX&}tT4z`Ag5o#YZBRjJb1B(jxe0|q*iq=Pb@*agIx)@Z| z7AnPXODQkAyZ+~@tu>B|e(szgT6s9hu9G$Osmc-$D~{{Ei%wXvnw<$-RulMp@8VK} zVgq3|=1^Hx79NmiwAmP0S=pJH4R}C;!ihY(B(2OMVIbBZvSI;`VVZrb{ha(yVID<~E7mh* zYaj<3vpa)<3zI_Bn(aq6K4+8GxD(*m9pWHv`qj+qh+{^x@2$)K-gE!B#H8Rt<8 literal 0 HcmV?d00001 diff --git a/fedora-44-ima.der b/fedora-44-ima.der new file mode 100644 index 0000000000000000000000000000000000000000..3d11e15ff795f83e5536a64550e3dd6e0f541687 GIT binary patch literal 445 zcmXqLV%%xa#2CMTnTe5!NhDfyQ{vsvj9DjngJn1`EqZe?&}@kT7aNCGo5wj@7G@R$ z2}3ah5jN&f7G@q^x73vUqC^ExUq=OJM*}%=UL#WjLqiiI0|O&dqbPA+BXcCKftI0$ zff_`oJXEKN2}E;#N~&&gW_n&`Ub;eZYEg+nq=7ISJJ?PpMyTb?jO@%#3@rYN(=R-_ z$8^C(Q0S-c4(3;URg1M(A7Ng;rfj9clAT_Ua@IJX^4zo1vdF=EYiy46?~gtg6)kwh zcn>=D7~A}wP`kL)px8i|jX6|Sm4yf7Gi^3TR#tXqW&<9OpfDrje-oA*NETBMlMT|e9XJI@)&gQS&NBn-qFL{==|F-)^> zwV#v!Da@njam9M3Yz^cvWcFY%aAi`^b7R$0(0pMp`%w4m- - 43-0.2 +- Add fedora-43-ima.der and fedora-44-ima.der for ima signing. + * Fri Jan 31 2025 Patrik Polakovic - 43-0.1 - Rawhide is now F43 From 3605a30b13112dc858d5b98f0d42cee426e11c10 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Mon, 4 Aug 2025 14:33:15 +0530 Subject: [PATCH 37/38] Add Fedora 45 Key and Der for signing Signed-off-by: Samyak Jain --- RPM-GPG-KEY-fedora-45-primary | 29 +++++++++++++++++++++++++++++ archmap | 2 ++ fedora-45-ima.der | Bin 0 -> 445 bytes fedora-repos.spec | 8 +++++++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-45-primary create mode 100644 fedora-45-ima.der diff --git a/RPM-GPG-KEY-fedora-45-primary b/RPM-GPG-KEY-fedora-45-primary new file mode 100644 index 0000000..561934e --- /dev/null +++ b/RPM-GPG-KEY-fedora-45-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGiIvJgBEAD3LK442lirRR/SSY884GtAlFjC4VbtOW82pks44Nu/7sbWQObo +A9kyCs69j/lCFKsq12yU+yk0rOSNHQT1aKwe64GOi9MokcOYK1gq0DtBvakl25o1 +pnBok+zuBUfwTQAsNTbevw1t5rdBJKusnuPPHjTnVdjVS9HU4QhZunI/7Y9QleX2 +oXkN2VFi0mhF2y8gU4Tve0xxSTjfgYM6ObV3W9vMusxmAabvCfdcVPpy9iEZxyjw +NL4Svkw3bt50plmnRuWRXA+P6R3SK/1XKBW/9jVr4bgs6d763VfVCMbKLpQvuWIX +6/UUOEc9LDziEjxjNBPFfLq+N7kN8235B26fuj+3XM2OqLtRv4/bl0Mryn13VrJl +hvdLSlmkjROlzywrGvZ/geqyqaSuEZMnWN6znxV/qt8+tEHJXNFO882wHOLTq+5F +6Bm/aJvdGxSffIFQyylcEzGaNgsH7AvkZPMqk2nMJ3y1KQx+LxdLM5hwGSexdaQ0 +wyW5DMH1Xn49J0nNE/IPWgBlRVAz146CNHMy0kR0J9dAUxg+1GeGKYnZ+q9mvs07 +82rFUqgJLq1gIBEVxYVh8eaO4u1wxWb+/LSx6OjZ7yFmZjN3c6V67Fwql/0EONic +QgI/2FyxLeYmQr19Cl3EY7b50Ql95RT5OqtAnqcYrzsjuv4n489F/ObRjwARAQAB +tDFGZWRvcmEgKDQ1KSA8ZmVkb3JhLTQ1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQJSBBMBCAA8FiEET1CmEUzVxpdqfxF5ZVpLAvV3hh4FAmiIvJgCGw8FCwkI +BwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEGVaSwL1d4YeErcQAMnCTVRF+W1A +W2kE9vQrqEXFj7wPXIH1uiwUAKtpLffjoD8SFekU6AqhrvMS1JgS0NsTwwvqbZXe +Zl7eTgMZ8XPxhufZ272pUaIDMlREnvoLEHb/HTbcSP8bBdCEzc5FwSNgwZEYRTC/ +OVhJ1isF54fd3JC9741feCgPOMG94dj1VX7FlZuq1AQsXKvI9H3GEm6DiqHg4nVR +WprMP7/sKqrgNSWx4s0zC/4WpALOgLXJO8qZOtul9SzcPmt4E56jjJ7TNX3uQcgu +0zKFdzb92tJ6WLpVsFk5AgBoZFSi7xZEh+nQzu/PwMorxNyw2WvKR5+avWQCY/WO +pmPIBAL4IevB/sGyrDVdh1ZNMTMIf3Pz3jkn2BGMOAo4ohP+5P4hFzt/4nOm5fL6 +DpJxlCcWaFjMuZgdJY9IHqRcwtnX4nGnrv0cbYAjt59cnHuzqzW84KWJcDEy+3v6 +jAhHn6UM27CGCN99hfh7zhj+fMcOOyugCwxbjke123uNC80J1WADB0KF99en1p1f +1VHBOfS3IS8ezmlWFrllrG0Rxl1a9LDkQJivH5mV0HNmYvRPlWky/mP7q66TRHKs +JfD7idqM7pdf6u4vYpGq/MlbGgK4xCm7geaoLWDN5zExgrgZFzgtieIEa2M1uumj +BRh9EFo/y5xhwu9mVgCJmLCLW/ByEYJE +=7kLn +-----END PGP PUBLIC KEY BLOCK----- diff --git a/archmap b/archmap index c3a4cb1..fbc4aab 100644 --- a/archmap +++ b/archmap @@ -95,3 +95,5 @@ fedora-42-primary: x86_64 aarch64 ppc64le s390x fedora-43-primary: x86_64 aarch64 ppc64le s390x fedora-44-primary: x86_64 aarch64 ppc64le s390x + +fedora-45-primary: x86_64 aarch64 ppc64le s390x diff --git a/fedora-45-ima.der b/fedora-45-ima.der new file mode 100644 index 0000000000000000000000000000000000000000..6ad652db7fe33038f8e570ff4ad90410e392f52e GIT binary patch literal 445 zcmXqLV%%xa#2CMTnTe5!NhIOi<{2mUo;2&f|8`?`(5eNK#T{N6aItY{wRxPgWnpG9 zkT4W85Mg5uWnt#wbxTdjFG^JK^mSBlb~KO^=QT1lurM$&Ff%kVF^&@FH8Mxy8fY16 z7^p#X%0qRUm_jt?r=;o@XQt<6=A|nnrxukML>dUQv4iboVuV`G%*f8{#K6LS#uAgQS&NBn-qFL{==|F-)^> zwV#v!Da@njam9M3Yz^cvWcFY%aAi_ZJ+wKL=b%o(#isvDggFm - 43-0.3 +- Add RPM-GPG-KEY-fedora-45-primary +- Add fedora-45-ima.der for ima signing. + * Thu Mar 13 2025 Kevin Fenzi - 43-0.2 - Add fedora-43-ima.der and fedora-44-ima.der for ima signing. From b38b2b9743f27ab776c2ef406f1c271d8f73339b Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Mon, 11 Aug 2025 17:54:14 +0530 Subject: [PATCH 38/38] Rawhide is now F44 Signed-off-by: Samyak Jain --- fedora-repos.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 060d834..1a23b9b 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ -%global rawhide_release 43 +%global rawhide_release 44 %global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos -Version: 43 -Release: 0.3%{?eln:.eln%{eln}} +Version: 44 +Release: 0.1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -407,6 +407,9 @@ rm -f "$TMPRING" %changelog +* Mon Aug 11 2025 Samyak Jain - 44-0.1 +- Rawhide is now F44 + * Mon Aug 04 2025 Samyak Jain - 43-0.3 - Add RPM-GPG-KEY-fedora-45-primary - Add fedora-45-ima.der for ima signing.