From e26aab88392c6ff3dcc90224c3d3c6f20c21e1c3 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Fri, 19 Jul 2024 10:38:46 -0500 Subject: [PATCH 1/3] Add through Fedora 45 for Fedora CPEs --- products/fedora/product.yml | 40 +++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/products/fedora/product.yml b/products/fedora/product.yml index f38bb830c80..3f9c1095d5d 100644 --- a/products/fedora/product.yml +++ b/products/fedora/product.yml @@ -22,29 +22,39 @@ dconf_gdm_dir: "distro.d" cpes_root: "../../shared/applicability" cpes: - - fedora_40: - name: "cpe:/o:fedoraproject:fedora:40" - title: "Fedora 40" + - fedora_45: + name: "cpe:/o:fedoraproject:fedora:45" + title: "Fedora 45" check_id: installed_OS_is_fedora - - fedora_39: - name: "cpe:/o:fedoraproject:fedora:39" - title: "Fedora 39" + - fedora_44: + name: "cpe:/o:fedoraproject:fedora:44" + title: "Fedora 44" check_id: installed_OS_is_fedora - - fedora_38: - name: "cpe:/o:fedoraproject:fedora:38" - title: "Fedora 38" + - fedora_43: + name: "cpe:/o:fedoraproject:fedora:43" + title: "Fedora 37" check_id: installed_OS_is_fedora - - fedora_37: - name: "cpe:/o:fedoraproject:fedora:37" - title: "Fedora 37" + - fedora_42: + name: "cpe:/o:fedoraproject:fedora:42" + title: "Fedora 42" + check_id: installed_OS_is_fedora + + - fedora_41: + name: "cpe:/o:fedoraproject:fedora:41" + title: "Fedora 41" check_id: installed_OS_is_fedora - - fedora_36: - name: "cpe:/o:fedoraproject:fedora:36" - title: "Fedora 36" + - fedora_40: + name: "cpe:/o:fedoraproject:fedora:40" + title: "Fedora 40" + check_id: installed_OS_is_fedora + + - fedora_39: + name: "cpe:/o:fedoraproject:fedora:39" + title: "Fedora 39" check_id: installed_OS_is_fedora # Retrieve the fingerprint as follows: From ef8494c7cd23fe488ea493d40e8d4c79a84a550e Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Mon, 22 Jul 2024 10:19:13 -0500 Subject: [PATCH 2/3] Update product stability for Fedora --- tests/data/product_stability/fedora.yml | 32 +++++++++++++++---------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/tests/data/product_stability/fedora.yml b/tests/data/product_stability/fedora.yml index 0002055e7ee..caa322c29c0 100644 --- a/tests/data/product_stability/fedora.yml +++ b/tests/data/product_stability/fedora.yml @@ -11,6 +11,26 @@ chrony_conf_path: /etc/chrony.conf chrony_d_path: /etc/chrony.d/ components_root: ../../components cpes: +- fedora_45: + check_id: installed_OS_is_fedora + name: cpe:/o:fedoraproject:fedora:45 + title: Fedora 45 +- fedora_44: + check_id: installed_OS_is_fedora + name: cpe:/o:fedoraproject:fedora:44 + title: Fedora 44 +- fedora_43: + check_id: installed_OS_is_fedora + name: cpe:/o:fedoraproject:fedora:43 + title: Fedora 37 +- fedora_42: + check_id: installed_OS_is_fedora + name: cpe:/o:fedoraproject:fedora:42 + title: Fedora 42 +- fedora_41: + check_id: installed_OS_is_fedora + name: cpe:/o:fedoraproject:fedora:41 + title: Fedora 41 - fedora_40: check_id: installed_OS_is_fedora name: cpe:/o:fedoraproject:fedora:40 @@ -19,18 +39,6 @@ cpes: check_id: installed_OS_is_fedora name: cpe:/o:fedoraproject:fedora:39 title: Fedora 39 -- fedora_38: - check_id: installed_OS_is_fedora - name: cpe:/o:fedoraproject:fedora:38 - title: Fedora 38 -- fedora_37: - check_id: installed_OS_is_fedora - name: cpe:/o:fedoraproject:fedora:37 - title: Fedora 37 -- fedora_36: - check_id: installed_OS_is_fedora - name: cpe:/o:fedoraproject:fedora:36 - title: Fedora 36 cpes_root: ../../shared/applicability dconf_gdm_dir: distro.d faillock_path: /var/run/faillock From 697e0bce2c63260860ff7ef5e284b2fdfba0b788 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Mon, 22 Jul 2024 13:42:07 -0500 Subject: [PATCH 3/3] Fix Fedora 43 in Fedora product --- products/fedora/product.yml | 2 +- tests/data/product_stability/fedora.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/products/fedora/product.yml b/products/fedora/product.yml index 3f9c1095d5d..0455c2a9c09 100644 --- a/products/fedora/product.yml +++ b/products/fedora/product.yml @@ -34,7 +34,7 @@ cpes: - fedora_43: name: "cpe:/o:fedoraproject:fedora:43" - title: "Fedora 37" + title: "Fedora 43" check_id: installed_OS_is_fedora - fedora_42: diff --git a/tests/data/product_stability/fedora.yml b/tests/data/product_stability/fedora.yml index caa322c29c0..214cf9a8abf 100644 --- a/tests/data/product_stability/fedora.yml +++ b/tests/data/product_stability/fedora.yml @@ -22,7 +22,7 @@ cpes: - fedora_43: check_id: installed_OS_is_fedora name: cpe:/o:fedoraproject:fedora:43 - title: Fedora 37 + title: Fedora 43 - fedora_42: check_id: installed_OS_is_fedora name: cpe:/o:fedoraproject:fedora:42