subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-emulation\/containerd\/files\/"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

2020-11-10 Thread Georgy Yakovlev

commit: bff574337518003f1f7bfcbb98e92373f0580a58
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Nov 10 21:25:33 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Nov 10 21:33:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff57433

app-emulation/containerd: drop old

Bug: https://bugs.gentoo.org/749579
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/Manifest |  9 
 app-emulation/containerd/containerd-1.2.10.ebuild | 56 ---
 app-emulation/containerd/containerd-1.2.12.ebuild | 56 ---
 app-emulation/containerd/containerd-1.2.13.ebuild | 56 ---
 app-emulation/containerd/containerd-1.2.6.ebuild  | 56 ---
 app-emulation/containerd/containerd-1.2.7.ebuild  | 56 ---
 app-emulation/containerd/containerd-1.3.0.ebuild  | 56 ---
 app-emulation/containerd/containerd-1.3.1.ebuild  | 56 ---
 app-emulation/containerd/containerd-1.3.2.ebuild  | 55 --
 app-emulation/containerd/containerd-1.3.4.ebuild  | 55 --
 app-emulation/containerd/files/containerd.initd   | 24 --
 11 files changed, 535 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index c00825bee4e..0f5c4312268 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,10 +1 @@
-DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 
6727fde9949ca96f351964df3c0c7481cb5274895aa3b31552258d57cc5958bd2d3006cfe4d87088d24ac53de1c391b6029b3f800363ee743f08e1937f0d0fec
 SHA512 
14d4f1cad1a68414915c1e98b64dfb6f3f29a0e86e18570d6cc138f4db14b56499b978135954198fe9e2a1363383694eed530b301a9dc699d28c305d4dbf3cd8
-DIST containerd-1.2.12.tar.gz 4990623 BLAKE2B 
640ff03f74e94dd3f919d3c26015cebae1f316c910442db881cd999c92991b7011131f05501648e9f08b6e34d38e2aa6ee1065ae31550de88ad79d9cafa5687e
 SHA512 
bcb4f94aea984c804e34137cab6aad252c01dc75d5e33ade5d1e533e4266fd0af67d2bf8aa85f0e6eba4e43756e84f884f1dec4c9febd66f8a3e3bc8cd3ac775
-DIST containerd-1.2.13.tar.gz 4993470 BLAKE2B 
8a094745358ee60f37826898668bbbad3dc8c02b20d29bc977dd99bcb78ca4cba0cda737caaa66bf827b09f38e5ad1357bc7cbc85c0c3bf21d7ff8d8eff8
 SHA512 
19504a7419595f75160de2b85c5ea505257dc9b58972545bc3d31c144d59c8255f7a3d326b2a96b4fe1b34fb27525db8f3aa61bad97b40a315591a16c240ca5b
-DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 
202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36
 SHA512 
287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
-DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 
6cf98e370547d3ca5158f546e72e3ff5fdccc08c2e9f390988d080222195f95512dbf6f7dc042b7a966283a04b7b8777b3fbeb4c5b861caae4f6209c59c5
 SHA512 
b96ca236d28933c1bf309fc7204af7d2c356e19af394d5c2274a178c8f15298faf6ca9bb8e7d04acb7c3c9c41035446643a8df0103017f7ed0320bfc37cb8ca9
-DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B 
c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12
 SHA512 
cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
-DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 
6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513
 SHA512 
4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
-DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 
32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29
 SHA512 
768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
-DIST containerd-1.3.4.tar.gz 5700890 BLAKE2B 
9d5642399eafbf3df25d2bdb6ffeb8e98362e9f2c6cdcd7a64fff12bad40f58fa97451228a607def408cc8a8cfbfce67c47fcfdf86865d8086d0b7aad7595d5a
 SHA512 
b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee

diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild 
b/app-emulation/containerd/containerd-1.2.10.ebuild
deleted file mode 100644
index 5a1d397114b..000
--- a/app-emulation/containerd/containerd-1.2.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Autho

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

2020-09-22 Thread Georgy Yakovlev

commit: 1b388199dc189202d9739c02a2fcd15741739fed
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Sep 22 22:25:48 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Sep 22 22:50:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b388199

app-emulation/containerd: bump to 1.4.1, improve ebuild

a lot of improvements, doc and manpage installation.
device-mapper useflag added
selinux useflag added

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/Manifest  |  1 +
 app-emulation/containerd/containerd-1.4.1.ebuild   | 85 ++
 app-emulation/containerd/files/containerd.initd-r1 | 26 +++
 app-emulation/containerd/metadata.xml  |  1 +
 4 files changed, 113 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 50dea9321e9..0008c98ed50 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -7,3 +7,4 @@ DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B 
c334cfd2aa11dd430c74bc9f3fe6f31d83f
 DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 
6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513
 SHA512 
4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
 DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 
32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29
 SHA512 
768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
 DIST containerd-1.3.4.tar.gz 5700890 BLAKE2B 
9d5642399eafbf3df25d2bdb6ffeb8e98362e9f2c6cdcd7a64fff12bad40f58fa97451228a607def408cc8a8cfbfce67c47fcfdf86865d8086d0b7aad7595d5a
 SHA512 
b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa
+DIST containerd-1.4.1.tar.gz 6168048 BLAKE2B 
f050808d77c66caead8acba595b1cf91d7f386a77aae84d08840f458ba8141bb0e8763222f37b4295d2afedd5eb2fc311e8a69f6c01a08740ad27d2e7380b61f
 SHA512 
e16196db59ba71cfd7e5515b8d2bc6336503e996419182274dfc5ac9caca901cf712f465698e9ff667747959faf93cdf66fe652c47a83a6ead6f6a3a22add43b

diff --git a/app-emulation/containerd/containerd-1.4.1.ebuild 
b/app-emulation/containerd/containerd-1.4.1.ebuild
new file mode 100644
index 000..b1eae77465c
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.4.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# update on bump
+CONTAINERD_COMMIT="c623d1b"
+EGO_PN="github.com/containerd/${PN}"
+MY_PV="${PV/_rc/-rc.}"
+
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/";
+SRC_URI="https://github.com/containerd/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+# ~pinned dependencies described in vendor.conf
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0_rc92
+"
+
+BDEPEND="
+   dev-go/go-md2man
+   virtual/pkgconfig
+   test? ( "${RDEPEND}" )
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT="strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+   default
+   sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+   -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
+   -e "s/-s -w//" \
+   Makefile || die
+}
+
+src_compile() {
+   local options=(
+   $(usev apparmor)
+   $(usex btrfs "" "no_btrfs")
+   $(usex cri "" "no_cri")
+   $(usex device-mapper "" "no_devmapper")
+   $(usev seccomp)
+   $(usev selinux)
+   )
+
+   myemakeargs=(
+   BUILDTAGS="${options[*]}"
+   DESTDIR="${ED}"
+   LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+   )
+
+   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+   export GOFLAGS="-v -x -mod=vendor"
+   emake "${myemakeargs[@]}" all man
+}
+
+src_install() {
+   dobin bin/*
+   doman man/*
+   newinitd "${FILESDIR}"/${PN}.initd-r1 "${PN}"
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -rf docs/man || die
+   local DOCS=( README.md PLUGINS.md docs/. )
+   einstalldocs
+}

diff --git a/app-emulation/containerd/files/containerd.initd-r1 
b/app-emulation/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/

2019-03-25 Thread Sven Wegener

commit: 0df5299ab0f6b97f4c0808ee64b72506541a53d0
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Mar 25 10:21:48 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Mar 25 10:22:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df5299a

app-emulation/containerd: Wait for containerd socket

Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-emulation/containerd/files/containerd.initd | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-emulation/containerd/files/containerd.initd 
b/app-emulation/containerd/files/containerd.initd
index f0f4e735b5a..bedf000cad5 100644
--- a/app-emulation/containerd/files/containerd.initd
+++ b/app-emulation/containerd/files/containerd.initd
@@ -18,3 +18,7 @@ start_pre() {
 
return 0
 }
+
+start_post() {
+   ewaitfile 5 /run/containerd/containerd.sock
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/

2019-03-25 Thread Sven Wegener

commit: b7ef9be685391ff5c82c990263036fc3776165a4
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Mar 25 08:36:25 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Mar 25 08:43:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7ef9be6

app-emulation/containerd: Write pidfile and create log directory

Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Sven Wegener  gentoo.org>

 app-emulation/containerd/files/containerd.initd | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-emulation/containerd/files/containerd.initd 
b/app-emulation/containerd/files/containerd.initd
index 3a02d494ad1..f0f4e735b5a 100644
--- a/app-emulation/containerd/files/containerd.initd
+++ b/app-emulation/containerd/files/containerd.initd
@@ -1,13 +1,15 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="Containerd container runtime"
 command="/usr/bin/containerd"
 pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
-start_stop_daemon_args="--background --stderr 
/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout 
/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+start_stop_daemon_args="--background --make-pidfile --stderr 
/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout 
/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
 
 start_pre() {
+   checkpath -m 0750 -d /var/log/${RC_SVCNAME}
+
ulimit -n 1048576
 
# Having non-zero limits causes performance problems due to accounting 
overhead

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

2019-02-07 Thread Manuel Rüger

commit: b8f6aff9acb4cbc32d79486ecdff09e4adf5d5f4
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Feb  7 12:01:18 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Feb  7 12:01:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f6aff9

app-emulation/containerd: Remove old

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/containerd/Manifest  |  3 --
 app-emulation/containerd/containerd-1.1.1.ebuild   | 54 -
 .../containerd/containerd-1.2.0-r1.ebuild  | 56 --
 app-emulation/containerd/containerd-1.2.0.ebuild   | 55 -
 app-emulation/containerd/containerd-1.2.1.ebuild   | 56 --
 ...p20180223-remove-c-constant-redefinitions.patch | 38 ---
 6 files changed, 262 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 62e4ec779c2..1aba2d6949e 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,8 +1,5 @@
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
-DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B 
e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f
 SHA512 
429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd
 DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B 
d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a
 SHA512 
fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c
 DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B 
cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0
 SHA512 
c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
-DIST containerd-1.2.0.tar.gz 4605096 BLAKE2B 
5bcfb252933d4f8d5ab6c7e91505cfec34137545121440cd6935e05cd3c62a4969fff8b90b628634c01cc9a4dc3901c307604ab30f45a03dd20112653da9437d
 SHA512 
f7e1ede8db253c666dc9d68642951a427722945da60acf8631312377c84aab14c7a8b14e81f9a63ab8f909d25eb55911c0f2eef68f11380c66cd77bada8577bd
-DIST containerd-1.2.1.tar.gz 4605947 BLAKE2B 
340daac847eaa653d15894fd65c190702807400dfb8293b5a2507b9a13a86752c00357cf6aeb3735c57878c34f79c35076d7087a905ee7efe7971746c792a212
 SHA512 
0949299afe17e269a6c551e865e500afeeaba700cf78bb12fef4af8e6d48a2f699976e81dad44d797bb13079361f5d5e05e9abe903a3b158af93f2aaa95712e5
 DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B 
aca366f23cb24ddd036e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89
 SHA512 
0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
 DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 
9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897
 SHA512 
01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d

diff --git a/app-emulation/containerd/containerd-1.1.1.ebuild 
b/app-emulation/containerd/containerd-1.1.1.ebuild
deleted file mode 100644
index 0dc6845f4ea..000
--- a/app-emulation/containerd/containerd-1.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == * ]]; then
-   inherit golang-vcs
-else
-   MY_PV="${PV/_rc/-rc.}"
-   EGIT_COMMIT="v${MY_PV}"
-   CONTAINERD_COMMIT="d64c661f1d51c48782c9cec8fda7604785f93587"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-   inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+btrfs hardened"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )"
-RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
-   >=app-emulation/runc-1.0.0_rc4 )
-   sys-libs/libseccomp"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
-   default
-   if [[ ${PV} != ** ]]; then
-   sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-   -e "s/git rev-parse HEAD.*$/echo $

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

2018-11-09 Thread Manuel Rüger

commit: b7bd9e0c49bca1682b7707425298c102ce813d71
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Nov  9 10:42:48 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Nov  9 10:42:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7bd9e0c

app-emulation/containerd: Add initscript, drop docker-runc dep

Signed-off-by: Manuel Rüger  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../containerd/containerd-1.2.0-r1.ebuild  | 56 ++
 app-emulation/containerd/files/containerd.initd| 18 +++
 2 files changed, 74 insertions(+)

diff --git a/app-emulation/containerd/containerd-1.2.0-r1.ebuild 
b/app-emulation/containerd/containerd-1.2.0-r1.ebuild
new file mode 100644
index 000..27e3a753155
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   MY_PV="${PV/_rc/-rc.}"
+   EGIT_COMMIT="v${MY_PV}"
+   CONTAINERD_COMMIT="c4446665cb9c30056f4998ed953e6d4ff22c7c39"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor +btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )"
+RDEPEND=">=app-emulation/runc-1.0.0_rc5
+   seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+   default
+   if [[ ${PV} != ** ]]; then
+   sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+   -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+   -e "s/-s -w//" \
+   Makefile || die
+   fi
+}
+
+src_compile() {
+   local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") 
$(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+   LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') 
BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+   newinitd "${FILESDIR}"/${PN}.initd ${PN}
+   dodir /var/lib/containerd
+   dobin bin/containerd{-shim,-stress,} bin/ctr
+}

diff --git a/app-emulation/containerd/files/containerd.initd 
b/app-emulation/containerd/files/containerd.initd
new file mode 100644
index 000..3a02d494ad1
--- /dev/null
+++ b/app-emulation/containerd/files/containerd.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Containerd container runtime"
+command="/usr/bin/containerd"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+start_stop_daemon_args="--background --stderr 
/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout 
/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+start_pre() {
+   ulimit -n 1048576
+
+   # Having non-zero limits causes performance problems due to accounting 
overhead
+   # in the kernel. We recommend using cgroups to do container-local 
accounting.
+   ulimit -u unlimited
+
+   return 0
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

2018-05-17 Thread Craig Andrews

commit: ab5303b4ea459e7a829d36fe3198c7e350953e8d
Author: Craig Andrews  gentoo  org>
AuthorDate: Tue May 15 16:24:10 2018 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Thu May 17 17:30:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab5303b4

app-emulation/containerd: Fix "overflows _Ctype_ulonglong" error with GCC 8

Closes: https://bugs.gentoo.org/655804
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 .../containerd-1.0.3_p20180223-r1.ebuild   | 58 ++
 ...p20180223-remove-c-constant-redefinitions.patch | 38 ++
 2 files changed, 96 insertions(+)

diff --git a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild 
b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
new file mode 100644
index 000..a25ff621428
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   MY_PV="${PV/_rc/-rc.}"
+   EGIT_COMMIT="v${MY_PV}"
+   CONTAINERD_COMMIT="4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac"
+   SRC_URI="https://${EGO_PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+btrfs hardened"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+   >=app-emulation/runc-1.0.0_rc4 )
+   sys-libs/libseccomp"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/"${P}-remove-c-constant-redefinitions.patch"
+)
+
+src_prepare() {
+   default
+   if [[ ${PV} != ** ]]; then
+   sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+   -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+   -e "s/-s -w//" \
+   Makefile || die
+   fi
+}
+
+src_compile() {
+   local options=( $(usex btrfs "" "no_btrfs") )
+   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+   LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake 
BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+   dobin bin/containerd{-shim,-stress,} bin/ctr
+}

diff --git 
a/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch
 
b/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch
new file mode 100644
index 000..f08fab6e592
--- /dev/null
+++ 
b/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch
@@ -0,0 +1,38 @@
+From 9686d822284aa8fc9d4d136cc01314f5bf455cba Mon Sep 17 00:00:00 2001
+From: Stephen J Day 
+Date: Fri, 2 Mar 2018 13:23:31 -0800
+Subject: [PATCH] btrfs: remove C constant redefinitions
+
+Signed-off-by: Stephen J Day 
+---
+ btrfs.go | 10 +++---
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/vendor/github.com/containerd/btrfs/btrfs.go 
b/vendor/github.com/containerd/btrfs/btrfs.go
+index 1deab47..efdf528 100644
+--- a/vendor/github.com/containerd/btrfs/btrfs.go
 b/vendor/github.com/containerd/btrfs/btrfs.go
+@@ -7,10 +7,6 @@ import "sort"
+ #include 
+ #include "btrfs.h"
+ 
+-// Required because Go has struct casting rules for negative numbers
+-const __u64 u64_BTRFS_LAST_FREE_OBJECTID = (__u64)BTRFS_LAST_FREE_OBJECTID;
+-const __u64 negative_one = (__u64)-1;
+-
+ static char* get_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* 
btrfs_struct) {
+   return btrfs_struct->name;
+ }
+@@ -100,9 +96,9 @@ func subvolMap(path string) (map[uint64]*Info, error) {
+   args.key.min_type = C.BTRFS_ROOT_ITEM_KEY
+   args.key.max_type = C.BTRFS_ROOT_BACKREF_KEY
+   args.key.min_objectid = C.BTRFS_FS_TREE_OBJECTID
+-  args.key.max_objectid = C.u64_BTRFS_LAST_FREE_OBJECTID
+-  args.key.max_offset = C.negative_one
+-  args.key.max_transid = C.negative_one
++  args.key.max_objectid = C.BTRFS_LAST_FREE_OBJECTID
++  args.key.max_offset = ^C.__u64(0)
++  args.key.max_transid = ^C.__u64(0)
+ 
+   subvolsByID := make(map[uint64]*Info)
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/, app-emulation/containerd/

7 matches

Site Navigation

Mail list logo

Footer information