Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/runc/
Date: Mon, 14 Jun 2021 00:31:53
Message-Id: 1623630678.89bd668530ff5875708c792d2967aa07229c4218.gyakovlev@gentoo
1 commit: 89bd668530ff5875708c792d2967aa07229c4218
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 14 00:27:34 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 14 00:31:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89bd6685
7
8 app-emulation/runc: drop 1.0.0_rc10-r1, 1.0.0_rc92, 1.0.0_rc93
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 app-emulation/runc/Manifest | 3 --
13 app-emulation/runc/metadata.xml | 3 --
14 app-emulation/runc/runc-1.0.0_rc10-r1.ebuild | 80 ----------------------------
15 app-emulation/runc/runc-1.0.0_rc92.ebuild | 80 ----------------------------
16 app-emulation/runc/runc-1.0.0_rc93.ebuild | 78 ---------------------------
17 5 files changed, 244 deletions(-)
18
19 diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
20 index cf45439a450..cf7cc93b5e3 100644
21 --- a/app-emulation/runc/Manifest
22 +++ b/app-emulation/runc/Manifest
23 @@ -1,4 +1 @@
24 -DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
25 -DIST runc-1.0.0_rc92.tar.gz 2061469 BLAKE2B 06444eaf7602fe9ddaf7728c7f55bd718d1fe8f5f0ce6b21abc49a1d84eaa2fc3550d0d275ba5548ee9ebb6948a8ed415de8562a990d6085d1da8fb37e46afb9 SHA512 770a31736f5ab4ba359d91bd236750511f90b29af0af2bad5c238b611f465d7302e78b57ce8a702068440fda2d74588b92fd4d24c6d34e6fc1bd649ea3d8ee40
26 -DIST runc-1.0.0_rc93.tar.gz 2132429 BLAKE2B 35d6fe9eebd26fb37d648a67b35415c51283ac3dff0f111e88be9120cf139e4811ab9a7b98e2c559dc4ce8b0e7958f15464dc4f039f7b3eb9f06f26a1776875f SHA512 087becdf3882818b7c8d05ac0192928695b35033d72e5ce584d5b8291310f4ba35b1cc78299fc8f17dc7ee425a94817b989890f4108444cc3c45927740b2d378
27 DIST runc-1.0.0_rc95.tar.gz 2309875 BLAKE2B 8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841 SHA512 c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
28
29 diff --git a/app-emulation/runc/metadata.xml b/app-emulation/runc/metadata.xml
30 index f9c14aa5bb8..8d7e000ad34 100644
31 --- a/app-emulation/runc/metadata.xml
32 +++ b/app-emulation/runc/metadata.xml
33 @@ -14,9 +14,6 @@
34 <name>Georgy Yakovlev</name>
35 </maintainer>
36 <use>
37 - <flag name="ambient">
38 - Enable support for ambient capabilities set (Requires Linux kernel 4.3 or later).
39 - </flag>
40 <flag name="apparmor">
41 Enable AppArmor support.
42 </flag>
43
44 diff --git a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
45 deleted file mode 100644
46 index 0a433baafd1..00000000000
47 --- a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
48 +++ /dev/null
49 @@ -1,80 +0,0 @@
50 -# Copyright 1999-2021 Gentoo Authors
51 -# Distributed under the terms of the GNU General Public License v2
52 -
53 -EAPI=7
54 -
55 -inherit golang-vcs-snapshot linux-info
56 -
57 -# update on bump, look for https://github.com/docker\
58 -# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
59 -RUNC_COMMIT="dc9208a3303feef5b3839f4323d9beb36df0a9dd"
60 -CONFIG_CHECK="~USER_NS"
61 -EGO_PN="github.com/opencontainers/${PN}"
62 -
63 -DESCRIPTION="runc container cli tools"
64 -HOMEPAGE="http://runc.io"
65 -SRC_URI="https://github.com/opencontainers/${PN}/archive/v${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
66 -
67 -LICENSE="Apache-2.0 BSD-2 BSD MIT"
68 -SLOT="0"
69 -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
70 -IUSE="apparmor +ambient hardened +kmem +seccomp selinux test"
71 -
72 -DEPEND="seccomp? ( sys-libs/libseccomp )"
73 -
74 -RDEPEND="
75 - ${DEPEND}
76 - !app-emulation/docker-runc
77 - apparmor? ( sys-libs/libapparmor )
78 -"
79 -
80 -BDEPEND="
81 - dev-go/go-md2man
82 - test? ( "${RDEPEND}" )
83 -"
84 -
85 -# tests need busybox binary, and portage namespace
86 -# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
87 -# majority of tests pass
88 -RESTRICT+=" test"
89 -
90 -src_compile() {
91 - # Taken from app-emulation/docker-1.7.0-r1
92 - export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
93 - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
94 - -L${ESYSROOT}/usr/$(get_libdir)"
95 -
96 - # build up optional flags
97 - local options=(
98 - $(usev ambient)
99 - $(usev apparmor)
100 - $(usev seccomp)
101 - $(usev selinux)
102 - $(usex kmem '' 'nokmem')
103 - )
104 -
105 - myemakeargs=(
106 - BUILDTAGS="${options[*]}"
107 - COMMIT=${RUNC_COMMIT}
108 - GOPATH="${S}"
109 - -C "src/${EGO_PN}"
110 - )
111 -
112 - emake "${myemakeargs[@]}" runc man
113 -}
114 -
115 -src_install() {
116 - myemakeargs+=(
117 - PREFIX="${ED}/usr"
118 - BINDIR="${ED}/usr/bin"
119 - MANDIR="${ED}/usr/share/man"
120 - )
121 - emake "${myemakeargs[@]}" install install-man install-bash
122 -
123 - local DOCS=( src/"${EGO_PN}"/{README.md,PRINCIPLES.md,docs/.} )
124 - einstalldocs
125 -}
126 -
127 -src_test() {
128 - emake "${myemakeargs[@]}" localunittest
129 -}
130
131 diff --git a/app-emulation/runc/runc-1.0.0_rc92.ebuild b/app-emulation/runc/runc-1.0.0_rc92.ebuild
132 deleted file mode 100644
133 index ec75ad824e4..00000000000
134 --- a/app-emulation/runc/runc-1.0.0_rc92.ebuild
135 +++ /dev/null
136 @@ -1,80 +0,0 @@
137 -# Copyright 1999-2021 Gentoo Authors
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -EAPI=7
141 -
142 -inherit go-module linux-info
143 -
144 -# update on bump, look for https://github.com/docker\
145 -# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
146 -RUNC_COMMIT=ff819c7e9184c13b7c2607fe6c30ae19403a7aff
147 -CONFIG_CHECK="~USER_NS"
148 -
149 -DESCRIPTION="runc container cli tools"
150 -HOMEPAGE="http://runc.io"
151 -MY_PV="${PV/_/-}"
152 -SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
153 -
154 -LICENSE="Apache-2.0 BSD-2 BSD MIT"
155 -SLOT="0"
156 -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
157 -IUSE="apparmor +ambient hardened +kmem +seccomp selinux test"
158 -
159 -DEPEND="seccomp? ( sys-libs/libseccomp )"
160 -
161 -RDEPEND="
162 - ${DEPEND}
163 - !app-emulation/docker-runc
164 - apparmor? ( sys-libs/libapparmor )
165 -"
166 -
167 -BDEPEND="
168 - dev-go/go-md2man
169 - test? ( "${RDEPEND}" )
170 -"
171 -
172 -# tests need busybox binary, and portage namespace
173 -# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
174 -# majority of tests pass
175 -RESTRICT+=" test"
176 -
177 -S="${WORKDIR}/${PN}-${MY_PV}"
178 -
179 -src_compile() {
180 - # Taken from app-emulation/docker-1.7.0-r1
181 - export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
182 - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
183 - -L${ESYSROOT}/usr/$(get_libdir)"
184 -
185 - # build up optional flags
186 - local options=(
187 - $(usev ambient)
188 - $(usev apparmor)
189 - $(usev seccomp)
190 - $(usev selinux)
191 - $(usex kmem '' 'nokmem')
192 - )
193 -
194 - myemakeargs=(
195 - BUILDTAGS="${options[*]}"
196 - COMMIT="${RUNC_COMMIT}"
197 - )
198 -
199 - emake "${myemakeargs[@]}" runc man
200 -}
201 -
202 -src_install() {
203 - myemakeargs+=(
204 - PREFIX="${ED}/usr"
205 - BINDIR="${ED}/usr/bin"
206 - MANDIR="${ED}/usr/share/man"
207 - )
208 - emake "${myemakeargs[@]}" install install-man install-bash
209 -
210 - local DOCS=( README.md PRINCIPLES.md docs/. )
211 - einstalldocs
212 -}
213 -
214 -src_test() {
215 - emake "${myemakeargs[@]}" localunittest
216 -}
217
218 diff --git a/app-emulation/runc/runc-1.0.0_rc93.ebuild b/app-emulation/runc/runc-1.0.0_rc93.ebuild
219 deleted file mode 100644
220 index 316f720fc29..00000000000
221 --- a/app-emulation/runc/runc-1.0.0_rc93.ebuild
222 +++ /dev/null
223 @@ -1,78 +0,0 @@
224 -# Copyright 1999-2021 Gentoo Authors
225 -# Distributed under the terms of the GNU General Public License v2
226 -
227 -EAPI=7
228 -
229 -inherit go-module linux-info
230 -
231 -# update on bump, look for https://github.com/docker\
232 -# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
233 -RUNC_COMMIT=ff819c7e9184c13b7c2607fe6c30ae19403a7aff
234 -CONFIG_CHECK="~USER_NS"
235 -
236 -DESCRIPTION="runc container cli tools"
237 -HOMEPAGE="http://runc.io"
238 -MY_PV="${PV/_/-}"
239 -SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
240 -
241 -LICENSE="Apache-2.0 BSD-2 BSD MIT"
242 -SLOT="0"
243 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
244 -IUSE="apparmor hardened +kmem +seccomp test"
245 -
246 -DEPEND="seccomp? ( sys-libs/libseccomp )"
247 -
248 -RDEPEND="
249 - ${DEPEND}
250 - !app-emulation/docker-runc
251 - apparmor? ( sys-libs/libapparmor )
252 -"
253 -
254 -BDEPEND="
255 - dev-go/go-md2man
256 - test? ( "${RDEPEND}" )
257 -"
258 -
259 -# tests need busybox binary, and portage namespace
260 -# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
261 -# majority of tests pass
262 -RESTRICT+=" test"
263 -
264 -S="${WORKDIR}/${PN}-${MY_PV}"
265 -
266 -src_compile() {
267 - # Taken from app-emulation/docker-1.7.0-r1
268 - export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
269 - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
270 - -L${ESYSROOT}/usr/$(get_libdir)"
271 -
272 - # build up optional flags
273 - local options=(
274 - $(usev apparmor)
275 - $(usev seccomp)
276 - $(usex kmem '' 'nokmem')
277 - )
278 -
279 - myemakeargs=(
280 - BUILDTAGS="${options[*]}"
281 - COMMIT="${RUNC_COMMIT}"
282 - )
283 -
284 - emake "${myemakeargs[@]}" runc man
285 -}
286 -
287 -src_install() {
288 - myemakeargs+=(
289 - PREFIX="${ED}/usr"
290 - BINDIR="${ED}/usr/bin"
291 - MANDIR="${ED}/usr/share/man"
292 - )
293 - emake "${myemakeargs[@]}" install install-man install-bash
294 -
295 - local DOCS=( README.md PRINCIPLES.md docs/. )
296 - einstalldocs
297 -}
298 -
299 -src_test() {
300 - emake "${myemakeargs[@]}" localunittest
301 -}