1 |
commit: a31909a9b4c2ac85ba6d1bd4f8b605f3594a560c |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 31 11:42:58 2021 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 31 11:43:07 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31909a9 |
7 |
|
8 |
app-admin/salt: security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/767919 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
app-admin/salt/Manifest | 1 - |
15 |
app-admin/salt/salt-3000.5.ebuild | 193 -------------------------------------- |
16 |
2 files changed, 194 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
19 |
index 3ac4178786a..b7e31231a67 100644 |
20 |
--- a/app-admin/salt/Manifest |
21 |
+++ b/app-admin/salt/Manifest |
22 |
@@ -1,5 +1,4 @@ |
23 |
DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f |
24 |
-DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317 |
25 |
DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4 SHA512 a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800 |
26 |
DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12dcc89008aa63c96814957b6ce8654f4d4d51dbce7b14027f0cee66fd2ea9602f6be18bf2f4beac11ae164f89f SHA512 e45c9cfddb64ab1c9d66b6b6b3e5ff8d9010c01307161e5013140b4362ee630cf912ab153d1afa72f56d18fc5353293b2f4b449caf8ee384d1e93204d490bf4c |
27 |
DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1 |
28 |
|
29 |
diff --git a/app-admin/salt/salt-3000.5.ebuild b/app-admin/salt/salt-3000.5.ebuild |
30 |
deleted file mode 100644 |
31 |
index 648c82a92c4..00000000000 |
32 |
--- a/app-admin/salt/salt-3000.5.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,193 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
-PYTHON_COMPAT=( python3_{7,8} ) |
40 |
-DISTUTILS_USE_SETUPTOOLS=bdepend |
41 |
-inherit systemd distutils-r1 |
42 |
- |
43 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
44 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
45 |
- https://github.com/saltstack" |
46 |
- |
47 |
-if [[ ${PV} == 9999* ]]; then |
48 |
- inherit git-r3 |
49 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
50 |
- EGIT_BRANCH="develop" |
51 |
- SRC_URI="" |
52 |
-else |
53 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
54 |
- https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz" |
55 |
- KEYWORDS="amd64 x86" |
56 |
-fi |
57 |
- |
58 |
-LICENSE="Apache-2.0" |
59 |
-SLOT="0" |
60 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
61 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
62 |
- +zeromq vim-syntax" |
63 |
- |
64 |
-RDEPEND=" |
65 |
- sys-apps/pciutils |
66 |
- dev-python/distro[${PYTHON_USEDEP}] |
67 |
- dev-python/jinja[${PYTHON_USEDEP}] |
68 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
69 |
- >=dev-python/msgpack-0.5[${PYTHON_USEDEP}] |
70 |
- <dev-python/msgpack-1.0[${PYTHON_USEDEP}] |
71 |
- dev-python/pycryptodome[${PYTHON_USEDEP}] |
72 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
73 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
74 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
75 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
76 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
77 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
78 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
79 |
- libvirt? ( |
80 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7) |
81 |
- ) |
82 |
- openssl? ( |
83 |
- dev-libs/openssl:0=[-bindist] |
84 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
85 |
- ) |
86 |
- raet? ( |
87 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
88 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
89 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
90 |
- ) |
91 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
92 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
93 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
94 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
95 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
96 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
97 |
- selinux? ( sec-policy/selinux-salt ) |
98 |
- nova? ( |
99 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7) |
100 |
- ) |
101 |
- neutron? ( |
102 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7) |
103 |
- ) |
104 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
105 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
106 |
- vim-syntax? ( app-vim/salt-vim ) |
107 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
108 |
-" |
109 |
-BDEPEND=" |
110 |
- test? ( |
111 |
- ${RDEPEND} |
112 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
113 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
114 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
115 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
116 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
117 |
- dev-python/pip[${PYTHON_USEDEP}] |
118 |
- dev-python/psutil[${PYTHON_USEDEP}] |
119 |
- dev-python/pytest[${PYTHON_USEDEP}] |
120 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
121 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
122 |
- >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] |
123 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
124 |
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
125 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
126 |
- !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) |
127 |
- )" |
128 |
- |
129 |
-DOCS=( README.rst AUTHORS ) |
130 |
- |
131 |
-REQUIRED_USE="|| ( raet zeromq ) |
132 |
- test? ( cheetah genshi )" |
133 |
-RESTRICT="!test? ( test ) x86? ( test )" |
134 |
- |
135 |
-PATCHES=( |
136 |
- "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" |
137 |
- "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
138 |
- "${FILESDIR}/salt-3000.1-tests.patch" |
139 |
- "${FILESDIR}/salt-3000.2-tests.patch" |
140 |
- |
141 |
- # https://github.com/saltstack/salt/pull/55410 |
142 |
- "${FILESDIR}/salt-3000.2-py38.patch" |
143 |
- |
144 |
- # https://github.com/saltstack/salt/pull/55900 |
145 |
- "${FILESDIR}/salt-3000.2-py38-abc.patch" |
146 |
- |
147 |
- # misc py38 fixups |
148 |
- "${WORKDIR}/salt-3000.2-py38-misc.patch" |
149 |
- "${FILESDIR}/salt-3000.2-py38-logwarn.patch" |
150 |
-) |
151 |
- |
152 |
-python_prepare() { |
153 |
- # remove tests with external dependencies that may not be available |
154 |
- rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die |
155 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
156 |
- rm tests/unit/states/test_boto_vpc.py || die |
157 |
- |
158 |
- # tests that require network access |
159 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
160 |
- |
161 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
162 |
- find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die |
163 |
- |
164 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
165 |
- local abc |
166 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
167 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
168 |
- |
169 |
- # allow the use of the renamed msgpack |
170 |
- sed -i '/^msgpack/d' requirements/base.txt || die |
171 |
-} |
172 |
- |
173 |
-python_install_all() { |
174 |
- local svc |
175 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
176 |
- |
177 |
- for svc in minion master syndic api; do |
178 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
179 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
180 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
181 |
- done |
182 |
- |
183 |
- insinto /etc/${PN} |
184 |
- doins -r conf/* |
185 |
-} |
186 |
- |
187 |
-python_test() { |
188 |
- local tempdir |
189 |
- # testsuite likes lots of files |
190 |
- ulimit -n 3072 || die |
191 |
- |
192 |
- # ${T} is too long a path for the tests to work |
193 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
194 |
- mkdir "${T}/$(basename "${tempdir}")" |
195 |
- |
196 |
- ( |
197 |
- cleanup() { rm -f "${tempdir}" || die; } |
198 |
- |
199 |
- trap cleanup EXIT |
200 |
- |
201 |
- addwrite "${tempdir}" |
202 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
203 |
- |
204 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
205 |
- TMPDIR="${tempdir}" \ |
206 |
- ${EPYTHON} tests/runtests.py \ |
207 |
- --unit-tests --no-report --verbose \ |
208 |
- || die "testing failed with ${EPYTHON}" |
209 |
- ) |
210 |
-} |
211 |
- |
212 |
-pkg_postinst() { |
213 |
- if use python_targets_python3_8; then |
214 |
- if use nova; then |
215 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
216 |
- ewarn "dev-python/python-novaclient does not support it yet" |
217 |
- fi |
218 |
- if use neutron; then |
219 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
220 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
221 |
- fi |
222 |
- if use libvirt; then |
223 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
224 |
- ewarn "dev-python/libvirt-python does not support it yet" |
225 |
- fi |
226 |
- fi |
227 |
-} |