Attachment #237103 for bug #266847

Lines 80-85 Link Here

(-)b/net/Makefile (+1 lines)
80	SUBDIR += cjdns	80	SUBDIR += cjdns
81	SUBDIR += clash	81	SUBDIR += clash
82	SUBDIR += cloud-init	82	SUBDIR += cloud-init
		83	SUBDIR += cloud-init-devel
83	SUBDIR += cloudflared	84	SUBDIR += cloudflared
84	SUBDIR += cloudquery	85	SUBDIR += cloudquery
85	SUBDIR += clusterit	86	SUBDIR += clusterit




PORTNAME=	cloud-init
DISTVERSION=	22.4
PORTREVISION=	4
CATEGORIES=	net python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX=	-devel

MAINTAINER=	me+FreeBSD@igalic.co
COMMENT=	Init scripts for use on cloud images, development version
WWW=		https://cloud-init.io/

LICENSE=	APACHE20 GPLv3
LICENSE_COMB=	dual
LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-Apache2.0
LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPLv3

CONFLICTS_INSTALL=	cloud-init

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
GH_TAGNAME= 87d98de2e

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 <bsd.port.mk>

Added Link Here

(-)b/net/cloud-init-devel/distinfo (+3 lines)
1	TIMESTAMP = 1664852245
2	SHA256 (canonical-cloud-init-22.4-87d98de2e_GH0.tar.gz) = f22dafd84b5f031891935c36615a6eaaa0fe8eb47a82755dda01a56c3ace6162
3	SIZE (canonical-cloud-init-22.4-87d98de2e_GH0.tar.gz) = 1443925




--- cloudinit/settings.py.orig	2021-03-17 15:43:42 UTC
+++ cloudinit/settings.py
@@ -12,7 +12,7 @@
 CFG_ENV_NAME = "CLOUD_CFG"
 
 # This is expected to be a yaml formatted file
-CLOUD_CONFIG = "/etc/cloud/cloud.cfg"
+CLOUD_CONFIG = "%%PREFIX%%/etc/cloud/cloud.cfg"
 
 RUN_CLOUD_CONFIG = "/run/cloud-init/cloud.cfg"
 
@@ -50,7 +50,7 @@ CFG_BUILTIN = {
     "system_info": {
         "paths": {
             "cloud_dir": "/var/lib/cloud",
-            "templates_dir": "/etc/cloud/templates/",
+            "templates_dir": "%%PREFIX%%/etc/cloud/templates/",
         },
         "distro": "ubuntu",
         "network": {"renderers": None},

Added Link Here

(-)b/net/cloud-init-devel/files/patch-config_cloud.cfg.d_99__freebsd.cfg (+5 lines)
1	--- config/cloud.cfg.d/99_freebsd.cfg.orig 2021-12-13 06:41:51 UTC
2	+++ config/cloud.cfg.d/99_freebsd.cfg
3	@@ -0,0 +1,2 @@
4	+no_ssh_fingerprints: true
5	+disable_network_activation: true

Added Link Here

(-)b/net/cloud-init-devel/files/patch-setup.py (+11 lines)
1	--- setup.py.orig 2021-03-17 15:40:30 UTC
2	+++ setup.py
3	@@ -153,7 +153,7 @@ INITSYS_TYPES = sorted([f.partition(".")[0] for f in I
4	# Install everything in the right location and take care of Linux (default) and
5	# FreeBSD systems.
6	USR = "usr"
7	-ETC = "etc"
8	+ETC = "%%PREFIX%%/etc"
9	USR_LIB_EXEC = "usr/lib"
10	LIB = "lib"
11	if os.uname()[0] in ["FreeBSD", "DragonFly"]:

Added Link Here

(-)b/net/cloud-init-devel/pkg-descr (+4 lines)
1	Cloud-init is the industry standard multi-distribution method for cross-platform
2	cloud instance initialization. It is supported across all major public cloud
3	providers, provisioning systems for private cloud infrastructure, and bare-metal
4	installations. This is the development version, it follows the git HEAD.

Added Link Here

(-)b/net/cloud-init-devel/pkg-message (-1 / +11 lines)
0	-	1	[
		2	{ type: install
		3	message: <<EOM
		4	To enable cloud-init, add the following line to rc.conf:
		5
		6	cloudinit_enable="YES"
		7
		8	This will make sure cloud-init is started at boot.
		9	EOM
		10	}
		11	]

Return to bug 266847

Added Link Here

(-)b/net/cloud-init-devel/Makefile (+54 lines)
1	PORTNAME= cloud-init
2	DISTVERSION= 22.4
3	PORTREVISION= 4
4	CATEGORIES= net python
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6	PKGNAMESUFFIX= -devel
7
8	MAINTAINER= me+FreeBSD@igalic.co
9	COMMENT= Init scripts for use on cloud images, development version
10	WWW= https://cloud-init.io/
11
12	LICENSE= APACHE20 GPLv3
13	LICENSE_COMB= dual
14	LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-Apache2.0
15	LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPLv3
16
17	CONFLICTS_INSTALL= cloud-init
18
19	RUN_DEPENDS= sudo>0:security/sudo \
20	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \
30	${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR}
31
32	USES= python:3.6+ shebangfix
33	USE_GITHUB= yes
34	GH_ACCOUNT= canonical
35	GH_TAGNAME= 87d98de2e
36
37	SHEBANG_FILES= tools/validate-yaml.py tools/read-dependencies \
38	tools/read-version tools/hook-hotplug
39	USE_PYTHON= autoplist distutils
40	ETCDIR= ${PREFIX}/etc/cloud
41
42	PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_freebsd"
43
44	NO_ARCH= yes
45
46	post-patch:
47	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${STAGEDIR}${PREFIX}\|g' ${WRKSRC}/setup.py
48	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/cloudinit/settings.py
49	@cd ${WRKSRC} && ${RM} config/cloud.cfg.d/99_freebsd.cfg.orig
50
51	post-build:
52	@cd ${WRKSRC} && ${MV} config/cloud.cfg.d/05_logging.cfg config/cloud.cfg.d/05_logging.cfg.sample
53
54	.include <bsd.port.mk>

Added Link Here

(-)b/net/cloud-init-devel/files/patch-cloudinit_settings.py (+20 lines)
1	--- cloudinit/settings.py.orig 2021-03-17 15:43:42 UTC
2	+++ cloudinit/settings.py
3	@@ -12,7 +12,7 @@
4	CFG_ENV_NAME = "CLOUD_CFG"
5
6	# This is expected to be a yaml formatted file
7	-CLOUD_CONFIG = "/etc/cloud/cloud.cfg"
8	+CLOUD_CONFIG = "%%PREFIX%%/etc/cloud/cloud.cfg"
9
10	RUN_CLOUD_CONFIG = "/run/cloud-init/cloud.cfg"
11
12	@@ -50,7 +50,7 @@ CFG_BUILTIN = {
13	"system_info": {
14	"paths": {
15	"cloud_dir": "/var/lib/cloud",
16	- "templates_dir": "/etc/cloud/templates/",
17	+ "templates_dir": "%%PREFIX%%/etc/cloud/templates/",
18	},
19	"distro": "ubuntu",
20	"network": {"renderers": None},