diff options
| author | Mikael Urankar <mikael@FreeBSD.org> | 2020-12-06 15:50:39 +0000 |
|---|---|---|
| committer | Mikael Urankar <mikael@FreeBSD.org> | 2020-12-06 15:50:39 +0000 |
| commit | cee823d878da8a75c61b01fceba4d8bbcd2a7f5d (patch) | |
| tree | 3a38e0adcb0e23b4b318fab9ce357f2a54e3d525 /net/cloud-init | |
| parent | textproc/kibana7: Fix rc script (diff) | |
net/cloud-init: Update to 20.4
Changes: https://github.com/canonical/cloud-init/blob/47f4229ebcef9f83df8b549bb869a2dbf6dff17c/ChangeLog
PR: 251280
Submitted by: Mina Galić
Approved by: Andrey Fesenko (maintainer)
Diffstat (limited to 'net/cloud-init')
| -rw-r--r-- | net/cloud-init/Makefile | 9 | ||||
| -rw-r--r-- | net/cloud-init/distinfo | 6 | ||||
| -rw-r--r-- | net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py | 11 | ||||
| -rw-r--r-- | net/cloud-init/files/patch-cloudinit_util.py | 16 |
4 files changed, 5 insertions, 37 deletions
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile index 6e805c9172e6..e509e51d1535 100644 --- a/net/cloud-init/Makefile +++ b/net/cloud-init/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cloud-init -PORTVERSION= 20.3 -PORTREVISION= 1 +PORTVERSION= 20.4 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,11 +13,7 @@ LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-Apache2.0 LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPLv3 -ONLY_FOR_ARCHS= amd64 i386 -ONLY_FOR_ARCHS_REASON= currently depends on dmidecode which is x86-only - -RUN_DEPENDS= dmidecode>0:sysutils/dmidecode \ - sudo>0:security/sudo \ +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} \ diff --git a/net/cloud-init/distinfo b/net/cloud-init/distinfo index 251dadf433d5..a28177f36b93 100644 --- a/net/cloud-init/distinfo +++ b/net/cloud-init/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1599320213 -SHA256 (canonical-cloud-init-20.3_GH0.tar.gz) = a0ddf894895b0450e963dd56d49e6ed9565eedef105de78d79f13b97c7062a91 -SIZE (canonical-cloud-init-20.3_GH0.tar.gz) = 1179033 +TIMESTAMP = 1606245571 +SHA256 (canonical-cloud-init-20.4_GH0.tar.gz) = 15c26e74d0c8135230a4087c60b0aced7b909949a6bf4fce31351bd0f6702559 +SIZE (canonical-cloud-init-20.4_GH0.tar.gz) = 1240893 diff --git a/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py b/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py deleted file mode 100644 index b90f61cc34e8..000000000000 --- a/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py +++ /dev/null @@ -1,11 +0,0 @@ ---- cloudinit/config/cc_resizefs.py.orig 2020-10-29 12:41:28 UTC -+++ cloudinit/config/cc_resizefs.py -@@ -110,7 +110,7 @@ def _can_skip_resize_ufs(mount_point, devpth): - 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:L:' -+ opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:l:m:o:t:L:' - optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value) - for o, a in optlist: - if o == "-s": diff --git a/net/cloud-init/files/patch-cloudinit_util.py b/net/cloud-init/files/patch-cloudinit_util.py deleted file mode 100644 index cae641a1ef1e..000000000000 --- a/net/cloud-init/files/patch-cloudinit_util.py +++ /dev/null @@ -1,16 +0,0 @@ ---- cloudinit/util.py.orig 2020-10-29 12:40:41 UTC -+++ cloudinit/util.py -@@ -1652,10 +1652,12 @@ def mount_cb(device, callback, data=None, mtype=None, - mtypes = ["auto"] - elif platsys.endswith("bsd"): - if mtypes is None: -- mtypes = ['ufs', 'cd9660', 'vfat'] -+ mtypes = ['ufs', 'cd9660', 'msdos'] - for index, mtype in enumerate(mtypes): - if mtype == "iso9660": - mtypes[index] = "cd9660" -+ if mtype in ["vfat", "msdosfs", "msdos"]: -+ mtypes[index] = "msdos" - else: - # we cannot do a smart "auto", so just call 'mount' once with no -t - mtypes = [''] |