rpms/cloud-init
7
1
Fork 1
Code Issues Pull Requests Releases Activity

Import from AlmaLinux stable repository

Browse Source
This commit is contained in:
eabdullin 2025-12-04 11:26:49 +00:00
parent 4fdb0b64cc
commit abeb30003f
5 changed files with 1040 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1000
SOURCES/ci-feat-aliyun-datasource-support-crawl-metadata-at-onc.patch Normal file
View File

File diff suppressed because it is too large Load Diff

9
SOURCES/ci-fix-Don-t-attempt-to-identify-non-x86-OpenStack-inst.patch
View File

@ -1,14 +1,15 @@
From b4d74e6043fa991a52e2cb98178a17914afe75b9 Mon Sep 17 00:00:00 2001
From cce7faf49aeb3b53433b9b7bcc48ca2e7dbaee64 Mon Sep 17 00:00:00 2001
From: Brett Holman <brett.holman@canonical.com>
Date: Thu, 22 Aug 2024 16:54:53 -0600
Subject: [PATCH 1/2] fix: Don't attempt to identify non-x86 OpenStack
instances
RH-Author: Ani Sinha <anisinha@redhat.com>
RH-MergeRequest: 161: CVE-2024-6174: fix: Don't attempt to identify non-x86 OpenStack instances
RH-Jira: RHEL-100611
RH-MergeRequest: 129: CVE-2024-6174: fix: Don't attempt to identify non-x86 OpenStack instances
RH-Jira: RHEL-100615
RH-Acked-by: xiachen <xiachen@redhat.com>
RH-Commit: [1/2] 9a7d7ee54fc4361e3c2b92e399ea2a6e45290300
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Commit: [1/2] 71a7a1b189d33ff43dc439ecf73c996a9cca3494 (anisinha/cloud-init)
This causes cloud-init to attempt to reach out to the OpenStack Nova
datasource in non-Nova deployments on non-x86 architectures.

14
SOURCES/ci-fix-NM-reload-and-bring-up-individual-network-conns-.patch
View File

@ -1,14 +1,12 @@
From 9fc0cee23d9d2b9ed43a7b4a8d09395b3507002a Mon Sep 17 00:00:00 2001
From 95e9d95a1bd0b995cdb505395b761896739d1476 Mon Sep 17 00:00:00 2001
From: Ani Sinha <anisinha@redhat.com>
Date: Thu, 13 Mar 2025 19:46:35 +0530
Subject: [PATCH] fix: NM reload and bring up individual network conns (#6073)
RH-Author: Ani Sinha <anisinha@redhat.com>
RH-MergeRequest: 156: fix: NM reload and bring up individual network conns (#6073)
RH-Jira: RHEL-83636
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
RH-Acked-by: xiachen <xiachen@redhat.com>
RH-Commit: [1/1] f4aa90029dff342dd100b95f1d67dcddac434095
RH-MergeRequest: 125: fix: NM reload and bring up individual network conns (#6073)
RH-Jira: RHEL-81703
RH-Commit: [1/1] 7d9b3575e1807360c40a1f45620060d1843a65b7 (anisinha/cloud-init)
Reloading the network manager service is equivalent to "nmcli reload" and this
command only reloads the global .conf files and DNS config, not connections.
@ -34,7 +32,7 @@ Signed-off-by: Ani Sinha <anisinha@redhat.com>
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cloudinit/net/activators.py b/cloudinit/net/activators.py
index de9a1d3c..94212894 100644
index de9a1d3c9..942128941 100644
--- a/cloudinit/net/activators.py
+++ b/cloudinit/net/activators.py
@@ -206,9 +206,9 @@ class NetworkManagerActivator(NetworkActivator):
@ -50,7 +48,7 @@ index de9a1d3c..94212894 100644
class NetplanActivator(NetworkActivator):
diff --git a/tests/unittests/test_net_activators.py b/tests/unittests/test_net_activators.py
index a720ada8..84876b73 100644
index a720ada81..84876b73b 100644
--- a/tests/unittests/test_net_activators.py
+++ b/tests/unittests/test_net_activators.py
@@ -247,8 +247,8 @@ NETWORK_MANAGER_BRING_UP_ALL_CALL_LIST: list = [

9
SOURCES/ci-fix-strict-disable-in-ds-identify-on-no-datasources-.patch
View File

@ -1,14 +1,15 @@
From e408a36f43f476a0804f4855da2d7b58b405d87f Mon Sep 17 00:00:00 2001
From 9c2c1169ba2d11b22ff054583583cd4298a5ba81 Mon Sep 17 00:00:00 2001
From: Chad Smith <chad.smith@canonical.com>
Date: Tue, 24 Jun 2025 09:12:52 -0600
Subject: [PATCH 2/2] fix: strict disable in ds-identify on no datasources
found
RH-Author: Ani Sinha <anisinha@redhat.com>
RH-MergeRequest: 161: CVE-2024-6174: fix: Don't attempt to identify non-x86 OpenStack instances
RH-Jira: RHEL-100611
RH-MergeRequest: 129: CVE-2024-6174: fix: Don't attempt to identify non-x86 OpenStack instances
RH-Jira: RHEL-100615
RH-Acked-by: xiachen <xiachen@redhat.com>
RH-Commit: [2/2] 4a12b4c640fe84916cc52484c232898506ab9d19
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Commit: [2/2] f941ad029982aa5b1aecd569380ae47a6d727d9b (anisinha/cloud-init)
Take the CVE-2024-6174 strict detection fix one step further.

42
SPECS/cloud-init.spec
View File

@ -1,6 +1,6 @@
Name: cloud-init
Version: 24.4
Release: 4%{?dist}.3.alma.1
Release: 7%{?dist}.alma.1
Summary: Cloud instance init scripts
License: ASL 2.0 or GPLv3
URL: http://launchpad.net/cloud-init
@ -21,13 +21,15 @@ Patch7: ci-Use-log_with_downgradable_level-for-user-password-wa.patch
Patch8: ci-downstream-set-deprecation-boundary-version.patch
# For RHEL-76361 - [c9s] cloud-init remove 'NOZEROCONF=yes' from /etc/sysconfig/network
Patch9: ci-net-sysconfig-do-not-remove-all-existing-settings-of.patch
# For RHEL-83636 - DataSourceNoCloudNet network configuration is ineffective [rhel-9.6.z]
# For RHEL-81703 - DataSourceNoCloudNet network configuration is ineffective - c9s
Patch10: ci-fix-NM-reload-and-bring-up-individual-network-conns-.patch
Patch11: 0003-downstream-Retain-exit-code-in-cloud-init-status-for.patch
# For RHEL-100611 - CVE-2024-6174 cloud-init: From CVEorg collector [rhel-9.6.z]
# For RHEL-88658 - Cloud-Init Backport Optimization Features on Alibaba Cloud
Patch11: ci-feat-aliyun-datasource-support-crawl-metadata-at-onc.patch
# For RHEL-100615 - CVE-2024-6174 cloud-init: From CVEorg collector [rhel-9.7]
Patch12: ci-fix-Don-t-attempt-to-identify-non-x86-OpenStack-inst.patch
# For RHEL-100611 - CVE-2024-6174 cloud-init: From CVEorg collector [rhel-9.6.z]
# For RHEL-100615 - CVE-2024-6174 cloud-init: From CVEorg collector [rhel-9.7]
Patch13: ci-fix-strict-disable-in-ds-identify-on-no-datasources-.patch
Patch14: 0003-downstream-Retain-exit-code-in-cloud-init-status-for.patch
# AlmaLinux Patch
Patch3100: 0001-Add-AlmaLinux-OS-and-CloudLinux-OS-support-to.patch
@ -245,23 +247,27 @@ fi
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
%changelog
* Tue Jul 22 2025 Elkhan Mammadli <elkhan@almalinux.org> - 24.4-4.3.alma.1
* Mon Sep 15 2025 Elkhan Mammadli <elkhan@almalinux.org> - 24.4-7.alma.1
- Add-AlmaLinux-OS-and-CloudLinux-OS-support-to.patch
* Thu Jul 03 2025 Miroslav Rezanina <mrezanin@redhat.com> - 24.4-4.el9_6.3
- ci-fix-Don-t-attempt-to-identify-non-x86-OpenStack-inst.patch [RHEL-100611]
- ci-fix-strict-disable-in-ds-identify-on-no-datasources-.patch [RHEL-100611]
- Resolves: RHEL-100611
(CVE-2024-6174 cloud-init: From CVEorg collector [rhel-9.6.z])
* Thu Jul 03 2025 Miroslav Rezanina <mrezanin@redhat.com> - 24.4-7
- ci-fix-Don-t-attempt-to-identify-non-x86-OpenStack-inst.patch [RHEL-100615]
- ci-fix-strict-disable-in-ds-identify-on-no-datasources-.patch [RHEL-100615]
- Fix missing patch [RHEL-101692]
- Resolves: RHEL-100615
(CVE-2024-6174 cloud-init: From CVEorg collector [rhel-9.7])
- Resolves: RHEL-101692
(c9s dist-git missing patch "downstream: Retain exit code in cloud-init status for recoverable errors")
* Thu Jul 03 2025 Miroslav Rezanina <mrezanin@redhat.com> - 24.4-4.el9_6.2
- Adding missed fix 'Retain exit code in cloud-init status for recoverable errors'
- Resolves: RHEL-101693
* Wed May 14 2025 Jon Maloy <jmaloy@redhat.com> - 24.4-6
- ci-feat-aliyun-datasource-support-crawl-metadata-at-onc.patch [RHEL-88658]
- Resolves: RHEL-88658
(Cloud-Init Backport Optimization Features on Alibaba Cloud)
* Thu Mar 20 2025 Jon Maloy <jmaloy@redhat.com> - 24.4-4.el9_6.1
- ci-fix-NM-reload-and-bring-up-individual-network-conns-.patch [RHEL-83636]
- Resolves: RHEL-83636
(DataSourceNoCloudNet network configuration is ineffective [rhel-9.6.z])
* Tue Mar 18 2025 Jon Maloy <jmaloy@redhat.com> - 24.4-5
- ci-fix-NM-reload-and-bring-up-individual-network-conns-.patch [RHEL-81703]
- Resolves: RHEL-81703
(DataSourceNoCloudNet network configuration is ineffective - c9s)
* Mon Feb 17 2025 Jon Maloy <jmaloy@redhat.com> - 24.4-4
- ci-net-sysconfig-do-not-remove-all-existing-settings-of.patch [RHEL-76361]