diff options
author | Patrick McLean <chutzpah@gentoo.org> | 2015-04-17 21:29:28 +0000 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2015-04-17 21:29:28 +0000 |
commit | 4c00487ffa56d572a32f02431b87aef9d4db3011 (patch) | |
tree | 9c4e4d1d35f6ce457b3ebed779da432633abc043 | |
parent | Stable for x86, wrt bug #546678 (diff) | |
download | gentoo-2-4c00487ffa56d572a32f02431b87aef9d4db3011.tar.gz gentoo-2-4c00487ffa56d572a32f02431b87aef9d4db3011.tar.bz2 gentoo-2-4c00487ffa56d572a32f02431b87aef9d4db3011.zip |
Remove old 2014.7 versions, unkeyword 2014.1.13 for security bug #546904.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
-rw-r--r-- | app-admin/salt/ChangeLog | 6 | ||||
-rw-r--r-- | app-admin/salt/salt-2014.1.13.ebuild | 4 | ||||
-rw-r--r-- | app-admin/salt/salt-2014.7.0.ebuild | 101 | ||||
-rw-r--r-- | app-admin/salt/salt-2014.7.2.ebuild | 108 |
4 files changed, 7 insertions, 212 deletions
diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog index 8b6357e677b9..377a775ef5cc 100644 --- a/app-admin/salt/ChangeLog +++ b/app-admin/salt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/salt # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.58 2015/04/08 07:30:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.59 2015/04/17 21:29:28 chutzpah Exp $ + + 17 Apr 2015; Patrick McLean <chutzpah@gentoo.org> -salt-2014.7.0.ebuild, + -salt-2014.7.2.ebuild, salt-2014.1.13.ebuild: + Remove old 2014.7 versions, unkeyword 2014.1.13 for security bug #546904. 08 Apr 2015; Michał Górny <mgorny@gentoo.org> salt-2014.1.13.ebuild: Remove old Python implementations diff --git a/app-admin/salt/salt-2014.1.13.ebuild b/app-admin/salt/salt-2014.1.13.ebuild index 76241d67e062..858390043802 100644 --- a/app-admin/salt/salt-2014.1.13.ebuild +++ b/app-admin/salt/salt-2014.1.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild,v 1.3 2015/04/08 07:30:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild,v 1.4 2015/04/17 21:29:28 chutzpah Exp $ EAPI=5 @@ -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 LICENSE="Apache-2.0" diff --git a/app-admin/salt/salt-2014.7.0.ebuild b/app-admin/salt/salt-2014.7.0.ebuild deleted file mode 100644 index 266adf80d545..000000000000 --- a/app-admin/salt/salt-2014.7.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.0.ebuild,v 1.1 2014/11/13 03:58:29 chutzpah Exp $ - -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="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql nova" -IUSE+=" openssl redis 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[${PYTHON_USEDEP}] - dev-python/pycrypto[${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}] ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${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-2014.4.24[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=(README.rst AUTHORS) - -REQUIRED_USE="|| ( raet zeromq )" - -PATCHES=( - "${FILESDIR}/${P}-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; 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" \ - ./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed" -} diff --git a/app-admin/salt/salt-2014.7.2.ebuild b/app-admin/salt/salt-2014.7.2.ebuild deleted file mode 100644 index 56737010a7f0..000000000000 --- a/app-admin/salt/salt-2014.7.2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.2.ebuild,v 1.1 2015/02/17 20:07:03 chutzpah Exp $ - -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" -} |