FreeBSD Bugzilla – Attachment 219938 Details for
Bug 251280
net/cloud-init: prepare for 20.4 release
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to prepare for 20.4 release (including distinfo update)
0001-prepare-release-for-20.4-removing-patches-fixed-upst.patch (text/plain), 3.21 KB, created by
Mina Galić
on 2020-11-24 19:24:27 UTC
(
hide
)
Description:
patch to prepare for 20.4 release (including distinfo update)
Filename:
MIME Type:
Creator:
Mina Galić
Created:
2020-11-24 19:24:27 UTC
Size:
3.21 KB
patch
obsolete
>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 >index b90f61cc34e8..e69de29bb2d1 100644 >--- a/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py >+++ b/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py >@@ -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 >index cae641a1ef1e..e69de29bb2d1 100644 >--- a/net/cloud-init/files/patch-cloudinit_util.py >+++ b/net/cloud-init/files/patch-cloudinit_util.py >@@ -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 = ['']
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=219938">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 251280
:
219842
| 219938