Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cloud-init for openSUSE:Factory checked in at 2021-01-29 14:55:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-init (Old) and /work/SRC/openSUSE:Factory/.cloud-init.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init" Fri Jan 29 14:55:04 2021 rev:78 rq:866971 version:20.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2021-01-06 19:56:18.721051586 +0100 +++ /work/SRC/openSUSE:Factory/.cloud-init.new.28504/cloud-init.changes 2021-01-29 14:55:08.749337140 +0100 @@ -1,0 +2,6 @@ +Fri Jan 22 16:27:17 UTC 2021 - Jordi Massaguer <[email protected]> + +- Add use_arroba_to_include_sudoers_directory-bsc_1181283.patchfix (bsc#1181283) + - Do not including sudoers.d directory twice + +------------------------------------------------------------------- New: ---- use_arroba_to_include_sudoers_directory-bsc_1181283.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-init.spec ++++++ --- /var/tmp/diff_new_pack.jZAVtg/_old 2021-01-29 14:55:11.285340871 +0100 +++ /var/tmp/diff_new_pack.jZAVtg/_new 2021-01-29 14:55:11.285340871 +0100 @@ -41,6 +41,7 @@ # FIXME https://github.com/canonical/cloud-init/commit/eea754492f074e00b601cf77aa278e3623857c5a Patch60: cloud-init-azure-def-usr-pass.patch Patch61: cloud-init-sle12-compat.patch +Patch70: use_arroba_to_include_sudoers_directory-bsc_1181283.patch BuildRequires: fdupes BuildRequires: filesystem # pkg-config is needed to find correct systemd unit dir @@ -141,6 +142,7 @@ %patch60 %if 0%{?suse_version} < 1500 %patch61 +%patch70 %endif # patch in the full version to version.py version_pys=$(find . -name version.py -type f) ++++++ use_arroba_to_include_sudoers_directory-bsc_1181283.patch ++++++ commit d62bd1f0efb25bc156a23b8e703ff264e479303c Author: Jordi Massaguer Pla <[email protected]> Date: Fri Jan 22 17:10:17 2021 +0100 includedir in suoders can be prefixed by "arroba" Since version 1.9.1, @includedir can be used in the sudoers files instead of #includedir: https://github.com/sudo-project/sudo/releases/tag/SUDO_1_9_1 This happens to be the default in SUSE Linux enterprise sudoer package, so cloudinit should take this into account. Otherwise, cloudinit was adding an extra #includedir, which was resulting on the files under /etc/sudoers.d being included twice, one by @includedir from the SUSE package, one by the @includedir from cloudinit. The consequence of this, was that if you were defining an Cmnd_Alias inside any of those files, this was being defined twice and creating an error when using sudo. Signed-off-by: Jordi Massaguer Pla <[email protected]> diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 1e118472..220bd11f 100755 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -673,7 +673,7 @@ class Distro(persistence.CloudInitPickleMixin, metaclass=abc.ABCMeta): found_include = False for line in sudoers_contents.splitlines(): line = line.strip() - include_match = re.search(r"^#includedir\s+(.*)$", line) + include_match = re.search(r"^[#|@]includedir\s+(.*)$", line) if not include_match: continue included_dir = include_match.group(1).strip()
