rpm/cloud-init
SHA256
1
0
Fork 0
forked from pool/cloud-init
Code Pull Requests Activity

Accepting request 911577 from Cloud:Tools

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/911577
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cloud-init?expand=0&rev=82
This commit is contained in:
Richard Brown 2021-08-16 08:08:31 +00:00 committed by Git OBS Bridge
commit 6b19333bfc
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cloud-init-update-test-characters-in-substitution-unit-test.patch Normal file
View File

@ -0,0 +1,19 @@
--- a/cloudinit/distros/tests/test_init.py
+++ b/cloudinit/distros/tests/test_init.py
@@ -11,10 +11,15 @@ import pytest
from cloudinit.distros import _get_package_mirror_info, LDH_ASCII_CHARS
+# In newer versions of Python, these characters will be omitted instead
+# of substituted because of security concerns.
+# See https://bugs.python.org/issue43882
+SECURITY_URL_CHARS = '\n\r\t'
# Define a set of characters we would expect to be replaced
INVALID_URL_CHARS = [
- chr(x) for x in range(127) if chr(x) not in LDH_ASCII_CHARS
+ chr(x) for x in range(127)
+ if chr(x) not in LDH_ASCII_CHARS + SECURITY_URL_CHARS
]
for separator in [":", ".", "/", "#", "?", "@", "[", "]"]:
# Remove from the set characters that either separate hostname parts (":",

6
cloud-init.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 12 02:16:08 UTC 2021 - Fusion Future <qydwhotmail@gmail.com>
- Add cloud-init-update-test-characters-in-substitution-unit-test.patch
to fix unit test fail in TestGetPackageMirrorInfo::test_substitution.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 9 10:45:23 UTC 2021 - Antonio Larrosa <alarrosa@suse.com> Fri Jul 9 10:45:23 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>

3
cloud-init.spec
View File

@ -52,6 +52,8 @@ Patch73: cloud-init-no-pwd-in-log.patch
Patch74: cloud-init-purge-cache-py-ver-change.patch Patch74: cloud-init-purge-cache-py-ver-change.patch
# PATCH-FIX-UPSTREAM https://github.com/canonical/cloud-init/commit/f23a4c4262ac11cd75c99fcbfbfe453f4e115f18 # PATCH-FIX-UPSTREAM https://github.com/canonical/cloud-init/commit/f23a4c4262ac11cd75c99fcbfbfe453f4e115f18
Patch75: 0001-templater-drop-Jinja-Python-2-compatibility-shim.patch Patch75: 0001-templater-drop-Jinja-Python-2-compatibility-shim.patch
# PATCH-FIX-UPSTREAM https://github.com/canonical/cloud-init/commit/899bfaa9d6bfab1db0df99257628ca1f6febff60
Patch76: cloud-init-update-test-characters-in-substitution-unit-test.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: filesystem BuildRequires: filesystem
# pkg-config is needed to find correct systemd unit dir # pkg-config is needed to find correct systemd unit dir
@ -161,6 +163,7 @@ Documentation and examples for cloud-init tools
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
%patch75 -p1 %patch75 -p1
%endif %endif
%patch76 -p1
# patch in the full version to version.py # patch in the full version to version.py
version_pys=$(find . -name version.py -type f) version_pys=$(find . -name version.py -type f)
[ -n "$version_pys" ] || [ -n "$version_pys" ] ||