summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2014-06-19 01:34:19 +0000
committerPatrick McLean <chutzpah@gentoo.org>2014-06-19 01:34:19 +0000
commit15673cdf4bc7a8f8adff7d07b6d5a5902271273e (patch)
tree9cc5a0292514f9f503710fd22c5d42f850ad93cd /app-admin/salt
parentRemove testing cruft (bug #513720 by Helmut Jarausch). (diff)
downloadhistorical-15673cdf4bc7a8f8adff7d07b6d5a5902271273e.tar.gz
historical-15673cdf4bc7a8f8adff7d07b6d5a5902271273e.tar.bz2
historical-15673cdf4bc7a8f8adff7d07b6d5a5902271273e.zip
Revision bump, fix problem starting the minion in certain setups.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF
Diffstat (limited to 'app-admin/salt')
-rw-r--r--app-admin/salt/ChangeLog8
-rw-r--r--app-admin/salt/Manifest30
-rw-r--r--app-admin/salt/files/salt-2014.1.5-minion-error.patch16
-rw-r--r--app-admin/salt/salt-2014.1.5-r1.ebuild89
4 files changed, 128 insertions, 15 deletions
diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 79ed1a2f58ca..40dc39f24ee3 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/salt
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.38 2014/06/13 01:23:37 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.39 2014/06/19 01:34:13 chutzpah Exp $
+
+*salt-2014.1.5-r1 (19 Jun 2014)
+
+ 19 Jun 2014; Patrick McLean <chutzpah@gentoo.org> +salt-2014.1.5-r1.ebuild,
+ +files/salt-2014.1.5-minion-error.patch:
+ Revision bump, fix problem starting the minion in certain setups.
*salt-2014.1.5 (13 Jun 2014)
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index ebb8594b0f3a..ed78835a0647 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -9,6 +9,7 @@ AUX minion-initd-2 406 SHA256 b7f8975fcf9cc16538af591bac2c26e9d60144d5341396b570
AUX minion-initd-3 417 SHA256 06415d7f958210a4dd1490db5796b0d3c08392a81547f290776d9164dde786ae SHA512 3fe554e93e07aa90f6f568807301b622a5e3e120009f92e4cd534b0fe2c4affbb7f79f8e29bb6e5ef1f51458dfe98664e1a36e3414cdf06629c074d8a02839c0 WHIRLPOOL b70116cb10494034ae83c86eb1f31ea2a06775bc90ec099cb219721173b33df5203ffdca732df690704cc11c0813a8cba26a5f02edba1dad118b540656637833
AUX salt-0.17.1-tests-nonroot.patch 688 SHA256 a557f2a226d771a110f8b8085d39d9fe76d28020807038dbfbd1244b7b1b8db1 SHA512 838c2626bcf9399fc33d6f387b95e13010a2e32a68529ff10d97b3f3b96960255606630b6a2466edfb52c0b37aa4b14fd41b8ed2d5744a20f35eafc647f882a8 WHIRLPOOL 7ff95728e6e6727aaa79fbf683ee7af83239089f7969de91a1e6ee4f6bf281276d02717f48cf64c2fe807dfeb9ea8ad1c15ba70038c92698a321a9d8564ad826
AUX salt-2014.1.2-tests-nonroot.patch 537 SHA256 5b0e06027eb2663d215b8ffda773d8d4b7aac69489563a15f177d7f8049f1f46 SHA512 17de6c83da1660b35590d0acfcbbc1756c0699bf7b1de72157b4f3039fac00c7dfd1a3536662ad7322b39d7e710feb53c7174084a11c3248bc2f09d15010612c WHIRLPOOL 81233516139fa12627fe110aab27aba6cfd738cab9b996e980deb0eb11fac310279dcfc1920bfdc42f57788e523628dd7108d252046aec48c4659db4c8420c5f
+AUX salt-2014.1.5-minion-error.patch 578 SHA256 fe7ebaaa872958d8135ead8d00e717bda12aed270bb4357a675e6f16f1d81921 SHA512 cf6064ebe739731ec159634fe750100e121f45b87abc1e159e310efa0adcc6b1931af306b44384734e163d23a83ab659f3df744641bab97b0d42efcb4ee032dc WHIRLPOOL adf93fa5d76474752eb81ecf1ba3d6d0f861a740490550299dfe13977dbb8d01e46e82e01ff242af578aad5abbc913b4c790325bec7b725815abe203164f2431
AUX salt-2014.1.5-tests-nonroot.patch 643 SHA256 3094a80bc6966a266dc0b5fae8cec2bed80df83399a805a7aac48b5df09800e5 SHA512 76f7ce52419951122943d0d33c9db29a2be539b1eba96b86885eb61553f65b885ca04dff68b2bdcd3c2184ce0cd04b2a0c4025c0bfa98f80b53300583f922587 WHIRLPOOL 127872ecf85b907987e1c55642ef42d8a8f3bac9419929f851de82b8e942982474dab986adb61a14263f1855a4ecc131e81dc354c6992416de0c07f0b7f0c3dc
AUX salt-master.service 169 SHA256 5a8c43e469c47ce8cc5b4175105ca6233daa47b411ebf4002aad84003cb9f4a6 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 WHIRLPOOL ebb632028483e8849eb8ab61677967477bd4f420277b1360b3c28424a5192615aecf2d62372df76d6dee8855e6cd5557075ce17bcf85a999d92a0734cf849628
AUX salt-minion.service 162 SHA256 829f0f25e5ae73befaa107bd5d2317ec608e8be95d5f60f9650c01e5d19d07a6 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed WHIRLPOOL 50255e88a81c64d461b70b6d990545561f4e9cdbc1f4b0caf0048b8ca46eef3233f5d174b88b1e07bf52aaab5ba16355b72fdea675a0099578acab2d5cb27e1b
@@ -19,24 +20,25 @@ AUX syndic-initd-3 411 SHA256 2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb7
DIST salt-0.17.4.tar.gz 1871032 SHA256 5a7b3f4d5c22aa4b8e7c03d60dc429b0428c575fb8f0c285616239c0fe5a0ddd SHA512 3ea8d42c321d111bc3d277167c85a3ac6eb99c97eb5d53030e462372d227e0a0c2a93b4b13eae38eed2e73ec591e1e78b535493bf77d66c3d19102baf13cb445 WHIRLPOOL 27acf1f7adb0fbe9ad393711d6bd5998feb090f5bb38ec05d11dbd85a434ffbb19d921ec90e462a212ff080729a553701ca1d750fe8b31346e903e8944285180
DIST salt-2014.1.5.tar.gz 2800978 SHA256 0b69e831b0446f3bee47407a8cb455eb0fd05fbdf4b27abeff10dd29e0ca8e1d SHA512 3eef5e3efa3f999921ec7ea66ffc4598875c0592a880e686fe4b2f535130451c166867cee1fef0076b97deadca57dafede31d04c8449811591116e356f574725 WHIRLPOOL f2bfd3c53fb1a4ed0ce8803499aad0a23d39da53417c43e7d1c7ee747facfe1837aa5d13f8d3da61cb7fac714f387d7043ec9c10f3aaf2c58f7c87b3ad318ab9
EBUILD salt-0.17.4-r2.ebuild 2214 SHA256 99ac240c300950df1617983b0094e4f47361659d25a5d55a7afc01620c4de489 SHA512 e8c473134a71308b41293849f06d0378b72f7bb1f1479927b9bbd8bdcb4c4868d55ccda5e53f7bbdcb6068b14b089de8a80061b851d86307dd819240711c0edc WHIRLPOOL 5ca3224a701065b9bacd6dcfb4fd807e4d1fd8009a090724e60c7117d9e12025074616aca8b966742d60fb424402aed9ed40a93f78f00b9975bb1e538a36f6de
+EBUILD salt-2014.1.5-r1.ebuild 2602 SHA256 234d2ca907fa609008a119cb36b23ad2106869efe3eaf9f39e8be8af04a42b88 SHA512 cbd0ef7301a92d16c5f56ff0e196c5f28e312090c5b3d576522423d7b253fa20f6747ac8fb907810189b5a5115e00129ccaab1912b50a199c4ffd1e0405f81a7 WHIRLPOOL 1143f4ad30989f9950ae69f84b268756688b4aa24c8d0249b6ee84f432c34efc94eff188624cafdd79f0718f0122225f1dc2d71eaddab87470231ad0bee4161f
EBUILD salt-2014.1.5.ebuild 2560 SHA256 2f4c7eeee943198fb6eae1df8504249e762f6e423c7a5b1626e149b042ab3b19 SHA512 be86f29f6a08c19d425aec84d1c381b5f3cd68d9cb677929acd671303f6b5bf5c2ed343e7e58e0210c9ae30793b69a0af03d7159a6006b3a83ec26c020865e86 WHIRLPOOL b1f31482dbea7f5b3472525353c1482d60a1e0b68301409eb36665340d5c9b75de4de88d342dc22b0f796faed099b50184eaf74197fa0586a8d533bde888c84a
EBUILD salt-9999.ebuild 2339 SHA256 7ed9b4d262d30f2de38952772a969fb94c892d6dc34b0c5e404a02773d660b1c SHA512 583ddd18377cb9bd88a90c8ea6f631e53c772aa2514982a2df4db7cbc15012683f92d9a11c64e376ec75d045dffa8989eef7245c832fe681146a30f153232c25 WHIRLPOOL 104c739d3c60e80fdff8f1d0dabf0061c5ada3d5df8cadac4791a7e07e6a042c64fce1550ea4d3b1ae3b501de9db6d64ac633439a901db258a19f231f80d4871
-MISC ChangeLog 6974 SHA256 079563ff832b730ae7fb59395a3e1df518d90baad8224d2604b99402c8cf0a05 SHA512 96fc60957325eca173687b126bea95e377db0923cd61aa90d20bdfabd17f7ff7e170b0704f7c842d09e9985d4e8d08ad84c1833a16e36f2925c4ec81bf5728bf WHIRLPOOL d773f0c9af4394a784bb52698e9c91a1b075d1deea1cb10111bb765d4b4083fdd51860d25c5bbfaec9a227e92b6b1f8e07ce06cec65ea299205f78837415006c
+MISC ChangeLog 7197 SHA256 0375ba3b6d05cbfcc4293e2e81643f1e961cf35afb68e6ccae740877867f2822 SHA512 32502fa2d14772183f34f15e0fb42424086e4721ffa3d922cdd31493dab19fdb17632c1d26d6ea5169f08db2f85572e57b24913a11efe686311af143282fa88b WHIRLPOOL 9d580b77d6f32ccdc24c426f79041bbb6df920829b7e24e611e8dd547bcdb2197417e16b221a8724b1bb2a5eaa65f8f6fc09844d0d6015ea41ac6d813d50f5d1
MISC metadata.xml 1506 SHA256 ae73efc765e4fcb1806a7f8da5e27e00fd3c42b90494ba9870304b9abd49df93 SHA512 00d2c68cd6edb7ae2b26c5b16dc182d136dd2969844a5dbedc1864b5af8783885fc597f20df427dbfa57cc1a59c1e43299c6aa7ecf7d1a5a9e512b2f61a1c8f4 WHIRLPOOL 29859710a53a6cba45848b8ea0cb283c268124c592d5b95e31b7956b3e95449f607a7675087f851933b661252a7599eda869b04116279ca00261fa2008cde929
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJTmlKaAAoJEHy/RO9cNQiDcHYP/js1YLfx8Mx/mfayXqdZ8Lgx
-Anp8nWfdEo4DTOzwgm2y9SsEL4qdWzyBW+8w/X9MVU5XPK7rQQONgh+MG4e/TS0+
-08k31ccaGrS2XVao6x6/AgcVS0/c9cbZ4Vk0lRncxBrI+eQ9x4kKlz4uiNkaU1gu
-gHrDT8NySYol8DISNmn0QB5jbSFhK10uMez6HA6rpsPjsKbsWIlRxcDCHgP7zG/v
-h6Y5nC/GvG0dXFc2a2gXOmI0iyTVOdESR5oR3gPbhRfax2/YLNoBj1GntEy017+r
-CNKmpczBVZV1Nly9NLHUMqZVVyHxC0jiN7CUixo69+xwxiGThmEK+lmPuAhwgu+K
-S/RSAt4Jq2Pxb99j/1BmoYfzEfhNfWf5BskqN0iTI7U6XhI3DkO5ybq+BZJfQTOR
-0OzjXlOFCCM0fpugxNjpQzuyamrBpFgmYxeC/e98hQm36DBZp8/Rk2O+O1E64Xuv
-9uKASz+atmPuc8kKWu+bayPaPlywaluCszL83OzIZBCy6Le6CZujaoFTtO5LPexL
-aZb7JxJvT4p8amsX5r0SK6Z1nyrwy8wPZgbJwfq2QWFuhl5p1bFfPy9eMbxt/QPb
-LxxTfmyF4J8y27Ksm/X1dKL+tTWCOe1yEUNmr2eJUA2X2RZMYrGWViGkj3+XbrI+
-QmoJWm9BMfv2g06lbvoY
-=dETK
+iQIcBAEBCAAGBQJToj4WAAoJEHy/RO9cNQiDMMYP+QFAuJVYP14RArjFWmmOdfDD
+/j1EiMSMeMI2lqaSUiKPpl+zx5YpqY04D9/VgvRIASsRks4yEnurFq7Om/ane69j
+avjhkT3ejZLIA80KjukJi90xLUjdGk5TBA8ExzwRld3GDAJlwLX5UoqnWtI22Bky
+rKQgPgWaG1CwmCmoA5QyNQpDW2yAX1eEyGr4zke+5gYV+GevjLS8csH/iFfCfCUp
+MaRU6lN8z/g6hrrJqzugqigneAoUw8Ewhc63FSZFpLUmOLNhfb1xm37zyguykQGX
+cuzNLium15124LFcgvXgU4+tmLiENuAhaFYMY4FYpEdLqjx9QO+LpS1KI1p06X2t
+CCRqUr2VbkEr+YM0E9ETx5KMnUqvIhs2PmfMD77anVQQQhiNWhsNF4r4hdm9y7kT
+/qsTLBiVlO9JKmHgB5cAN6+ppwH2wGN2Jj39altOt4F5vrwQvjse2GmqS8pVupJD
+JLPSrZpgxGPLP0NvbOG5a2Ar5gGMjACQclWPoHH59qjfL8u8vr6vXhTri/mJNkJT
+Ns5+83BOGnrWrcsaiFhyHd23QuB5jHcwdKZA1wHha0+7JnHBQ0e9xvTzs0hQ/Dta
+VbVpxvtPDCcfPGsaeB9ta952Q8j7Z1RD+PQVEs+ZPCHBzdMLSf4E6RyNnlXqUBIN
+JTBmrpTKCJobkQuV6Qak
+=v5Kl
-----END PGP SIGNATURE-----
diff --git a/app-admin/salt/files/salt-2014.1.5-minion-error.patch b/app-admin/salt/files/salt-2014.1.5-minion-error.patch
new file mode 100644
index 000000000000..19c9dd682599
--- /dev/null
+++ b/app-admin/salt/files/salt-2014.1.5-minion-error.patch
@@ -0,0 +1,16 @@
+diff --git a/salt/minion.py b/salt/minion.py
+index 47a23de..52a5849 100644
+--- a/salt/minion.py
++++ b/salt/minion.py
+@@ -461,8 +461,10 @@ class MultiMinion(object):
+
+ while True:
+ for minion in minions.values():
+- if isinstance(minion, dict):
++ if isinstance(minion, dict) and 'minion' in minion:
+ minion = minion['minion']
++ elif isinstance(minion, dict):
++ continue
+ if not hasattr(minion, 'schedule'):
+ continue
+ try:
diff --git a/app-admin/salt/salt-2014.1.5-r1.ebuild b/app-admin/salt/salt-2014.1.5-r1.ebuild
new file mode 100644
index 000000000000..48115abcf465
--- /dev/null
+++ b/app-admin/salt/salt-2014.1.5-r1.ebuild
@@ -0,0 +1,89 @@
+# 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.1.5-r1.ebuild,v 1.1 2014/06/19 01:34:13 chutzpah Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_6,2_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-2
+ 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="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test"
+
+RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/m2crypto[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ dev-python/pycryptopp[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ sys-apps/pciutils
+ 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}]
+ app-emulation/libvirt[python,${PYTHON_USEDEP}]
+ )
+ )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+ dev-python/pip
+ dev-python/virtualenv
+ >=dev-python/SaltTesting-2014.4.24
+ ${RDEPEND}
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-tests-nonroot.patch"
+ "${FILESDIR}/${PN}-2014.1.2-tests-nonroot.patch"
+ "${FILESDIR}/${P}-minion-error.patch"
+)
+DOCS=(README.rst AUTHORS)
+
+python_prepare() {
+ sed -i '/install_requires=/ d' setup.py || die "sed failed"
+
+ # 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 conf/*
+}
+
+python_test() {
+ # testsuite likes lots of files
+ ulimit -n 3072
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
+}