1 |
commit: 70131677e5b5fbf9aa3a03b539d1a9a96efaeaca |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 31 23:19:23 2017 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 31 23:19:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70131677 |
7 |
|
8 |
app-admin/salt: Security version bump to 2016.11.2 |
9 |
|
10 |
Gentoo-Bug: 607824 |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
|
14 |
app-admin/salt/Manifest | 1 + |
15 |
app-admin/salt/salt-2016.11.2.ebuild | 147 +++++++++++++++++++++++++++++++++++ |
16 |
2 files changed, 148 insertions(+) |
17 |
|
18 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
19 |
index 9005b58..8f2baee 100644 |
20 |
--- a/app-admin/salt/Manifest |
21 |
+++ b/app-admin/salt/Manifest |
22 |
@@ -2,5 +2,6 @@ DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfb |
23 |
DIST salt-2015.8.12.tar.gz 7033938 SHA256 712f72b30a9555ea46a51bc677e05ffa2eefaeefa6b48d4f7ae45dbcb1073c69 SHA512 8ce940a413c740bd82c6c96103d48b376a47cb8161a5d72ece3f4bf6b39134bd722787a427249726dc137064d032fa913c7f6c6db22d0808ba1a829d4f25e9ec WHIRLPOOL 723660eac1346c3ba29b88c7db1a4485a194aebbdf33ea6dc411c420059767a3feb5c863941d772b504cede4a78a57e3ce696601872d21d29f4def373db697d4 |
24 |
DIST salt-2015.8.13.tar.gz 7036243 SHA256 cca82c9a4f267692660b098c1f76e54ab6a24131391893719bde0eb3a1ed2959 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a WHIRLPOOL c21f3bdc5fd674ea664c7e8fd58ef6685328a6ee3679850f3e9a085b1e604e1224a3323b906b47075fb8dd39f373583fb549e7b0f3f725d44928bcf716955a10 |
25 |
DIST salt-2016.11.0.tar.gz 9044879 SHA256 b516285926ee95cedc64ecddab05d14422b7c8819c9f6d046a431c41d608e6bc SHA512 0cddebe9fda1f7d08aa7ee5d4e49e182c67e7bc179136da30d20c991bc10d7299034198f6721b89eda2604480aa2cfe6960f37fadde4d72adf166a065a9f6443 WHIRLPOOL 595ab7c7e50cafdfc7d69a1e24964a88092e93416dc23b295e1ab59f1ce3ae8fa10b24c4e9fe45c1d2d8557290aceae66f93d3da81a1f1be62c98e537cb8ad6a |
26 |
+DIST salt-2016.11.2.tar.gz 9114042 SHA256 f5c3d3cf4293d5b80a93790c76dec61421991c9c54222abd7327b3437ad13a43 SHA512 0dbc861424643af664edd2d9cb8bcbde7e9bcf7c1d202a5e844af83c21dc2d75fd7034db27dffc58dc2a6e47cfe2ea2c42e2a9af867c7ca78f93166eb4fd03ad WHIRLPOOL e1757de32d41e356a423ca347f59fdce05b574bb7bd9dbeffd34e7f6e90e8f0a2afb48ac209736fa6b7da86525c85e7ac5c7539dde621c533fa1e5b3475c5392 |
27 |
DIST salt-2016.3.4.tar.gz 8354090 SHA256 5d4c822719d7fb2d79b0103cd9b015d251300890f8aa174e16b73fcfd6eb22f9 SHA512 ca17c5607d23d09e95fb4b6afbcf1b4f0be6bab47ff3eee883c1464e13b5271b71f0e7bedfa8afe05f32bf3a0a6f4050a91afb9285b52aa0f3da6105221397e0 WHIRLPOOL 95347b1f8447e8701074727430ef0a232e92aa9e961451c445890552c6d9533569e470dfa4864f673c6c3b3eccb16ec9c3615cfcab6d29e74756861afe43fcac |
28 |
DIST salt-2016.3.5.tar.gz 8405980 SHA256 fec215dfdec33ca6826453e5437656f9ed5e4a121ef3db6341f91f799cd3e751 SHA512 ca9ae85f8174aa55fefeaef70d65981d581f25f14f219f437ad4dc0db08e5944f356564c92aee46e796547db38312efedc8db5080576d578982f963a742635e6 WHIRLPOOL 72b504dd669adf4ffc6818083f40b07b78914c8f168ab496d628a3f5cd136d7c4266906007e095aff4c18e123dfcf03391f577fb09b841eb71bc30ea6a46de07 |
29 |
|
30 |
diff --git a/app-admin/salt/salt-2016.11.2.ebuild b/app-admin/salt/salt-2016.11.2.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000..a1f5c2e |
33 |
--- /dev/null |
34 |
+++ b/app-admin/salt/salt-2016.11.2.ebuild |
35 |
@@ -0,0 +1,147 @@ |
36 |
+# Copyright 1999-2017 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+# $Id$ |
39 |
+ |
40 |
+EAPI=6 |
41 |
+PYTHON_COMPAT=( python2_7 ) |
42 |
+ |
43 |
+inherit eutils systemd distutils-r1 |
44 |
+ |
45 |
+DESCRIPTION="Salt is a remote execution and configuration manager" |
46 |
+HOMEPAGE="http://saltstack.org/" |
47 |
+ |
48 |
+if [[ ${PV} == 9999* ]]; then |
49 |
+ inherit git-r3 |
50 |
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
51 |
+ EGIT_BRANCH="develop" |
52 |
+ SRC_URI="" |
53 |
+ KEYWORDS="" |
54 |
+else |
55 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
56 |
+ KEYWORDS="~x86 ~amd64" |
57 |
+fi |
58 |
+ |
59 |
+LICENSE="Apache-2.0" |
60 |
+SLOT="0" |
61 |
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
62 |
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
63 |
+ |
64 |
+RDEPEND="sys-apps/pciutils |
65 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
66 |
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
67 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
68 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
69 |
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
70 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
71 |
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
72 |
+ virtual/python-futures[${PYTHON_USEDEP}] |
73 |
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
74 |
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
75 |
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
76 |
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
77 |
+ openssl? ( |
78 |
+ dev-libs/openssl:*[-bindist] |
79 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
80 |
+ ) |
81 |
+ raet? ( |
82 |
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
83 |
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
84 |
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
85 |
+ ) |
86 |
+ zeromq? ( |
87 |
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
88 |
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
89 |
+ ) |
90 |
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
91 |
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
92 |
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
93 |
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
94 |
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
95 |
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
96 |
+ selinux? ( sec-policy/selinux-salt ) |
97 |
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
98 |
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
99 |
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
100 |
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
101 |
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
102 |
+ vim-syntax? ( app-vim/salt-vim )" |
103 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
104 |
+ test? ( |
105 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
106 |
+ dev-python/pip[${PYTHON_USEDEP}] |
107 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
108 |
+ dev-python/mock[${PYTHON_USEDEP}] |
109 |
+ dev-python/timelib[${PYTHON_USEDEP}] |
110 |
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
111 |
+ !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) |
112 |
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
113 |
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
114 |
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
115 |
+ ${RDEPEND} |
116 |
+ )" |
117 |
+ |
118 |
+DOCS=( README.rst AUTHORS ) |
119 |
+ |
120 |
+REQUIRED_USE="|| ( raet zeromq )" |
121 |
+RESTRICT="x86? ( test )" |
122 |
+ |
123 |
+PATCHES=( |
124 |
+ "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" |
125 |
+ "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" |
126 |
+ "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" |
127 |
+ "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" |
128 |
+ "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" |
129 |
+) |
130 |
+ |
131 |
+python_prepare() { |
132 |
+ # this test fails because it trys to "pip install distribute" |
133 |
+ rm tests/unit/{modules,states}/zcbuildout_test.py \ |
134 |
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die |
135 |
+ |
136 |
+ # https://github.com/saltstack/salt/issues/39095 |
137 |
+ rm tests/unit/utils/parsers_test.py |
138 |
+ |
139 |
+ # apparently libcloud does not know about this? |
140 |
+ rm tests/unit/cloud/clouds/dimensiondata_test.py || die |
141 |
+ |
142 |
+ # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" |
143 |
+ rm tests/unit/cloud/clouds/gce_test.py || die |
144 |
+} |
145 |
+ |
146 |
+python_install_all() { |
147 |
+ local svc |
148 |
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all |
149 |
+ |
150 |
+ for svc in minion master syndic api; do |
151 |
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
152 |
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
153 |
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service |
154 |
+ done |
155 |
+ |
156 |
+ insinto /etc/${PN} |
157 |
+ doins -r conf/* |
158 |
+} |
159 |
+ |
160 |
+python_test() { |
161 |
+ local tempdir |
162 |
+ # testsuite likes lots of files |
163 |
+ ulimit -n 3072 || die |
164 |
+ |
165 |
+ # ${T} is too long a path for the tests to work |
166 |
+ tempdir="$(mktemp -dup /tmp salt-XXX)" |
167 |
+ mkdir "${T}/$(basename "${tempdir}")" |
168 |
+ |
169 |
+ ( |
170 |
+ cleanup() { rm -f "${tempdir}"; } |
171 |
+ trap cleanup EXIT |
172 |
+ |
173 |
+ addwrite "${tempdir}" |
174 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
175 |
+ |
176 |
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
177 |
+ TMPDIR="${tempdir}" \ |
178 |
+ ${EPYTHON} tests/runtests.py \ |
179 |
+ --unit-tests --no-report --verbose |
180 |
+ |
181 |
+ ) || die "testing failed" |
182 |
+} |