Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/
Date: Mon, 26 Apr 2021 23:20:18
Message-Id: 1619479206.449dae000afa1038f206f231ada81254df905a5d.zmedico@gentoo
1 commit: 449dae000afa1038f206f231ada81254df905a5d
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 26 23:18:45 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 26 23:20:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449dae00
7
8 app-emulation/cri-o: Remove vulnerable versions
9
10 Bug: https://bugs.gentoo.org/785904
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 app-emulation/cri-o/Manifest | 3 --
15 app-emulation/cri-o/cri-o-1.17.1.ebuild | 95 ---------------------------------
16 app-emulation/cri-o/cri-o-1.18.3.ebuild | 95 ---------------------------------
17 app-emulation/cri-o/cri-o-1.19.0.ebuild | 95 ---------------------------------
18 4 files changed, 288 deletions(-)
19
20 diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
21 index d7ff5b78000..150bb961cd3 100644
22 --- a/app-emulation/cri-o/Manifest
23 +++ b/app-emulation/cri-o/Manifest
24 @@ -41,9 +41,6 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.12.0.mod 443 BLAKE2B 067bb19e6d9f
25 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
26 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
27 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
28 -DIST cri-o-1.17.1.tar.gz 10532728 BLAKE2B 12747b0161ca2fa7dc7e95fd4c000b9011402e65dac0885ed59a37a87b53907044d3b3c873d6fe82186313af6745e463ce84be259dae99793c6363794c76e16f SHA512 1548c4b20081e8f1af772b0b0fadd0f1b63af641283bef8b8cd8478bd626699c23b30b39fe460660776bc7e6509e85db73d1d7e0d030dd7bd3dbfe319c82e332
29 -DIST cri-o-1.18.3.tar.gz 11210469 BLAKE2B 16a9ed89c594c082e18d5a08ba1f87eaed600b95baed1e36c5b718e9dbaf52c7b482dbf6dba94a1cbc5e02f3dc58f0f21236b6b11c65fa60666d654e28c793fd SHA512 28798d0a46a9fe361fa2e57f350375abe2a66b955447d667a0a51b39034d73f98abf06371ccf5ea27dfcad38dc46907a2fe9583b94c9a0092ad18b2485b12640
30 -DIST cri-o-1.19.0.tar.gz 13383665 BLAKE2B 8288985392a08fb7fdc58f509d34f8814bf9670386b7aae42be349765cb1f3bd3f4b77077e9c282a4a25b0f99b8a8fc335c6a53053bd2575b3e23c225483a1d3 SHA512 15b506d755be735d7b71e503b02b309693e3090be41f5790bd34cec460238eab56829239caf18849f3656cf8c12f77a10bbb3ae4ad81eb4e18858946e454583d
31 DIST cri-o-1.21.0.tar.gz 14014014 BLAKE2B 352f0313eba7b984dd37e64791c25e5d1dd1ab52ed7123062485362542f7b143aa2324b0788ff86a30423e10ec6b9df276a97f2ab7f7c2f2db0c4516f7c78931 SHA512 69c13b00d259f9dc45192493dff0ab853f181629fba5408d895a96e291c2ed20235beea18b70ab77d6d8f593dc0a2c06ca29a40211caaedf51d89b58afcfe77e
32 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
33 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20201218220906-28db891af037.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
34
35 diff --git a/app-emulation/cri-o/cri-o-1.17.1.ebuild b/app-emulation/cri-o/cri-o-1.17.1.ebuild
36 deleted file mode 100644
37 index d528603cf52..00000000000
38 --- a/app-emulation/cri-o/cri-o-1.17.1.ebuild
39 +++ /dev/null
40 @@ -1,95 +0,0 @@
41 -# Copyright 1999-2019 Gentoo Authors
42 -# Distributed under the terms of the GNU General Public License v2
43 -
44 -EAPI=7
45 -
46 -EGIT_COMMIT=ee2de87bd8e2a7a84799476cb4fc4ce8a78fdf6d
47 -
48 -inherit go-module
49 -
50 -DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
51 -HOMEPAGE="https://cri-o.io/"
52 -SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
53 -
54 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
55 -SLOT="0"
56 -KEYWORDS="~amd64"
57 -IUSE="btrfs +device-mapper selinux systemd"
58 -
59 -COMMON_DEPEND="
60 - app-crypt/gpgme:=
61 - app-emulation/conmon
62 - app-emulation/runc
63 - dev-libs/glib:=
64 - dev-libs/libassuan:=
65 - dev-libs/libgpg-error:=
66 - net-firewall/conntrack-tools
67 - net-firewall/iptables
68 - net-misc/cni-plugins
69 - net-misc/socat
70 - sys-apps/iproute2
71 - sys-libs/libseccomp:=
72 - btrfs? ( sys-fs/btrfs-progs )
73 - device-mapper? ( sys-fs/lvm2:= )
74 - selinux? ( sys-libs/libselinux:= )
75 - systemd? ( sys-apps/systemd:= )"
76 -DEPEND="
77 - ${COMMON_DEPEND}"
78 -RDEPEND="${COMMON_DEPEND}
79 - !<app-emulation/podman-1.3.2-r1"
80 -
81 -src_prepare() {
82 - default
83 -
84 - sed -e '/^GIT_.*/d' \
85 - -e '/ git diff --exit-code/d' \
86 - -e 's/$(GO) build -i/$(GO) build -v -work -x/' \
87 - -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
88 - -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
89 - -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
90 - -i Makefile || die
91 -
92 - echo ".NOTPARALLEL: binaries docs" >> Makefile || die
93 -
94 - sed -e 's:/usr/local/bin:/usr/bin:' \
95 - -i contrib/systemd/* || die
96 -}
97 -
98 -src_compile() {
99 - [[ -f hack/btrfs_installed_tag.sh ]] || die
100 - use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
101 - hack/btrfs_installed_tag.sh || die; }
102 -
103 - [[ -f hack/libdm_installed.sh ]] || die
104 - use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
105 - hack/libdm_installed.sh || die; }
106 -
107 - [[ -f hack/selinux_tag.sh ]] || die
108 - use selinux || { echo -e "#!/bin/sh\ntrue" > \
109 - hack/selinux_tag.sh || die; }
110 -
111 - mkdir -p bin || die
112 - GOBIN="${S}/bin" \
113 - emake all
114 -}
115 -
116 -src_install() {
117 - emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
118 -
119 - keepdir /etc/crio
120 - mv "${ED}/etc/crio/crio.conf"{,.example} || die
121 -
122 - newinitd "${FILESDIR}/crio.initd" crio
123 -
124 - insinto /etc/logrotate.d
125 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
126 -
127 - # Suppress crio log error messages triggered if these don't exist.
128 - keepdir /etc/containers/oci/hooks.d
129 - keepdir /usr/share/containers/oci/hooks.d
130 -
131 - # Suppress crio "Missing CNI default network" log message.
132 - keepdir /etc/cni/net.d
133 - insinto /etc/cni/net.d
134 - doins contrib/cni/99-loopback.conf
135 -}
136
137 diff --git a/app-emulation/cri-o/cri-o-1.18.3.ebuild b/app-emulation/cri-o/cri-o-1.18.3.ebuild
138 deleted file mode 100644
139 index bed85815a89..00000000000
140 --- a/app-emulation/cri-o/cri-o-1.18.3.ebuild
141 +++ /dev/null
142 @@ -1,95 +0,0 @@
143 -# Copyright 1999-2020 Gentoo Authors
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=7
147 -
148 -EGIT_COMMIT=61de18161fb4ccda720768c001713592b5a04e46
149 -
150 -inherit go-module
151 -
152 -DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
153 -HOMEPAGE="https://cri-o.io/"
154 -SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
155 -
156 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
157 -SLOT="0"
158 -KEYWORDS="~amd64 ~arm64"
159 -IUSE="btrfs +device-mapper selinux systemd"
160 -
161 -COMMON_DEPEND="
162 - app-crypt/gpgme:=
163 - app-emulation/conmon
164 - app-emulation/runc
165 - dev-libs/glib:=
166 - dev-libs/libassuan:=
167 - dev-libs/libgpg-error:=
168 - net-firewall/conntrack-tools
169 - net-firewall/iptables
170 - net-misc/cni-plugins
171 - net-misc/socat
172 - sys-apps/iproute2
173 - sys-libs/libseccomp:=
174 - btrfs? ( sys-fs/btrfs-progs )
175 - device-mapper? ( sys-fs/lvm2:= )
176 - selinux? ( sys-libs/libselinux:= )
177 - systemd? ( sys-apps/systemd:= )"
178 -DEPEND="
179 - ${COMMON_DEPEND}"
180 -RDEPEND="${COMMON_DEPEND}
181 - !<app-emulation/podman-1.3.2-r1"
182 -
183 -src_prepare() {
184 - default
185 -
186 - sed -e '/^GIT_.*/d' \
187 - -e '/ git diff --exit-code/d' \
188 - -e 's/$(GO) build -i/$(GO) build -v -work -x/' \
189 - -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
190 - -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
191 - -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
192 - -i Makefile || die
193 -
194 - echo ".NOTPARALLEL: binaries docs" >> Makefile || die
195 -
196 - sed -e 's:/usr/local/bin:/usr/bin:' \
197 - -i contrib/systemd/* || die
198 -}
199 -
200 -src_compile() {
201 - [[ -f hack/btrfs_installed_tag.sh ]] || die
202 - use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
203 - hack/btrfs_installed_tag.sh || die; }
204 -
205 - [[ -f hack/libdm_installed.sh ]] || die
206 - use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
207 - hack/libdm_installed.sh || die; }
208 -
209 - [[ -f hack/selinux_tag.sh ]] || die
210 - use selinux || { echo -e "#!/bin/sh\ntrue" > \
211 - hack/selinux_tag.sh || die; }
212 -
213 - mkdir -p bin || die
214 - GOBIN="${S}/bin" \
215 - emake all
216 -}
217 -
218 -src_install() {
219 - emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
220 -
221 - keepdir /etc/crio
222 - mv "${ED}/etc/crio/crio.conf"{,.example} || die
223 -
224 - newinitd "${FILESDIR}/crio.initd" crio
225 -
226 - insinto /etc/logrotate.d
227 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
228 -
229 - # Suppress crio log error messages triggered if these don't exist.
230 - keepdir /etc/containers/oci/hooks.d
231 - keepdir /usr/share/containers/oci/hooks.d
232 -
233 - # Suppress crio "Missing CNI default network" log message.
234 - keepdir /etc/cni/net.d
235 - insinto /etc/cni/net.d
236 - doins contrib/cni/99-loopback.conf
237 -}
238
239 diff --git a/app-emulation/cri-o/cri-o-1.19.0.ebuild b/app-emulation/cri-o/cri-o-1.19.0.ebuild
240 deleted file mode 100644
241 index d1678516f2e..00000000000
242 --- a/app-emulation/cri-o/cri-o-1.19.0.ebuild
243 +++ /dev/null
244 @@ -1,95 +0,0 @@
245 -# Copyright 1999-2020 Gentoo Authors
246 -# Distributed under the terms of the GNU General Public License v2
247 -
248 -EAPI=7
249 -
250 -EGIT_COMMIT=99c925bebdd9e392f2d575e25f2e6a1082e6c232
251 -
252 -inherit go-module
253 -
254 -DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
255 -HOMEPAGE="https://cri-o.io/"
256 -SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
257 -
258 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
259 -SLOT="0"
260 -KEYWORDS="~amd64 ~arm64"
261 -IUSE="btrfs +device-mapper selinux systemd"
262 -
263 -COMMON_DEPEND="
264 - app-crypt/gpgme:=
265 - app-emulation/conmon
266 - app-emulation/runc
267 - dev-libs/glib:=
268 - dev-libs/libassuan:=
269 - dev-libs/libgpg-error:=
270 - net-firewall/conntrack-tools
271 - net-firewall/iptables
272 - net-misc/cni-plugins
273 - net-misc/socat
274 - sys-apps/iproute2
275 - sys-libs/libseccomp:=
276 - btrfs? ( sys-fs/btrfs-progs )
277 - device-mapper? ( sys-fs/lvm2:= )
278 - selinux? ( sys-libs/libselinux:= )
279 - systemd? ( sys-apps/systemd:= )"
280 -DEPEND="
281 - ${COMMON_DEPEND}"
282 -RDEPEND="${COMMON_DEPEND}
283 - !<app-emulation/podman-1.3.2-r1"
284 -
285 -src_prepare() {
286 - default
287 -
288 - sed -e '/^GIT_.*/d' \
289 - -e '/ git diff --exit-code/d' \
290 - -e 's/$(GO) build -i/$(GO) build -v -work -x/' \
291 - -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
292 - -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
293 - -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
294 - -i Makefile || die
295 -
296 - echo ".NOTPARALLEL: binaries docs" >> Makefile || die
297 -
298 - sed -e 's:/usr/local/bin:/usr/bin:' \
299 - -i contrib/systemd/* || die
300 -}
301 -
302 -src_compile() {
303 - [[ -f hack/btrfs_installed_tag.sh ]] || die
304 - use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
305 - hack/btrfs_installed_tag.sh || die; }
306 -
307 - [[ -f hack/libdm_installed.sh ]] || die
308 - use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
309 - hack/libdm_installed.sh || die; }
310 -
311 - [[ -f hack/selinux_tag.sh ]] || die
312 - use selinux || { echo -e "#!/bin/sh\ntrue" > \
313 - hack/selinux_tag.sh || die; }
314 -
315 - mkdir -p bin || die
316 - GOBIN="${S}/bin" \
317 - emake all
318 -}
319 -
320 -src_install() {
321 - emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
322 -
323 - keepdir /etc/crio
324 - mv "${ED}/etc/crio/crio.conf"{,.example} || die
325 -
326 - newinitd "${FILESDIR}/crio.initd" crio
327 -
328 - insinto /etc/logrotate.d
329 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
330 -
331 - # Suppress crio log error messages triggered if these don't exist.
332 - keepdir /etc/containers/oci/hooks.d
333 - keepdir /usr/share/containers/oci/hooks.d
334 -
335 - # Suppress crio "Missing CNI default network" log message.
336 - keepdir /etc/cni/net.d
337 - insinto /etc/cni/net.d
338 - doins contrib/cni/99-loopback.conf
339 -}