From nobody Mon Mar 20 02:59:41 2023 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 4Pfzws2sRtz4042c; Mon, 20 Mar 2023 02:59:41 +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 4Pfzws2K4tz3G3d; Mon, 20 Mar 2023 02:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679281181; 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=JyF2WJFChmZDD8qmgbPaUTnfWfGm0zxvQGMKPINJGP0=; b=mRzfCNLffnv9sSCFT6aX3pBirsjOxixaCiBS69SaA/7+nrjt6jQaq0Y7xKM7biUoDGfSTV wVW7BirZT1IlfqBi9K+Re/e3wP59lzZS94CG6NypYZvpueivKl1ZiC3w/EltJ2qLif+i5J hMPa7+BFWisuZUHvoKWs7zQD+WiJAJdogNmrE5LULiJQljjbjXsGKfNoe3ynTHDoHMelvb fAgkMGSGOe2yUslsKkw4L0oiidp+yzYCCo+EjMaqmweqAgPAd22LJiIkqWvyE41y4knosC RPaCj4lNu7RVClGuj9VhP2bPKJk6S+/yf4paVfbO9dV4+LtQOT9QR8qaO92E8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679281181; 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=JyF2WJFChmZDD8qmgbPaUTnfWfGm0zxvQGMKPINJGP0=; b=ALt353dEgM4BeDBA6y1Me7iuZxnPC/0W6xHtRZeI1EGZk1DtpNQWtr9dcr1nKsBIuTL+M/ tWWyzH/AKyf11nm8EG6Kz9/whM+JqlmJbqWvBDprNqtORvVRb0OTUd0StxvwccRmQ/aYt0 twC3UyotB3vwRJw5fHINsuXLHIcdew/b/5bg7knXW7x5TKgzQ9iBptxdklgO0dknvm+g68 J14lPpW0w3auiFN7AWZimLm57UXuPROl0BRpJBi944ZOrGUox26YaBGGAhYljc38lFyHJE LrCJKO7R+HozePo1Q11V0pJ2xQJdV8kVWeGxHXW07xgj1Tw7oaENaslH8uzj/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679281181; a=rsa-sha256; cv=none; b=G1E3xx1ca6CGFbMsOVcixmGhcXj3Z2KwAe0w4w1+sTdoJSi3SWABKn5XCFnE9lQIryFZy3 JiiMO5TcxGUvMYywM8RsR1bi3pejo1MARAQ9KtnsYeXvNHT2pfZkZ7amcfHv8ooebKTmbK XfeoKY4YZ20puOcdN7G5+F9EAf0hOTXWLuSlhyryw5N8ncFGR8LpZkzPuLeoWGmsudEdsv h6huvZMDyugoKNSaAMH5DD+sD8mgzKCYK7I5zxZ6uKYseV7SO9SRsdqSLXmu3To/vdBh1U MhyRirsXggGXWbQh0h23rTqumVe1WB+WImlReTrOVktAK+WIc4tCSeQ0by3ahg== 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 4Pfzws1Mv5zDh8; Mon, 20 Mar 2023 02:59:41 +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 32K2xf4f021335; Mon, 20 Mar 2023 02:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K2xfsE021334; Mon, 20 Mar 2023 02:59:41 GMT (envelope-from git) Date: Mon, 20 Mar 2023 02:59:41 GMT Message-Id: <202303200259.32K2xfsE021334@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: cadd4725f3e8 - main - net/cloud-init: Update to 23.1.1 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: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cadd4725f3e8bae43a9a030996324767d2bfafbd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=cadd4725f3e8bae43a9a030996324767d2bfafbd commit cadd4725f3e8bae43a9a030996324767d2bfafbd Author: Koichiro Iwao AuthorDate: 2023-03-20 02:54:20 +0000 Commit: Koichiro Iwao CommitDate: 2023-03-20 02:58:15 +0000 net/cloud-init: Update to 23.1.1 - distros/freebsd: add support for static IPv6 addresses - Sync Makefile with cloud-init-devel (minimize diff) PR: 270334 Changes: https://github.com/canonical/cloud-init/blob/23.1.x/ChangeLog Reported by: andrey@bsdnir.info (maintainer) --- net/cloud-init/Makefile | 41 +++++++++++++--------- net/cloud-init/distinfo | 6 ++-- .../files/patch-cloudinit_distros_networking.py | 10 ------ 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile index a1cd023dc2ee..b8df0dff41b3 100644 --- a/net/cloud-init/Makefile +++ b/net/cloud-init/Makefile @@ -1,5 +1,5 @@ PORTNAME= cloud-init -DISTVERSION= 22.4.2 +DISTVERSION= 23.1.1 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,18 +12,18 @@ LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-Apache2.0 LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPLv3 -RUN_DEPENDS= sudo>0:security/sudo \ - ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${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}netifaces>0:net/py-netifaces@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ + sudo>0:security/sudo USES= python:3.6+ shebangfix USE_GITHUB= yes @@ -31,8 +31,13 @@ GH_ACCOUNT= canonical USE_PYTHON= autoplist distutils PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_freebsd" -SHEBANG_FILES= tools/validate-yaml.py tools/read-dependencies \ - tools/read-version tools/hook-hotplug +SHEBANG_FILES= tools/hook-hotplug tools/read-dependencies tools/read-version \ + tools/validate-yaml.py + +# Conflicts +CONFLICTS_INSTALL= cloud-init-devel + +# Standard bsd.port.mk variables ETCDIR= ${PREFIX}/etc/cloud NO_ARCH= yes @@ -40,9 +45,13 @@ 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 + ${REINPLACE_CMD} -e 's|@@PACKAGED_VERSION@@|${DISTVERSION}${DISTVERSIONSUFFIX}|g' ${WRKSRC}/cloudinit/version.py + ${RM} ${WRKSRC}/config/cloud.cfg.d/99_freebsd.cfg.orig + +post-install: + ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.sample + ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg.sample + ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg.sample + ${REINPLACE_CMD} 's|^.*\.cfg$$|@sample &.sample|' ${_PYTHONPKGLIST} .include diff --git a/net/cloud-init/distinfo b/net/cloud-init/distinfo index 338c72431a08..1fc9cf2f3b9c 100644 --- a/net/cloud-init/distinfo +++ b/net/cloud-init/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670787766 -SHA256 (canonical-cloud-init-22.4.2_GH0.tar.gz) = 9542bc57138f50bcbbb47283c8fc57762d0dfb4bdd0829a02c2104c26ca5e1ac -SIZE (canonical-cloud-init-22.4.2_GH0.tar.gz) = 1511043 +TIMESTAMP = 1679196468 +SHA256 (canonical-cloud-init-23.1.1_GH0.tar.gz) = c72f7678ba047a57f852b09eb03125bfd6a5ca221a3ba29c46946ede5da1b332 +SIZE (canonical-cloud-init-23.1.1_GH0.tar.gz) = 1539667 diff --git a/net/cloud-init/files/patch-cloudinit_distros_networking.py b/net/cloud-init/files/patch-cloudinit_distros_networking.py deleted file mode 100644 index 811534c5f298..000000000000 --- a/net/cloud-init/files/patch-cloudinit_distros_networking.py +++ /dev/null @@ -1,10 +0,0 @@ ---- cloudinit/distros/networking.py.orig 2022-12-11 19:43:15 UTC -+++ cloudinit/distros/networking.py -@@ -190,6 +190,7 @@ class BSDNetworking(Networking): - self.ifc = ifconfig.Ifconfig() - self.ifs = {} - self._update_ifs() -+ super().__init__() - - def _update_ifs(self): - ifconf = subp.subp(["ifconfig", "-a"])