From 0d2d54418fb95545dd46cee3ef9589cb8557a804 Mon Sep 17 00:00:00 2001
From: Andrey Fesenko <andrey@bsdnir.info>
Date: Mon, 22 Aug 2022 10:43:12 -0700
Subject: net/cloud-init: Update to 22.3

Changes: https://github.com/canonical/cloud-init/blob/main/ChangeLog

PR:	265975
---
 net/cloud-init/Makefile                             |  2 +-
 net/cloud-init/distinfo                             |  6 +++---
 .../patch-cloudinit_config_cc__salt__minion.py      | 21 ---------------------
 net/cloud-init/files/patch-cloudinit_settings.py    | 20 ++++++++++----------
 net/cloud-init/files/patch-setup.py                 |  2 +-
 5 files changed, 15 insertions(+), 36 deletions(-)
 delete mode 100644 net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py

diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index eb4fd9923dc0..b9dbe25d77ab 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cloud-init
-DISTVERSION=	21.4
+DISTVERSION=	22.3
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/net/cloud-init/distinfo b/net/cloud-init/distinfo
index 60e1acba3d13..6723002a4607 100644
--- a/net/cloud-init/distinfo
+++ b/net/cloud-init/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639345579
-SHA256 (canonical-cloud-init-21.4_GH0.tar.gz) = ff0794e94b5a21e2496c2d2b1e7ceffb8da443bcb2f86eeb9db06992c4c56e4b
-SIZE (canonical-cloud-init-21.4_GH0.tar.gz) = 1293892
+TIMESTAMP = 1661007749
+SHA256 (canonical-cloud-init-22.3_GH0.tar.gz) = d3c5d129e88678b3db56472a4dddc4612aa09f1c367e4f3048477f16dc0b711a
+SIZE (canonical-cloud-init-22.3_GH0.tar.gz) = 1417910
diff --git a/net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py b/net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py
deleted file mode 100644
index b1a65b7bd71c..000000000000
--- a/net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- cloudinit/config/cc_salt_minion.py.orig	2021-01-15 17:33:05 UTC
-+++ cloudinit/config/cc_salt_minion.py
-@@ -46,7 +46,7 @@ specify them with ``pkg_name``, ``service_name`` and `
- import os
- 
- from cloudinit import safeyaml, subp, util
--from cloudinit.distros import rhel_util
-+from cloudinit.distros import bsd_utils
- 
- 
- # Note: see https://docs.saltstack.com/en/latest/topics/installation/
-@@ -125,8 +141,7 @@ def handle(name, cfg, cloud, log, _args):
-     # we need to have the salt minion service enabled in rc in order to be
-     # able to start the service. this does only apply on FreeBSD servers.
-     if cloud.distro.osfamily == 'freebsd':
--        rhel_util.update_sysconfig_file(
--            '/etc/rc.conf', {'salt_minion_enable': 'YES'})
-+        bsd_utils.set_rc_config_value('salt_minion_enable', 'YES')
- 
-     # restart salt-minion. 'service' will start even if not started. if it
-     # was started, it needs to be restarted for config change.
diff --git a/net/cloud-init/files/patch-cloudinit_settings.py b/net/cloud-init/files/patch-cloudinit_settings.py
index 45c101c4b668..d7ca2bd87f2c 100644
--- a/net/cloud-init/files/patch-cloudinit_settings.py
+++ b/net/cloud-init/files/patch-cloudinit_settings.py
@@ -4,17 +4,17 @@
  CFG_ENV_NAME = "CLOUD_CFG"
  
  # This is expected to be a yaml formatted file
--CLOUD_CONFIG = '/etc/cloud/cloud.cfg'
-+CLOUD_CONFIG = '%%PREFIX%%/etc/cloud/cloud.cfg'
+-CLOUD_CONFIG = "/etc/cloud/cloud.cfg"
++CLOUD_CONFIG = "%%PREFIX%%/etc/cloud/cloud.cfg"
  
- RUN_CLOUD_CONFIG = '/run/cloud-init/cloud.cfg'
+ RUN_CLOUD_CONFIG = "/run/cloud-init/cloud.cfg"
  
 @@ -50,7 +50,7 @@ CFG_BUILTIN = {
-     'system_info': {
-         'paths': {
-             'cloud_dir': '/var/lib/cloud',
--            'templates_dir': '/etc/cloud/templates/',
-+            'templates_dir': '%%PREFIX%%/etc/cloud/templates/',
+     "system_info": {
+         "paths": {
+             "cloud_dir": "/var/lib/cloud",
+-            "templates_dir": "/etc/cloud/templates/",
++            "templates_dir": "%%PREFIX%%/etc/cloud/templates/",
          },
-         'distro': 'ubuntu',
-         'network': {'renderers': None},
+         "distro": "ubuntu",
+         "network": {"renderers": None},
diff --git a/net/cloud-init/files/patch-setup.py b/net/cloud-init/files/patch-setup.py
index badbe6c0ebaa..c94715dc97c6 100644
--- a/net/cloud-init/files/patch-setup.py
+++ b/net/cloud-init/files/patch-setup.py
@@ -8,4 +8,4 @@
 +ETC = "%%PREFIX%%/etc"
  USR_LIB_EXEC = "usr/lib"
  LIB = "lib"
- if os.uname()[0] in ['FreeBSD', 'DragonFly']:
+ if os.uname()[0] in ["FreeBSD", "DragonFly"]:
-- 
cgit v1.2.3