diff --git a/cloud-init.spec b/cloud-init.spec index 5b80c7c290bb33ba901f5bed566ea8d43bc736bf..2ad7a43462442f79932fe8251d8b16e87f6cb2c7 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 23.2.2 -Release: 5 +Release: 6 Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -14,6 +14,7 @@ Patch2: bugfix-sort-requirements.patch Patch3: add-variable-to-forbid-tmp-dir.patch Patch4: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch Patch5: cloud-init-23.2.2-nm-controlled.patch +Patch6: delete-config-nopasswd-all.patch Patch6000: backport-fix-Don-t-loosen-the-permissions-of-the-log-file-462.patch @@ -124,6 +125,12 @@ fi %exclude /usr/share/doc/* %changelog +* Mon Jan 15 2024 shixuantong - 23.2.2-6 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:delete "ALL=(ALL) NOPASSWD:ALL" in cloud.cfg.tmpl + * Thu Dec 14 2023 shixuantong - 23.2.2-5 - Type:bugfix - ID:NA diff --git a/delete-config-nopasswd-all.patch b/delete-config-nopasswd-all.patch new file mode 100644 index 0000000000000000000000000000000000000000..2c08107a3b081288d8ccef3937593c028472c565 --- /dev/null +++ b/delete-config-nopasswd-all.patch @@ -0,0 +1,23 @@ +From 5d4297092279a96da79b6404dfb7f31cc406b01c Mon Sep 17 00:00:00 2001 +From: qiushigang +Date: Thu, 18 Aug 2022 09:51:59 +0800 +Subject: [xfusion]cloud-init:delete "ALL=(ALL) NOPASSWD:ALL" in cloud.cfg.tmpl + +--- + config/cloud.cfg.tmpl | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl +index 39e36dd..cbf91ac 100644 +--- a/config/cloud.cfg.tmpl ++++ b/config/cloud.cfg.tmpl +@@ -252,7 +252,6 @@ system_info: + {% else %} + groups: [wheel, adm, systemd-journal] + {% endif %} +- sudo: ["ALL=(ALL) NOPASSWD:ALL"] + {% if variant == "alpine" %} + shell: /bin/ash + {% else %} +-- +2.27.0