diff options
author | Aaron Bauman <bman@gentoo.org> | 2018-01-24 19:46:28 -0500 |
---|---|---|
committer | Aaron Bauman <bman@gentoo.org> | 2018-01-24 19:46:28 -0500 |
commit | 83c3b7ff1b9edab8f437aad399ec4b01c07395d2 (patch) | |
tree | cb1e3d4756347cd76774b6637f8b2a81ce71fff8 | |
parent | net-nds/rpcbind: cleanup vulnerable wrt bug #617472 (diff) | |
download | gentoo-83c3b7ff1b9edab8f437aad399ec4b01c07395d2.tar.gz gentoo-83c3b7ff1b9edab8f437aad399ec4b01c07395d2.tar.bz2 gentoo-83c3b7ff1b9edab8f437aad399ec4b01c07395d2.zip |
app-admin/salt: cleanup vulnerable wrt bug #627928
-rw-r--r-- | app-admin/salt/Manifest | 3 | ||||
-rw-r--r-- | app-admin/salt/salt-2015.5.10.ebuild | 133 | ||||
-rw-r--r-- | app-admin/salt/salt-2015.8.13-r1.ebuild | 141 | ||||
-rw-r--r-- | app-admin/salt/salt-2015.8.13.ebuild | 140 | ||||
-rw-r--r-- | app-admin/salt/salt-2016.3.8.ebuild | 147 |
5 files changed, 0 insertions, 564 deletions
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index ac42a2512d06..5d09e1c2ff3b 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -1,5 +1,2 @@ -DIST salt-2015.5.10.tar.gz 5693422 BLAKE2B 99ba6321b998c111704178f55495327eb6b9122e4eb6efacab40eaa4d8be0cae91c6d72d6fb2732e4ae5c05170b4af772b6210d129e5849f86c7be6252768c67 SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d -DIST salt-2015.8.13.tar.gz 7036243 BLAKE2B 0b222f91d5bc42621c96fcd46223b064a480185d79b164e0f7ba8782b502f68edc21691b661dd9ec0547d1363320aae3c6560137875570a73c8536d6ea695603 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7d7ff6c27ce555379b69274b3a5d72a1e372081a62c18440deb0955c1ef24a41c5d855a5e622f2ffe51276bd87b25 SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de -DIST salt-2016.3.8.tar.gz 8519835 BLAKE2B a3936f36a513dfd4a9fd1ece41bf7abfc893d1788c8e5e85b28a2898c321e1d9ab2141dc3ab346e243c0c9c5dbf119abf7506e1dbc6be66995e30d09a1723122 SHA512 bba41d4c70e278aa7196d292fb27b926dce32f4cc67c5b23b6c219ad59178b1a8b26e8adeb3a7bd587c25cc1c8ff36a207ea2a2f68d13d64f37a34f96f35ecd1 DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b diff --git a/app-admin/salt/salt-2015.5.10.ebuild b/app-admin/salt/salt-2015.5.10.ebuild deleted file mode 100644 index 24630f9f662b..000000000000 --- a/app-admin/salt/salt-2015.5.10.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=(python2_7) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://saltstack.com/community/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${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}] - >=www-servers/tornado-4.0[${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? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-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}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=(README.rst AUTHORS) - -REQUIRED_USE="|| ( raet zeromq )" - -PATCHES=( - "${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch" - "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" - "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" - "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" - "${FILESDIR}/${PN}-2015.5.7-tmpdir.patch" - "${FILESDIR}/${PN}-2015.5.10-buggy-tests.patch" -) - -python_prepare() { - # this test fails because it trys to "pip install distribute" - rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network}_test.py \ - || die "Failed to remove broken tests" -} - -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 - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -dup /tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}"; } - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2015.8.13-r1.ebuild b/app-admin/salt/salt-2015.8.13-r1.ebuild deleted file mode 100644 index ed02341af26a..000000000000 --- a/app-admin/salt/salt-2015.8.13-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=(python2_7) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://saltstack.com/community/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${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}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${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? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-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}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=(README.rst AUTHORS) - -REQUIRED_USE="|| ( raet zeromq )" - -PATCHES=( - "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch" - "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" - "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" - "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" - "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch" - "${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.patch" - "${FILESDIR}/${PN}-2015.8.13-failing-gateway-tests.patch" - "${FILESDIR}/${PN}-2015.8.13-sanitize-minion-name.patch" -) - -python_prepare() { - # this test fails because it trys to "pip install distribute" - rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network,random_org}_test.py -} - -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} - if [[ -e pkg/salt-${svc}.service ]]; then - sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die - systemd_dounit pkg/salt-${svc}.service - elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then - systemd_dounit "${FILESDIR}"/salt-${svc}.service - fi - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -dup /tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}"; } - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2015.8.13.ebuild b/app-admin/salt/salt-2015.8.13.ebuild deleted file mode 100644 index 88256a21d767..000000000000 --- a/app-admin/salt/salt-2015.8.13.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=(python2_7) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://saltstack.com/community/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${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}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${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? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-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}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=(README.rst AUTHORS) - -REQUIRED_USE="|| ( raet zeromq )" - -PATCHES=( - "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch" - "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" - "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" - "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" - "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch" - "${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.patch" - "${FILESDIR}/${PN}-2015.8.13-failing-gateway-tests.patch" -) - -python_prepare() { - # this test fails because it trys to "pip install distribute" - rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network,random_org}_test.py -} - -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} - if [[ -e pkg/salt-${svc}.service ]]; then - sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die - systemd_dounit pkg/salt-${svc}.service - elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then - systemd_dounit "${FILESDIR}"/salt-${svc}.service - fi - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -dup /tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}"; } - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2016.3.8.ebuild b/app-admin/salt/salt-2016.3.8.ebuild deleted file mode 100644 index 655ea35eb46a..000000000000 --- a/app-admin/salt/salt-2016.3.8.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://saltstack.com/community/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${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}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${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? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-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}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-2016.3.5-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" - "${FILESDIR}/${PN}-2016.3.4-dont-test-ordering.patch" -) - -python_prepare() { - # this test fails because it trys to "pip install distribute" - rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die - - # apparently libcloud does not know about this? - rm tests/unit/cloud/clouds/dimensiondata_test.py || die - - # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" - rm tests/unit/cloud/clouds/gce_test.py || die - - # needs network access - rm tests/unit/modules/boto_{vpc,elb,secgroup}_test.py || die - rm tests/unit/states/boto_vpc_test.py || die - rm tests/unit/transport/{zeromq,tcp,req}_test.py || 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 -dup /tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}"; } - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} |