Index: branches/2021Q1/net/cloud-init/Makefile
===================================================================
--- branches/2021Q1/net/cloud-init/Makefile	(revision 562093)
+++ branches/2021Q1/net/cloud-init/Makefile	(revision 562094)
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	cloud-init
-PORTVERSION=	20.4
+DISTVERSION=	20.4.1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andrey@bsdnir.info
 COMMENT=	Init scripts for use on cloud images
 
 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}
 
 USES=		python:3.6+ shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	canonical
 
 SHEBANG_FILES=	tools/validate-yaml.py tools/read-dependencies \
 		tools/read-version
 USE_PYTHON=	autoplist distutils
 ETCDIR=		${PREFIX}/etc/cloud
 
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|"etc"|"${STAGEDIR}${PREFIX}/etc"|g' ${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/cloudinit/settings.py
 	@${RM} ${WRKSRC}/sysvinit/freebsd/*.orig
 
 post-build:
 	@cd ${WRKSRC} && ${MV} config/cloud.cfg.d/05_logging.cfg config/cloud.cfg.d/05_logging.cfg.sample
 
 .include <bsd.port.mk>
Index: branches/2021Q1/net/cloud-init/distinfo
===================================================================
--- branches/2021Q1/net/cloud-init/distinfo	(revision 562093)
+++ branches/2021Q1/net/cloud-init/distinfo	(revision 562094)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606245571
-SHA256 (canonical-cloud-init-20.4_GH0.tar.gz) = 15c26e74d0c8135230a4087c60b0aced7b909949a6bf4fce31351bd0f6702559
-SIZE (canonical-cloud-init-20.4_GH0.tar.gz) = 1240893
+TIMESTAMP = 1611086699
+SHA256 (canonical-cloud-init-20.4.1_GH0.tar.gz) = 76187a5b1cdda31fe46e993b70e9a3ef5759f5d3cf84eb08520ea19ea80ebcad
+SIZE (canonical-cloud-init-20.4.1_GH0.tar.gz) = 1240251
Index: branches/2021Q1
===================================================================
--- branches/2021Q1	(revision 562093)
+++ branches/2021Q1	(revision 562094)

Property changes on: branches/2021Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r562085