Attachment 206513 Details for Bug 239836 – Update to 19.2

[patch] Update to 19.2

cloud-init.diff (text/plain), 5.89 KB, created by Andrey Fesenko on 2019-08-14 07:17:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Fesenko

Created: 2019-08-14 07:17:48 UTC

Size: 5.89 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 508811)
>+++ Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cloud-init
>-PORTVERSION=	18.3
>-PORTREVISION=	2
>+PORTVERSION=	19.2
> CATEGORIES=	net python
> MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -24,13 +23,12 @@
> 		${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:2.7 shebangfix
>+USES=		python shebangfix
> SHEBANG_FILES=	tools/validate-yaml.py tools/read-dependencies \
> 		tools/read-version
> USE_PYTHON=	autoplist distutils
>@@ -47,5 +45,6 @@
> 
> 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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 508811)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1533065272
>-SHA256 (cloud-init-18.3.tar.gz) = ba93bffc6bd5ba6117e4f3c59a677d7af3e1621b7482aec4c6ceab9b7b223228
>-SIZE (cloud-init-18.3.tar.gz) = 915723
>+TIMESTAMP = 1565726929
>+SHA256 (cloud-init-19.2.tar.gz) = f5ead1b3c782c159669f8f8779c45d16a986c7405425d75f915ec55301d83a07
>+SIZE (cloud-init-19.2.tar.gz) = 1028832
>Index: files/patch-cloudinit_config_cc__resizefs.py
>===================================================================
>--- files/patch-cloudinit_config_cc__resizefs.py	(revision 508811)
>+++ files/patch-cloudinit_config_cc__resizefs.py	(nonexistent)
>@@ -1,20 +0,0 @@
>---- 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":
>
>Property changes on: files/patch-cloudinit_config_cc__resizefs.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-cloudinit_netinfo.py
>===================================================================
>--- files/patch-cloudinit_netinfo.py	(revision 508811)
>+++ files/patch-cloudinit_netinfo.py	(nonexistent)
>@@ -1,16 +0,0 @@
>---- 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
>- 
>- 
>
>Property changes on: files/patch-cloudinit_netinfo.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-cloudinit_util.py
>===================================================================
>--- files/patch-cloudinit_util.py	(revision 508811)
>+++ files/patch-cloudinit_util.py	(nonexistent)
>@@ -1,29 +0,0 @@
>---- 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):
>
>Property changes on: files/patch-cloudinit_util.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

andrey: maintainer-approval? (zi)

Actions: View | Diff

Attachments on bug 239836: 206511 | 206513