app-admin/salt: clean out and unkeyword old versions

This cleans out or unkeywords versions that leak credentials to the log
in the git module (bug #558820).

Reported-by: Agostino Sarubbo <ago@gentoo.org>

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 4b83eea56058e9eb21220c0f48f0e85ccaf6c94b..6104f6d951447ec2f044a7058ea4dec7a2d1a51f 100644 (file)
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,6 +1,3 @@
-DIST salt-2014.7.4.tar.gz 3833928 SHA256 0adf4c138ebd26745b1d1157be0772d89da3582fe8a6622a8031cbe32a28e9f3 SHA512 8cbb9b26472b8980c36f0394a79bf872fd68a62bc886ba2a7fa35720db0a01c3a026e63c839a5c0dddc328c9555fa87aff4cfd71e3faaf01d6c1db01ae5bed64 WHIRLPOOL 1234c14e5fbb552cabb827d416e5ccbaccf9df03bac1ea72f32eeac33dc06d6afe0af0e83bff1682fbec0a52558a43945fccca8a9b08ace28c42a6c2c2016f01
-DIST salt-2014.7.5.tar.gz 3845643 SHA256 474d0a23866e42c664f46e04bc8ead87fc57ee16ff2cc8945248f1e0706f6eb8 SHA512 60e64db5125eb3c6f44cccf906ff0e8916cdcb31970e000785a81cf6ae95b38c681088f2fb3964fabc16667a26403ae30cb84cea3493d837d0b57aa86e771160 WHIRLPOOL b3600c1824cd49983cfe73567ec4a3861bdec88c5cc725ae8159e917e5074ade32aee29eafe5ec78fe4c87f2effc0f5f49627772e12468eb3a050b9395a45374
-DIST salt-2015.5.1.tar.gz 4970135 SHA256 0edb1d0584f53e805ad6ffc21c163a637b23d187052ba2dbb7e641c2d7099c4d SHA512 0de9b3391f33940e230b21841dca05943edcf7a890c0cae8efdd39bcbaf46c27f71cefaf73861dc5b59b567c40c2f0cada04ccedc73cffd905a449795b2f8ecb WHIRLPOOL 4aaa899fa6fd13b60daba7bbef692db24020ffc54e03e4c5d194e32aaa1580430a5fc7bb70f0b87e1ed2710428ed9aa8e729fa4e1144fb42754c740e3e45405e
 DIST salt-2015.5.3.tar.gz 5389038 SHA256 f8b04dc8bd4b00ce803d31ce5fba033c2f20fa38cdc5a3bf54b4c47362fbe853 SHA512 61203cb9b82fe8ab84fa36d06f442aebcf5c5decfacb99f8df6b52320979699d168f9df7e9e675a13a8078feabbe9210a40e526627a213239760ea43d85f1298 WHIRLPOOL 160455263ee1a95faec1f03dfcd16f9b811e5ecb961a2db5c9545070ed74786c83592e008c1ed70a6ea358ba2491128d6081d57bf7c0a679bb99abb1555bbd21
 DIST salt-2015.5.5.tar.gz 5526444 SHA256 5cd8d317616abab691a83f7fd3f8bcf9ad8aecaa95fcfdc0f6d788de87f0beeb SHA512 263f772d403c0e841957342f552389914c563add3f774f26b5d9da81efa04330ec95349223f81e192a2a4789b2d565f7a67e9e3be564296d6235a47cb6657ac3 WHIRLPOOL 7b4f71d6a12b50f4f0a92bfd68c1df2cf8992481d17db984079d4a9cadd51de56d7390ea69c9b02055e747993818756af85f82538a4640e5fb831e4a1ee1cb57
 DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545

diff --git a/app-admin/salt/salt-2014.7.4.ebuild b/app-admin/salt/salt-2014.7.4.ebuild
deleted file mode 100644 (file)
index 385fe0f..0000000
--- a/app-admin/salt/salt-2014.7.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils distutils-r1 systemd
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://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="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
-IUSE+=" openssl redis selinux timelib raet +zeromq test"
-
-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}]
-       libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-       mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-       ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-       openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-       libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-       raet? (
-               dev-python/libnacl[${PYTHON_USEDEP}]
-               dev-python/ioflo[${PYTHON_USEDEP}]
-               dev-python/raet[${PYTHON_USEDEP}]
-       )
-       zeromq? (
-               >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-               >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
-               dev-python/pycrypto[${PYTHON_USEDEP}]
-       )
-       api? (
-               || (
-                       dev-python/cherrypy[${PYTHON_USEDEP}]
-                       www-servers/tornado[${PYTHON_USEDEP}]
-               )
-       )
-       mongodb? ( dev-python/pymongo[${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}] )
-       gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               dev-python/pip[${PYTHON_USEDEP}]
-               dev-python/virtualenv[${PYTHON_USEDEP}]
-               dev-python/timelib[${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"
-)
-
-python_prepare() {
-       # this test fails because it trys to "pip install distribute"
-       rm tests/unit/{modules,states}/zcbuildout_test.py
-}
-
-python_install_all() {
-       USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-       for s in minion master syndic $(use api && echo api); do
-               newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-               newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-               systemd_dounit "${FILESDIR}"/salt-${s}.service
-       done
-
-       insinto /etc/${PN}
-       doins -r conf/*
-}
-
-python_test() {
-       # testsuite likes lots of files
-       ulimit -n 3072
-
-       # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
-       USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-               ${EPYTHON} tests/runtests.py \
-               --unit-tests --no-report --verbose || die "testing failed"
-}

diff --git a/app-admin/salt/salt-2014.7.5.ebuild b/app-admin/salt/salt-2014.7.5.ebuild
deleted file mode 100644 (file)
index bfbff12..0000000
--- a/app-admin/salt/salt-2014.7.5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils distutils-r1 systemd
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://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="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
-IUSE+=" openssl redis selinux timelib raet +zeromq test"
-
-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}]
-       libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-       mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-       ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-       openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-       libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-       raet? (
-               dev-python/libnacl[${PYTHON_USEDEP}]
-               dev-python/ioflo[${PYTHON_USEDEP}]
-               dev-python/raet[${PYTHON_USEDEP}]
-       )
-       zeromq? (
-               >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-               >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
-               dev-python/pycrypto[${PYTHON_USEDEP}]
-       )
-       api? (
-               || (
-                       dev-python/cherrypy[${PYTHON_USEDEP}]
-                       www-servers/tornado[${PYTHON_USEDEP}]
-               )
-       )
-       mongodb? ( dev-python/pymongo[${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}] )
-       gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               dev-python/pip[${PYTHON_USEDEP}]
-               dev-python/virtualenv[${PYTHON_USEDEP}]
-               dev-python/timelib[${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}-2014.7.5-archive-test.patch"
-)
-
-python_prepare() {
-       # this test fails because it trys to "pip install distribute"
-       rm tests/unit/{modules,states}/zcbuildout_test.py
-}
-
-python_install_all() {
-       USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-       for s in minion master syndic $(use api && echo api); do
-               newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-               newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-               systemd_dounit "${FILESDIR}"/salt-${s}.service
-       done
-
-       insinto /etc/${PN}
-       doins -r conf/*
-}
-
-python_test() {
-       # testsuite likes lots of files
-       ulimit -n 3072
-
-       # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
-       USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-               ${EPYTHON} tests/runtests.py \
-               --unit-tests --no-report --verbose || die "testing failed"
-}

diff --git a/app-admin/salt/salt-2015.5.1.ebuild b/app-admin/salt/salt-2015.5.1.ebuild
deleted file mode 100644 (file)
index 33404a8..0000000
--- a/app-admin/salt/salt-2015.5.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils systemd vim-plugin distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05"
-
-if [[ ${PV} == 9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://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
-
-SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl 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}] )
-       openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-       libvirt? ( dev-python/libvirt-python[${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}] )
-       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}] )"
-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.0-archive-test.patch"
-       "${FILESDIR}/${PN}-2015.5.1-skip-libvirt-test-on-nonroot.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
-}
-
-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/*
-
-       use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \
-               vim-plugin_src_install
-}
-
-python_test() {
-       # testsuite likes lots of files
-       ulimit -n 3072
-
-       # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
-       USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-               ${EPYTHON} tests/runtests.py \
-               --unit-tests --no-report --verbose || die "testing failed"
-}

diff --git a/app-admin/salt/salt-2015.5.3.ebuild b/app-admin/salt/salt-2015.5.3.ebuild
index 5f23c6bb1c04ee63949e391ce34ab843509a9bfd..37c21728f3006d1d9deba35e46c14e8f76b63772 100644 (file)
--- a/app-admin/salt/salt-2015.5.3.ebuild
+++ b/app-admin/salt/salt-2015.5.3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
        KEYWORDS=""
 else
        SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-       KEYWORDS="~x86 ~amd64"
+       KEYWORDS=""
 fi
 
 SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )"