diff options
Diffstat (limited to 'app-emulation/cloud-init')
13 files changed, 200 insertions, 450 deletions
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest index c613182719d4..a1fdc85deb9c 100644 --- a/app-emulation/cloud-init/Manifest +++ b/app-emulation/cloud-init/Manifest @@ -1,2 +1,3 @@ -DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df SHA512 e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3 -DIST cloud-init-20.1.tar.gz 1088152 BLAKE2B 1c075676bcf7454965beafaaa38f3cdf08f321ddd0303b7f710c49d2a69e0fb2ec8a81870a632b7504c47af6436555c97ea9fa9c8416955de78f8f551b5509b7 SHA512 ad28e4a0290165308ef2cdb8a935778ad99039978a204bee1098460de006bc3f375a3b81d0d72971fc4f4195d5d2ade9c648fb19e6d6eba12decf750dc54b6eb +DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae SHA512 18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf +DIST cloud-init-22.4.tar.gz 1494295 BLAKE2B 5f961c895c0d6c78a7cee47d2b52acd57d959baeb5172cea89d75ffe23424e3a8a3170a0ecdcad729c6cb0c898477ea94c43a5f8bdf200fc3f122c32fdb2e96d SHA512 6151d1d5e4be241219cb5804ca2bad2dd790f366bc847d286a8840faad1fb4adf5d780c9418ce574c2cfcefc16851a49961f33c5da1fbc84bb8299cf138bfcfc +DIST cloud-init-23.4.tar.gz 1648908 BLAKE2B 0acec9c437c7a5a86ed9cd8718830a7311c257ae9f223a68959b8d1eccc693b35f6a716de5c04112d848c1e2e54f6461a3919fd733debba18989145f6669d359 SHA512 34966b173571764bf83779bef0e89a86971310ff0fa62feceef4fbe17c9fa6d1b69f11f57caaa32cc4ae4a74f598f157dfb3ce356221044666401230cfb1ad13 diff --git a/app-emulation/cloud-init/cloud-init-20.1.ebuild b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild index 2ab63c9b9602..a1d0ec08c413 100644 --- a/app-emulation/cloud-init/cloud-init-20.1.ebuild +++ b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild @@ -1,18 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI=8 -inherit distutils-r1 +# Disabled for now: bug #850628 +# https://bugs.launchpad.net/cloud-init/+bug/1978328 +#DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_10 ) -if [[ ${PV} == *9999 ]];then +inherit distutils-r1 udev + +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.launchpad.net/cloud-init" else SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="amd64 arm64 ppc64 x86" fi DESCRIPTION="Cloud instance initialisation magic" @@ -20,7 +23,7 @@ HOMEPAGE="https://launchpad.net/cloud-init" LICENSE="GPL-3" SLOT="0" -IUSE="test" +IUSE="selinux test" RESTRICT="!test? ( test )" CDEPEND=" @@ -32,17 +35,16 @@ CDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/jsonpatch[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] + dev-python/netifaces[${PYTHON_USEDEP}] " -DEPEND=" +BDEPEND=" + ${CDEPEND} 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}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] ) " RDEPEND=" @@ -51,28 +53,19 @@ RDEPEND=" sys-apps/iproute2 sys-fs/growpart virtual/logger + selinux? ( sec-policy/selinux-cloudinit ) " -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}/${PN}-20.1-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 -) +distutils_enable_tests pytest python_prepare_all() { # Fix location of documentation installation sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die - sed -i 's/version=get_version(),/version=9999,/g' setup.py || die - distutils-r1_python_prepare_all -} -python_test() { - # Do not use Makefile target as it does not setup environment correclty - esetup.py nosetests -v --where cloudinit --where tests/unittests || die + if [[ ${PV} == *9999 ]] ; then + sed -i 's/version=get_version(),/version=9999,/g' setup.py || die + fi + distutils-r1_python_prepare_all } python_install() { @@ -85,10 +78,16 @@ python_install_all() { distutils-r1_python_install_all # installs as non-executable - chmod +x "${D}"/etc/init.d/* + chmod +x "${D}"/etc/init.d/* || die +} + +pkg_prerm() { + udev_reload } pkg_postinst() { + udev_reload + 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" diff --git a/app-emulation/cloud-init/cloud-init-19.4.ebuild b/app-emulation/cloud-init/cloud-init-22.4.ebuild index 6ece034faa12..839d6105a832 100644 --- a/app-emulation/cloud-init/cloud-init-19.4.ebuild +++ b/app-emulation/cloud-init/cloud-init-22.4.ebuild @@ -1,20 +1,29 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_6 python3_7 ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI=8 -inherit distutils-r1 +# Disabled for now: bug #850628 +# https://bugs.launchpad.net/cloud-init/+bug/1978328 +#DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_10 python3_11 ) + +inherit distutils-r1 udev + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.launchpad.net/cloud-init" +else + SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" + KEYWORDS="amd64 arm64 ppc64 x86" +fi 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" +IUSE="selinux test" RESTRICT="!test? ( test )" CDEPEND=" @@ -26,17 +35,16 @@ CDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/jsonpatch[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] + dev-python/netifaces[${PYTHON_USEDEP}] " -DEPEND=" +BDEPEND=" + ${CDEPEND} 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}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] ) " RDEPEND=" @@ -45,28 +53,19 @@ RDEPEND=" sys-apps/iproute2 sys-fs/growpart virtual/logger + selinux? ( sec-policy/selinux-cloudinit ) " -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() { +distutils_enable_tests pytest + +python_prepare_all() { # 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 + if [[ ${PV} == *9999 ]] ; then + sed -i 's/version=get_version(),/version=9999,/g' setup.py || die + fi + distutils-r1_python_prepare_all } python_install() { @@ -79,10 +78,16 @@ python_install_all() { distutils-r1_python_install_all # installs as non-executable - chmod +x "${D}"/etc/init.d/* + chmod +x "${D}"/etc/init.d/* || die +} + +pkg_prerm() { + udev_reload } pkg_postinst() { + udev_reload + 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" diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild b/app-emulation/cloud-init/cloud-init-23.4.ebuild new file mode 100644 index 000000000000..eba8a0ee55f0 --- /dev/null +++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Disabled for now: bug #850628 +# https://bugs.launchpad.net/cloud-init/+bug/1978328 +#DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) + +inherit distutils-r1 udev + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.launchpad.net/cloud-init" +else + SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="Cloud instance initialisation magic" +HOMEPAGE="https://launchpad.net/cloud-init" + +LICENSE="GPL-3" +SLOT="0" +IUSE="selinux 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/netifaces[${PYTHON_USEDEP}] +" +BDEPEND=" + ${CDEPEND} + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + ) +" +RDEPEND=" + ${CDEPEND} + net-analyzer/macchanger + sys-apps/iproute2 + sys-fs/growpart + virtual/logger + selinux? ( sec-policy/selinux-cloudinit ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + # Fix location of documentation installation + sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die + + if [[ ${PV} == *9999 ]] ; then + sed -i 's/version=get_version(),/version=9999,/g' setup.py || die + fi + distutils-r1_python_prepare_all +} + +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/* || die +} + +pkg_prerm() { + udev_reload +} + +pkg_postinst() { + udev_reload + + 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/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild index 581d49cdff12..7bb69ee6336a 100644 --- a/app-emulation/cloud-init/cloud-init-9999.ebuild +++ b/app-emulation/cloud-init/cloud-init-9999.ebuild @@ -1,18 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI=8 -inherit distutils-r1 +# Disabled for now: bug #850628 +#DISTUTILS_USE_PEP517=setuptools +# https://bugs.launchpad.net/cloud-init/+bug/1978328 +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) -if [[ ${PV} == *9999 ]];then +inherit distutils-r1 udev + +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.launchpad.net/cloud-init" else SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi DESCRIPTION="Cloud instance initialisation magic" @@ -20,8 +23,7 @@ HOMEPAGE="https://launchpad.net/cloud-init" LICENSE="GPL-3" SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" +IUSE="selinux" CDEPEND=" dev-python/jinja[${PYTHON_USEDEP}] @@ -32,17 +34,16 @@ CDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/jsonpatch[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] + dev-python/netifaces[${PYTHON_USEDEP}] " -DEPEND=" +BDEPEND=" + ${CDEPEND} 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}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] ) " RDEPEND=" @@ -51,28 +52,20 @@ RDEPEND=" sys-apps/iproute2 sys-fs/growpart virtual/logger + selinux? ( sec-policy/selinux-cloudinit ) " -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}/${PN}-20.1-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 -) +distutils_enable_tests pytest python_prepare_all() { # Fix location of documentation installation sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die - sed -i 's/version=get_version(),/version=9999,/g' setup.py || die - distutils-r1_python_prepare_all -} -python_test() { - # Do not use Makefile target as it does not setup environment correclty - esetup.py nosetests -v --where cloudinit --where tests/unittests || die + if [[ ${PV} == *9999 ]] ; then + sed -i 's/version=get_version(),/version=9999,/g' setup.py || die + fi + + distutils-r1_python_prepare_all } python_install() { @@ -85,10 +78,16 @@ python_install_all() { distutils-r1_python_install_all # installs as non-executable - chmod +x "${D}"/etc/init.d/* + chmod +x "${D}"/etc/init.d/* || die +} + +pkg_prerm() { + udev_reload } pkg_postinst() { + udev_reload + 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" diff --git a/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch b/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch deleted file mode 100644 index 9c542cfc0777..000000000000 --- a/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7868b97507d0dd7d7721ad5c4539e22c67635f92 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 14 Nov 2018 15:58:30 +0100 -Subject: [PATCH 5/5] gentoo: add support for package_upgrade - ---- - cloudinit/distros/gentoo.py | 25 ++++++++++++++----------- - 1 file changed, 14 insertions(+), 11 deletions(-) - -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index 7b838e82..22ad2cf3 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -189,23 +189,26 @@ class Distro(distros.Distro): - distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz)) - - def package_command(self, command, args=None, pkgs=None): -- if pkgs is None: -- pkgs = [] -- - cmd = ['emerge'] - # Redirect output - cmd.append("--quiet") - -- if args and isinstance(args, str): -- cmd.append(args) -- elif args and isinstance(args, list): -- cmd.extend(args) -+ if command == "upgrade": -+ cmd.extend(["--update", "world"]) -+ else: -+ if pkgs is None: -+ pkgs = [] -+ -+ if args and isinstance(args, str): -+ cmd.append(args) -+ elif args and isinstance(args, list): -+ cmd.extend(args) - -- if command: -- cmd.append(command) -+ if command: -+ cmd.append(command) - -- pkglist = util.expand_package_list('%s-%s', pkgs) -- cmd.extend(pkglist) -+ pkglist = util.expand_package_list('%s-%s', pkgs) -+ cmd.extend(pkglist) - - # Allow the output of this to flow outwards (ie not be captured) - util.subp(cmd, capture=False) --- -2.19.1 - diff --git a/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch b/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch deleted file mode 100644 index a5bbf6034ac5..000000000000 --- a/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3756cdea3e844b9611de321a8075df80e7dbf74d Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 14 Nov 2018 15:28:22 +0100 -Subject: [PATCH 3/5] gentoo: fix filename for storing locale - -There must have been a misunderstanding as locale.gen is meant to -contain locales to be generated if no argument is passed to locale-gen. - -When using openrc, Gentoo stores system locale in /etc/env.d/02locale -which is generally manipulated through eselect. ---- - cloudinit/distros/gentoo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index 98ac41ca..50bb61fb 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -20,7 +20,7 @@ LOG = logging.getLogger(__name__) - - - class Distro(distros.Distro): -- locale_conf_fn = '/etc/locale.gen' -+ locale_conf_fn = '/etc/env.d/02locale' - network_conf_fn = '/etc/conf.d/net' - resolve_conf_fn = '/etc/resolv.conf' - hostname_conf_fn = '/etc/conf.d/hostname' --- -2.19.1 - diff --git a/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch b/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch deleted file mode 100644 index d90258d1bc48..000000000000 --- a/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b15c4c4b24c894b3c8d444466110c881c35525e2 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 14 Nov 2018 15:35:37 +0100 -Subject: [PATCH 4/5] gentoo: fix update_package_sources function - -Method is meant to update packages repository, not to update the system. ---- - cloudinit/distros/gentoo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index 50bb61fb..7b838e82 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -212,7 +212,7 @@ class Distro(distros.Distro): - - def update_package_sources(self): - self._runner.run("update-sources", self.package_command, -- ["-u", "world"], freq=PER_INSTANCE) -+ ["--sync"], freq=PER_INSTANCE) - - - def convert_resolv_conf(settings): --- -2.19.1 - diff --git a/app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch b/app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch deleted file mode 100644 index 4a42cbb7d9e1..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e894c6f57b88305cdf6e4e2b1543475b2e02f436 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 23 Oct 2018 18:59:58 +0200 -Subject: [PATCH 1/2] Fix Gentoo package installation command - ---- - cloudinit/distros/gentoo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index dc57717d..98ac41ca 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -192,7 +192,7 @@ class Distro(distros.Distro): - if pkgs is None: - pkgs = [] - -- cmd = list('emerge') -+ cmd = ['emerge'] - # Redirect output - cmd.append("--quiet") - --- -2.19.0 - 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 deleted file mode 100644 index 210c29437361..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-19.4-gentoo-support-upstream-templates.patch +++ /dev/null @@ -1,93 +0,0 @@ -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 deleted file mode 100644 index 625473c68f1d..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-19.4_CVE-2020-8631.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/files/cloud-init-20.1-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch deleted file mode 100644 index c840f4fde3eb..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch +++ /dev/null @@ -1,93 +0,0 @@ -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 ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel", "suse", "ubuntu"] %} -+{% if variant in ["amazon", "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 ["amazon", "arch", "centos", "fedora", "rhel", "suse"] %} -+{% elif variant in ["amazon", "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 = ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel", -- "suse", "ubuntu", "unknown"] -+VARIANTS = ["amazon", "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/metadata.xml b/app-emulation/cloud-init/metadata.xml index 997452569a62..a754b254be6b 100644 --- a/app-emulation/cloud-init/metadata.xml +++ b/app-emulation/cloud-init/metadata.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>prometheanfire@gentoo.org</email> <name>Matthew Thode</name> </maintainer> - <maintainer type="person"> - <email>eva@gentoo.org</email> - <name>Gilles Dartiguelongue</name> - </maintainer> <longdescription lang="en"> 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> + <remote-id type="github">canonical/cloud-init</remote-id> </upstream> </pkgmetadata> |