Attachment #206513 for bug #239836




# $FreeBSD$

PORTNAME=	cloud-init
PORTVERSION=	19.2
PORTREVISION=	2
CATEGORIES=	net python
MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

		${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}cheetah>0:devel/py-cheetah@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}

ETCDIR=		${PREFIX}/etc/cloud

USES=		python shebangfix
SHEBANG_FILES=	tools/validate-yaml.py tools/read-dependencies \
		tools/read-version
USE_PYTHON=	autoplist distutils


post-build:
	(cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg)
	@cd ${WRKSRC} && ${MV} config/cloud.cfg.d/05_logging.cfg config/cloud.cfg.d/05_logging.cfg.sample

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1533065272	1	TIMESTAMP = 1565726929
2	SHA256 (cloud-init-18.3.tar.gz) = ba93bffc6bd5ba6117e4f3c59a677d7af3e1621b7482aec4c6ceab9b7b223228	2	SHA256 (cloud-init-19.2.tar.gz) = f5ead1b3c782c159669f8f8779c45d16a986c7405425d75f915ec55301d83a07
3	SIZE (cloud-init-18.3.tar.gz) = 915723	3	SIZE (cloud-init-19.2.tar.gz) = 1028832




--- cloudinit/config/cc_resizefs.py.orig	2018-08-03 17:33:27 UTC
+++ cloudinit/config/cc_resizefs.py
@@ -81,7 +81,7 @@ def _resize_xfs(mount_point, devpth):
 
 
 def _resize_ufs(mount_point, devpth):
-    return ('growfs', '-y', devpth)
+    return ('growfs', '-y', mount_point)
 
 
 def _resize_zfs(mount_point, devpth):
@@ -110,7 +110,7 @@ def _can_skip_resize_ufs(mount_point, de
     for line in dumpfs_res.splitlines():
         if not line.startswith('#'):
             newfs_cmd = shlex.split(line)
-            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:'
+            opt_value = 'L:O:Ua:s:b:d:e:f:g:h:i:jk:m:o:'
             optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value)
             for o, a in optlist:
                 if o == "-s":




--- cloudinit/netinfo.py.orig	2018-07-31 21:06:07 UTC
+++ cloudinit/netinfo.py
@@ -138,9 +138,10 @@ def _netdev_info_ifconfig(ifconfig_data)
             elif toks[i].startswith("scope:"):
                 devs[curdev]['ipv6'][-1]['scope6'] = toks[i].lstrip("scope:")
             elif toks[i] == "scopeid":
-                res = re.match(r'.*<(\S+)>', toks[i + 1])
-                if res:
-                    devs[curdev]['ipv6'][-1]['scope6'] = res.group(1)
+                if toks[i + 1] == "0x1":
+                    devs[curdev]['ipv6']['scope6'] = "Global"
+                elif toks[i + 1] == "0x2":
+                    devs[curdev]['ipv6']['scope6'] = "Link"
     return devs
 
 




--- cloudinit/util.py.orig	2018-08-03 17:34:37 UTC
+++ cloudinit/util.py
@@ -2291,7 +2291,7 @@ def parse_mtab(path):
 
 
 def find_freebsd_part(label_part):
-    if label_part.startswith("/dev/label/"):
+    if label_part.startswith("/dev/gpt/"):
         target_label = label_part[5:]
         (label_part, _err) = subp(['glabel', 'status', '-s'])
         for labels in label_part.split("\n"):
@@ -2300,7 +2300,7 @@ def find_freebsd_part(label_part):
                 label_part = items[2]
                 break
         label_part = str(label_part)
-    return label_part
+    return "/dev/" + label_part
 
 
 def get_path_dev_freebsd(path, mnt_list):
@@ -2324,7 +2324,7 @@ def get_mount_info_freebsd(path):
         result = path_found
     ret = result.split()
     label_part = find_freebsd_part(ret[0])
-    return "/dev/" + label_part, ret[2], ret[1]
+    return label_part, ret[2], ret[1]
 
 
 def get_device_info_from_zpool(zpool):

Return to bug 239836

Lines 1-8 Link Here

(-)Makefile (-4 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cloud-init	3	PORTNAME= cloud-init
4	PORTVERSION= 18.3	4	PORTVERSION= 19.2
5	PORTREVISION= 2
6	CATEGORIES= net python	5	CATEGORIES= net python
7	MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/	6	MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 24-36 Link Here
24	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \	25	${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \	26	${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}	27	${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}
30		28
31	ETCDIR= ${PREFIX}/etc/cloud	29	ETCDIR= ${PREFIX}/etc/cloud
32		30
33	USES= python:2.7 shebangfix	31	USES= python shebangfix
34	SHEBANG_FILES= tools/validate-yaml.py tools/read-dependencies \	32	SHEBANG_FILES= tools/validate-yaml.py tools/read-dependencies \
35	tools/read-version	33	tools/read-version
36	USE_PYTHON= autoplist distutils	34	USE_PYTHON= autoplist distutils
Lines 47-51 Link Here
47		45
48	post-build:	46	post-build:
49	(cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg)	47	(cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg)
		48	@cd ${WRKSRC} && ${MV} config/cloud.cfg.d/05_logging.cfg config/cloud.cfg.d/05_logging.cfg.sample
50		49
51	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)files/patch-cloudinit_config_cc__resizefs.py (-20 lines)
1	--- cloudinit/config/cc_resizefs.py.orig 2018-08-03 17:33:27 UTC
2	+++ cloudinit/config/cc_resizefs.py
3	@@ -81,7 +81,7 @@ def _resize_xfs(mount_point, devpth):
4
5
6	def _resize_ufs(mount_point, devpth):
7	- return ('growfs', '-y', devpth)
8	+ return ('growfs', '-y', mount_point)
9
10
11	def _resize_zfs(mount_point, devpth):
12	@@ -110,7 +110,7 @@ def _can_skip_resize_ufs(mount_point, de
13	for line in dumpfs_res.splitlines():
14	if not line.startswith('#'):
15	newfs_cmd = shlex.split(line)
16	- opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:'
17	+ opt_value = 'L:O:Ua:s:b:d:e:f:g:h:i:jk:m:o:'
18	optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value)
19	for o, a in optlist:
20	if o == "-s":

Lines 1-16 Link Here

(-)files/patch-cloudinit_netinfo.py (-16 lines)
1	--- cloudinit/netinfo.py.orig 2018-07-31 21:06:07 UTC
2	+++ cloudinit/netinfo.py
3	@@ -138,9 +138,10 @@ def _netdev_info_ifconfig(ifconfig_data)
4	elif toks[i].startswith("scope:"):
5	devs[curdev]['ipv6'][-1]['scope6'] = toks[i].lstrip("scope:")
6	elif toks[i] == "scopeid":
7	- res = re.match(r'.*<(\S+)>', toks[i + 1])
8	- if res:
9	- devs[curdev]['ipv6'][-1]['scope6'] = res.group(1)
10	+ if toks[i + 1] == "0x1":
11	+ devs[curdev]['ipv6']['scope6'] = "Global"
12	+ elif toks[i + 1] == "0x2":
13	+ devs[curdev]['ipv6']['scope6'] = "Link"
14	return devs
15
16

Lines 1-29 Link Here

(-)files/patch-cloudinit_util.py (-29 lines)
1	--- cloudinit/util.py.orig 2018-08-03 17:34:37 UTC
2	+++ cloudinit/util.py
3	@@ -2291,7 +2291,7 @@ def parse_mtab(path):
4
5
6	def find_freebsd_part(label_part):
7	- if label_part.startswith("/dev/label/"):
8	+ if label_part.startswith("/dev/gpt/"):
9	target_label = label_part[5:]
10	(label_part, _err) = subp(['glabel', 'status', '-s'])
11	for labels in label_part.split("\n"):
12	@@ -2300,7 +2300,7 @@ def find_freebsd_part(label_part):
13	label_part = items[2]
14	break
15	label_part = str(label_part)
16	- return label_part
17	+ return "/dev/" + label_part
18
19
20	def get_path_dev_freebsd(path, mnt_list):
21	@@ -2324,7 +2324,7 @@ def get_mount_info_freebsd(path):
22	result = path_found
23	ret = result.split()
24	label_part = find_freebsd_part(ret[0])
25	- return "/dev/" + label_part, ret[2], ret[1]
26	+ return label_part, ret[2], ret[1]
27
28
29	def get_device_info_from_zpool(zpool):