From nobody Mon Aug 22 17:44:35 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MBKVr0nsrz4ZF5K; Mon, 22 Aug 2022 17:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MBKVr0PPYz3XB6; Mon, 22 Aug 2022 17:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661190276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ex6EWlDanNuHNNMUiUN1N2H1qsnJbn0ESVZuvKcTkss=; b=CW2A0/cb3rPpAqo+lzzHu3HaO7Ugj9G7rfTK8tte48G6oiAwqSeHt5yP4Kj2pBUqiPudxB DQaGW5DeGR3lRqMcGhiU4mcfQa56eyn0CFPI92Kpswedktqu+Cp1ZmIbafcnMB3AZs9XWf Mw7cCtNd2B2y/e0j9nVqJ7d6b+JXlS4Qg8wzAVeamEiBRHS4y4klhwppsm57Gl0Bhx+qV5 a7gPxlLsDTwwwQee1CyO5DZvi4eeVkVjTNS37SGmjye/WSLuC+J0QCKg+FdcRa7pPyhric egIOXALKow58P2TxOK7OL4dxaaDX3SJpn9qe6dMpAFR1wK/tWMEdc3I97b28hQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MBKVq6dNNzyDD; Mon, 22 Aug 2022 17:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27MHiZXL067535; Mon, 22 Aug 2022 17:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MHiZ1R067534; Mon, 22 Aug 2022 17:44:35 GMT (envelope-from git) Date: Mon, 22 Aug 2022 17:44:35 GMT Message-Id: <202208221744.27MHiZ1R067534@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 0d2d54418fb9 - main - net/cloud-init: Update to 22.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d2d54418fb95545dd46cee3ef9589cb8557a804 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661190276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ex6EWlDanNuHNNMUiUN1N2H1qsnJbn0ESVZuvKcTkss=; b=LDzIc7BEoHmaL6TbfILM04n+ljoa824KKru1oKvWbpMdk1HjgU/n0WVGbZZS6UddL8MH8N 53g3sow/ciB+YgWb782scgx176vDcXiD21OdsYgwmshm9lxgoSdZuXSfsennsZVWp8XMYT vMTAMC4bor8DVMwE6crUlO2v/Dpyzge+JWW1PINXBin2QXDpBhHJPoVlcHWccTSPthMDNI voadVJcQhQVYqQrxKx8ttOcgzVUQ1l+BRtkVYwoyzQMHFd5yHzz1iSFZGrDVcIeWCtV+hb ygxS7rNf0UT0lp7iZU0D7I/B/xCG7o9HgMK3pxa0y/J8+jf5pzFer8HR7kv0cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661190276; a=rsa-sha256; cv=none; b=oxwg3Des0M5aIIQ6PgadUkr4LOTxOLH6PHTaXkd+BdmW7By/GzGDAv7PbM9L4k4U3dVn6l W6Gqj0Rm8Qi/o9WPHYAlTZUEPQZkBmnaLosIznySICbkXPPb0JNUKK7QmeNhSKBoDvZbwC mtMYCYwv7s7JT7WLByrCwEh2Fjo9jRXrVvAIu29MzjCA57CRsOvkwNM650cF0aXiqt5hc/ NRpTNbkNUx2kBL3JucLt03In+U/21af0S0chaAcJBRBhXTJHU2BeEIWXNGuAN+fd1nCMTK rnhjTlpLHznAzJTsgZw+WgNWchY0TqJ8rumNzXP4MaLpTPlQEEVf++oDKVtzjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d2d54418fb95545dd46cee3ef9589cb8557a804 commit 0d2d54418fb95545dd46cee3ef9589cb8557a804 Author: Andrey Fesenko AuthorDate: 2022-08-22 17:43:12 +0000 Commit: Neel Chauhan CommitDate: 2022-08-22 17:43:48 +0000 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(-) 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"]: