1 |
commit: 5a30b66574ee67ab8bef771c13fff12bb73fe71f |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 2 19:40:21 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 2 19:47:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a30b665 |
7 |
|
8 |
app-emulation/containerd: bump to 1.3.9 ( for CVE-2020-15257 ) |
9 |
|
10 |
Package-Manager: Portage-3.0.11, Repoman-3.0.2 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
app-emulation/containerd/Manifest | 1 + |
14 |
app-emulation/containerd/containerd-1.3.9.ebuild | 84 ++++++++++++++++++++++++ |
15 |
2 files changed, 85 insertions(+) |
16 |
|
17 |
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest |
18 |
index 0f5c4312268..bb55e05e21a 100644 |
19 |
--- a/app-emulation/containerd/Manifest |
20 |
+++ b/app-emulation/containerd/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee |
23 |
+DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa |
24 |
|
25 |
diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild b/app-emulation/containerd/containerd-1.3.9.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..a6dcc20d842 |
28 |
--- /dev/null |
29 |
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild |
30 |
@@ -0,0 +1,84 @@ |
31 |
+# Copyright 1999-2020 Gentoo Authors |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+ |
34 |
+EAPI=7 |
35 |
+ |
36 |
+# update on bump, look for https://github.com/docker\ |
37 |
+# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/containerd.installer |
38 |
+CONTAINERD_COMMIT="ea765ab" |
39 |
+EGO_PN="github.com/containerd/${PN}" |
40 |
+ |
41 |
+inherit golang-vcs-snapshot toolchain-funcs |
42 |
+ |
43 |
+DESCRIPTION="A daemon to control runC" |
44 |
+HOMEPAGE="https://containerd.io/" |
45 |
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz" |
46 |
+ |
47 |
+LICENSE="Apache-2.0" |
48 |
+SLOT="0" |
49 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
50 |
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" |
51 |
+ |
52 |
+DEPEND=" |
53 |
+ btrfs? ( sys-fs/btrfs-progs ) |
54 |
+ seccomp? ( sys-libs/libseccomp ) |
55 |
+" |
56 |
+ |
57 |
+RDEPEND=" |
58 |
+ ${DEPEND} |
59 |
+ ~app-emulation/runc-1.0.0_rc10 |
60 |
+" |
61 |
+ |
62 |
+BDEPEND=" |
63 |
+ dev-go/go-md2man |
64 |
+ virtual/pkgconfig |
65 |
+ test? ( "${RDEPEND}" ) |
66 |
+" |
67 |
+ |
68 |
+# tests require root or docker |
69 |
+# upstream does not recommend stripping binary |
70 |
+RESTRICT+=" strip test" |
71 |
+ |
72 |
+S="${WORKDIR}/${P}/src/${EGO_PN}" |
73 |
+ |
74 |
+src_prepare() { |
75 |
+ default |
76 |
+ sed -i -e "s/git describe --match.*$/echo ${PV})/"\ |
77 |
+ -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\ |
78 |
+ -e "s/-s -w//" \ |
79 |
+ Makefile || die |
80 |
+} |
81 |
+ |
82 |
+src_compile() { |
83 |
+ local options=( |
84 |
+ $(usev apparmor) |
85 |
+ $(usex btrfs "" "no_btrfs") |
86 |
+ $(usex cri "" "no_cri") |
87 |
+ $(usex device-mapper "" "no_devmapper") |
88 |
+ $(usev seccomp) |
89 |
+ $(usev selinux) |
90 |
+ ) |
91 |
+ |
92 |
+ myemakeargs=( |
93 |
+ BUILDTAGS="${options[*]}" |
94 |
+ DESTDIR="${ED}" |
95 |
+ LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') |
96 |
+ ) |
97 |
+ |
98 |
+ export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor |
99 |
+ export GOFLAGS="-v -x -mod=vendor" |
100 |
+ emake "${myemakeargs[@]}" all man |
101 |
+} |
102 |
+ |
103 |
+src_install() { |
104 |
+ dobin bin/* |
105 |
+ doman man/* |
106 |
+ newinitd "${FILESDIR}"/${PN}.initd "${PN}" |
107 |
+ keepdir /var/lib/containerd |
108 |
+ |
109 |
+ # we already installed manpages, remove markdown source |
110 |
+ # before installing docs directory |
111 |
+ rm -rf docs/man || die |
112 |
+ local DOCS=( README.md PLUGINS.md docs/. ) |
113 |
+ einstalldocs |
114 |
+} |