gentoo resync : 17.02.2020

5 files changed, 214 insertions, 2 deletions

diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 46d54fd89ce0..c5c3b06bb017 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -4,13 +4,17 @@ AUX 18.4-fix-update_package_sources-function.patch 880 BLAKE2B f8a50714d5763f43c
 AUX 18.5-fix-invalid-string-format.patch 1680 BLAKE2B 55e0fe95b7ab61bfa8a9106f92e28da8df39d47e3fc35adbbff0a1c977cbbc0d996de400693cfcbf1011f8f9e0ed61fd444f225f6b0f9dd2cd4e0c48484cea31 SHA512 b9a6646419dd3c0fa34a1ba97cec29870369af97ea72791973348443d6ceeee80fd5e27ed4d7f2beb1fc7c27c699f2e22a787ad062bada5284bc55981cb08f29
 AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63bf6978900d250356a3b29972b5c8ec6dd19c202d03cf0a07bbf1e8b437c3ec80b810f5c1af456bd589adfde290636b3fc10028ad36 SHA512 ea28c8d5c9a4ebd0d65dea8dd09e5c9c9973fc3456ff8a4e35b3eb4eb856e5c4809b922ef5d958682fb7429ba23eafd80e0fdee629967b7f838d4127db5e1ac7
 AUX cloud-init-18.4-gentoo-support-upstream-templates.patch 3366 BLAKE2B 88add00b9754fb9b9301545ec35bbcf3c747fa6a3a5b10e79879c022a59cbb8d3b1102615b48ad19e5d2c9e477c31159bea4d9435bd4371fe6b4ab864225cf59 SHA512 c840338d19ef74caec4d1d867a3e674b80b34fd995d2961efa41650de36653f1c027e3e7c841a2231db6ad1b3dfe478fb3e7511bf2ba8a9cba9e43e160a0412b
+AUX cloud-init-19.4-gentoo-support-upstream-templates.patch 3445 BLAKE2B e7a7e9d3d36d78ab00f2d495f9a3fad795b142c755c797c4cfaf93263c98392b6a03f14bfd38fe4f3a332b108d3c5624051c267e60d0bad1c3469457a0f2f937 SHA512 b88f71c2131e15ead8638f0e094930c76eb1da213443402b4ac15fd735a307393952d4970f6584a2d0199cf58f535956ffa8226a0ce0b51a309299f4424b2f5d
+AUX cloud-init-19.4_CVE-2020-8631.patch 821 BLAKE2B 1c684ab25b44ab35d027d342647070c2558f4740d2117316790ef244a3fac0cd47d205f4af9968c7b6438602172a4f383d211ac58726431e7d1eeeb4bafb4600 SHA512 057158b90890bd14c8252da2c53f04f818f1e7ac7146f39fcbd90fa9cc6ab4914881804bfdf552bc8af589f6f297a8c96584131f648165d9dbbe42a3ce6f3617
 AUX cloud.cfg 1815 BLAKE2B df997117fc3e15303171942c2127eb1ae8c333a04c3d8ba7aa6e55b6f0641872e90bc643cb4ac576876c50af09136777507b739b4cc50b5b4094272b5e8bcdb0 SHA512 ff9a978befebdc177000ce50252a89d2b9adf4e2ab92c7c87300c54cebe5ff160fd6619dd56f0432a6ec8a819a4f948aa3e99c06e37dc6650ed41fdce16daeb3
 AUX hosts.gentoo.tmpl 920 BLAKE2B 9195167754ff1f09c37c0220a2dbf7c0c098daf8e71edabe944a96cbf66d2b029fbb36fef9efe6ffa7410bb8ee33f71f04a4dc1f7c62811fdd87e5216eb6589a SHA512 39e6bcdf40bd842a1d2e4ccd1c993b432016f7b3c4d5455b71896a16ee87a5d698e214919172f0a7e2f647156f5efe0964fed999dd193e4f16c944efdcc0f9c5
 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5 SHA512 ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
 DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4 SHA512 730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103
 DIST cloud-init-18.5.tar.gz 990381 BLAKE2B 0dbbd5b2402d3a7742c46f8a37b0ea31f40ac16bdbfe49dca0056ab8f90c47dbf26e6d3f40f34275caf5102d0b9b8be4e2c28bfc2276e85a5aad11af20b08979 SHA512 f89ee636922e33b5b2dcb5230763404fbeee148e28b8f61bf5b2f1f07000f960f9d38545dfb7bcbe9afb8253f77d66c94b39e9a159715b44a440a7cbe1fe1aeb
+DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df SHA512 e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3
 EBUILD cloud-init-17.2.ebuild 1929 BLAKE2B ad1db953bd7f3979863ada2abdfd30f771d5b70681dc0bdcba5efaf29ae0b1990a2bd390e33a16ac0b972e62619076b78d1d25511ce3a77dc58ce8204b931cb0 SHA512 75e2fa44eb2f902e2bca28937467070bf35d6d601eb4e9c852506dd368c276567cf145849ab60725859f31accfd48e3a8ab41868d13592c4ce5f60b517b5a940
 EBUILD cloud-init-18.4-r1.ebuild 2501 BLAKE2B c2b8019cb77f0f33f64947c41e8dd794ea3f690075bde34d35ad3ca5d27435cfecb2a19ee625b0047b31a7e3d2a5af005321de1fbbf9387e3044cdfec593b887 SHA512 3ee348a6243eea01a03770b6671653eed415bdd9d14858ed5fd5d4c1895863ba85af3d717021d24b5cb5323b557857fe8e79707f846ad5e621a83848139c6bb2
 EBUILD cloud-init-18.5.ebuild 2578 BLAKE2B 83811a6394b46734d157a49293e585cb347e1dcf0c895dba9925658867c28329b6037944f2ea2e836a6bef95d66fd220d5f4c867e6cbb091d7d9f4f82edf8822 SHA512 a6ef91f9ba05591f1a333366ddd388115383371f9da914ef41f7e847ab529c86fdf8f8063cffb32df5ceb40b05e70f03f614813d32a08649b142846a541a1ddb
+EBUILD cloud-init-19.4.ebuild 2554 BLAKE2B efc353823eae06695fa1893d7169a0b40b9c7f581a0e42f00134b259fd6bf469a1851e786e79d79d8e778eca842d53cda0fd36c933b87e0d01fb82275120618a SHA512 0cfdc6e8923d17ea442d8507259e745db1cd20e8050355bc429c6f6dd14683673e5062c246284f230717ae98e859c28cdb4db0c6ddffc0d84fd6f63b1f960cea
 EBUILD cloud-init-9999.ebuild 2568 BLAKE2B 22b8c5ddce48902329a5e5a9eb82cc57d6abfc87120d6d319f102f9a26915a262100db940a8749b091ff5dc7139bb471865bcbeecfad1dc43ee56045d949dae5 SHA512 5faa9348d693f0f662192021fbdecfa75814fd64aa3d4f0d78f9bb42ecff1a93908381be0ba4026ea3d8a5b857cb00b1ef914c1b234b97f9c5f0e128fccf2c03
-MISC metadata.xml 583 BLAKE2B 24a5563ff0106a6992b0adb539bc12f34f4ceee97213a71c6b8c15701ff627dc914917dc32510b728a59e8014571ec9d86313b0016710308e317da4b28adbf1e SHA512 1424ff88b0a75fe1037471c4187f3a557f1d180acf7879b52696730b9e789e6bcb2e2d870b68ae0b6d4eab05fa0d11388f2fd9b6a64eb0bfbd54403a88b1f68b
+MISC metadata.xml 769 BLAKE2B 4a6e831e4cd77a81826f3d8a1f16603ece81cb75261a0dfb0b4ff2cea47a4458abf3f7fb5d61672a3bbe38d538b8ba827fd50a7c9c12ef69a69107216e923c29 SHA512 760c8e7a756438fc511eb6959b0ce50cf58e0df6e553e3634a233c2bd95ad0a04310be96ee6ce392eb97e12d2d8760399ab135c4c9eb97b0dd9cd62aeecd1859
diff --git a/app-emulation/cloud-init/cloud-init-19.4.ebuild b/app-emulation/cloud-init/cloud-init-19.4.ebuild
new file mode 100644
index 000000000000..67e494f94a86
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-19.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	net-analyzer/macchanger
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=(
+	# Fix Gentoo support
+	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
+	"${FILESDIR}/${PN}-18.4-fix-packages-module.patch"
+	"${FILESDIR}/${P}-gentoo-support-upstream-templates.patch"
+	"${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch
+	"${FILESDIR}"/18.4-fix-update_package_sources-function.patch
+	"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
+	"${FILESDIR}/${P}_CVE-2020-8631.patch"
+)
+
+src_prepare() {
+	# Fix location of documentation installation
+	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Do not use Makefile target as it does not setup environment correclty
+	esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+}
+
+python_install() {
+	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/files/cloud-init-19.4-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-19.4-gentoo-support-upstream-templates.patch
new file mode 100644
index 000000000000..210c29437361
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-19.4-gentoo-support-upstream-templates.patch
@@ -0,0 +1,93 @@
+From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 24 Oct 2018 10:52:46 +0200
+Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates
+
+---
+ config/cloud.cfg.tmpl       |  8 ++++++--
+ templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++
+ tools/render-cloudcfg       |  2 +-
+ 3 files changed, 31 insertions(+), 3 deletions(-)
+ create mode 100644 templates/hosts.gentoo.tmpl
+
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index 1fef133a..3f5a41a2 100644
+--- a/config/cloud.cfg.tmpl
++++ b/config/cloud.cfg.tmpl
+@@ -134,7 +134,7 @@ cloud_final_modules:
+ # (not accessible to handlers/transforms)
+ system_info:
+    # This will affect which distro class gets used
+-{% if variant in ["arch", "centos", "debian", "fedora", "freebsd", "rhel", "suse", "ubuntu"] %}
++{% if variant in ["arch", "centos", "debian", "fedora", "freebsd", "gentoo", "rhel", "suse", "ubuntu"] %}
+    distro: {{ variant }}
+ {% else %}
+    # Unknown/fallback distro.
+@@ -172,7 +172,7 @@ system_info:
+          primary: http://ports.ubuntu.com/ubuntu-ports
+          security: http://ports.ubuntu.com/ubuntu-ports
+    ssh_svcname: ssh
+-{% elif variant in ["arch", "centos", "fedora", "rhel", "suse"] %}
++{% elif variant in ["arch", "centos", "fedora", "gentoo", "rhel", "suse"] %}
+    # Default user name + that default users groups (if added/used)
+    default_user:
+      name: {{ variant }}
+@@ -180,6 +180,10 @@ system_info:
+ {% endif %}
+ {% if variant == "suse" %}
+      groups: [cdrom, users]
++{% elif variant == "gentoo" %}
++     groups: [users, wheel]
++     primary_group: users
++     no_user_group: true
+ {% elif variant == "arch" %}
+      groups: [wheel, users]
+ {% else %}
+diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl
+new file mode 100644
+index 00000000..cd045fa6
+--- /dev/null
++++ b/templates/hosts.gentoo.tmpl
+@@ -0,0 +1,24 @@
++## template:jinja
++{#
++This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
++if enabled in cloud-config.  Specifically, in order to enable it
++you need to add the following to config:
++  manage_etc_hosts: True
++-#}
++# Your system has configured 'manage_etc_hosts' as True.
++# As a result, if you wish for changes to this file to persist
++# then you will need to either
++# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl
++# b.) change or remove the value of 'manage_etc_hosts' in
++#     /etc/cloud/cloud.cfg or cloud-config from user-data
++# 
++# The following lines are desirable for IPv4 capable hosts
++127.0.0.1 {{fqdn}} {{hostname}}
++127.0.0.1 localhost.localdomain localhost
++127.0.0.1 localhost4.localdomain4 localhost4
++
++# The following lines are desirable for IPv6 capable hosts
++::1 {{fqdn}} {{hostname}}
++::1 localhost.localdomain localhost
++::1 localhost6.localdomain6 localhost6
++
+diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
+index 8b7cb875..d109044e 100755
+--- a/tools/render-cloudcfg
++++ b/tools/render-cloudcfg
+@@ -4,7 +4,7 @@ import argparse
+ import os
+ import sys
+ 
+-VARIANTS = ["arch", "centos", "debian", "fedora", "freebsd", "rhel", "suse",
+-            "ubuntu", "unknown"]
++VARIANTS = ["arch", "centos", "debian", "fedora", "freebsd", "gentoo", "rhel",
++            "suse", "ubuntu", "unknown"]
+ 
+ if "avoid-pep8-E402-import-not-top-of-file":
+     _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+-- 
+2.19.1
+
diff --git a/app-emulation/cloud-init/files/cloud-init-19.4_CVE-2020-8631.patch b/app-emulation/cloud-init/files/cloud-init-19.4_CVE-2020-8631.patch
new file mode 100644
index 000000000000..625473c68f1d
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-19.4_CVE-2020-8631.patch
@@ -0,0 +1,25 @@
+From 42788bf24a1a0a5421a2d00a7f59b59e38ba1a14 Mon Sep 17 00:00:00 2001
+From: Ryan Harper <ryan.harper@canonical.com>
+Date: Fri, 24 Jan 2020 21:33:12 +0200
+Subject: [PATCH] cc_set_password: increase random pwlength from 9 to 20 (#189)
+
+Increasing the bits of security from 52 to 115.
+
+LP: #1860795
+---
+ cloudinit/config/cc_set_passwords.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
+index e3b39d8be..4943d5453 100755
+--- a/cloudinit/config/cc_set_passwords.py
++++ b/cloudinit/config/cc_set_passwords.py
+@@ -236,7 +236,7 @@ def handle(_name, cfg, cloud, log, args):
+         raise errors[-1]
+ 
+ 
+-def rand_user_password(pwlen=9):
++def rand_user_password(pwlen=20):
+     return util.rand_str(pwlen, select_from=PW_SET)
+ 
+ 
diff --git a/app-emulation/cloud-init/metadata.xml b/app-emulation/cloud-init/metadata.xml
index ac6c94ad0679..997452569a62 100644
--- a/app-emulation/cloud-init/metadata.xml
+++ b/app-emulation/cloud-init/metadata.xml
@@ -10,7 +10,7 @@
     <name>Gilles Dartiguelongue</name>
   </maintainer>
   <longdescription lang="en">
-    Package provides configuration and customization of cloud instance.
+    Cloud-init is the industry standard multi-distribution method for cross-platform cloud instance initialization. It is supported across all major public cloud providers, provisioning systems for private cloud infrastructure, and bare-metal installations.
   </longdescription>
   <upstream>
     <remote-id type="launchpad">cloud-init</remote-id>