diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile index 1a011e4369fe..a1cd023dc2ee 100644 --- a/net/cloud-init/Makefile +++ b/net/cloud-init/Makefile @@ -1,49 +1,48 @@ PORTNAME= cloud-init -DISTVERSION= 22.3.4 +DISTVERSION= 22.4.2 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= andrey@bsdnir.info COMMENT= Init scripts for use on cloud images WWW= https://cloud-init.io/ LICENSE= APACHE20 GPLv3 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} \ ${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}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} USES= python:3.6+ shebangfix USE_GITHUB= yes 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 -USE_PYTHON= autoplist distutils ETCDIR= ${PREFIX}/etc/cloud -PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_freebsd" - 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 .include diff --git a/net/cloud-init/distinfo b/net/cloud-init/distinfo index 20c534a25724..338c72431a08 100644 --- a/net/cloud-init/distinfo +++ b/net/cloud-init/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666819675 -SHA256 (canonical-cloud-init-22.3.4_GH0.tar.gz) = e601a3ce278d6b5c0d0cfbffe2c9a4fa71a5e4ff8589b0f63b6868d1177e0eaa -SIZE (canonical-cloud-init-22.3.4_GH0.tar.gz) = 1425504 +TIMESTAMP = 1670787766 +SHA256 (canonical-cloud-init-22.4.2_GH0.tar.gz) = 9542bc57138f50bcbbb47283c8fc57762d0dfb4bdd0829a02c2104c26ca5e1ac +SIZE (canonical-cloud-init-22.4.2_GH0.tar.gz) = 1511043 diff --git a/net/cloud-init/files/patch-cloudinit_distros_networking.py b/net/cloud-init/files/patch-cloudinit_distros_networking.py new file mode 100644 index 000000000000..811534c5f298 --- /dev/null +++ b/net/cloud-init/files/patch-cloudinit_distros_networking.py @@ -0,0 +1,10 @@ +--- 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"])