1 |
commit: 5a5db48979af4cb94edfd978d9aceffe40a3172c |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 31 20:15:56 2017 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 31 23:19:54 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5db489 |
7 |
|
8 |
app-admin/salt: Security version bump to 2016.3.5 |
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/files/salt-2016.3.5-tmpdir.patch | 47 ++++++++ |
16 |
app-admin/salt/salt-2016.3.5.ebuild | 143 ++++++++++++++++++++++++ |
17 |
3 files changed, 191 insertions(+) |
18 |
|
19 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
20 |
index a68766a..9005b58 100644 |
21 |
--- a/app-admin/salt/Manifest |
22 |
+++ b/app-admin/salt/Manifest |
23 |
@@ -3,3 +3,4 @@ DIST salt-2015.8.12.tar.gz 7033938 SHA256 712f72b30a9555ea46a51bc677e05ffa2eefae |
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.3.4.tar.gz 8354090 SHA256 5d4c822719d7fb2d79b0103cd9b015d251300890f8aa174e16b73fcfd6eb22f9 SHA512 ca17c5607d23d09e95fb4b6afbcf1b4f0be6bab47ff3eee883c1464e13b5271b71f0e7bedfa8afe05f32bf3a0a6f4050a91afb9285b52aa0f3da6105221397e0 WHIRLPOOL 95347b1f8447e8701074727430ef0a232e92aa9e961451c445890552c6d9533569e470dfa4864f673c6c3b3eccb16ec9c3615cfcab6d29e74756861afe43fcac |
27 |
+DIST salt-2016.3.5.tar.gz 8405980 SHA256 fec215dfdec33ca6826453e5437656f9ed5e4a121ef3db6341f91f799cd3e751 SHA512 ca9ae85f8174aa55fefeaef70d65981d581f25f14f219f437ad4dc0db08e5944f356564c92aee46e796547db38312efedc8db5080576d578982f963a742635e6 WHIRLPOOL 72b504dd669adf4ffc6818083f40b07b78914c8f168ab496d628a3f5cd136d7c4266906007e095aff4c18e123dfcf03391f577fb09b841eb71bc30ea6a46de07 |
28 |
|
29 |
diff --git a/app-admin/salt/files/salt-2016.3.5-tmpdir.patch b/app-admin/salt/files/salt-2016.3.5-tmpdir.patch |
30 |
new file mode 100644 |
31 |
index 00000000..dce4f09 |
32 |
--- /dev/null |
33 |
+++ b/app-admin/salt/files/salt-2016.3.5-tmpdir.patch |
34 |
@@ -0,0 +1,47 @@ |
35 |
+diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py |
36 |
+index 615e6b5670..fbd24aab86 100644 |
37 |
+--- a/tests/unit/modules/qemu_nbd_test.py |
38 |
++++ b/tests/unit/modules/qemu_nbd_test.py |
39 |
+@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase): |
40 |
+ Test if it mount the named image via qemu-nbd |
41 |
+ and return the mounted roots |
42 |
+ ''' |
43 |
++ tmpdir = os.environ.get('TMPDIR', '/tmp') |
44 |
+ mock = MagicMock(return_value=True) |
45 |
+ with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}): |
46 |
+ self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '') |
47 |
+@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase): |
48 |
+ 'mount.mount': mock, |
49 |
+ 'cmd.retcode': MagicMock(side_effect=[1, 0])}): |
50 |
+ self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'), |
51 |
+- {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'}) |
52 |
++ {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'}) |
53 |
+ |
54 |
+ # 'clear' function tests: 1 |
55 |
+ |
56 |
+diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py |
57 |
+index e699362d8a..c7c7e8a965 100644 |
58 |
+--- a/tests/unit/states/archive_test.py |
59 |
++++ b/tests/unit/states/archive_test.py |
60 |
+@@ -25,7 +25,7 @@ from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-bui |
61 |
+ |
62 |
+ # Globals |
63 |
+ archive.__salt__ = {} |
64 |
+-archive.__opts__ = {"cachedir": "/tmp", "test": False} |
65 |
++archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False} |
66 |
+ archive.__env__ = 'test' |
67 |
+ |
68 |
+ |
69 |
+diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py |
70 |
+index 5249d56747..a27ee9ab61 100644 |
71 |
+--- a/tests/unit/utils/context_test.py |
72 |
++++ b/tests/unit/utils/context_test.py |
73 |
+@@ -18,7 +18,7 @@ import salt.payload |
74 |
+ import salt.utils |
75 |
+ |
76 |
+ __context__ = {'a': 'b'} |
77 |
+-__opts__ = {'cachedir': '/tmp'} |
78 |
++__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')} |
79 |
+ |
80 |
+ |
81 |
+ @skipIf(NO_MOCK, NO_MOCK_REASON) |
82 |
|
83 |
diff --git a/app-admin/salt/salt-2016.3.5.ebuild b/app-admin/salt/salt-2016.3.5.ebuild |
84 |
new file mode 100644 |
85 |
index 00000000..2589794 |
86 |
--- /dev/null |
87 |
+++ b/app-admin/salt/salt-2016.3.5.ebuild |
88 |
@@ -0,0 +1,143 @@ |
89 |
+# Copyright 1999-2017 Gentoo Foundation |
90 |
+# Distributed under the terms of the GNU General Public License v2 |
91 |
+# $Id$ |
92 |
+ |
93 |
+EAPI=6 |
94 |
+PYTHON_COMPAT=( python2_7 ) |
95 |
+ |
96 |
+inherit eutils systemd distutils-r1 |
97 |
+ |
98 |
+DESCRIPTION="Salt is a remote execution and configuration manager" |
99 |
+HOMEPAGE="http://saltstack.org/" |
100 |
+ |
101 |
+if [[ ${PV} == 9999* ]]; then |
102 |
+ inherit git-r3 |
103 |
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
104 |
+ EGIT_BRANCH="develop" |
105 |
+ SRC_URI="" |
106 |
+ KEYWORDS="" |
107 |
+else |
108 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
109 |
+ KEYWORDS="~x86 ~amd64" |
110 |
+fi |
111 |
+ |
112 |
+LICENSE="Apache-2.0" |
113 |
+SLOT="0" |
114 |
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
115 |
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
116 |
+ |
117 |
+RDEPEND="sys-apps/pciutils |
118 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
119 |
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
120 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
121 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
122 |
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
123 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
124 |
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
125 |
+ virtual/python-futures[${PYTHON_USEDEP}] |
126 |
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
127 |
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
128 |
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
129 |
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
130 |
+ openssl? ( |
131 |
+ dev-libs/openssl:*[-bindist] |
132 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
133 |
+ ) |
134 |
+ raet? ( |
135 |
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
136 |
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
137 |
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
138 |
+ ) |
139 |
+ zeromq? ( |
140 |
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
141 |
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
142 |
+ ) |
143 |
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
144 |
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
145 |
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
146 |
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
147 |
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
148 |
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
149 |
+ selinux? ( sec-policy/selinux-salt ) |
150 |
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
151 |
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
152 |
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
153 |
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
154 |
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
155 |
+ vim-syntax? ( app-vim/salt-vim )" |
156 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
157 |
+ test? ( |
158 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
159 |
+ dev-python/pip[${PYTHON_USEDEP}] |
160 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
161 |
+ dev-python/mock[${PYTHON_USEDEP}] |
162 |
+ dev-python/timelib[${PYTHON_USEDEP}] |
163 |
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
164 |
+ !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) |
165 |
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
166 |
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
167 |
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
168 |
+ ${RDEPEND} |
169 |
+ )" |
170 |
+ |
171 |
+DOCS=( README.rst AUTHORS ) |
172 |
+ |
173 |
+REQUIRED_USE="|| ( raet zeromq )" |
174 |
+RESTRICT="x86? ( test )" |
175 |
+ |
176 |
+PATCHES=( |
177 |
+ "${FILESDIR}/${PN}-2016.3.5-tmpdir.patch" |
178 |
+ "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" |
179 |
+ "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" |
180 |
+ "${FILESDIR}/${PN}-2016.3.4-dont-test-ordering.patch" |
181 |
+) |
182 |
+ |
183 |
+python_prepare() { |
184 |
+ # this test fails because it trys to "pip install distribute" |
185 |
+ rm tests/unit/{modules,states}/zcbuildout_test.py \ |
186 |
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die |
187 |
+ |
188 |
+ # apparently libcloud does not know about this? |
189 |
+ rm tests/unit/cloud/clouds/dimensiondata_test.py || die |
190 |
+ |
191 |
+ # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" |
192 |
+ rm tests/unit/cloud/clouds/gce_test.py || die |
193 |
+} |
194 |
+ |
195 |
+python_install_all() { |
196 |
+ local svc |
197 |
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all |
198 |
+ |
199 |
+ for svc in minion master syndic api; do |
200 |
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
201 |
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
202 |
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service |
203 |
+ done |
204 |
+ |
205 |
+ insinto /etc/${PN} |
206 |
+ doins -r conf/* |
207 |
+} |
208 |
+ |
209 |
+python_test() { |
210 |
+ local tempdir |
211 |
+ # testsuite likes lots of files |
212 |
+ ulimit -n 3072 || die |
213 |
+ |
214 |
+ # ${T} is too long a path for the tests to work |
215 |
+ tempdir="$(mktemp -dup /tmp salt-XXX)" |
216 |
+ mkdir "${T}/$(basename "${tempdir}")" |
217 |
+ |
218 |
+ ( |
219 |
+ cleanup() { rm -f "${tempdir}"; } |
220 |
+ trap cleanup EXIT |
221 |
+ |
222 |
+ addwrite "${tempdir}" |
223 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
224 |
+ |
225 |
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
226 |
+ TMPDIR="${tempdir}" \ |
227 |
+ ${EPYTHON} tests/runtests.py \ |
228 |
+ --unit-tests --no-report --verbose |
229 |
+ |
230 |
+ ) || die "testing failed" |
231 |
+} |