From 051badb288c5cbe9140be22ba3fe11844cef306c Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Wed, 17 Feb 2021 17:17:46 -0800 Subject: app-admin/salt-3002.2-r4: revbump, fix init scripts Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Patrick McLean --- app-admin/salt/files/api-initd-5 | 5 +- app-admin/salt/files/master-initd-5 | 5 +- app-admin/salt/files/minion-initd-5 | 5 +- app-admin/salt/files/syndic-initd-5 | 5 +- app-admin/salt/salt-3002.2-r3.ebuild | 185 ----------------------------------- app-admin/salt/salt-3002.2-r4.ebuild | 185 +++++++++++++++++++++++++++++++++++ 6 files changed, 197 insertions(+), 193 deletions(-) delete mode 100644 app-admin/salt/salt-3002.2-r3.ebuild create mode 100644 app-admin/salt/salt-3002.2-r4.ebuild (limited to 'app-admin/salt') diff --git a/app-admin/salt/files/api-initd-5 b/app-admin/salt/files/api-initd-5 index 1fecd03275ee..18e06c6fd086 100644 --- a/app-admin/salt/files/api-initd-5 +++ b/app-admin/salt/files/api-initd-5 @@ -4,8 +4,9 @@ command="/usr/bin/salt-api" command_args="${SALT_OPTS}" -pidfile="/var/run/salt-api.pid" -command_args_background="--daemon --pid-file=\"${pidfile}\"" +pidfile="/var/run/supervisor-salt-api.pid" +daemon_pidfile="/var/run/salt-api.pid" +command_args_background="--daemon --pid-file=\"${daemon_pidfile}\"" name="SALT API daemon" retry="20" diff --git a/app-admin/salt/files/master-initd-5 b/app-admin/salt/files/master-initd-5 index 13c8ad892284..7313e2b7a701 100644 --- a/app-admin/salt/files/master-initd-5 +++ b/app-admin/salt/files/master-initd-5 @@ -4,8 +4,9 @@ command="/usr/bin/salt-master" command_args="${SALT_OPTS}" -command_args_background="--daemon --pid-file=\"${pidfile}\"" -pidfile="/var/run/salt-master.pid" +pidfile="/var/run/supervisor-salt-master.pid" +daemon_pidfile="/var/run/salt-master.pid" +command_args_background="--daemon --pid-file=\"${daemon_pidfile}\"" name="SALT master daemon" retry="20" diff --git a/app-admin/salt/files/minion-initd-5 b/app-admin/salt/files/minion-initd-5 index e3a430b77fa4..426ba964dcb3 100644 --- a/app-admin/salt/files/minion-initd-5 +++ b/app-admin/salt/files/minion-initd-5 @@ -4,8 +4,9 @@ command="/usr/bin/salt-minion" command_args="${SALT_OPTS}" -pidfile="/var/run/salt-minion.pid" -command_args_background="--daemon --pid-file=\"${pidfile}\"" +pidfile="/var/run/supervisor-salt-minion.pid" +daemon_pidfile="/var/run/salt-minion.pid" +command_args_background="--daemon --pid-file=\"${daemon_pidfile}\"" name="SALT minion daemon" retry="20" diff --git a/app-admin/salt/files/syndic-initd-5 b/app-admin/salt/files/syndic-initd-5 index 7e43828bda47..992cacb3f0f3 100644 --- a/app-admin/salt/files/syndic-initd-5 +++ b/app-admin/salt/files/syndic-initd-5 @@ -4,8 +4,9 @@ command="/usr/bin/salt-syndic" command_args="${SALT_OPTS}" -pidfile="/var/run/salt-syndic.pid" -command_args_background="--daemon --pid-file=\"${pidfile}\"" +pidfile="/var/run/supervisor-salt-syndic.pid" +daemon_pidfile="/var/run/salt-syndic.pid" +command_args_background="--daemon --pid-file=\"${daemon_pidfile}\"" name="SALT syndic daemon" retry="20" diff --git a/app-admin/salt/salt-3002.2-r3.ebuild b/app-admin/salt/salt-3002.2-r3.ebuild deleted file mode 100644 index 7c65d1b19803..000000000000 --- a/app-admin/salt/salt-3002.2-r3.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2021 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 ~arm ~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/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 - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || 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-5 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 -} diff --git a/app-admin/salt/salt-3002.2-r4.ebuild b/app-admin/salt/salt-3002.2-r4.ebuild new file mode 100644 index 000000000000..7c65d1b19803 --- /dev/null +++ b/app-admin/salt/salt-3002.2-r4.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2021 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 ~arm ~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/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 + # make sure pkg_resources doesn't bomb because pycrypto isn't installed + find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die + # pycryptodome rather than pycryptodomex + find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || 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-5 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 +} -- cgit v1.2.3-65-gdbad