From d8c1a1bdee74a41b65ba81a7f12538b4b7fbc5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mina=20Gali=C4=87?= Date: Sat, 6 Apr 2024 17:36:41 +0100 Subject: [PATCH 1/2] net/cloud-init: Bump to newest release: 24.1.4 add homedir patch: https://github.com/canonical/cloud-init/pull/5061 Also work around python.mk autoplist bug described in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=205056. Changelogs: - https://github.com/canonical/cloud-init/releases/tag/24.1 - https://github.com/canonical/cloud-init/releases/tag/24.1.1 - https://github.com/canonical/cloud-init/releases/tag/24.1.2 - https://github.com/canonical/cloud-init/releases/tag/24.1.3 - https://github.com/canonical/cloud-init/releases/tag/24.1.4 Sponsored by: The FreeBSD Foundation --- net/cloud-init/Makefile | 9 +++++++-- net/cloud-init/distinfo | 8 +++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile index aa10ff1f411f..14029b61afcf 100644 --- a/net/cloud-init/Makefile +++ b/net/cloud-init/Makefile @@ -1,5 +1,5 @@ PORTNAME= cloud-init -DISTVERSION= 23.4.1 +DISTVERSION= 24.1.4 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -7,6 +7,9 @@ MAINTAINER= andrey@bsdnir.info COMMENT= Init scripts for use on cloud images WWW= https://cloud-init.io/ +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= a6e09d9bfd3ef0770bc4d9452d978ba93dbe1245.patch:-p1 + LICENSE= APACHE20 GPLv3 LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-Apache2.0 @@ -52,6 +55,8 @@ 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} + ${REINPLACE_CMD} -e 's|^.*\.cfg$$|@sample &.sample|' \ + -e 's|${ETCDIR}/clean.d|@dir ${ETCDIR}/clean.d|' \ + ${_PYTHONPKGLIST} .include diff --git a/net/cloud-init/distinfo b/net/cloud-init/distinfo index ce9ed65157b2..c7e39f0502b2 100644 --- a/net/cloud-init/distinfo +++ b/net/cloud-init/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1703197535 -SHA256 (canonical-cloud-init-23.4.1_GH0.tar.gz) = 3051f64e45bfb6100d69ac6bc247fce20f5cf507c1866ba40d60c45d37d994ba -SIZE (canonical-cloud-init-23.4.1_GH0.tar.gz) = 1668298 +TIMESTAMP = 1712351569 +SHA256 (canonical-cloud-init-24.1.4_GH0.tar.gz) = 3c70effcea02be47b6cd751a1d164583df674ff8d6e4eaa6599eb1499e3b3f28 +SIZE (canonical-cloud-init-24.1.4_GH0.tar.gz) = 1734414 +SHA256 (a6e09d9bfd3ef0770bc4d9452d978ba93dbe1245.patch) = e90e4df05691b64abf2f3a0fc02ff7c450260e53ca236583f7fc3fd315a2b114 +SIZE (a6e09d9bfd3ef0770bc4d9452d978ba93dbe1245.patch) = 18418 -- 2.34.1