From 8ad04dbb6c03dd007fe0bc610e48643408ae7ee2 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Wed, 24 Jul 2024 18:43:45 +0300 Subject: [PATCH] Add ELevate and TuxCare keys fingerprint as known Bump the package release --- SOURCES/leapp-repository-0.19.0-elevate.patch | 126 +++++++++++++----- SPECS/leapp-repository.spec | 5 +- 2 files changed, 94 insertions(+), 37 deletions(-) diff --git a/SOURCES/leapp-repository-0.19.0-elevate.patch b/SOURCES/leapp-repository-0.19.0-elevate.patch index a58d683..6340da7 100644 --- a/SOURCES/leapp-repository-0.19.0-elevate.patch +++ b/SOURCES/leapp-repository-0.19.0-elevate.patch @@ -1,7 +1,7 @@ From b420c259c2362e06115afbd1d7ec5e85994b65e5 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 26 Jul 2021 14:33:12 +0300 -Subject: [PATCH 01/36] Add AlmaLinux and CentOS keys +Subject: [PATCH 01/38] Add AlmaLinux and CentOS keys (cherry picked from commit 0f31a666e94e22c51e6a949dd7450bff92cdc9ea) --- @@ -39,7 +39,7 @@ index 1085beee..1c1f39da 100644 From 656765244ba73eb706ba6d1d2fe29dad5c07b994 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 26 Jul 2021 17:30:58 +0300 -Subject: [PATCH 02/36] Change GRUB entry name to AlmaLinux-Upgrade-Initramfs +Subject: [PATCH 02/38] Change GRUB entry name to AlmaLinux-Upgrade-Initramfs (cherry picked from commit 3b0e3da0ba4f9ab77c6992ab0ae80e49093d593e) --- @@ -80,7 +80,7 @@ index ddc37e52..84c3ae18 100644 From 5958b310e3a97ce8e1b2ec3b398c5ad54c378b41 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 26 Jul 2021 17:34:55 +0300 -Subject: [PATCH 03/36] Add CentOS 7.9 as supported OS +Subject: [PATCH 03/38] Add CentOS 7.9 as supported OS (cherry picked from commit 6c7c4b9d55a51e4fad208c883c512ac87eeb288b) --- @@ -107,7 +107,7 @@ index 0f1e5874..b4707b33 100644 From f95a819d6b3a773eea627f01693ee77fb091be17 Mon Sep 17 00:00:00 2001 From: Aleksandr Kravchenko Date: Mon, 26 Jul 2021 17:13:30 +0300 -Subject: [PATCH 04/36] fixed version_id +Subject: [PATCH 04/38] fixed version_id (cherry picked from commit 041e84db618561218eee09f0101fa935d3da6321) --- @@ -142,7 +142,7 @@ index 9e213f64..73197e0b 100644 From 8ea0f2b0d7beb39f50cbcd94c4b186a0700bcc20 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 24 Sep 2021 18:13:23 +0300 -Subject: [PATCH 05/36] Fix CentOS major version detection Leapp expects +Subject: [PATCH 05/38] Fix CentOS major version detection Leapp expects distribution version to be X.Y but CentOS doesn't have minor version in /etc/os-release. This commit fixes major version detection for CentOS @@ -190,7 +190,7 @@ index 5cc6fd92..fe81626f 100755 From 9163f4db4ff424e0cf7dbcffdede6f0f3f3168ad Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 27 Sep 2021 20:20:33 +0300 -Subject: [PATCH 06/36] Use ELevate name in GRUB entries +Subject: [PATCH 06/38] Use ELevate name in GRUB entries (cherry picked from commit 66fe44ed2c92ee3a0ae0cabe50df9fb5bdbb8d1f) --- @@ -231,7 +231,7 @@ index 84c3ae18..a9c40691 100644 From bc407bb2fd2159ee7c12f13a3e7502ac0e528518 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 27 Sep 2021 20:28:07 +0300 -Subject: [PATCH 07/36] Disable RHSM +Subject: [PATCH 07/38] Disable RHSM (cherry picked from commit 3ac3cb65c2668990971cbf528c0d6b6a77e5e1cb) --- @@ -258,7 +258,7 @@ index 4a5b0eb0..9fdec233 100644 From 96dbd35128163c738e819e632c359c85b907358f Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 1 Apr 2022 17:43:27 +0200 -Subject: [PATCH 08/36] accept major-only versions like CentOS has them +Subject: [PATCH 08/38] accept major-only versions like CentOS has them (cherry picked from commit b92b7167971c4702543314ba748da079c51bb78e) --- @@ -285,7 +285,7 @@ index 338978dd..af78efdf 100644 From 2316fc1e4d93cc772fa33a06e315fb00fad984d1 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 4 Apr 2022 11:43:29 +0200 -Subject: [PATCH 09/36] accept CentOS SCL gpg key as "RH signed" +Subject: [PATCH 09/38] accept CentOS SCL gpg key as "RH signed" Otherwise packages from SCLs aren't recognized and ignored in certain actions (like "to_remove" filtering in FilterRpmTransactionTasks). @@ -316,7 +316,7 @@ index 1c1f39da..45a4ef60 100644 From 77228cd1fb3538fce931db1c23c922615fef227a Mon Sep 17 00:00:00 2001 From: Jason Tucker Date: Mon, 3 Oct 2022 18:20:40 +0000 -Subject: [PATCH 10/36] Modify efibootorderfix to support distro changes (#3) +Subject: [PATCH 10/38] Modify efibootorderfix to support distro changes (#3) * Modify efibootorderfix to support distro changes @@ -436,7 +436,7 @@ index f42909f0..caa94e09 100644 From 146eaf5c2218fc8f942c38bf598d4edb728dca82 Mon Sep 17 00:00:00 2001 From: Jason Tucker Date: Thu, 13 Oct 2022 11:58:29 +0000 -Subject: [PATCH 11/36] [efibootorderfix] fix device path for md devices (#13) +Subject: [PATCH 11/38] [efibootorderfix] fix device path for md devices (#13) (cherry picked from commit aebbf63e816f05f42c62a2fcc2606b37130016c6) --- @@ -473,7 +473,7 @@ index caa94e09..9f532eb6 100644 From 3c66a9166b35002fcd9456f0a80a25cfd3b132ef Mon Sep 17 00:00:00 2001 From: Jason Tucker Date: Mon, 17 Oct 2022 12:06:20 +0000 -Subject: [PATCH 12/36] [fix] efibootorderfix (#16) +Subject: [PATCH 12/38] [fix] efibootorderfix (#16) Previous efibootorderfix versions were incorrectly specifying the partition number being passed to `efibootmgr`. This change makes that @@ -566,7 +566,7 @@ index 9f532eb6..20b21313 100644 From 9077960c41a84ac320be2b7cdf461d184e93a0b1 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Mon, 14 Nov 2022 16:00:47 +0000 -Subject: [PATCH 13/36] Add support of: eurolinux 7.9, ol 7.9, cloudlinux 7.9; +Subject: [PATCH 13/38] Add support of: eurolinux 7.9, ol 7.9, cloudlinux 7.9; centos 8.5, almalinux 8.6 and 8.7, eurolinux 8.6 and 8.7, ol 8.6 and 8.7, rocky 8.6 and 8.7. @@ -597,7 +597,7 @@ index b4707b33..a0ef8a81 100644 From d0920806922356800ac67428e871dce01b2a8c90 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Thu, 8 Dec 2022 19:29:00 +0100 -Subject: [PATCH 14/36] Add Scientific Linux support (#33) +Subject: [PATCH 14/38] Add Scientific Linux support (#33) (cherry picked from commit c847c4a3fdbae7536481720d19384550e5993961) --- @@ -624,7 +624,7 @@ index a0ef8a81..e46e165e 100644 From 132f49418fe1c93c4bad997a74551e7ec1cf2035 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 9 Dec 2022 02:58:25 -0700 -Subject: [PATCH 15/36] Scientific Linux 7.9 support (#20) +Subject: [PATCH 15/38] Scientific Linux 7.9 support (#20) * Attempt at supporting Scientific Linux 7.9 @@ -659,7 +659,7 @@ index 20b21313..832f51ab 100644 From a87825e07e6add1e6d32369a685dc0aeda42318d Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Thu, 8 Dec 2022 19:29:00 +0100 -Subject: [PATCH 16/36] Add CentOS Linux, CloudLinux, AlmaLinux, RockyLinux, +Subject: [PATCH 16/38] Add CentOS Linux, CloudLinux, AlmaLinux, RockyLinux, Oracle Linux, EuroLinux and Scientific Linux sigs. --- @@ -725,7 +725,7 @@ index 45a4ef60..ef8749c5 100644 From 1fac729266c733af67ee69c2425804865291ea53 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Thu, 25 May 2023 18:57:10 +0900 -Subject: [PATCH 17/36] Add support for 8.8 (#75) +Subject: [PATCH 17/38] Add support for 8.8 (#75) (cherry picked from commit 67956b80df2d90a092ccb1d5a9f4a6e949dc93d8) --- @@ -752,7 +752,7 @@ index e46e165e..b435cc99 100644 From bdf87f2cbe298cc15c401fdebcc3f6d348442f3c Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Wed, 22 Nov 2023 20:14:44 +0100 -Subject: [PATCH 18/36] Add support for 8.9 and 8.10 Put back support for RHEL +Subject: [PATCH 18/38] Add support for 8.9 and 8.10 Put back support for RHEL 8.5 (cherry picked from commit d1ae79368692366c47d717566695942a95895d01) @@ -780,7 +780,7 @@ index b435cc99..b4a5b022 100644 From 1362cd2678920382e3d54c22dce21aa4740a93e7 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Fri, 22 Dec 2023 13:05:30 +0200 -Subject: [PATCH 19/36] Drop CloudLinux related code. +Subject: [PATCH 19/38] Drop CloudLinux related code. --- .../common/actors/redhatsignedrpmscanner/actor.py | 2 -- @@ -827,7 +827,7 @@ index b4a5b022..95f0d231 100644 From 8d4bc08af97a5b1bbbaee1f1c94abb9a6fb1f20e Mon Sep 17 00:00:00 2001 From: Elkhan Mammadli Date: Mon, 2 Oct 2023 16:23:32 +0400 -Subject: [PATCH 20/36] Initial version of automated ELevation testing +Subject: [PATCH 20/38] Initial version of automated ELevation testing Signed-off-by: Elkhan Mammadli (cherry picked from commit 7c71c0f0c024badf52adcb269157bb6c4cdd453b) @@ -3478,7 +3478,7 @@ index 00000000..4fcb18c2 From 051385eb12ef5e00453b104de736c7fafd5ed184 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 25 Dec 2023 15:00:32 +0300 -Subject: [PATCH 21/36] Add ability to set custom branch and username +Subject: [PATCH 21/38] Add ability to set custom branch and username (cherry picked from commit a74d5f7ac1bd57ac22f281bb5bc6d553b9b92278) --- @@ -3552,7 +3552,7 @@ index 4de5c3f4..4f2b4c06 100644 From d6f17ecc63e3d364cc4b349c789b62e46f4cb9d1 Mon Sep 17 00:00:00 2001 From: Elkhan Mammadli Date: Mon, 25 Dec 2023 21:37:12 +0400 -Subject: [PATCH 22/36] Add job parameters for custom git user and branch +Subject: [PATCH 22/38] Add job parameters for custom git user and branch Add those parameters as GIT_USER and GIT_BRANCH for testing the leapp changes on different @@ -3593,7 +3593,7 @@ index d83e1788..f60a74df 100644 From 698f69c8d7b909e221ebc9f600a99d02de2d1aa1 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 26 Dec 2023 13:58:25 +0300 -Subject: [PATCH 23/36] Add Dev internal job +Subject: [PATCH 23/38] Add Dev internal job (cherry picked from commit bc36aa2e8d721c618db58eb334cd9fb902c31930) --- @@ -4094,7 +4094,7 @@ index 00000000..2647cc06 From e2787314c8e3248903b81dadb29a0d671699e78e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 12 Dec 2023 18:36:22 +0300 -Subject: [PATCH 24/36] Add priority for internal repo +Subject: [PATCH 24/38] Add priority for internal repo (cherry picked from commit d38464d040b9821958ca9b49929e292cade63cc5) --- @@ -4134,7 +4134,7 @@ index 4fcb18c2..e7fcde75 100644 From c7cfb12e0a6d4f2030749178ba38291df9b80077 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 12 Dec 2023 15:41:48 +0300 -Subject: [PATCH 25/36] Add boot_timeout var +Subject: [PATCH 25/38] Add boot_timeout var (cherry picked from commit bfafc09b182332c9b2b9a754e221821447be37a6) --- @@ -4173,7 +4173,7 @@ index e7fcde75..0e2ba8ab 100644 From d3adefaa9a68e64573fc7a58a34e481e4a7faa4b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 11 Dec 2023 16:54:42 +0300 -Subject: [PATCH 26/36] Add internal repos +Subject: [PATCH 26/38] Add internal repos (cherry picked from commit e4e6370e0e80d39de1f9e24df7934e4fad6a842d) --- @@ -4664,7 +4664,7 @@ index 00000000..33daa5dd From 4c90150b15e71ae0ef4743485f181f6076e7edbe Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Tue, 9 Jan 2024 13:03:41 +0200 -Subject: [PATCH 27/36] Add AlmaLinux8 new sig. +Subject: [PATCH 27/38] Add AlmaLinux8 new sig. --- .../system_upgrade/common/actors/redhatsignedrpmscanner/actor.py | 1 + @@ -4689,7 +4689,7 @@ index f4f8d2c5..8416fd39 100644 From f68c91aab845a537348530f0549dc7164fcdf695 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Tue, 9 Jan 2024 13:04:54 +0200 -Subject: [PATCH 28/36] Copy system's certificates if RHSM only. +Subject: [PATCH 28/38] Copy system's certificates if RHSM only. --- .../actors/targetuserspacecreator/libraries/userspacegen.py | 2 +- @@ -4717,7 +4717,7 @@ index 9dfa0f14..3dc8e6db 100644 From 51d38a912f6e25dccc3f67bdab156e8a80634b95 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Wed, 10 Jan 2024 10:24:01 +0200 -Subject: [PATCH 29/36] Remove obsolete GPG keys +Subject: [PATCH 29/38] Remove obsolete GPG keys --- .../libraries/removeobsoleterpmgpgkeys.py | 6 +++++- @@ -4747,7 +4747,7 @@ index 1cc5d64f..11c61e36 100644 From 3e609f9f7519f154bd109948a16f41ad58dd6a70 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Wed, 10 Jan 2024 19:26:16 +0200 -Subject: [PATCH 30/36] Fix creation of /etc/rhsm/facts path. +Subject: [PATCH 30/38] Fix creation of /etc/rhsm/facts path. --- commands/upgrade/breadcrumbs.py | 2 +- @@ -4773,7 +4773,7 @@ index 16903ee0..46f116fb 100644 From 67e43451ca810f9673745ddf42ba86f87ab307b0 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Thu, 18 Jan 2024 14:11:03 +0200 -Subject: [PATCH 31/36] Add EuroLinux to the list of distributions, where grub +Subject: [PATCH 31/38] Add EuroLinux to the list of distributions, where grub config should be created in case if EFI. --- @@ -4799,7 +4799,7 @@ index 832f51ab..f08b7b82 100644 From 5d27743b78d41e72fabaadd98e25aeb2ea7d53a9 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Mon, 22 Apr 2024 17:45:59 +0300 -Subject: [PATCH 32/36] Load all substitutions from etc (the way dfn CLI does) +Subject: [PATCH 32/38] Load all substitutions from etc (the way dfn CLI does) Convert dot-less CentOS Stream release to X.999. Add 'centos' '8.999' version to the list of supported for the in-place upgrade --- @@ -4884,7 +4884,7 @@ index abde69e7..7d4e8aa4 100644 From 0a7b515366b131ef13a43f75d9f17f22606fd13d Mon Sep 17 00:00:00 2001 From: Richard Alloway Date: Mon, 26 Feb 2024 15:15:34 -0500 -Subject: [PATCH 33/36] Update actor.py to support NVMe device enumeration +Subject: [PATCH 33/38] Update actor.py to support NVMe device enumeration (cherry picked from commit ca804f0c916fb21504a1393b4c8a016df9671aff) --- @@ -4929,7 +4929,7 @@ index f08b7b82..4a2bc8ad 100644 From 70259236fbd64f4a8b8bdef86012f3677eec3bf0 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Wed, 24 Apr 2024 10:48:42 +0300 -Subject: [PATCH 34/36] Fix dot-less CentOS Stream release determining. +Subject: [PATCH 34/38] Fix dot-less CentOS Stream release determining. --- .../actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py | 2 +- @@ -4955,7 +4955,7 @@ index 7abb2b42..52cfe14f 100644 From 6d4f9ea8f45f8e06489dc0712e21c7d02e4fd1bc Mon Sep 17 00:00:00 2001 From: Monstrofil Date: Thu, 20 Jun 2024 19:44:48 +0300 -Subject: [PATCH 35/36] AlmaLinux vendors.d functionaloty rebased on top of +Subject: [PATCH 35/38] AlmaLinux vendors.d functionaloty rebased on top of v0.19 (#114) * Reimplement the vendors mechanism on top of 0.19.0 @@ -6654,7 +6654,7 @@ index 00000000..014b7afb From 7325b6d5af40f1c7705502a7701a48cf19483101 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Thu, 20 Jun 2024 19:52:32 +0300 -Subject: [PATCH 36/36] CI: (#110) +Subject: [PATCH 36/38] CI: (#110) - enhance the script, to install leapp-repositoriy from Git, with the GPG keys preserving, and exits if some important commands fail --- @@ -6725,3 +6725,57 @@ index 4f2b4c06..f9cc2903 100644 -- 2.43.0 + +From 10cad20fd1f5e416eed77421ce63556010522373 Mon Sep 17 00:00:00 2001 +From: Yuriy Kohut +Date: Thu, 11 Jul 2024 19:45:35 +0300 +Subject: [PATCH 37/38] Add AlmaLinux ELevate SIG. (#116) + +--- + .../common/actors/redhatsignedrpmscanner/actor.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py b/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py +index 36daf322..e77e095e 100644 +--- a/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py ++++ b/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py +@@ -18,7 +18,8 @@ VENDOR_SIGS = { + 'cloudlinux': ['8c55a6628608cb71'], + 'almalinux': ['51d6647ec21ad6ea', + 'd36cb86cb86b3716', +- '2ae81e8aced7258b'], ++ '2ae81e8aced7258b', ++ '429785e181b961a5'], # ELevate + 'rocky': ['15af5dac6d745a60', + '702d426d350d275d'], + 'ol': ['72f97b74ec551f03', +-- +2.43.0 + + +From e966de1e8c0f4d03c67f26850370207d315da76e Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Tue, 16 Jul 2024 17:01:21 +0200 +Subject: [PATCH 38/38] Add TuxCare key fingerprint as known (#118) + +--- + .../common/actors/redhatsignedrpmscanner/actor.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py b/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py +index e77e095e..4aab00ca 100644 +--- a/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py ++++ b/repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py +@@ -15,7 +15,8 @@ VENDOR_SIGS = { + '4eb84e71f2ee9d55', + 'a963bbdbf533f4fa', + '6c7cb6ef305d49d6'], +- 'cloudlinux': ['8c55a6628608cb71'], ++ 'cloudlinux': ['8c55a6628608cb71', ++ 'd07bf2a08d50eb66'], # TuxCare + 'almalinux': ['51d6647ec21ad6ea', + 'd36cb86cb86b3716', + '2ae81e8aced7258b', +-- +2.43.0 + diff --git a/SPECS/leapp-repository.spec b/SPECS/leapp-repository.spec index 400272c..d997e42 100644 --- a/SPECS/leapp-repository.spec +++ b/SPECS/leapp-repository.spec @@ -43,7 +43,7 @@ py2_byte_compile "%1" "%2"} Epoch: 1 Name: leapp-repository Version: 0.19.0 -Release: 7%{?dist} +Release: 7.1%{?dist} Summary: Repositories for leapp License: ASL 2.0 @@ -283,6 +283,9 @@ done; # no files here %changelog +* Wed Jul 24 2024 Yuriy Kohut - 1:0.19.0-7.1 +- Add ELevate and TuxCare keys fingerprint as known + * Fri Jun 21 2024 Yuriy Kohut - 1:0.19.0-7 - Implement Vendors support -- 2.43.5