From nobody Wed Dec 15 03:42:54 2021 X-Original-To: dev-commits-ports-main@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 CDDB618D67EB; Wed, 15 Dec 2021 03:42:54 +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 4JDLg23xYlz4r6n; Wed, 15 Dec 2021 03:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 672271526A; Wed, 15 Dec 2021 03:42:54 +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 1BF3gsSf079597; Wed, 15 Dec 2021 03:42:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BF3gsYG079596; Wed, 15 Dec 2021 03:42:54 GMT (envelope-from git) Date: Wed, 15 Dec 2021 03:42:54 GMT Message-Id: <202112150342.1BF3gsYG079596@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: 312cdb10c938 - main - net/cloud-init: Update to 21.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 312cdb10c938703b50c654a7f72f60f6a3f2ceb4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639539774; 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=EYt8GDj64vgR1mNIGySQY7/gGQFOaVfi2cH43ZtNz74=; b=NHg1Ih9Mk89AsbjCuvYP0OHdmKsVNVsBLz/6PZY7nS2AwjLMS2quQs8OpSjNcOPSVWVNLn FwbLMcYkL7YS3x/21TMcaT57ZMExIWB1Pxy2rwqN3vpeIfPQj+ofsofFwTgwhbyNK70HKp u1zsSW3fM362P1ghvlPDLtxHZIpKwn4em2Z/SGbtQLN6egUnzqNBjAdvWw2hjyN/DDKh6F 5313zwmymz5o4b3Gtbvbq/PBSR2L0X860QwOJNwmWMnDagK4ORDVEeXSjcUSuHPugt2cPx yRidGSj7VTUNro49jAwpRUi1LftSKxqOK2bvncsJh60Y4tF9adhP4mVgZsFupg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639539774; a=rsa-sha256; cv=none; b=S9bg00cVsNSi8UqzGC5Ru5pmIydKw21URgOTzUsUndBfLMAJv3LnYZH1GqEOplp0A5VABP 5fdgACTAaovnJqs4mS7QCq2X5mEOtHyXucJhmmOVET5je368TGwoPWx97pc2hA6uEqZYpF Pek/vjfeQP63LQWP6ja2O/qB35+CoKWTHi6pBUXqu5Wv8CGZYGNxi82dhJzRheoHO4oR2p avKl0kfdyygwdprPHJuo2dkeCiIn9qXCDzghi2KtNb26GuW455n0a/xP4hz2/WDWONM3CN wdFOPUrZakNP9LofH/2OAsX31M06b/RUma17OIr5bck8UFPd3jJRJf8UpHrIHg== 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=312cdb10c938703b50c654a7f72f60f6a3f2ceb4 commit 312cdb10c938703b50c654a7f72f60f6a3f2ceb4 Author: Andrey Fesenko AuthorDate: 2021-12-15 03:42:35 +0000 Commit: Neel Chauhan CommitDate: 2021-12-15 03:42:35 +0000 net/cloud-init: Update to 21.4 PR: 260379 --- net/cloud-init/Makefile | 8 +-- net/cloud-init/distinfo | 6 +-- net/cloud-init/files/patch-cloudinit_net_bsd.py | 60 ---------------------- .../files/patch-cloudinit_net_freebsd.py | 21 -------- .../files/patch-config_cloud.cfg.d_99__freebsd.cfg | 5 ++ net/cloud-init/files/patch-setup.py | 2 +- 6 files changed, 14 insertions(+), 88 deletions(-) diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile index e7f68e4ffb84..eb4fd9923dc0 100644 --- a/net/cloud-init/Makefile +++ b/net/cloud-init/Makefile @@ -1,5 +1,5 @@ PORTNAME= cloud-init -DISTVERSION= 21.2 +DISTVERSION= 21.4 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,8 +20,9 @@ RUN_DEPENDS= sudo>0:security/sudo \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}jsonschema3>0:devel/py-jsonschema3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} USES= python:3.6+ shebangfix USE_GITHUB= yes @@ -39,6 +40,7 @@ NO_ARCH= yes post-patch: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py + @cd ${WRKSRC} && ${RM} config/cloud.cfg.d/99_freebsd.cfg.orig post-build: @cd ${WRKSRC} && ${MV} config/cloud.cfg.d/05_logging.cfg config/cloud.cfg.d/05_logging.cfg.sample diff --git a/net/cloud-init/distinfo b/net/cloud-init/distinfo index 156ee69ef2c4..60e1acba3d13 100644 --- a/net/cloud-init/distinfo +++ b/net/cloud-init/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625456512 -SHA256 (canonical-cloud-init-21.2_GH0.tar.gz) = f9ee63692a68102c396daf6e9fff5c1dfdec44cba478b4659484f68e58d1b3ca -SIZE (canonical-cloud-init-21.2_GH0.tar.gz) = 1289949 +TIMESTAMP = 1639345579 +SHA256 (canonical-cloud-init-21.4_GH0.tar.gz) = ff0794e94b5a21e2496c2d2b1e7ceffb8da443bcb2f86eeb9db06992c4c56e4b +SIZE (canonical-cloud-init-21.4_GH0.tar.gz) = 1293892 diff --git a/net/cloud-init/files/patch-cloudinit_net_bsd.py b/net/cloud-init/files/patch-cloudinit_net_bsd.py deleted file mode 100644 index 72b7f34029b7..000000000000 --- a/net/cloud-init/files/patch-cloudinit_net_bsd.py +++ /dev/null @@ -1,60 +0,0 @@ ---- cloudinit/net/bsd.py.orig 2021-07-05 03:47:58 UTC -+++ cloudinit/net/bsd.py -@@ -33,7 +33,7 @@ class BSDRenderer(renderer.Renderer): - self.interface_configurations = {} - self._postcmds = config.get('postcmds', True) - -- def _ifconfig_entries(self, settings, target=None): -+ def _ifconfig_entries(self, settings): - ifname_by_mac = net.get_interfaces_by_mac() - for interface in settings.iter_interfaces(): - device_name = interface.get("name") -@@ -76,9 +76,10 @@ class BSDRenderer(renderer.Renderer): - self.interface_configurations[device_name] = { - 'address': subnet.get('address'), - 'netmask': subnet.get('netmask'), -+ 'mtu': subnet.get('mtu') or interface.get('mtu'), - } - -- def _route_entries(self, settings, target=None): -+ def _route_entries(self, settings): - routes = list(settings.iter_routes()) - for interface in settings.iter_interfaces(): - subnets = interface.get("subnets", []) -@@ -101,7 +102,7 @@ class BSDRenderer(renderer.Renderer): - gateway = route.get('gateway') - self.set_route(network, netmask, gateway) - -- def _resolve_conf(self, settings, target=None): -+ def _resolve_conf(self, settings): - nameservers = settings.dns_nameservers - searchdomains = settings.dns_searchdomains - for interface in settings.iter_interfaces(): -@@ -114,11 +115,11 @@ class BSDRenderer(renderer.Renderer): - # fails. - try: - resolvconf = ResolvConf(util.load_file(subp.target_path( -- target, self.resolv_conf_fn))) -+ self.target, self.resolv_conf_fn))) - resolvconf.parse() - except IOError: - util.logexc(LOG, "Failed to parse %s, use new empty file", -- subp.target_path(target, self.resolv_conf_fn)) -+ subp.target_path(self.target, self.resolv_conf_fn)) - resolvconf = ResolvConf('') - resolvconf.parse() - -@@ -136,10 +137,12 @@ class BSDRenderer(renderer.Renderer): - except ValueError: - util.logexc(LOG, "Failed to add search domain %s", domain) - util.write_file( -- subp.target_path(target, self.resolv_conf_fn), -+ subp.target_path(self.target, self.resolv_conf_fn), - str(resolvconf), 0o644) - - def render_network_state(self, network_state, templates=None, target=None): -+ if target: -+ self.target = target - self._ifconfig_entries(settings=network_state) - self._route_entries(settings=network_state) - self._resolve_conf(settings=network_state) diff --git a/net/cloud-init/files/patch-cloudinit_net_freebsd.py b/net/cloud-init/files/patch-cloudinit_net_freebsd.py deleted file mode 100644 index 0e2096721b0d..000000000000 --- a/net/cloud-init/files/patch-cloudinit_net_freebsd.py +++ /dev/null @@ -1,21 +0,0 @@ ---- cloudinit/net/freebsd.py.orig 2021-07-05 03:46:41 UTC -+++ cloudinit/net/freebsd.py -@@ -19,12 +19,13 @@ class Renderer(cloudinit.net.bsd.BSDRenderer): - - def write_config(self): - for device_name, v in self.interface_configurations.items(): -+ net_config = 'DHCP' - if isinstance(v, dict): -- self.set_rc_config_value( -- 'ifconfig_' + device_name, -- v.get('address') + ' netmask ' + v.get('netmask')) -- else: -- self.set_rc_config_value('ifconfig_' + device_name, 'DHCP') -+ net_config = v.get('address') + ' netmask ' + v.get('netmask') -+ mtu = v.get('mtu') -+ if mtu: -+ net_config += (' mtu %d' % mtu) -+ self.set_rc_config_value('ifconfig_' + device_name, net_config) - - def start_services(self, run=False): - if not run: diff --git a/net/cloud-init/files/patch-config_cloud.cfg.d_99__freebsd.cfg b/net/cloud-init/files/patch-config_cloud.cfg.d_99__freebsd.cfg new file mode 100644 index 000000000000..54430cfbd422 --- /dev/null +++ b/net/cloud-init/files/patch-config_cloud.cfg.d_99__freebsd.cfg @@ -0,0 +1,5 @@ +--- config/cloud.cfg.d/99_freebsd.cfg.orig 2021-12-13 06:41:51 UTC ++++ config/cloud.cfg.d/99_freebsd.cfg +@@ -0,0 +1,2 @@ ++no_ssh_fingerprints: true ++disable_network_activation: true diff --git a/net/cloud-init/files/patch-setup.py b/net/cloud-init/files/patch-setup.py index 11704eebead5..badbe6c0ebaa 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] == 'FreeBSD': + if os.uname()[0] in ['FreeBSD', 'DragonFly']: