commit: 5b526a1d6b0fff6bf8834b27adc4b4e08e3e2ebb Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> AuthorDate: Sat Oct 31 01:36:31 2020 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Sat Oct 31 01:36:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b526a1d
app-admin/salt-3002: Version bump (bug #750815) Closes: https://bugs.gentoo.org/750815 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> app-admin/salt/Manifest | 1 + .../files/salt-3002-dont-realpath-on-tmpdir.patch | 38 +++++ app-admin/salt/files/salt-3002-tests.patch | 27 +++ app-admin/salt/salt-3002.ebuild | 183 +++++++++++++++++++++ 4 files changed, 249 insertions(+) diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 4f594f7a094..e98dc8130cb 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -3,3 +3,4 @@ DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7 DIST salt-3000.2.tar.gz 15231513 BLAKE2B 2090d0f52f953a42f1685ad190750e9c76ad6e862a3272444fef063a7605f69a6c542f04165a41fb9cdaa126a878cc133d4857faa70edc5eac4bf49bdde937ab SHA512 88e8876ed8cd18e942c2194686cda68f40fa49e69e317ca488bf58e095bcf6cdf8771d93eba7960038941cc5863e13a4eea4dad5256c12da7cd8288a2c61f59d DIST salt-3000.3.tar.gz 15237557 BLAKE2B ab51e07f56f9e02c47da58fad95c9482ea70e0685996a78e34382eadb3a9a3dace63ef65d643a9de284ea00c34785eae631d033f32e00e59eb3639514459af33 SHA512 a4697da9a2f7d484b72145e8b83f6d9032369f87e2e7119a9d51f59b989488285406543f79142fc686c41c144f5878eefba37927137581c892c88f03fc3a8208 DIST salt-3001.1.tar.gz 14556156 BLAKE2B 3088955a07b6ff95588f5b6235e0bae9cea366e957e026bacd228af9f1ed500f88f7fb543833f2398d64fe7e4546f0f29d7c65362464097bf89424174e76c954 SHA512 d59b6c3580d3379192f36e462385c74b53b0b385e63b3db7734003d0a71df8f88593a59eeccd86b1dc15800e46d050094e7a88f2636673770ddc952d0110ca29 +DIST salt-3002.tar.gz 15741439 BLAKE2B 7463cfe558515697177fedb25fdf9f2e2819b62e3a96c8196b4243a4f2a59a202ac5a3869138b2df00fb47238329ba102396b464379f09d2a79c8c0a672638fb SHA512 7a3ed78b301e9c1ef65c8e6aeeaebc2376b3942e94e38b0591860fa1d9213c6c0f85db4d932b4c7c9d20717027a686690973d0dfd2aff17f44abae0ec0e97d31 diff --git a/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch b/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch new file mode 100644 index 00000000000..5ef68dcd180 --- /dev/null +++ b/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch @@ -0,0 +1,38 @@ +diff --git a/tests/integration/files/file/base/_modules/runtests_helpers.py b/tests/integration/files/file/base/_modules/runtests_helpers.py +index 3ee0e2da5f..5b462f0a9e 100644 +--- a/tests/integration/files/file/base/_modules/runtests_helpers.py ++++ b/tests/integration/files/file/base/_modules/runtests_helpers.py +@@ -18,7 +18,7 @@ try: + from tests.support.runtests import RUNTIME_VARS + except ImportError: + # Salt SSH Tests +- SYS_TMP_DIR = os.path.realpath( ++ SYS_TMP_DIR = os.path.abspath( + # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long + # for unix sockets: ``error: AF_UNIX path too long`` + # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} +diff --git a/tests/support/paths.py b/tests/support/paths.py +index 5f28904858..26245fadf9 100644 +--- a/tests/support/paths.py ++++ b/tests/support/paths.py +@@ -48,14 +48,12 @@ if TESTS_DIR not in sys.path: + sys.path.insert(1, TESTS_DIR) + + SYS_TMP_DIR = os.path.abspath( +- os.path.realpath( +- # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long +- # for unix sockets: ``error: AF_UNIX path too long`` +- # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} +- os.environ.get("TMPDIR", tempfile.gettempdir()) +- if not sys.platform.startswith("darwin") +- else "/tmp" +- ) ++ # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long ++ # for unix sockets: ``error: AF_UNIX path too long`` ++ # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} ++ os.environ.get("TMPDIR", tempfile.gettempdir()) ++ if not sys.platform.startswith("darwin") ++ else "/tmp" + ) + TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir") + TMP_ROOT_DIR = os.path.join(TMP, "rootdir") diff --git a/app-admin/salt/files/salt-3002-tests.patch b/app-admin/salt/files/salt-3002-tests.patch new file mode 100644 index 00000000000..88e1ce59056 --- /dev/null +++ b/app-admin/salt/files/salt-3002-tests.patch @@ -0,0 +1,27 @@ +diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py +index 5662cf621b..16aa6d08da 100644 +--- a/tests/unit/utils/test_verify.py ++++ b/tests/unit/utils/test_verify.py +@@ -329,6 +329,7 @@ class TestVerifyLog(TestCase): + self.assertTrue(os.path.exists(path)) + + ++@skipIf(True, "skipping since temp dir is a symlink") + class TestCleanPath(TestCase): + """ + salt.utils.clean_path works as expected +@@ -394,12 +395,14 @@ class TestCleanPathLink(TestCase): + def tearDown(self): + shutil.rmtree(self.tmpdir) + ++ @skipIf(True, "skipping since temp dir is a symlink") + def test_clean_path_symlinked_src(self): + test_path = os.path.join(self.from_path, "test") + expect_path = os.path.join(self.to_path, "test") + ret = clean_path(self.from_path, test_path) + assert ret == expect_path, "{} is not {}".format(ret, expect_path) + ++ @skipIf(True, "skipping since temp dir is a symlink") + def test_clean_path_symlinked_tgt(self): + test_path = os.path.join(self.to_path, "test") + expect_path = os.path.join(self.to_path, "test") diff --git a/app-admin/salt/salt-3002.ebuild b/app-admin/salt/salt-3002.ebuild new file mode 100644 index 00000000000..59838e3e579 --- /dev/null +++ b/app-admin/salt/salt-3002.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack"; + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax" + +RDEPEND=" + sys-apps/pciutils + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] + dev-python/pycryptodomex[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/toml[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7) + ) + openssl? ( + dev-libs/openssl:0=[-bindist] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + ${RDEPEND} + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" + "${FILESDIR}/salt-3002-tests.patch" +) + +python_prepare_all() { + # remove tests with external dependencies that may not be available + rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die + rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die + rm tests/unit/states/test_boto_vpc.py || die + rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die + + # tests that require network access + rm tests/unit/{states,modules}/test_zcbuildout.py || die + + # make sure pkg_resources doesn't bomb because pycrypto isn't installed + find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die + + distutils-r1_python_prepare_all +} + +python_prepare() { + einfo "Fixing collections.abc warnings for ${EPYTHON}" + local abc + abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die + find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + + ( + cleanup() { rm -f "${tempdir}" || die; } + + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die + + USE_SETUPTOOLS=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose \ + || die "testing failed with ${EPYTHON}" + ) +} + +pkg_postinst() { + if use python_targets_python3_8; then + if use nova; then + ewarn "Salt's nova functionality will not work with python3.8 since" + ewarn "dev-python/python-novaclient does not support it yet" + fi + if use neutron; then + ewarn "Salt's neutron functionality will not work with python3.8 since" + ewarn "dev-python/python-neutronclient does not support it yet" + fi + if use libvirt; then + ewarn "Salt's libvirt functionality will not work with python3.8 since" + ewarn "dev-python/libvirt-python does not support it yet" + fi + fi +}
