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

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

2021-12-01 Thread Georgy Yakovlev

commit: 5ef66bebc02b9facd0b20e0282376f4dbbba4ff2
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Dec  1 12:33:21 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Dec  1 12:38:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef66beb

app-emulation/containerd: add 1.4.12

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/Manifest |  1 +
 app-emulation/containerd/containerd-1.4.12.ebuild | 84 +++
 2 files changed, 85 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 4cb47a486a9a..afccf8f9a0b7 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,2 +1,3 @@
 DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B 
a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078
 SHA512 
16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
+DIST containerd-1.4.12.tar.gz 6408402 BLAKE2B 
559164a9d8680edea52040690da8e9b45777a39e471b1a7cc56ff4cf207cee7c83dc73969a8868db5d531f6e4e27cc7a975f073ffcf7f9c2768858b1a4001ddf
 SHA512 
52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1
 DIST containerd-1.5.7.tar.gz 7714453 BLAKE2B 
621b6527814665432c52e72263da371840a183aa65f621a686111b59ee48e85dd96919abd35f069476b97858a8112d3c92b03afbe42d57495649ca0d2af2fd50
 SHA512 
ce0d9d355b4a6142569690a9fcde8cd07de20b5788098f1184a728106a60dd11a437c87499a97af0c147b14372c2bca4daa823ea470f10b5e1b8a1e34ba530b0

diff --git a/app-emulation/containerd/containerd-1.4.12.ebuild 
b/app-emulation/containerd/containerd-1.4.12.ebuild
new file mode 100644
index ..10c53e0472be
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.4.12.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CONTAINERD_COMMIT=7b11cfaabd73bb80907dd23182b9347b4245eb5d
+EGO_PN="github.com/containerd/${PN}"
+inherit golang-vcs-snapshot
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/containerd/archive/v${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"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.2
+"
+
+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[*]}"
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+   )
+
+   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+   export GOFLAGS="-v -x -mod=vendor"
+   # race condition in man target https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" man -j1 #nowarn
+   emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+   dobin bin/*
+   doman man/*
+   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -r docs/man || die
+
+   local DOCS=( README.md PLUGINS.md docs/. )
+   einstalldocs
+}

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

2021-10-06 Thread William Hubbs

commit: ba7b1b77732edac12149f1ff2c04ce608127369d
Author: William Hubbs  gentoo  org>
AuthorDate: Wed Oct  6 17:50:37 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Oct  6 17:53:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7b1b77

app-emulation/containerd: drop unused inherit

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/containerd-1.4.11.ebuild | 2 +-
 app-emulation/containerd/containerd-1.5.7.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.4.11.ebuild 
b/app-emulation/containerd/containerd-1.4.11.ebuild
index 0080787ccd7..d2038dd4a85 100644
--- a/app-emulation/containerd/containerd-1.4.11.ebuild
+++ b/app-emulation/containerd/containerd-1.4.11.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CONTAINERD_COMMIT=5b46e404f6b9f661a205e28d59c982d3634148f8
 EGO_PN="github.com/containerd/${PN}"
-inherit golang-vcs-snapshot toolchain-funcs
+inherit golang-vcs-snapshot
 
 DESCRIPTION="A daemon to control runC"
 HOMEPAGE="https://containerd.io/;

diff --git a/app-emulation/containerd/containerd-1.5.7.ebuild 
b/app-emulation/containerd/containerd-1.5.7.ebuild
index d23baf73ad0..03b79d4159d 100644
--- a/app-emulation/containerd/containerd-1.5.7.ebuild
+++ b/app-emulation/containerd/containerd-1.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 GIT_REVISION=8686ededfc90076914c5238eb96c883ea093a8ba
-inherit go-module systemd toolchain-funcs
+inherit go-module systemd
 
 DESCRIPTION="A daemon to control runC"
 HOMEPAGE="https://containerd.io/;

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

2021-10-06 Thread William Hubbs

commit: a2ad3315d3835f669cc4430a382d00b3724e5e89
Author: William Hubbs  gentoo  org>
AuthorDate: Wed Oct  6 17:21:55 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Oct  6 17:24:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ad3315

app-emulation/containerd: remove unstable version

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest|  1 -
 app-emulation/containerd/containerd-1.5.4.ebuild | 84 
 2 files changed, 85 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 82b2c36efe5..4cb47a486a9 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,2 @@
 DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B 
a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078
 SHA512 
16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
-DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B 
b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5
 SHA512 
91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
 DIST containerd-1.5.7.tar.gz 7714453 BLAKE2B 
621b6527814665432c52e72263da371840a183aa65f621a686111b59ee48e85dd96919abd35f069476b97858a8112d3c92b03afbe42d57495649ca0d2af2fd50
 SHA512 
ce0d9d355b4a6142569690a9fcde8cd07de20b5788098f1184a728106a60dd11a437c87499a97af0c147b14372c2bca4daa823ea470f10b5e1b8a1e34ba530b0

diff --git a/app-emulation/containerd/containerd-1.5.4.ebuild 
b/app-emulation/containerd/containerd-1.5.4.ebuild
deleted file mode 100644
index 5c02912623d..000
--- a/app-emulation/containerd/containerd-1.5.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/;
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-   btrfs? ( sys-fs/btrfs-progs )
-   seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-   ${DEPEND}
-   ~app-emulation/runc-1.0.0
-"
-
-BDEPEND="
-   dev-go/go-md2man
-   virtual/pkgconfig
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-src_prepare() {
-   default
-   sed -i \
-   -e "s/-s -w//" \
-   Makefile || die
-   sed -i \
-   -e "s:/usr/local:/usr:" \
-   containerd.service || 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[*]}"
-   GO_BUILD_FLAGS="-mod vendor"
-   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-   REVISION=69107e47a62e1d690afa2b9b1d43f8ece3ff4483
-   VERSION=v${PV}
-   )
-
-   # race condition in man target https://bugs.gentoo.org/765100
-   # we need to explicitly specify GOFLAGS for "go run" to use vendor 
source
-   GOFLAGS="-v -x -mod=vendor" emake "${myemakeargs[@]}" man -j1 #nowarn
-   emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-   dobin bin/*
-   doman man/*
-   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-   systemd_dounit containerd.service
-   keepdir /var/lib/containerd
-
-   # we already installed manpages, remove markdown source
-   # before installing docs directory
-   rm -r docs/man || die
-
-   local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md 
docs/. )
-   einstalldocs
-}

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

2021-10-06 Thread William Hubbs

commit: 034053ac638abda13af6c8b4fe9fce45bd1023ed
Author: William Hubbs  gentoo  org>
AuthorDate: Wed Oct  6 16:49:18 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Oct  6 16:49:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034053ac

app-emulation/containerd: remove old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest|  1 -
 app-emulation/containerd/containerd-1.4.8.ebuild | 84 
 2 files changed, 85 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 41853b67f9c..82b2c36efe5 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1,3 @@
 DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B 
a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078
 SHA512 
16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
-DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B 
def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22
 SHA512 
3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
 DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B 
b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5
 SHA512 
91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
 DIST containerd-1.5.7.tar.gz 7714453 BLAKE2B 
621b6527814665432c52e72263da371840a183aa65f621a686111b59ee48e85dd96919abd35f069476b97858a8112d3c92b03afbe42d57495649ca0d2af2fd50
 SHA512 
ce0d9d355b4a6142569690a9fcde8cd07de20b5788098f1184a728106a60dd11a437c87499a97af0c147b14372c2bca4daa823ea470f10b5e1b8a1e34ba530b0

diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild 
b/app-emulation/containerd/containerd-1.4.8.ebuild
deleted file mode 100644
index 9e30a14ae4d..000
--- a/app-emulation/containerd/containerd-1.4.8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CONTAINERD_COMMIT=7eba5930496d9bbe375fdf71603e610ad737d2b2
-EGO_PN="github.com/containerd/${PN}"
-inherit golang-vcs-snapshot toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/;
-SRC_URI="https://github.com/containerd/containerd/archive/v${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"
-
-DEPEND="
-   btrfs? ( sys-fs/btrfs-progs )
-   seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-   ${DEPEND}
-   ~app-emulation/runc-1.0.0
-"
-
-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[*]}"
-   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-   )
-
-   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-   export GOFLAGS="-v -x -mod=vendor"
-   # race condition in man target https://bugs.gentoo.org/765100
-   emake "${myemakeargs[@]}" man -j1 #nowarn
-   emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-   dobin bin/*
-   doman man/*
-   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-   keepdir /var/lib/containerd
-
-   # we already installed manpages, remove markdown source
-   # before installing docs directory
-   rm -r docs/man || die
-
-   local DOCS=( README.md PLUGINS.md docs/. )
-   einstalldocs
-}

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

2021-10-05 Thread Georgy Yakovlev

commit: 299071d1a80d7c574ccda1e990bbb1a0d8517f56
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Oct  6 01:18:43 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Oct  6 01:18:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=299071d1

app-emulation/containerd: Stabilize 1.4.11 arm64, #816468

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/containerd-1.4.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.11.ebuild 
b/app-emulation/containerd/containerd-1.4.11.ebuild
index 845737c6c54..0080787ccd7 100644
--- a/app-emulation/containerd/containerd-1.4.11.ebuild
+++ b/app-emulation/containerd/containerd-1.4.11.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-10-05 Thread Georgy Yakovlev

commit: 864c68412acaf19b536611e8b72d64995c404963
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Oct  6 01:18:23 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Oct  6 01:18:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864c6841

app-emulation/containerd: Stabilize 1.4.11 ppc64, #816468

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/containerd-1.4.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.11.ebuild 
b/app-emulation/containerd/containerd-1.4.11.ebuild
index 4a5c178764b..845737c6c54 100644
--- a/app-emulation/containerd/containerd-1.4.11.ebuild
+++ b/app-emulation/containerd/containerd-1.4.11.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-10-05 Thread William Hubbs

commit: 1be02ef08d8efe39524433e78d56f4e5553bb025
Author: William Hubbs  gentoo  org>
AuthorDate: Wed Oct  6 01:10:41 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Oct  6 01:16:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be02ef0

app-emulation/containerd: stable 1.4.11 on amd64

Bug: https://bugs.gentoo.org/show_bug.cgi?id=816468
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/containerd-1.4.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.11.ebuild 
b/app-emulation/containerd/containerd-1.4.11.ebuild
index 8134e8bbf88..4a5c178764b 100644
--- a/app-emulation/containerd/containerd-1.4.11.ebuild
+++ b/app-emulation/containerd/containerd-1.4.11.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-10-05 Thread William Hubbs

commit: 1fa97ba76f7df04d1aee11df3defb5645c376b24
Author: William Hubbs  gentoo  org>
AuthorDate: Tue Oct  5 20:57:28 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Oct  5 21:00:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa97ba7

app-emulation/containerd: fix dependencies

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/containerd-1.4.11.ebuild | 2 +-
 app-emulation/containerd/containerd-1.5.7.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.4.11.ebuild 
b/app-emulation/containerd/containerd-1.4.11.ebuild
index 69dd4dcf2d1..8134e8bbf88 100644
--- a/app-emulation/containerd/containerd-1.4.11.ebuild
+++ b/app-emulation/containerd/containerd-1.4.11.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 # recommended version of runc is found in script/setup/runc-version
 RDEPEND="
${DEPEND}
-   ~app-emulation/runc-1.0.0
+   ~app-emulation/runc-1.0.2
 "
 
 BDEPEND="

diff --git a/app-emulation/containerd/containerd-1.5.7.ebuild 
b/app-emulation/containerd/containerd-1.5.7.ebuild
index 3aca24c9b92..d23baf73ad0 100644
--- a/app-emulation/containerd/containerd-1.5.7.ebuild
+++ b/app-emulation/containerd/containerd-1.5.7.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 # recommended version of runc is found in script/setup/runc-version
 RDEPEND="
${DEPEND}
-   ~app-emulation/runc-1.0.0
+   ~app-emulation/runc-1.0.2
 "
 
 BDEPEND="

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

2021-10-05 Thread William Hubbs

commit: 667dda8c7e1cee35457456b7e5d65d6c1fabbd46
Author: William Hubbs  gentoo  org>
AuthorDate: Tue Oct  5 20:06:09 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Oct  5 20:18:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667dda8c

app-emulation/containerd: 1.5.7 bump

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.5.7.ebuild | 84 
 2 files changed, 85 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 58aa13bbeeb..41853b67f9c 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,4 @@
 DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B 
a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078
 SHA512 
16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
 DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B 
def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22
 SHA512 
3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
 DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B 
b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5
 SHA512 
91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
+DIST containerd-1.5.7.tar.gz 7714453 BLAKE2B 
621b6527814665432c52e72263da371840a183aa65f621a686111b59ee48e85dd96919abd35f069476b97858a8112d3c92b03afbe42d57495649ca0d2af2fd50
 SHA512 
ce0d9d355b4a6142569690a9fcde8cd07de20b5788098f1184a728106a60dd11a437c87499a97af0c147b14372c2bca4daa823ea470f10b5e1b8a1e34ba530b0

diff --git a/app-emulation/containerd/containerd-1.5.7.ebuild 
b/app-emulation/containerd/containerd-1.5.7.ebuild
new file mode 100644
index 000..3aca24c9b92
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.5.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_REVISION=8686ededfc90076914c5238eb96c883ea093a8ba
+inherit go-module systemd toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0
+"
+
+BDEPEND="
+   dev-go/go-md2man
+   virtual/pkgconfig
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+src_prepare() {
+   default
+   sed -i \
+   -e "s/-s -w//" \
+   Makefile || die
+   sed -i \
+   -e "s:/usr/local:/usr:" \
+   containerd.service || 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[*]}"
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+   REVISION="${GIT_REVISION}"
+   VERSION=v${PV}
+   )
+
+   # race condition in man target https://bugs.gentoo.org/765100
+   # we need to explicitly specify GOFLAGS for "go run" to use vendor 
source
+   emake "${myemakeargs[@]}" man -j1 #nowarn
+   emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+   dobin bin/*
+   doman man/*
+   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+   systemd_dounit containerd.service
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -r docs/man || die
+
+   local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md 
docs/. )
+   einstalldocs
+}

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

2021-10-05 Thread William Hubbs

commit: f36dcd565c851467fdf849945b84439847b37b36
Author: William Hubbs  gentoo  org>
AuthorDate: Tue Oct  5 19:12:24 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Oct  5 19:12:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36dcd56

app-emulation/containerd: fix commit hash for 1.4.11

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/containerd-1.4.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.11.ebuild 
b/app-emulation/containerd/containerd-1.4.11.ebuild
index 114568e5a33..69dd4dcf2d1 100644
--- a/app-emulation/containerd/containerd-1.4.11.ebuild
+++ b/app-emulation/containerd/containerd-1.4.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CONTAINERD_COMMIT=7eba5930496d9bbe375fdf71603e610ad737d2b2
+CONTAINERD_COMMIT=5b46e404f6b9f661a205e28d59c982d3634148f8
 EGO_PN="github.com/containerd/${PN}"
 inherit golang-vcs-snapshot toolchain-funcs

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

2021-10-05 Thread William Hubbs

commit: d5af72dcbea251eeff530ccf79165d467cac764e
Author: William Hubbs  gentoo  org>
AuthorDate: Tue Oct  5 18:57:10 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Oct  5 18:57:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5af72dc

app-emulation/containerd: 1.4.11 bump

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest |  1 +
 app-emulation/containerd/containerd-1.4.11.ebuild | 84 +++
 2 files changed, 85 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 090fef9f9e6..58aa13bbeeb 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,2 +1,3 @@
+DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B 
a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078
 SHA512 
16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
 DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B 
def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22
 SHA512 
3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
 DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B 
b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5
 SHA512 
91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1

diff --git a/app-emulation/containerd/containerd-1.4.11.ebuild 
b/app-emulation/containerd/containerd-1.4.11.ebuild
new file mode 100644
index 000..114568e5a33
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.4.11.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CONTAINERD_COMMIT=7eba5930496d9bbe375fdf71603e610ad737d2b2
+EGO_PN="github.com/containerd/${PN}"
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/containerd/archive/v${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"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0
+"
+
+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[*]}"
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+   )
+
+   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+   export GOFLAGS="-v -x -mod=vendor"
+   # race condition in man target https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" man -j1 #nowarn
+   emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+   dobin bin/*
+   doman man/*
+   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -r docs/man || die
+
+   local DOCS=( README.md PLUGINS.md docs/. )
+   einstalldocs
+}

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

2021-08-12 Thread Yixun Lan

commit: e4bc161da16aa3840acccdfe604964ef04a54803
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Aug 13 01:53:43 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Aug 13 02:07:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4bc161d

app-emulation/containerd: keyword ~riscv

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 app-emulation/containerd/containerd-1.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.5.4.ebuild 
b/app-emulation/containerd/containerd-1.5.4.ebuild
index 2ba35903584..5c02912623d 100644
--- a/app-emulation/containerd/containerd-1.5.4.ebuild
+++ b/app-emulation/containerd/containerd-1.5.4.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-07-26 Thread Georgy Yakovlev

commit: 62af75d4a618ab35ca0d6d9ef057535f86f0ce0c
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jul 26 21:23:54 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jul 26 21:24:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62af75d4

app-emulation/containerd: drop 1.5.2

Bug: https://bugs.gentoo.org/802948
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/Manifest|  2 -
 app-emulation/containerd/containerd-1.5.2.ebuild | 82 
 2 files changed, 84 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 99e74a98cf1..53d555771a6 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,5 +1,3 @@
 DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 
3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f
 SHA512 
4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
 DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B 
def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22
 SHA512 
3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
-DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 
52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26
 SHA512 
e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
 DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B 
b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5
 SHA512 
91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
-DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 
647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c
 SHA512 
32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84

diff --git a/app-emulation/containerd/containerd-1.5.2.ebuild 
b/app-emulation/containerd/containerd-1.5.2.ebuild
deleted file mode 100644
index 7ebc5b20374..000
--- a/app-emulation/containerd/containerd-1.5.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/;
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~williamh/dist/${PN}-man-${PV}.tar.xz;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-   btrfs? ( sys-fs/btrfs-progs )
-   seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-   ${DEPEND}
-   ~app-emulation/runc-1.0.0_rc95
-"
-
-BDEPEND="
-   dev-go/go-md2man
-   virtual/pkgconfig
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-src_prepare() {
-   default
-   mv ../man . || die
-   sed -i \
-   -e "s/-s -w//" \
-   Makefile || die
-   sed -i \
-   -e "s:/usr/local:/usr:" \
-   containerd.service || 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[*]}"
-   GO_BUILD_FLAGS="-mod vendor"
-   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-   REVISION=36cc874494a56a253cd181a1a685b44b58a2e34a
-   VERSION=v${PV}
-   )
-
-   emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-   dobin bin/*
-   doman man/*
-   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-   systemd_dounit containerd.service
-   keepdir /var/lib/containerd
-
-   # we already installed manpages, remove markdown source
-   # before installing docs directory
-   rm -r docs/man || die
-
-   local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md 
docs/. )
-   einstalldocs
-}

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

2021-07-26 Thread Georgy Yakovlev

commit: 682e0ab4966d624d99be7e9a954e476e950be926
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jul 26 21:24:13 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jul 26 21:24:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682e0ab4

app-emulation/containerd: drop 1.4.6

Bug: https://bugs.gentoo.org/802948
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/Manifest|  1 -
 app-emulation/containerd/containerd-1.4.6.ebuild | 84 
 2 files changed, 85 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 53d555771a6..090fef9f9e6 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,2 @@
-DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 
3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f
 SHA512 
4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
 DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B 
def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22
 SHA512 
3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
 DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B 
b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5
 SHA512 
91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1

diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild 
b/app-emulation/containerd/containerd-1.4.6.ebuild
deleted file mode 100644
index 8e9b81b35d7..000
--- a/app-emulation/containerd/containerd-1.4.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CONTAINERD_COMMIT=d71fcd7d8303cbf684402823e425e9dd2e99285d
-EGO_PN="github.com/containerd/${PN}"
-inherit golang-vcs-snapshot toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/;
-SRC_URI="https://github.com/containerd/containerd/archive/v${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"
-
-DEPEND="
-   btrfs? ( sys-fs/btrfs-progs )
-   seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-   ${DEPEND}
-   ~app-emulation/runc-1.0.0_rc95
-"
-
-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[*]}"
-   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-   )
-
-   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-   export GOFLAGS="-v -x -mod=vendor"
-   # race condition in man target https://bugs.gentoo.org/765100
-   emake "${myemakeargs[@]}" man -j1 #nowarn
-   emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-   dobin bin/*
-   doman man/*
-   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-   keepdir /var/lib/containerd
-
-   # we already installed manpages, remove markdown source
-   # before installing docs directory
-   rm -r docs/man || die
-
-   local DOCS=( README.md PLUGINS.md docs/. )
-   einstalldocs
-}

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

2021-07-25 Thread Sam James

commit: f256f3ee832032aa2ae681b1c6c5943b0ec0b592
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 26 02:13:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 26 02:13:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f256f3ee

app-emulation/containerd: Stabilize 1.4.8 ppc64, #802948

Signed-off-by: Sam James  gentoo.org>

 app-emulation/containerd/containerd-1.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild 
b/app-emulation/containerd/containerd-1.4.8.ebuild
index c716298ccf9..9e30a14ae4d 100644
--- a/app-emulation/containerd/containerd-1.4.8.ebuild
+++ b/app-emulation/containerd/containerd-1.4.8.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-07-24 Thread Sam James

commit: 4c9d2177eb521d4ec1085444bb66796e4dd44b9a
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 24 17:19:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 24 17:19:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9d2177

app-emulation/containerd: Stabilize 1.4.8 arm64, #802948

Signed-off-by: Sam James  gentoo.org>

 app-emulation/containerd/containerd-1.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild 
b/app-emulation/containerd/containerd-1.4.8.ebuild
index 39f3e5aaf19..c716298ccf9 100644
--- a/app-emulation/containerd/containerd-1.4.8.ebuild
+++ b/app-emulation/containerd/containerd-1.4.8.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-07-23 Thread Sam James

commit: 121564b49eb82be8aece87e84a00f7de2bebbaef
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 23 17:59:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 23 17:59:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121564b4

app-emulation/containerd: fix WhitespaceFound

Signed-off-by: Sam James  gentoo.org>

 app-emulation/containerd/containerd-1.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.5.4.ebuild 
b/app-emulation/containerd/containerd-1.5.4.ebuild
index 88783770efe..2ba35903584 100644
--- a/app-emulation/containerd/containerd-1.5.4.ebuild
+++ b/app-emulation/containerd/containerd-1.5.4.ebuild
@@ -60,7 +60,7 @@ src_compile() {
REVISION=69107e47a62e1d690afa2b9b1d43f8ece3ff4483
VERSION=v${PV}
)
-   
+
# race condition in man target https://bugs.gentoo.org/765100
# we need to explicitly specify GOFLAGS for "go run" to use vendor 
source
GOFLAGS="-v -x -mod=vendor" emake "${myemakeargs[@]}" man -j1 #nowarn

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

2021-07-23 Thread Sam James

commit: 2e900abf88f6b48b02ae60f9f3cd1d2cba7c94bd
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 23 17:57:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 23 17:57:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e900abf

app-emulation/containerd: Stabilize 1.4.8 amd64, #802948

Signed-off-by: Sam James  gentoo.org>

 app-emulation/containerd/containerd-1.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild 
b/app-emulation/containerd/containerd-1.4.8.ebuild
index 114568e5a33..39f3e5aaf19 100644
--- a/app-emulation/containerd/containerd-1.4.8.ebuild
+++ b/app-emulation/containerd/containerd-1.4.8.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-07-19 Thread Georgy Yakovlev

commit: 3844230e77f39931083e7dfa33452666d6fd7452
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jul 20 02:41:18 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jul 20 02:43:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3844230e

app-emulation/containerd: add 1.5.4

Bug: https://bugs.gentoo.org/802948
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.5.4.ebuild | 84 
 2 files changed, 85 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 5e37778447d..99e74a98cf1 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1,5 @@
 DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 
3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f
 SHA512 
4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
 DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B 
def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22
 SHA512 
3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
 DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 
52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26
 SHA512 
e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
+DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B 
b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5
 SHA512 
91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
 DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 
647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c
 SHA512 
32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84

diff --git a/app-emulation/containerd/containerd-1.5.4.ebuild 
b/app-emulation/containerd/containerd-1.5.4.ebuild
new file mode 100644
index 000..88783770efe
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.5.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/containerd/archive/v${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"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0
+"
+
+BDEPEND="
+   dev-go/go-md2man
+   virtual/pkgconfig
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+src_prepare() {
+   default
+   sed -i \
+   -e "s/-s -w//" \
+   Makefile || die
+   sed -i \
+   -e "s:/usr/local:/usr:" \
+   containerd.service || 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[*]}"
+   GO_BUILD_FLAGS="-mod vendor"
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+   REVISION=69107e47a62e1d690afa2b9b1d43f8ece3ff4483
+   VERSION=v${PV}
+   )
+   
+   # race condition in man target https://bugs.gentoo.org/765100
+   # we need to explicitly specify GOFLAGS for "go run" to use vendor 
source
+   GOFLAGS="-v -x -mod=vendor" emake "${myemakeargs[@]}" man -j1 #nowarn
+   emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+   dobin bin/*
+   doman man/*
+   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+   systemd_dounit containerd.service
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -r docs/man || die
+
+   local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md

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

2021-07-19 Thread Georgy Yakovlev

commit: d7ca7f4aa67809d4817c384e744bc9653278b815
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jul 20 02:06:38 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jul 20 02:43:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ca7f4a

app-emulation/containerd: add 1.4.8

Bug: https://bugs.gentoo.org/802948
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.4.8.ebuild | 84 
 2 files changed, 85 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 8185d4679f3..5e37778447d 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,4 @@
 DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 
3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f
 SHA512 
4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
+DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B 
def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22
 SHA512 
3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
 DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 
52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26
 SHA512 
e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
 DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 
647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c
 SHA512 
32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84

diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild 
b/app-emulation/containerd/containerd-1.4.8.ebuild
new file mode 100644
index 000..114568e5a33
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.4.8.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CONTAINERD_COMMIT=7eba5930496d9bbe375fdf71603e610ad737d2b2
+EGO_PN="github.com/containerd/${PN}"
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/containerd/archive/v${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"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0
+"
+
+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[*]}"
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+   )
+
+   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+   export GOFLAGS="-v -x -mod=vendor"
+   # race condition in man target https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" man -j1 #nowarn
+   emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+   dobin bin/*
+   doman man/*
+   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -r docs/man || die
+
+   local DOCS=( README.md PLUGINS.md docs/. )
+   einstalldocs
+}

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

2021-07-11 Thread Georgy Yakovlev

commit: 4216bd412e922cf8611362c3918e990b4a9c90cb
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Jul 10 21:35:28 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Jul 11 08:58:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4216bd41

app-emulation/containerd: add a note about script/setup/runc-version

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/containerd-1.4.6.ebuild | 1 +
 app-emulation/containerd/containerd-1.5.2.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild 
b/app-emulation/containerd/containerd-1.4.6.ebuild
index f0cb4195bf5..8e9b81b35d7 100644
--- a/app-emulation/containerd/containerd-1.4.6.ebuild
+++ b/app-emulation/containerd/containerd-1.4.6.ebuild
@@ -21,6 +21,7 @@ DEPEND="
seccomp? ( sys-libs/libseccomp )
 "
 
+# recommended version of runc is found in script/setup/runc-version
 RDEPEND="
${DEPEND}
~app-emulation/runc-1.0.0_rc95

diff --git a/app-emulation/containerd/containerd-1.5.2.ebuild 
b/app-emulation/containerd/containerd-1.5.2.ebuild
index 7f7c816464f..7ebc5b20374 100644
--- a/app-emulation/containerd/containerd-1.5.2.ebuild
+++ b/app-emulation/containerd/containerd-1.5.2.ebuild
@@ -19,6 +19,7 @@ DEPEND="
seccomp? ( sys-libs/libseccomp )
 "
 
+# recommended version of runc is found in script/setup/runc-version
 RDEPEND="
${DEPEND}
~app-emulation/runc-1.0.0_rc95

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

2021-06-13 Thread Georgy Yakovlev

commit: 000d1279ef9ffa0bc7bcaa50d09b745dbacf59d4
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jun 14 00:26:01 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jun 14 00:26:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000d1279

app-emulation/containerd: drop 1.3.7, 1.3.9, 1.4.4

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/Manifest|  3 -
 app-emulation/containerd/containerd-1.3.7.ebuild | 85 
 app-emulation/containerd/containerd-1.3.9.ebuild | 85 
 app-emulation/containerd/containerd-1.4.4.ebuild | 83 ---
 4 files changed, 256 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index eaa22f899da..8185d4679f3 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,6 +1,3 @@
-DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
-DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
-DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 
62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e
 SHA512 
f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070
 DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 
3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f
 SHA512 
4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
 DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 
52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26
 SHA512 
e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
 DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 
647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c
 SHA512 
32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
deleted file mode 100644
index b78f87e7f3d..000
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob//components/engine/hack/dockerfile/install/containerd.installer
-CONTAINERD_COMMIT="8fba4e9a7d01810a393d5d25a3621dc101981175"
-EGO_PN="github.com/containerd/${PN}"
-
-inherit golang-vcs-snapshot toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/;
-SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.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"
-
-DEPEND="
-   btrfs? ( sys-fs/btrfs-progs )
-   seccomp? ( sys-libs/libseccomp )
-"
-
-RDEPEND="
-   ${DEPEND}
-   ~app-emulation/runc-1.0.0_rc10
-"
-
-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[*]}"
-   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-   )
-
-   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-   export GOFLAGS="-v -x -mod=vendor"
-

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

2021-06-13 Thread Sam James

commit: 15fed0934dc8f6ecdaf55a47fe9ee41fc7864cd9
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 13 22:36:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 13 22:36:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15fed093

app-emulation/containerd: Stabilize 1.4.6 arm64, #790257

Signed-off-by: Sam James  gentoo.org>

 app-emulation/containerd/containerd-1.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild 
b/app-emulation/containerd/containerd-1.4.6.ebuild
index a856d057bba..f0cb4195bf5 100644
--- a/app-emulation/containerd/containerd-1.4.6.ebuild
+++ b/app-emulation/containerd/containerd-1.4.6.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-06-13 Thread William Hubbs

commit: 9e0d43daf91ca755604c71e20c2f47937aa24bd2
Author: William Hubbs  gentoo  org>
AuthorDate: Sun Jun 13 18:41:26 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Sun Jun 13 18:45:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0d43da

app-emulation/containerd: 1.5.2 bump

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest|  2 +
 app-emulation/containerd/containerd-1.5.2.ebuild | 81 
 2 files changed, 83 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 463c79f6453..eaa22f899da 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,3 +2,5 @@ DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
 DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 
62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e
 SHA512 
f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070
 DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 
3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f
 SHA512 
4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
+DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 
52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26
 SHA512 
e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
+DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 
647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c
 SHA512 
32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84

diff --git a/app-emulation/containerd/containerd-1.5.2.ebuild 
b/app-emulation/containerd/containerd-1.5.2.ebuild
new file mode 100644
index 000..7f7c816464f
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.5.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   https://dev.gentoo.org/~williamh/dist/${PN}-man-${PV}.tar.xz;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0_rc95
+"
+
+BDEPEND="
+   dev-go/go-md2man
+   virtual/pkgconfig
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+src_prepare() {
+   default
+   mv ../man . || die
+   sed -i \
+   -e "s/-s -w//" \
+   Makefile || die
+   sed -i \
+   -e "s:/usr/local:/usr:" \
+   containerd.service || 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[*]}"
+   GO_BUILD_FLAGS="-mod vendor"
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+   REVISION=36cc874494a56a253cd181a1a685b44b58a2e34a
+   VERSION=v${PV}
+   )
+
+   emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+   dobin bin/*
+   doman man/*
+   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+   systemd_dounit containerd.service
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -r docs/man || die
+
+   local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md 
docs/. )
+   einstalldocs
+}

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

2021-06-11 Thread William Hubbs

commit: e50c548ae83692602b6cd5dce9621292b5ef7482
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Jun 11 15:57:13 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Jun 11 16:25:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50c548a

app-emulation/containerd: stabilize 1.4.6 on amd64

Bug: https://bugs.gentoo.org/775329
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/containerd-1.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild 
b/app-emulation/containerd/containerd-1.4.6.ebuild
index d5c1555af7d..a856d057bba 100644
--- a/app-emulation/containerd/containerd-1.4.6.ebuild
+++ b/app-emulation/containerd/containerd-1.4.6.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-06-10 Thread Georgy Yakovlev

commit: c2fd48e64057a3f70320cba78a438f30aa24c516
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jun 11 00:55:12 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jun 11 00:58:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2fd48e6

app-emulation/containerd: stabilize 1.4.6 for ppc64, bug #775329

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/containerd-1.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild 
b/app-emulation/containerd/containerd-1.4.6.ebuild
index 136f9943ac0..d5c1555af7d 100644
--- a/app-emulation/containerd/containerd-1.4.6.ebuild
+++ b/app-emulation/containerd/containerd-1.4.6.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-06-10 Thread William Hubbs

commit: 42f615190bbf77c8186ea9e7731b83e2a85fd6bb
Author: William Hubbs  gentoo  org>
AuthorDate: Thu Jun 10 21:53:14 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Jun 10 21:53:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f61519

app-emulation/containerd: 1.4.6 bump

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.4.6.ebuild | 83 
 2 files changed, 84 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 494937361e7..463c79f6453 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,4 @@
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
 DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 
62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e
 SHA512 
f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070
+DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 
3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f
 SHA512 
4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143

diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild 
b/app-emulation/containerd/containerd-1.4.6.ebuild
new file mode 100644
index 000..136f9943ac0
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.4.6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CONTAINERD_COMMIT=d71fcd7d8303cbf684402823e425e9dd2e99285d
+EGO_PN="github.com/containerd/${PN}"
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/containerd/archive/v${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"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0_rc95
+"
+
+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[*]}"
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+   )
+
+   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+   export GOFLAGS="-v -x -mod=vendor"
+   # race condition in man target https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" man -j1 #nowarn
+   emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+   dobin bin/*
+   doman man/*
+   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -r docs/man || die
+
+   local DOCS=( README.md PLUGINS.md docs/. )
+   einstalldocs
+}

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

2021-06-01 Thread Georgy Yakovlev

commit: 40b39040390e1003ac971588dd6e59166073dcd4
Author: Vaibhav Rustagi  google  com>
AuthorDate: Tue May 25 00:06:03 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Jun  2 00:00:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b39040

app-emulation: Add CPE tag for containerd.

This CL adds the CPE tag for containerd package.
Example: https://nvd.nist.gov/vuln/detail/CVE-2020-15257#range-6368294

Signed-off-by: Vaibhav Rustagi  google.com>
Closes: https://github.com/gentoo/gentoo/pull/20973
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/containerd/metadata.xml 
b/app-emulation/containerd/metadata.xml
index 0795c4ce61e..88d88c9fab9 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -24,5 +24,6 @@


containerd/containerd
+   cpe:/a:linuxfoundation:containerd

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

2021-05-25 Thread Georgy Yakovlev

commit: 950ad9503edeca6aaa690e6a6e062e3ce08bbd61
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue May 25 23:29:57 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue May 25 23:29:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950ad950

app-emulation/containerd: apply #nowarn properly to -j1

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

 app-emulation/containerd/containerd-1.3.7.ebuild | 3 ++-
 app-emulation/containerd/containerd-1.3.9.ebuild | 3 ++-
 app-emulation/containerd/containerd-1.4.4.ebuild | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
index de9c94b3557..b78f87e7f3d 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -66,7 +66,8 @@ src_compile() {
 
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
export GOFLAGS="-v -x -mod=vendor"
-   emake "${myemakeargs[@]}" man -j1 #nowarn https://bugs.gentoo.org/765100
+   # race condition in man target https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" man -j1 #nowarn
emake "${myemakeargs[@]}" all
 }
 

diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild 
b/app-emulation/containerd/containerd-1.3.9.ebuild
index ce0733b1086..2e7c01ad5a7 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -66,7 +66,8 @@ src_compile() {
 
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
export GOFLAGS="-v -x -mod=vendor"
-   emake "${myemakeargs[@]}" man -j1 #nowarn https://bugs.gentoo.org/765100
+   # race condition in man target https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" man -j1 #nowarn
emake "${myemakeargs[@]}" all
 }
 

diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild 
b/app-emulation/containerd/containerd-1.4.4.ebuild
index 18c54a20724..f6318700355 100644
--- a/app-emulation/containerd/containerd-1.4.4.ebuild
+++ b/app-emulation/containerd/containerd-1.4.4.ebuild
@@ -63,7 +63,8 @@ src_compile() {
 
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
export GOFLAGS="-v -x -mod=vendor"
-   emake "${myemakeargs[@]}" man -j1 #nowarn https://bugs.gentoo.org/765100
+   # race condition in man target https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" man -j1 #nowarn
emake "${myemakeargs[@]}" all
 }

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

2021-05-25 Thread Georgy Yakovlev

commit: 4675bc1a2c77f36edd2c58e5076923382625e0a8
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue May 25 23:26:51 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue May 25 23:27:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4675bc1a

app-emulation/containerd: work around makefile race condition

Closes: https://bugs.gentoo.org/765100
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/containerd/containerd-1.3.7.ebuild | 3 ++-
 app-emulation/containerd/containerd-1.3.9.ebuild | 3 ++-
 app-emulation/containerd/containerd-1.4.4.ebuild | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
index bd5fea0fe6c..de9c94b3557 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -66,7 +66,8 @@ src_compile() {
 
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
export GOFLAGS="-v -x -mod=vendor"
-   emake "${myemakeargs[@]}" all man
+   emake "${myemakeargs[@]}" man -j1 #nowarn https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" all
 }
 
 src_install() {

diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild 
b/app-emulation/containerd/containerd-1.3.9.ebuild
index c494ec62692..ce0733b1086 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -66,7 +66,8 @@ src_compile() {
 
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
export GOFLAGS="-v -x -mod=vendor"
-   emake "${myemakeargs[@]}" all man
+   emake "${myemakeargs[@]}" man -j1 #nowarn https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" all
 }
 
 src_install() {

diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild 
b/app-emulation/containerd/containerd-1.4.4.ebuild
index d4d947ad8f1..18c54a20724 100644
--- a/app-emulation/containerd/containerd-1.4.4.ebuild
+++ b/app-emulation/containerd/containerd-1.4.4.ebuild
@@ -63,7 +63,8 @@ src_compile() {
 
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
export GOFLAGS="-v -x -mod=vendor"
-   emake "${myemakeargs[@]}" all man
+   emake "${myemakeargs[@]}" man -j1 #nowarn https://bugs.gentoo.org/765100
+   emake "${myemakeargs[@]}" all
 }
 
 src_install() {

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

2021-05-16 Thread Sam James

commit: 338c8de0fbd6c146bef66ae2c30cd20cdee2f304
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 12:41:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 12:44:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=338c8de0

app-emulation/containerd: Stabilize 1.4.4 arm64, #783525

Signed-off-by: Sam James  gentoo.org>

 app-emulation/containerd/containerd-1.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild 
b/app-emulation/containerd/containerd-1.4.4.ebuild
index 44c2ad35531..d4d947ad8f1 100644
--- a/app-emulation/containerd/containerd-1.4.4.ebuild
+++ b/app-emulation/containerd/containerd-1.4.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-05-13 Thread Georgy Yakovlev

commit: a7352d981b2e22d68555954f61f8f453f42c6325
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu May 13 10:48:26 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu May 13 10:48:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7352d98

app-emulation/containerd: remove ED usage

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

 app-emulation/containerd/containerd-1.3.7.ebuild | 3 +--
 app-emulation/containerd/containerd-1.3.9.ebuild | 3 +--
 app-emulation/containerd/containerd-1.4.4.ebuild | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
index ab62a3500db..bd5fea0fe6c 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,7 +61,6 @@ src_compile() {
 
myemakeargs=(
BUILDTAGS="${options[*]}"
-   DESTDIR="${ED}"
LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
)
 

diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild 
b/app-emulation/containerd/containerd-1.3.9.ebuild
index bf487739cac..c494ec62692 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,7 +61,6 @@ src_compile() {
 
myemakeargs=(
BUILDTAGS="${options[*]}"
-   DESTDIR="${ED}"
LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
)
 

diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild 
b/app-emulation/containerd/containerd-1.4.4.ebuild
index 3031f34e224..44c2ad35531 100644
--- a/app-emulation/containerd/containerd-1.4.4.ebuild
+++ b/app-emulation/containerd/containerd-1.4.4.ebuild
@@ -58,7 +58,6 @@ src_compile() {
 
myemakeargs=(
BUILDTAGS="${options[*]}"
-   DESTDIR="${ED}"
LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
)

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

2021-04-28 Thread Mikle Kolyada

commit: 5727ac61bd0e725272712a071323bbedf34a2fa3
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Apr 28 16:43:30 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Apr 28 16:44:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5727ac61

app-emulation/containerd: Stabilize 1.4.4 amd64, #783525

Signed-off-by: Mikle Kolyada  gentoo.org>

 app-emulation/containerd/containerd-1.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild 
b/app-emulation/containerd/containerd-1.4.4.ebuild
index fc5462fead9..3031f34e224 100644
--- a/app-emulation/containerd/containerd-1.4.4.ebuild
+++ b/app-emulation/containerd/containerd-1.4.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2021-03-09 Thread William Hubbs

commit: f650b1d5e3ca55a60dea3be05b8a5fcc28434419
Author: William Hubbs  gentoo  org>
AuthorDate: Tue Mar  9 16:25:57 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Mar  9 16:26:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f650b1d5

app-emulation/containerd: remove 1.4.3

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest  |  1 -
 .../containerd/containerd-1.4.3-r2.ebuild  | 86 --
 2 files changed, 87 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index d3087745792..494937361e7 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1,3 @@
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
-DIST containerd-1.4.3.gh.tar.gz 6180754 BLAKE2B 
41dfedf18dcdfe942013ca4a036235b39e3ce98c89fa64a99c05693183b26c071cec613566234de709df943da6ebd62e6a29b918b30233b9660519c4970c0f0c
 SHA512 
0bb64ebc8afc87781fbdb21b7c8362e3cd9a3afe88c053905e9c6859788f0801187aa6abb79dc1d293dd92f74d320ff4a2293a6abb00914781a487a869e68a80
 DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 
62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e
 SHA512 
f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070

diff --git a/app-emulation/containerd/containerd-1.4.3-r2.ebuild 
b/app-emulation/containerd/containerd-1.4.3-r2.ebuild
deleted file mode 100644
index 90dd18565d1..000
--- a/app-emulation/containerd/containerd-1.4.3-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob//components/engine/hack/dockerfile/install/containerd.installer
-CONTAINERD_COMMIT="269548fa27e0089a8b8278fc4fc781d7f65a939b"
-EGO_PN="github.com/containerd/${PN}"
-
-inherit golang-vcs-snapshot toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/;
-# NOTE: Drop '.gh' on bump, it's there because of bug #764791
-SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-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 "${PN}"
-   keepdir /var/lib/containerd
-
-   # we already installed manpages, remove markdown source
-   # before installing docs directory
-   rm -r docs/man || die
-
-   local DOCS=( README.md PLUGINS.md docs/. )
-   einstalldocs
-}

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

2021-03-08 Thread William Hubbs

commit: 1b1a7f0489f9279bb3a6833c1310f163c2d75baa
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Mar  8 19:39:46 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Mar  8 19:40:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b1a7f04

app-emulation/containerd: 1.4.4 bump

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.4.4.ebuild | 82 
 2 files changed, 83 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index d0867a03104..d3087745792 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,4 @@
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
 DIST containerd-1.4.3.gh.tar.gz 6180754 BLAKE2B 
41dfedf18dcdfe942013ca4a036235b39e3ce98c89fa64a99c05693183b26c071cec613566234de709df943da6ebd62e6a29b918b30233b9660519c4970c0f0c
 SHA512 
0bb64ebc8afc87781fbdb21b7c8362e3cd9a3afe88c053905e9c6859788f0801187aa6abb79dc1d293dd92f74d320ff4a2293a6abb00914781a487a869e68a80
+DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 
62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e
 SHA512 
f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070

diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild 
b/app-emulation/containerd/containerd-1.4.4.ebuild
new file mode 100644
index 000..fc5462fead9
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.4.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CONTAINERD_COMMIT=05f951a3781f4f2c1911b05e61c160e9c30eaa8e
+EGO_PN="github.com/containerd/${PN}"
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/containerd/archive/v${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"
+
+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 "${PN}"
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -r docs/man || die
+
+   local DOCS=( README.md PLUGINS.md docs/. )
+   einstalldocs
+}

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

2021-01-13 Thread Sam James

commit: 4543f0e69a92d8696950524ec2e64bd5d5a0234b
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 13 15:11:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 13 15:11:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4543f0e6

app-emulation/containerd: fix 1.4.3 tarball

The commit wasn't updated.

Closes: https://bugs.gentoo.org/764791
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 app-emulation/containerd/Manifest  |  2 +-
 .../{containerd-1.4.3-r1.ebuild => containerd-1.4.3-r2.ebuild} | 10 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 631361d19d6..d0867a03104 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,3 @@
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
-DIST containerd-1.4.3.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
+DIST containerd-1.4.3.gh.tar.gz 6180754 BLAKE2B 
41dfedf18dcdfe942013ca4a036235b39e3ce98c89fa64a99c05693183b26c071cec613566234de709df943da6ebd62e6a29b918b30233b9660519c4970c0f0c
 SHA512 
0bb64ebc8afc87781fbdb21b7c8362e3cd9a3afe88c053905e9c6859788f0801187aa6abb79dc1d293dd92f74d320ff4a2293a6abb00914781a487a869e68a80

diff --git a/app-emulation/containerd/containerd-1.4.3-r1.ebuild 
b/app-emulation/containerd/containerd-1.4.3-r2.ebuild
similarity index 89%
rename from app-emulation/containerd/containerd-1.4.3-r1.ebuild
rename to app-emulation/containerd/containerd-1.4.3-r2.ebuild
index 0cbf0912b44..90dd18565d1 100644
--- a/app-emulation/containerd/containerd-1.4.3-r1.ebuild
+++ b/app-emulation/containerd/containerd-1.4.3-r2.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # update on bump, look for https://github.com/docker\
 # docker-ce/blob//components/engine/hack/dockerfile/install/containerd.installer
-CONTAINERD_COMMIT="ea765ab"
+CONTAINERD_COMMIT="269548fa27e0089a8b8278fc4fc781d7f65a939b"
 EGO_PN="github.com/containerd/${PN}"
 
 inherit golang-vcs-snapshot toolchain-funcs
 
 DESCRIPTION="A daemon to control runC"
 HOMEPAGE="https://containerd.io/;
-SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 -> ${P}.tar.gz"
+# NOTE: Drop '.gh' on bump, it's there because of bug #764791
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -78,7 +79,8 @@ src_install() {
 
# we already installed manpages, remove markdown source
# before installing docs directory
-   rm -rf docs/man || die
+   rm -r docs/man || die
+
local DOCS=( README.md PLUGINS.md docs/. )
einstalldocs
 }

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

2021-01-12 Thread Sam James

commit: c36f073341898c359069072c5a2dc86db1ee4d53
Author: Hector Martin  marcan  st>
AuthorDate: Mon Jan  4 07:39:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 12 22:46:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36f0733

app-emulation/containerd: fix USE=hardened

This probably broke with the recent bash update.

Signed-off-by: Hector Martin  marcan.st>
Closes: https://bugs.gentoo.org/763648
Closes: https://github.com/gentoo/gentoo/pull/18937
Signed-off-by: Sam James  gentoo.org>

 app-emulation/containerd/containerd-1.3.7.ebuild| 2 +-
 app-emulation/containerd/containerd-1.3.9.ebuild| 2 +-
 app-emulation/containerd/containerd-1.4.3-r1.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
index b6ed4b2e74c..ab62a3500db 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -62,7 +62,7 @@ src_compile() {
myemakeargs=(
BUILDTAGS="${options[*]}"
DESTDIR="${ED}"
-   LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
)
 
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor

diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild 
b/app-emulation/containerd/containerd-1.3.9.ebuild
index 7c664edf94c..bf487739cac 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -62,7 +62,7 @@ src_compile() {
myemakeargs=(
BUILDTAGS="${options[*]}"
DESTDIR="${ED}"
-   LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
)
 
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor

diff --git a/app-emulation/containerd/containerd-1.4.3-r1.ebuild 
b/app-emulation/containerd/containerd-1.4.3-r1.ebuild
index d8b675092ae..0cbf0912b44 100644
--- a/app-emulation/containerd/containerd-1.4.3-r1.ebuild
+++ b/app-emulation/containerd/containerd-1.4.3-r1.ebuild
@@ -62,7 +62,7 @@ src_compile() {
myemakeargs=(
BUILDTAGS="${options[*]}"
DESTDIR="${ED}"
-   LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
)
 
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor

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

2021-01-07 Thread Alexys Jacob

commit: 105ad161b48fe3115c28045a1f4ed3f21cf27729
Author: Tianon Gravi  gmail  com>
AuthorDate: Wed Dec 23 01:09:22 2020 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Thu Jan  7 10:34:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=105ad161

Remove Tianon from maintainers

Signed-off-by: Tianon Gravi  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18770
Signed-off-by: Alexys Jacob  gentoo.org>

 app-emulation/containerd/metadata.xml   | 4 
 app-emulation/docker-proxy/metadata.xml | 4 
 2 files changed, 8 deletions(-)

diff --git a/app-emulation/containerd/metadata.xml 
b/app-emulation/containerd/metadata.xml
index 46b01647099..0795c4ce61e 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -8,10 +8,6 @@
and user namespace support as well as checkpoint and restore 
for cloning
and live migration of containers.

-   
-   admwig...@gmail.com
-   Tianon
-   

willi...@gentoo.org
William Hubbs

diff --git a/app-emulation/docker-proxy/metadata.xml 
b/app-emulation/docker-proxy/metadata.xml
index ec233abe232..46bc689bb8c 100644
--- a/app-emulation/docker-proxy/metadata.xml
+++ b/app-emulation/docker-proxy/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   tia...@dockerproject.org
-   Tianon
-   

willi...@gentoo.org
William Hubbs

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

2021-01-04 Thread William Hubbs

commit: a1c17a2942a0e967a2b053b827571f33d66a5f89
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Jan  4 23:56:47 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Jan  4 23:56:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c17a29

app-emulation/containerd: 1.4.3-r1 bump to fix rdepend

Signed-off-by: William Hubbs  gentoo.org>

 .../containerd/{containerd-1.4.3.ebuild => containerd-1.4.3-r1.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.4.3.ebuild 
b/app-emulation/containerd/containerd-1.4.3-r1.ebuild
similarity index 98%
rename from app-emulation/containerd/containerd-1.4.3.ebuild
rename to app-emulation/containerd/containerd-1.4.3-r1.ebuild
index a6dcc20d842..d8b675092ae 100644
--- a/app-emulation/containerd/containerd-1.4.3.ebuild
+++ b/app-emulation/containerd/containerd-1.4.3-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 
 RDEPEND="
${DEPEND}
-   ~app-emulation/runc-1.0.0_rc10
+   ~app-emulation/runc-1.0.0_rc92
 "
 
 BDEPEND="

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

2021-01-04 Thread William Hubbs

commit: e3034cfd5b29826fe661aa508675c0abc1ff3f69
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Jan  4 22:44:10 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Jan  4 23:06:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3034cfd

app-emulation/containerd: 1.4.3 bump

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.4.3.ebuild | 84 
 2 files changed, 85 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index bb55e05e21a..631361d19d6 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,2 +1,3 @@
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
+DIST containerd-1.4.3.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa

diff --git a/app-emulation/containerd/containerd-1.4.3.ebuild 
b/app-emulation/containerd/containerd-1.4.3.ebuild
new file mode 100644
index 000..a6dcc20d842
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.4.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob//components/engine/hack/dockerfile/install/containerd.installer
+CONTAINERD_COMMIT="ea765ab"
+EGO_PN="github.com/containerd/${PN}"
+
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.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"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0_rc10
+"
+
+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 "${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
+}

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

2020-12-02 Thread Georgy Yakovlev

commit: b8539ff707d3770d8904e5d667fb287035ea4346
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Dec  2 20:33:21 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Dec  2 20:36:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8539ff7

app-emulation/containerd: ppc64 stable, bug #758137

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

 app-emulation/containerd/containerd-1.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild 
b/app-emulation/containerd/containerd-1.3.9.ebuild
index a6dcc20d842..50e8b0b8f64 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2020-12-02 Thread Georgy Yakovlev

commit: 24fc7c5ebed5ffe9d3eb6192a9588a93004cafbb
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Dec  2 20:34:06 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Dec  2 20:36:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24fc7c5e

app-emulation/containerd: amd64 stable, bug #758137

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

 app-emulation/containerd/containerd-1.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild 
b/app-emulation/containerd/containerd-1.3.9.ebuild
index 24aa2a38929..7c664edf94c 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2020-12-02 Thread Georgy Yakovlev

commit: 7639212f46ff870fbac548c88ae029e8fe90146d
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Dec  2 20:33:42 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Dec  2 20:36:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7639212f

app-emulation/containerd: arm64 stable, bug #758137

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

 app-emulation/containerd/containerd-1.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild 
b/app-emulation/containerd/containerd-1.3.9.ebuild
index 50e8b0b8f64..24aa2a38929 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2020-12-02 Thread Georgy Yakovlev

commit: 5a30b66574ee67ab8bef771c13fff12bb73fe71f
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Dec  2 19:40:21 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Dec  2 19:47:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a30b665

app-emulation/containerd: bump to 1.3.9 ( for  CVE-2020-15257 )

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.3.9.ebuild | 84 
 2 files changed, 85 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 0f5c4312268..bb55e05e21a 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1 +1,2 @@
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
+DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa

diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild 
b/app-emulation/containerd/containerd-1.3.9.ebuild
new file mode 100644
index 000..a6dcc20d842
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob//components/engine/hack/dockerfile/install/containerd.installer
+CONTAINERD_COMMIT="ea765ab"
+EGO_PN="github.com/containerd/${PN}"
+
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.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"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0_rc10
+"
+
+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 "${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
+}

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

2020-11-10 Thread Georgy Yakovlev

commit: 24612b52db7f0e1ad2cbe0d2deb608b499c6a411
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Nov 10 21:23:58 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Nov 10 21:33:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24612b52

app-emulation/containerd: update metadata.xml

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

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

diff --git a/app-emulation/containerd/metadata.xml 
b/app-emulation/containerd/metadata.xml
index 534d7d6a188..46b01647099 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -16,6 +16,10 @@
willi...@gentoo.org
William Hubbs

+   
+   gyakov...@gentoo.org
+   Georgy Yakovlev
+   

Support for AppArmor
Support for BTRFS snapshot driver

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

2020-11-10 Thread Georgy Yakovlev

commit: 26b6886f3924bfabf044b36f3bf1092e4f85f6d3
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Nov 10 21:27:51 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Nov 10 21:33:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b6886f

app-emulation/containerd: cleanup filesdir

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

 app-emulation/containerd/containerd-1.3.7.ebuild| 2 +-
 .../containerd/files/{containerd.initd-r1 => containerd.initd}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
index 583c12cb94a..b6ed4b2e74c 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -73,7 +73,7 @@ src_compile() {
 src_install() {
dobin bin/*
doman man/*
-   newinitd "${FILESDIR}"/${PN}.initd-r1 "${PN}"
+   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
keepdir /var/lib/containerd
 
# we already installed manpages, remove markdown source

diff --git a/app-emulation/containerd/files/containerd.initd-r1 
b/app-emulation/containerd/files/containerd.initd
similarity index 100%
rename from app-emulation/containerd/files/containerd.initd-r1
rename to app-emulation/containerd/files/containerd.initd

[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

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

2020-10-17 Thread Georgy Yakovlev

commit: 6829ba4a25db160a125529661007dbceb8587e54
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Oct 18 00:40:20 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Oct 18 00:48:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6829ba4a

app-emulation/containerd: arm64 stable, bug #749768

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

 app-emulation/containerd/containerd-1.3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
index 7d8ba4c6119..583c12cb94a 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2020-10-17 Thread Georgy Yakovlev

commit: 79868adcf3afb02aee3c79273df815fd836b717d
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Oct 18 00:36:45 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Oct 18 00:48:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79868adc

app-emulation/containerd: amd64 stable, bug #749768

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

 app-emulation/containerd/containerd-1.3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
index 9a7b8db286a..43f78885bd4 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2020-10-17 Thread Georgy Yakovlev

commit: a4b8dc424d4ba82354aaa0b0efe9487d6e3ff646
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Oct 18 00:37:15 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Oct 18 00:48:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b8dc42

app-emulation/containerd: ppc64 stable, bug #749768

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

 app-emulation/containerd/containerd-1.3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
index 43f78885bd4..7d8ba4c6119 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="

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

2020-09-23 Thread Georgy Yakovlev

commit: d8f66e21fb1d3b1ff2af0f82942eac7ea1ab6598
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Sep 23 22:47:17 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Sep 23 23:58:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f66e21

app-emulation/containerd: add 1.3.7

docker 19.03 requires this version, not 1.4.1

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.3.7.ebuild | 84 
 2 files changed, 85 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 0008c98ed50..a8de7f5f778 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -7,4 +7,5 @@ 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.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.4.1.tar.gz 6168048 BLAKE2B 
f050808d77c66caead8acba595b1cf91d7f386a77aae84d08840f458ba8141bb0e8763222f37b4295d2afedd5eb2fc311e8a69f6c01a08740ad27d2e7380b61f
 SHA512 
e16196db59ba71cfd7e5515b8d2bc6336503e996419182274dfc5ac9caca901cf712f465698e9ff667747959faf93cdf66fe652c47a83a6ead6f6a3a22add43b

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild 
b/app-emulation/containerd/containerd-1.3.7.ebuild
new file mode 100644
index 000..9a7b8db286a
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob//components/engine/hack/dockerfile/install/containerd.installer
+CONTAINERD_COMMIT="8fba4e9a7d01810a393d5d25a3621dc101981175"
+EGO_PN="github.com/containerd/${PN}"
+
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.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"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+   ${DEPEND}
+   ~app-emulation/runc-1.0.0_rc10
+"
+
+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

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

2020-09-23 Thread Georgy Yakovlev

commit: c59d4e1dbc9c39a6c30bfce3a740d3b2a1e13fab
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Sep 23 23:36:03 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Sep 24 00:01:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59d4e1d

app-emulation/containerd: drop 1.4.1

not needed yet

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 
 2 files changed, 86 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index a8de7f5f778..c00825bee4e 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -8,4 +8,3 @@ DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 
6eae3fe9714128e7a5378484115378629ba
 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
-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
deleted file mode 100644
index b1eae77465c..000
--- a/app-emulation/containerd/containerd-1.4.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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
-}

[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

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

2020-08-31 Thread Thomas Deutschmann

commit: 8d66375e4036abf6ab3ba71c26356ecd392e6272
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Aug 31 21:02:42 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Aug 31 21:03:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d66375e

app-emulation/containerd: x86 keyworded (bug #738758)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-emulation/containerd/containerd-1.2.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.2.13.ebuild 
b/app-emulation/containerd/containerd-1.2.13.ebuild
index f370b93d7c8..e9635351fbd 100644
--- a/app-emulation/containerd/containerd-1.2.13.ebuild
+++ b/app-emulation/containerd/containerd-1.2.13.ebuild
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT=35bd7a5f69c13e1563af8a93431411cd9ecf5021
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
inherit golang-vcs-snapshot
 fi

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

2020-04-16 Thread William Hubbs

commit: 21369e2071cb7ce4d5daaae710d4ac2f1c5fb4de
Author: William Hubbs  gentoo  org>
AuthorDate: Thu Apr 16 22:10:32 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Apr 16 22:10:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21369e20

app-emulation/containerd: 1.3.4 bump

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.3.4.ebuild | 55 
 2 files changed, 56 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index c55dea94df1..50dea9321e9 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -6,3 +6,4 @@ DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 
6cf98e370547d3ca5158f546e72e3ff5fdc
 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

diff --git a/app-emulation/containerd/containerd-1.3.4.ebuild 
b/app-emulation/containerd/containerd-1.3.4.ebuild
new file mode 100644
index 000..4733a84998c
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/containerd/${PN}"
+inherit toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   MY_PV="${PV/_rc/-rc.}"
+   EGIT_COMMIT="v${MY_PV}"
+   CONTAINERD_COMMIT=814b7956
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+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_rc9
+   seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="strip 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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2020-03-14 Thread William Hubbs

commit: 0f7e7febc9f684874b2c60eeeb545d4b2135db8c
Author: William Hubbs  gentoo  org>
AuthorDate: Sun Mar 15 03:04:04 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Sun Mar 15 03:04:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7e7feb

app-emulation/containerd: stabilize 1.2.13 on amd64

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/containerd-1.2.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.2.13.ebuild 
b/app-emulation/containerd/containerd-1.2.13.ebuild
index 5e5bc5aef5e..f370b93d7c8 100644
--- a/app-emulation/containerd/containerd-1.2.13.ebuild
+++ b/app-emulation/containerd/containerd-1.2.13.ebuild
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT=35bd7a5f69c13e1563af8a93431411cd9ecf5021
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi

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

2020-03-04 Thread William Hubbs

commit: e23f214c1683d1bd84e495a34f0d4de82502cee0
Author: William Hubbs  sony  com>
AuthorDate: Wed Mar  4 17:51:30 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Mar  4 17:51:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23f214c

app-emulation/containerd: 1.2.13 bump

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest |  1 +
 app-emulation/containerd/containerd-1.2.13.ebuild | 56 +++
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index e652b4a329c..c55dea94df1 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,5 +1,6 @@
 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

diff --git a/app-emulation/containerd/containerd-1.2.13.ebuild 
b/app-emulation/containerd/containerd-1.2.13.ebuild
new file mode 100644
index 000..5e5bc5aef5e
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.13.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 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=35bd7a5f69c13e1563af8a93431411cd9ecf5021
+   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.io/;
+
+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_rc8
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2020-02-13 Thread Mikle Kolyada

commit: 60fb748c85fd5810e244ad5ba8cad8ad97fabdc4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Feb 13 16:36:53 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Feb 13 16:46:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fb748c

app-emulation/containerd: disable btrfs default

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-emulation/containerd/containerd-1.2.10.ebuild | 4 ++--
 app-emulation/containerd/containerd-1.2.12.ebuild | 2 +-
 app-emulation/containerd/containerd-1.2.6.ebuild  | 4 ++--
 app-emulation/containerd/containerd-1.2.7.ebuild  | 4 ++--
 app-emulation/containerd/containerd-1.3.0.ebuild  | 4 ++--
 app-emulation/containerd/containerd-1.3.1.ebuild  | 4 ++--
 app-emulation/containerd/containerd-1.3.2.ebuild  | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild 
b/app-emulation/containerd/containerd-1.2.10.ebuild
index 53b84c16127..5a1d397114b 100644
--- a/app-emulation/containerd/containerd-1.2.10.ebuild
+++ b/app-emulation/containerd/containerd-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
seccomp? ( sys-libs/libseccomp )"

diff --git a/app-emulation/containerd/containerd-1.2.12.ebuild 
b/app-emulation/containerd/containerd-1.2.12.ebuild
index d2c5c94985c..5e5bc5aef5e 100644
--- a/app-emulation/containerd/containerd-1.2.12.ebuild
+++ b/app-emulation/containerd/containerd-1.2.12.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
seccomp? ( sys-libs/libseccomp )"

diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild 
b/app-emulation/containerd/containerd-1.2.6.ebuild
index dcc5a767030..48bf1f799cf 100644
--- a/app-emulation/containerd/containerd-1.2.6.ebuild
+++ b/app-emulation/containerd/containerd-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
seccomp? ( sys-libs/libseccomp )"

diff --git a/app-emulation/containerd/containerd-1.2.7.ebuild 
b/app-emulation/containerd/containerd-1.2.7.ebuild
index c021436695f..1cba833a741 100644
--- a/app-emulation/containerd/containerd-1.2.7.ebuild
+++ b/app-emulation/containerd/containerd-1.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
seccomp? ( sys-libs/libseccomp )"

diff --git a/app-emulation/containerd/containerd-1.3.0.ebuild 
b/app-emulation/containerd/containerd-1.3.0.ebuild
index 0c5e0f6bd86..0c41a6c57dd 100644
--- a/app-emulation/containerd/containerd-1.3.0.ebuild
+++ b/app-emulation/containerd/containerd-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
seccomp? ( sys-libs/libseccomp )"

diff --git a/app-emulation/containerd/containerd-1.3.1.ebuild 
b/app-emulation/containerd/containerd-1.3.1.ebuild
index 17258ef6de6..97f5996a48a 100644
--- a/app-emulation/containerd/containerd-1.3.1.ebuild
+++ b/app-emulation/containerd/containerd-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
seccomp? ( sys-libs/libseccomp )"

diff --git a/app-emulation/containerd/containerd-1.3.2.ebuild

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

2020-02-05 Thread William Hubbs

commit: 0cde6f45e86dc57c4812d1446ca1fee6698a67bb
Author: William Hubbs  gentoo  org>
AuthorDate: Thu Feb  6 03:17:14 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Feb  6 03:21:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cde6f45

app-emulation/containerd: 1.2.12 bump

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest |  1 +
 app-emulation/containerd/containerd-1.2.12.ebuild | 56 +++
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 9ecae2deadf..e652b4a329c 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1,5 @@
 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.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

diff --git a/app-emulation/containerd/containerd-1.2.12.ebuild 
b/app-emulation/containerd/containerd-1.2.12.ebuild
new file mode 100644
index 000..d2c5c94985c
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 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=35bd7a5f69c13e1563af8a93431411cd9ecf5021
+   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.io/;
+
+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_rc8
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2020-01-19 Thread William Hubbs

commit: b9e2b787c50df6fe24cb791f1e63131c410b758a
Author: William Hubbs  gentoo  org>
AuthorDate: Sun Jan 19 19:35:24 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Sun Jan 19 19:35:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e2b787

app-emulation/containerd: 1.3.2 bump

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.3.2.ebuild | 55 
 2 files changed, 56 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 7698ad6dbf2..9ecae2deadf 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -3,3 +3,4 @@ DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 
202e19cffbe2b5335558dc1db28ea28a05d
 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

diff --git a/app-emulation/containerd/containerd-1.3.2.ebuild 
b/app-emulation/containerd/containerd-1.3.2.ebuild
new file mode 100644
index 000..f6200c865cc
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/containerd/${PN}"
+inherit toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   MY_PV="${PV/_rc/-rc.}"
+   EGIT_COMMIT="v${MY_PV}"
+   CONTAINERD_COMMIT=ff48f57f
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+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_rc9
+   seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="strip 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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2019-11-23 Thread Aaron Bauman

commit: b3fb777284c9e5c5beaf798fb5cd205fa4dbc557
Author: Wim Muskee  gmail  com>
AuthorDate: Fri Nov 22 20:51:16 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Nov 24 00:52:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3fb7772

app-emulation/containerd: update HOMEPAGE, metadata

Closes: https://bugs.gentoo.org/699210
Signed-off-by: Wim Muskee  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13739
Signed-off-by: Aaron Bauman  gentoo.org>

 app-emulation/containerd/containerd-1.2.10.ebuild | 2 +-
 app-emulation/containerd/containerd-1.2.6.ebuild  | 2 +-
 app-emulation/containerd/containerd-1.2.7.ebuild  | 2 +-
 app-emulation/containerd/containerd-1.3.0.ebuild  | 2 +-
 app-emulation/containerd/containerd-1.3.1.ebuild  | 2 +-
 app-emulation/containerd/metadata.xml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild 
b/app-emulation/containerd/containerd-1.2.10.ebuild
index c897ead5766..53b84c16127 100644
--- a/app-emulation/containerd/containerd-1.2.10.ebuild
+++ b/app-emulation/containerd/containerd-1.2.10.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools;
+HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"

diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild 
b/app-emulation/containerd/containerd-1.2.6.ebuild
index 46e17e7be0b..dcc5a767030 100644
--- a/app-emulation/containerd/containerd-1.2.6.ebuild
+++ b/app-emulation/containerd/containerd-1.2.6.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools;
+HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"

diff --git a/app-emulation/containerd/containerd-1.2.7.ebuild 
b/app-emulation/containerd/containerd-1.2.7.ebuild
index 21f2f7301c8..c021436695f 100644
--- a/app-emulation/containerd/containerd-1.2.7.ebuild
+++ b/app-emulation/containerd/containerd-1.2.7.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools;
+HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"

diff --git a/app-emulation/containerd/containerd-1.3.0.ebuild 
b/app-emulation/containerd/containerd-1.3.0.ebuild
index 59441dac7e0..0c5e0f6bd86 100644
--- a/app-emulation/containerd/containerd-1.3.0.ebuild
+++ b/app-emulation/containerd/containerd-1.3.0.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools;
+HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"

diff --git a/app-emulation/containerd/containerd-1.3.1.ebuild 
b/app-emulation/containerd/containerd-1.3.1.ebuild
index 69fbb115600..17258ef6de6 100644
--- a/app-emulation/containerd/containerd-1.3.1.ebuild
+++ b/app-emulation/containerd/containerd-1.3.1.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools;
+HOMEPAGE="https://containerd.io/;
 
 LICENSE="Apache-2.0"
 SLOT="0"

diff --git a/app-emulation/containerd/metadata.xml 
b/app-emulation/containerd/metadata.xml
index a28d7bea81a..11dca7fe67a 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -26,6 +26,6 @@
Support for Kubernetes CRI


-   docker/containerd
+   containerd/containerd

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

2019-11-20 Thread Manuel Rüger

commit: eda08f9c1c0ea4425c72fa0e97b66a8497dda208
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Nov 20 22:18:53 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Nov 20 22:18:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda08f9c

app-emulation/containerd: Stabilize on amd64

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

 app-emulation/containerd/containerd-1.2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild 
b/app-emulation/containerd/containerd-1.2.10.ebuild
index 95e25445893..c897ead5766 100644
--- a/app-emulation/containerd/containerd-1.2.10.ebuild
+++ b/app-emulation/containerd/containerd-1.2.10.ebuild
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="b34a5c8af56e510852c35414db4c1f4fa6172339"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi

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

2019-11-20 Thread Manuel Rüger

commit: 51e7e08fa443bc88591389ae8726f11a3d58a503
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Nov 20 22:18:27 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Nov 20 22:18:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e7e08f

app-emulation/containerd: Version bump to 1.3.1

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.3.1.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 9fc74768dd3..7698ad6dbf2 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,3 +2,4 @@ DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 
6727fde9949ca96f351964df3c0c7481cb
 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

diff --git a/app-emulation/containerd/containerd-1.3.1.ebuild 
b/app-emulation/containerd/containerd-1.3.1.ebuild
new file mode 100644
index 000..69fbb115600
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="c7a4f87"
+   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_rc9
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2019-09-27 Thread Manuel Rüger

commit: de160635f5742145dd0a63b18cae8fa6bf8b5f7a
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Sep 27 12:17:07 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Sep 27 12:17:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de160635

app-emulation/containerd: Version bump to 1.2.10

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

 app-emulation/containerd/Manifest |  1 +
 app-emulation/containerd/containerd-1.2.10.ebuild | 56 +++
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index a18502cdd4d..3134272503d 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,2 +1,3 @@
+DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 
6727fde9949ca96f351964df3c0c7481cb5274895aa3b31552258d57cc5958bd2d3006cfe4d87088d24ac53de1c391b6029b3f800363ee743f08e1937f0d0fec
 SHA512 
14d4f1cad1a68414915c1e98b64dfb6f3f29a0e86e18570d6cc138f4db14b56499b978135954198fe9e2a1363383694eed530b301a9dc699d28c305d4dbf3cd8
 DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 
202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36
 SHA512 
287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
 DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 
6cf98e370547d3ca5158f546e72e3ff5fdccc08c2e9f390988d080222195f95512dbf6f7dc042b7a966283a04b7b8777b3fbeb4c5b861caae4f6209c59c5
 SHA512 
b96ca236d28933c1bf309fc7204af7d2c356e19af394d5c2274a178c8f15298faf6ca9bb8e7d04acb7c3c9c41035446643a8df0103017f7ed0320bfc37cb8ca9

diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild 
b/app-emulation/containerd/containerd-1.2.10.ebuild
new file mode 100644
index 000..95e25445893
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="b34a5c8af56e510852c35414db4c1f4fa6172339"
+   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_rc8
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2019-09-27 Thread Manuel Rüger

commit: 598fb066ab055d9b4a795bdc0ce2b89730d494d5
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Sep 27 12:19:22 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Sep 27 12:19:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598fb066

app-emulation/containerd: Version bump to 1.3.0

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.3.0.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 3134272503d..9fc74768dd3 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,4 @@
 DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 
6727fde9949ca96f351964df3c0c7481cb5274895aa3b31552258d57cc5958bd2d3006cfe4d87088d24ac53de1c391b6029b3f800363ee743f08e1937f0d0fec
 SHA512 
14d4f1cad1a68414915c1e98b64dfb6f3f29a0e86e18570d6cc138f4db14b56499b978135954198fe9e2a1363383694eed530b301a9dc699d28c305d4dbf3cd8
 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

diff --git a/app-emulation/containerd/containerd-1.3.0.ebuild 
b/app-emulation/containerd/containerd-1.3.0.ebuild
new file mode 100644
index 000..59441dac7e0
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="36cf5b690dcc00ff0f34ff7799209050c3d0c59a"
+   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_rc8
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2019-07-04 Thread Manuel Rüger

commit: c34df49a9e01c6928d712a9f3976d96d0da283c0
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jul  4 15:41:02 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jul  4 15:41:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c34df49a

app-emulation/containerd: Version bump to 1.2.7

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.2.7.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 989fa636800..a18502cdd4d 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1 +1,2 @@
 DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 
202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36
 SHA512 
287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
+DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 
6cf98e370547d3ca5158f546e72e3ff5fdccc08c2e9f390988d080222195f95512dbf6f7dc042b7a966283a04b7b8777b3fbeb4c5b861caae4f6209c59c5
 SHA512 
b96ca236d28933c1bf309fc7204af7d2c356e19af394d5c2274a178c8f15298faf6ca9bb8e7d04acb7c3c9c41035446643a8df0103017f7ed0320bfc37cb8ca9

diff --git a/app-emulation/containerd/containerd-1.2.7.ebuild 
b/app-emulation/containerd/containerd-1.2.7.ebuild
new file mode 100644
index 000..21f2f7301c8
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="85f6aa58b8a3170aec9824568f7a31832878b603"
+   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_rc8
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2019-07-04 Thread Manuel Rüger

commit: 37115c974ee894253dd3daed491eee2f13129c29
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jul  4 15:34:56 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jul  4 15:34:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37115c97

app-emulation/containerd: Remove old and unmaintained live

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

 app-emulation/containerd/Manifest|  3 --
 app-emulation/containerd/containerd-1.1.2.ebuild | 55 ---
 app-emulation/containerd/containerd-1.1.4.ebuild | 55 ---
 app-emulation/containerd/containerd-1.2.5.ebuild | 56 
 app-emulation/containerd/containerd-.ebuild  | 40 -
 5 files changed, 209 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 11961b23491..989fa636800 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1 @@
-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.5.tar.gz 4871876 BLAKE2B 
f8652d00b4338d0f4a1d77d452a46c316cc38b57f2df64fcfcef463f10d030f363b54f1a12c4cb32d9010872c688a75ebc1d481439dc3eb84aab193fc80c9bc0
 SHA512 
b249d5bfc0c1f884ecc1ad4544f9440405450c31f11e80ac094bfddb7a6660e950116114e563d7655e07f888f2ff62f4476f2b178f4e0e2acbbb9fb84a243b25
 DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 
202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36
 SHA512 
287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73

diff --git a/app-emulation/containerd/containerd-1.1.2.ebuild 
b/app-emulation/containerd/containerd-1.1.2.ebuild
deleted file mode 100644
index b37434d5661..000
--- a/app-emulation/containerd/containerd-1.1.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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="468a545b9edcd5932818eb9de8e72413e616e86e"
-   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/docker-runc-1.0.0_rc4
-   >=app-emulation/runc-1.0.0_rc4 )
-   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() {
-   dobin bin/containerd{-shim,-stress,} bin/ctr
-}

diff --git a/app-emulation/containerd/containerd-1.1.4.ebuild 
b/app-emulation/containerd/containerd-1.1.4.ebuild
deleted file mode 100644
index 0d07ff805fc..000
--- a/app-emulation/containerd/containerd-1.1.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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="9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64

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

2019-04-23 Thread Manuel Rüger

commit: 23e3efdb458daa37bb50fc54552cbdb41589d93f
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Apr 23 12:42:01 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Apr 23 12:42:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e3efdb

app-emulation/containerd: Stable on amd64

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

 app-emulation/containerd/containerd-1.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild 
b/app-emulation/containerd/containerd-1.2.6.ebuild
index 104f01bd688..46e17e7be0b 100644
--- a/app-emulation/containerd/containerd-1.2.6.ebuild
+++ b/app-emulation/containerd/containerd-1.2.6.ebuild
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="894b81a4b802e4eb2a91d1ce216b8817763c29fb"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi

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

2019-04-11 Thread Manuel Rüger

commit: 68cfdb16eb46f13b4eb5924b5d0941a321c9d783
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Apr 11 10:00:26 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Apr 11 10:00:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68cfdb16

app-emulation/containerd: Version bump to 1.2.6

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.2.6.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 6e66991040c..11961b23491 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,4 @@
 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.5.tar.gz 4871876 BLAKE2B 
f8652d00b4338d0f4a1d77d452a46c316cc38b57f2df64fcfcef463f10d030f363b54f1a12c4cb32d9010872c688a75ebc1d481439dc3eb84aab193fc80c9bc0
 SHA512 
b249d5bfc0c1f884ecc1ad4544f9440405450c31f11e80ac094bfddb7a6660e950116114e563d7655e07f888f2ff62f4476f2b178f4e0e2acbbb9fb84a243b25
+DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 
202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36
 SHA512 
287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73

diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild 
b/app-emulation/containerd/containerd-1.2.6.ebuild
new file mode 100644
index 000..104f01bd688
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="894b81a4b802e4eb2a91d1ce216b8817763c29fb"
+   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_rc6
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2019-03-28 Thread Manuel Rüger

commit: 5592b637b7b2af3f7ce6f32378315367a6bb7882
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Mar 28 16:14:54 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Mar 28 16:14:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5592b637

app-emulation/containerd: Remove old

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

 app-emulation/containerd/Manifest|  3 --
 app-emulation/containerd/containerd-1.2.2.ebuild | 56 
 app-emulation/containerd/containerd-1.2.3.ebuild | 56 
 app-emulation/containerd/containerd-1.2.4.ebuild | 56 
 4 files changed, 171 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 9eeb839fc7a..6e66991040c 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,6 +1,3 @@
 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.2.tar.gz 4607013 BLAKE2B 
aca366f23cb24ddd036e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89
 SHA512 
0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
-DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 
9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897
 SHA512 
01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d
-DIST containerd-1.2.4.tar.gz 4866424 BLAKE2B 
bd06d2df49fa426b0bb6fdbcb091215e34a7a0c30eb97c84887451dbfc126eef89eea714bd725fdf038eb7a2c4416237a27fc12730a8f241c27a12d47bfaee43
 SHA512 
8a4e5064b2c1e14d39d9943f445ae18e4653f73bd3bb90f7efe558b9ffd4345db4b308362103dbfbede716eae8b547c1cec3d93962acb0a2ff34d66e4fce0d80
 DIST containerd-1.2.5.tar.gz 4871876 BLAKE2B 
f8652d00b4338d0f4a1d77d452a46c316cc38b57f2df64fcfcef463f10d030f363b54f1a12c4cb32d9010872c688a75ebc1d481439dc3eb84aab193fc80c9bc0
 SHA512 
b249d5bfc0c1f884ecc1ad4544f9440405450c31f11e80ac094bfddb7a6660e950116114e563d7655e07f888f2ff62f4476f2b178f4e0e2acbbb9fb84a243b25

diff --git a/app-emulation/containerd/containerd-1.2.2.ebuild 
b/app-emulation/containerd/containerd-1.2.2.ebuild
deleted file mode 100644
index 0cdf19490c8..000
--- a/app-emulation/containerd/containerd-1.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 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="9754871865f7fe2f4e74d43e2fc7ccd237edcbce"
-   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}
-   keepdir /var/lib/containerd
-   dobin bin/containerd{-shim,-stress,} bin/ctr
-}

diff --git a/app-emulation/containerd/containerd-1.2.3.ebuild 
b/app-emulation/containerd/containerd-1.2.3.ebuild
deleted file mode 100644
index e548ba8fb08..000
---

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

2019-03-28 Thread Manuel Rüger

commit: 6b7345b293764ffb1b2bd0101f6cb58d2d656e54
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Mar 28 14:44:27 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Mar 28 14:44:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b7345b2

app-emulation/containerd: Stabilize on amd64

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

 app-emulation/containerd/containerd-1.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.2.5.ebuild 
b/app-emulation/containerd/containerd-1.2.5.ebuild
index f33a2808fa2..4df44a02efb 100644
--- a/app-emulation/containerd/containerd-1.2.5.ebuild
+++ b/app-emulation/containerd/containerd-1.2.5.ebuild
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="bb71b10fd8f58240ca47fbb579b9d1028eea7c84"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi

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

2019-03-28 Thread Manuel Rüger

commit: 5587b321c30f0fe46eac57d4c8140f916cdf9054
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Mar 28 14:20:07 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Mar 28 14:20:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5587b321

app-emulation/containerd: Version bump to 1.2.5

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.2.5.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index c249575b87a..9eeb839fc7a 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -3,3 +3,4 @@ DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B 
cb69f9bd80bc279ae2bd85c75152dacdbdf
 DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B 
aca366f23cb24ddd036e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89
 SHA512 
0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
 DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 
9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897
 SHA512 
01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d
 DIST containerd-1.2.4.tar.gz 4866424 BLAKE2B 
bd06d2df49fa426b0bb6fdbcb091215e34a7a0c30eb97c84887451dbfc126eef89eea714bd725fdf038eb7a2c4416237a27fc12730a8f241c27a12d47bfaee43
 SHA512 
8a4e5064b2c1e14d39d9943f445ae18e4653f73bd3bb90f7efe558b9ffd4345db4b308362103dbfbede716eae8b547c1cec3d93962acb0a2ff34d66e4fce0d80
+DIST containerd-1.2.5.tar.gz 4871876 BLAKE2B 
f8652d00b4338d0f4a1d77d452a46c316cc38b57f2df64fcfcef463f10d030f363b54f1a12c4cb32d9010872c688a75ebc1d481439dc3eb84aab193fc80c9bc0
 SHA512 
b249d5bfc0c1f884ecc1ad4544f9440405450c31f11e80ac094bfddb7a6660e950116114e563d7655e07f888f2ff62f4476f2b178f4e0e2acbbb9fb84a243b25

diff --git a/app-emulation/containerd/containerd-1.2.5.ebuild 
b/app-emulation/containerd/containerd-1.2.5.ebuild
new file mode 100644
index 000..f33a2808fa2
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="bb71b10fd8f58240ca47fbb579b9d1028eea7c84"
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

[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/

2019-03-01 Thread Manuel Rüger

commit: 90fc6ce88053cf7ba18edd8534886b3122a69216
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Mar  1 13:39:26 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Mar  1 13:42:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90fc6ce8

app-emulation/containerd: Remove old

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

 app-emulation/containerd/Manifest|  1 -
 app-emulation/containerd/containerd-1.0.3.ebuild | 52 
 2 files changed, 53 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index f4df5aadf4f..c249575b87a 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1,3 @@
-DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
 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.2.tar.gz 4607013 BLAKE2B 
aca366f23cb24ddd036e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89
 SHA512 
0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff

diff --git a/app-emulation/containerd/containerd-1.0.3.ebuild 
b/app-emulation/containerd/containerd-1.0.3.ebuild
deleted file mode 100644
index 446548c25d7..000
--- a/app-emulation/containerd/containerd-1.0.3.ebuild
+++ /dev/null
@@ -1,52 +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="773c489"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_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}
-
-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
-}

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

2019-02-14 Thread Manuel Rüger

commit: 5a5796df26fc16bb6d362d5eab8dd83c921306d7
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Feb 14 13:16:33 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Feb 14 13:16:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5796df

app-emulation/containerd: Version bump to 1.2.4

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.2.4.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 1aba2d6949e..f4df5aadf4f 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -3,3 +3,4 @@ DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B 
d989519d6bef4e12d1fa04aa00bfee223e9
 DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B 
cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0
 SHA512 
c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
 DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B 
aca366f23cb24ddd036e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89
 SHA512 
0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
 DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 
9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897
 SHA512 
01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d
+DIST containerd-1.2.4.tar.gz 4866424 BLAKE2B 
bd06d2df49fa426b0bb6fdbcb091215e34a7a0c30eb97c84887451dbfc126eef89eea714bd725fdf038eb7a2c4416237a27fc12730a8f241c27a12d47bfaee43
 SHA512 
8a4e5064b2c1e14d39d9943f445ae18e4653f73bd3bb90f7efe558b9ffd4345db4b308362103dbfbede716eae8b547c1cec3d93962acb0a2ff34d66e4fce0d80

diff --git a/app-emulation/containerd/containerd-1.2.4.ebuild 
b/app-emulation/containerd/containerd-1.2.4.ebuild
new file mode 100644
index 000..d34eeabe099
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e"
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2019-02-11 Thread Manuel Rüger

commit: 5283648835238bad0879de19cec7100899ef4f4e
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Feb 11 17:51:51 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Feb 11 17:54:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52836488

app-emulation/containerd: Stabilize on amd64

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

 app-emulation/containerd/containerd-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.2.2.ebuild 
b/app-emulation/containerd/containerd-1.2.2.ebuild
index 8ccee3fc69a..0cdf19490c8 100644
--- a/app-emulation/containerd/containerd-1.2.2.ebuild
+++ b/app-emulation/containerd/containerd-1.2.2.ebuild
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="9754871865f7fe2f4e74d43e2fc7ccd237edcbce"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi

[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/

2019-02-07 Thread Manuel Rüger

commit: 619cd345f665785b09a572c47b402c90b66e1809
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Feb  7 11:59:43 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Feb  7 11:59:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=619cd345

app-emulation/containerd: Version bump to 1.2.3

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.2.3.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 14fe116537f..62e4ec779c2 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -5,3 +5,4 @@ DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B 
cb69f9bd80bc279ae2bd85c75152dacdbdf
 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.2.3.ebuild 
b/app-emulation/containerd/containerd-1.2.3.ebuild
new file mode 100644
index 000..e548ba8fb08
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="7f5f1176dd9fb3cc8d3ce5de91759ed3dc969fa2"
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/*
+}

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

2019-01-09 Thread Manuel Rüger

commit: 1a733e460f0368825faec1d49b9a965381513c08
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Jan  9 15:44:08 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Jan  9 15:44:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a733e46

app-emulation/containerd: Version bump to 1.2.2

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.2.2.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index aa52e984354..14fe116537f 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -4,3 +4,4 @@ DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B 
d989519d6bef4e12d1fa04aa00bfee223e9
 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

diff --git a/app-emulation/containerd/containerd-1.2.2.ebuild 
b/app-emulation/containerd/containerd-1.2.2.ebuild
new file mode 100644
index 000..8ccee3fc69a
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="9754871865f7fe2f4e74d43e2fc7ccd237edcbce"
+   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}
+   keepdir /var/lib/containerd
+   dobin bin/containerd{-shim,-stress,} bin/ctr
+}

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

2018-12-11 Thread Manuel Rüger

commit: 4c5c99c702595f855592057ec7da23dbd1dd6496
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Dec  7 19:18:39 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Dec 11 08:06:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c5c99c7

app-emulation/containerd: Version bump to 1.2.1

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.2.1.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 09155d9b56a..aa52e984354 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -3,3 +3,4 @@ DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B 
e3e14311f4b444531b9b5d22ad7babd3fe9
 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

diff --git a/app-emulation/containerd/containerd-1.2.1.ebuild 
b/app-emulation/containerd/containerd-1.2.1.ebuild
new file mode 100644
index 000..c9791d3160d
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.1.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="9b32062dc1f5a7c2564315c269b5059754f12b9d"
+   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
+}

[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/

2018-10-28 Thread Manuel Rüger

commit: 98f98e97f106a86851336f42f580f7ff48f222e2
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Oct 28 16:18:51 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Oct 28 16:18:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f98e97

app-emulation/containerd: Version bump to 1.2.0

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

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.2.0.ebuild | 55 
 2 files changed, 56 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 8317dba9874..09155d9b56a 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,3 +2,4 @@ DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517
 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

diff --git a/app-emulation/containerd/containerd-1.2.0.ebuild 
b/app-emulation/containerd/containerd-1.2.0.ebuild
new file mode 100644
index 000..d7d5430a826
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.0.ebuild
@@ -0,0 +1,55 @@
+# 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/docker-runc-1.0.0_rc4
+   >=app-emulation/runc-1.0.0_rc4 )
+   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() {
+   dobin bin/containerd{-shim,-stress,} bin/ctr
+}

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

2018-09-26 Thread Manuel Rüger

commit: 4f8214f5250c024dd67c5f62f3acee771943088c
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Sep 26 11:20:26 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Sep 26 11:20:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8214f5

app-emulation/containerd: Version bump to 1.1.4

Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.1.4.ebuild | 55 
 2 files changed, 56 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 6baa2e4279b..8317dba9874 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/app-emulation/containerd/containerd-1.1.4.ebuild 
b/app-emulation/containerd/containerd-1.1.4.ebuild
new file mode 100644
index 000..0d07ff805fc
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.1.4.ebuild
@@ -0,0 +1,55 @@
+# 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="9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b"
+   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/docker-runc-1.0.0_rc4
+   >=app-emulation/runc-1.0.0_rc4 )
+   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() {
+   dobin bin/containerd{-shim,-stress,} bin/ctr
+}

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

2018-09-26 Thread Manuel Rüger

commit: aefd30ed6c1b6cea70bbddfd1895cfc33de2293d
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Sep 26 11:21:55 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Sep 26 11:21:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aefd30ed

app-emulation/containerd: Stabilize on amd64

Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-emulation/containerd/containerd-1.1.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.1.2.ebuild 
b/app-emulation/containerd/containerd-1.1.2.ebuild
index 1e306153994..b37434d5661 100644
--- a/app-emulation/containerd/containerd-1.1.2.ebuild
+++ b/app-emulation/containerd/containerd-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="468a545b9edcd5932818eb9de8e72413e616e86e"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi

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

2018-09-07 Thread Manuel Rüger

commit: 66dcf6865839e6dec857b1a39ef14df98bdf3fd8
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Sep  7 06:18:33 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Sep  7 06:18:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66dcf686

app-emulation/containerd: Fix build for multiple BUILDTAGS

Closes: https://bugs.gentoo.org/show_bug.cgi?id=665418
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 app-emulation/containerd/containerd-1.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.1.2.ebuild 
b/app-emulation/containerd/containerd-1.1.2.ebuild
index 4bd98d13a3b..1e306153994 100644
--- a/app-emulation/containerd/containerd-1.1.2.ebuild
+++ b/app-emulation/containerd/containerd-1.1.2.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
 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' '') emake 
BUILDTAGS="${options[@]}"
+   LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') 
BUILDTAGS="${options[@]}" emake
 }
 
 src_install() {

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

2018-07-24 Thread Manuel Rüger

commit: 7238d953a833a164cd8e5d0d2a80b10949d87e72
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Jul 24 11:46:29 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Jul 24 11:46:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7238d953

app-emulation/containerd: Propagate ~arm64 keyword from snapshots

Acked by leio

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 app-emulation/containerd/containerd-1.1.1.ebuild | 2 +-
 app-emulation/containerd/containerd-1.1.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/containerd/containerd-1.1.1.ebuild 
b/app-emulation/containerd/containerd-1.1.1.ebuild
index d3c39d6cfab..0dc6845f4ea 100644
--- a/app-emulation/containerd/containerd-1.1.1.ebuild
+++ b/app-emulation/containerd/containerd-1.1.1.ebuild
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="d64c661f1d51c48782c9cec8fda7604785f93587"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~ppc64"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi
 

diff --git a/app-emulation/containerd/containerd-1.1.2.ebuild 
b/app-emulation/containerd/containerd-1.1.2.ebuild
index 2aebd40c413..4bd98d13a3b 100644
--- a/app-emulation/containerd/containerd-1.1.2.ebuild
+++ b/app-emulation/containerd/containerd-1.1.2.ebuild
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="468a545b9edcd5932818eb9de8e72413e616e86e"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~ppc64"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi

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

2018-07-19 Thread Manuel Rüger

commit: 7b6acb20a2521b6d4293bc53bd54d3030a3a6c15
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jul 19 15:30:44 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jul 19 15:30:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6acb20

app-emulation/containerd: Remove old

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 app-emulation/containerd/Manifest  |  3 --
 app-emulation/containerd/containerd-1.0.1.ebuild   | 52 ---
 .../containerd-1.0.3_p20180223-r1.ebuild   | 58 --
 .../containerd/containerd-1.0.3_p20180223.ebuild   | 54 
 app-emulation/containerd/containerd-1.1.0.ebuild   | 54 
 5 files changed, 221 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 669fc87de20..6baa2e4279b 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,6 +1,3 @@
-DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 
36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431
 SHA512 
351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
-DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B 
bd3f74ad70c7de9a73397e401e49459d1724376434265dd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586
 SHA512 
a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7e9
-DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 
1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d
 SHA512 
34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42
 DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B 
e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f
 SHA512 
429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd
 DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B 
d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a
 SHA512 
fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c

diff --git a/app-emulation/containerd/containerd-1.0.1.ebuild 
b/app-emulation/containerd/containerd-1.0.1.ebuild
deleted file mode 100644
index 4495f702849..000
--- a/app-emulation/containerd/containerd-1.0.1.ebuild
+++ /dev/null
@@ -1,52 +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="9b55aab"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_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}
-
-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/containerd-1.0.3_p20180223-r1.ebuild 
b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
deleted file mode 100644
index a37f908adc0..000
--- a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU

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

2018-07-18 Thread Manuel Rüger

commit: fe13a335bff1e0ebb1ac5d105ce4d067163e4154
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Jul 18 14:25:56 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Jul 18 14:25:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe13a335

app-emulation/containerd: Version bump to 1.1.2

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.1.2.ebuild | 55 
 app-emulation/containerd/metadata.xml|  2 +
 3 files changed, 58 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 30ef8cd533f..669fc87de20 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -3,3 +3,4 @@ DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517
 DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B 
bd3f74ad70c7de9a73397e401e49459d1724376434265dd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586
 SHA512 
a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7e9
 DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 
1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d
 SHA512 
34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42
 DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B 
e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f
 SHA512 
429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd
+DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B 
d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a
 SHA512 
fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c

diff --git a/app-emulation/containerd/containerd-1.1.2.ebuild 
b/app-emulation/containerd/containerd-1.1.2.ebuild
new file mode 100644
index 000..2aebd40c413
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.1.2.ebuild
@@ -0,0 +1,55 @@
+# 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="468a545b9edcd5932818eb9de8e72413e616e86e"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_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="apparmor +btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+   >=app-emulation/runc-1.0.0_rc4 )
+   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' '') emake 
BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+   dobin bin/containerd{-shim,-stress,} bin/ctr
+}

diff --git a/app-emulation/containerd/metadata.xml 
b/app-emulation/containerd/metadata.xml
index 7cc46305346..a28d7bea81a 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -21,7 +21,9 @@
William Hubbs


+   Support for AppArmor
Support for BTRFS snapshot driver
+   Support for Kubernetes CRI


docker/containerd

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

2018-07-12 Thread Manuel Rüger

commit: c40997b68315bd9e519a2b3097d3a6a1726e14b2
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jul 12 12:18:36 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jul 12 12:18:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40997b6

app-emulation/containerd: Version bump to 1.1.1

Package-Manager: Portage-2.3.42, Repoman-2.3.9

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.1.1.ebuild | 54 
 2 files changed, 55 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 39c3905c7b6..30ef8cd533f 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,3 +2,4 @@ DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 
36c96a9e3cba22578daff31e46d9a876095
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
 DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B 
bd3f74ad70c7de9a73397e401e49459d1724376434265dd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586
 SHA512 
a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7e9
 DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 
1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d
 SHA512 
34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42
+DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B 
e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f
 SHA512 
429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd

diff --git a/app-emulation/containerd/containerd-1.1.1.ebuild 
b/app-emulation/containerd/containerd-1.1.1.ebuild
new file mode 100644
index 000..d3c39d6cfab
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.1.1.ebuild
@@ -0,0 +1,54 @@
+# 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 ~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 $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
+}

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

2018-06-04 Thread Mart Raudsepp

commit: 81dfdc024f104f1802c56aeaa93a27f75fa8a990
Author: Alex Bennée  linaro  org>
AuthorDate: Sun Jun  3 16:12:43 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jun  4 18:57:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81dfdc02

app-emulation/containerd: add ~arm64 keyword

I've only keyworded 1.0.3_p20180223 as that is what is currently
required for docker.

 app-emulation/containerd/containerd-1.0.3_p20180223.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild 
b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
index 9a8002153e0..3c7eee7d07d 100644
--- a/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
+++ b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
@@ -13,7 +13,7 @@ else
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"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi

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

2018-06-04 Thread Mart Raudsepp

commit: e004847ed45ad20451db41014dd9fe386e4f5622
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Jun  4 19:24:39 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jun  4 19:24:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e004847e

app-emulation/containerd-1.0.3_p20180223-r1: propagate ~arm64 keyword

docker is fine with any revision, so keyword version with gcc8 fix as well.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild 
b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
index a25ff621428..a37f908adc0 100644
--- a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
+++ b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
@@ -13,7 +13,7 @@ else
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"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi

[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/

2018-05-15 Thread Manuel Rüger

commit: 5af87322eb911c1c1d286e36df1bc2372cbbd3f6
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue May 15 13:05:15 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue May 15 13:05:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af87322

app-emulation/containerd: Add snapshot for docker 18.05.0

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-emulation/containerd/Manifest  |  1 +
 .../containerd/containerd-1.0.3_p20180223.ebuild   | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index f37c9bc2815..39c3905c7b6 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,4 @@
 DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 
36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431
 SHA512 
351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
+DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B 
bd3f74ad70c7de9a73397e401e49459d1724376434265dd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586
 SHA512 
a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7e9
 DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 
1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d
 SHA512 
34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42

diff --git a/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild 
b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
new file mode 100644
index 000..9a8002153e0
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
@@ -0,0 +1,54 @@
+# 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"
+
+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
+}

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

2018-05-15 Thread Manuel Rüger

commit: 5a8b61ce900b3306e93766ff248ccf911e93ac7a
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue May 15 12:15:58 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue May 15 12:15:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8b61ce

app-emulation/containerd: Remove old

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-emulation/containerd/Manifest|  1 -
 app-emulation/containerd/containerd-1.0.2.ebuild | 52 
 2 files changed, 53 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 7ebcb259766..f37c9bc2815 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1,3 @@
 DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 
36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431
 SHA512 
351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
-DIST containerd-1.0.2.tar.gz 3772144 BLAKE2B 
7549f47d1f0ff0244d7dedd41aabb76d2c2fc4942f8da3cf45fe0ca7b808b3aed4e39e0338d30ccc63cf37db3e59412442d43d272d3b073823e210a24d4d991a
 SHA512 
d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
 DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 
1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d
 SHA512 
34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42

diff --git a/app-emulation/containerd/containerd-1.0.2.ebuild 
b/app-emulation/containerd/containerd-1.0.2.ebuild
deleted file mode 100644
index 0051a46346c..000
--- a/app-emulation/containerd/containerd-1.0.2.ebuild
+++ /dev/null
@@ -1,52 +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="cfd0439"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_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}
-
-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
-}

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

2018-05-15 Thread Manuel Rüger

commit: 95660d514a0656c1c12458d66396934f2a51f3f2
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue May 15 12:14:08 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue May 15 12:14:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95660d51

app-emulation/containerd: Stable on amd64

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-emulation/containerd/containerd-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containerd/containerd-1.0.3.ebuild 
b/app-emulation/containerd/containerd-1.0.3.ebuild
index e516515b339..446548c25d7 100644
--- a/app-emulation/containerd/containerd-1.0.3.ebuild
+++ b/app-emulation/containerd/containerd-1.0.3.ebuild
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="773c489"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~ppc64"
+   KEYWORDS="amd64 ~arm ~ppc64"
inherit golang-vcs-snapshot
 fi

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

2018-04-24 Thread Manuel Rüger

commit: 58bbbafe0620ad5b7c25eab75c201a44f0166c0a
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Apr 24 22:46:44 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Apr 24 22:46:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58bbbafe

app-emulation/containerd: Version bump to 1.1.0

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.1.0.ebuild | 54 
 2 files changed, 55 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 8cd464eaf46..7ebcb259766 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,4 @@
 DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 
36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431
 SHA512 
351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
 DIST containerd-1.0.2.tar.gz 3772144 BLAKE2B 
7549f47d1f0ff0244d7dedd41aabb76d2c2fc4942f8da3cf45fe0ca7b808b3aed4e39e0338d30ccc63cf37db3e59412442d43d272d3b073823e210a24d4d991a
 SHA512 
d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
+DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 
1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d
 SHA512 
34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42

diff --git a/app-emulation/containerd/containerd-1.1.0.ebuild 
b/app-emulation/containerd/containerd-1.1.0.ebuild
new file mode 100644
index 000..1b01107dcac
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.1.0.ebuild
@@ -0,0 +1,54 @@
+# 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="209a7fc3e4a32ef71a8c7b50c68fc8398415badf"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_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"
+
+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
+}

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

2018-04-09 Thread Manuel Rüger

commit: f3caa2c3862759b98604a260665822a99828f09b
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Apr 10 01:11:30 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Apr 10 01:11:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3caa2c3

app-emulation/containerd: Remove old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-emulation/containerd/Manifest  |  1 -
 .../containerd/containerd-0.2.9_p20170917.ebuild   | 42 --
 2 files changed, 43 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index c990e983b47..8cd464eaf46 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1,3 @@
-DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 
96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab
 SHA512 
c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
 DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 
36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431
 SHA512 
351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
 DIST containerd-1.0.2.tar.gz 3772144 BLAKE2B 
7549f47d1f0ff0244d7dedd41aabb76d2c2fc4942f8da3cf45fe0ca7b808b3aed4e39e0338d30ccc63cf37db3e59412442d43d272d3b073823e210a24d4d991a
 SHA512 
d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c

diff --git a/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild 
b/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
deleted file mode 100644
index 25e1ed88476..000
--- a/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == * ]]; then
-   inherit golang-vcs
-else
-   MY_PV="${PV/_/-}"
-   EGIT_COMMIT="06b9cb35161009dcb7123345749fef02f7cea8e0"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_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="hardened +seccomp"
-
-DEPEND=""
-RDEPEND=">=app-emulation/docker-runc-1.0.0_rc4_p20170917
-   seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_compile() {
-   local options=( $(usex seccomp "seccomp" '') )
-   export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-   LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake 
GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
-}
-
-src_install() {
-   dobin bin/containerd* bin/ctr
-}

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

2018-04-03 Thread Manuel Rüger

commit: 13bf99d94af84816ec211a5977154daf0a2c8cb8
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Apr  3 06:23:11 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Apr  3 06:23:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13bf99d9

app-emulation/containerd: Remove old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-emulation/containerd/Manifest|  1 -
 app-emulation/containerd/containerd-1.0.0.ebuild | 52 
 2 files changed, 53 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 52a2c82b8d2..c990e983b47 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,5 +1,4 @@
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 
96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab
 SHA512 
c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
-DIST containerd-1.0.0.tar.gz 3763785 BLAKE2B 
cd4af679c9028b616aeedd594518f796a350523899c13da5a848a5843b318394166ddfbf5e7ed1f473a3759b26d134659f928d8e15da17ebdf65a41d2fd5f914
 SHA512 
8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a
 DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 
36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431
 SHA512 
351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
 DIST containerd-1.0.2.tar.gz 3772144 BLAKE2B 
7549f47d1f0ff0244d7dedd41aabb76d2c2fc4942f8da3cf45fe0ca7b808b3aed4e39e0338d30ccc63cf37db3e59412442d43d272d3b073823e210a24d4d991a
 SHA512 
d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c

diff --git a/app-emulation/containerd/containerd-1.0.0.ebuild 
b/app-emulation/containerd/containerd-1.0.0.ebuild
deleted file mode 100644
index cd55fba553c..000
--- a/app-emulation/containerd/containerd-1.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 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="89623f2"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_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}
-
-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
-}

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

2018-04-03 Thread Manuel Rüger

commit: ba14740cac8fa6e8a6bff87300253a25080a9efb
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Apr  3 06:20:37 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Apr  3 06:21:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba14740c

app-emulation/containerd: Version bump to 1.0.3

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-emulation/containerd/Manifest|  1 +
 app-emulation/containerd/containerd-1.0.3.ebuild | 52 
 2 files changed, 53 insertions(+)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 98e959577a6..52a2c82b8d2 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,3 +2,4 @@ DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 
96effa85f9cb03c3e416d5343
 DIST containerd-1.0.0.tar.gz 3763785 BLAKE2B 
cd4af679c9028b616aeedd594518f796a350523899c13da5a848a5843b318394166ddfbf5e7ed1f473a3759b26d134659f928d8e15da17ebdf65a41d2fd5f914
 SHA512 
8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a
 DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 
36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431
 SHA512 
351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
 DIST containerd-1.0.2.tar.gz 3772144 BLAKE2B 
7549f47d1f0ff0244d7dedd41aabb76d2c2fc4942f8da3cf45fe0ca7b808b3aed4e39e0338d30ccc63cf37db3e59412442d43d272d3b073823e210a24d4d991a
 SHA512 
d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a
+DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 
31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519
 SHA512 
31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c

diff --git a/app-emulation/containerd/containerd-1.0.3.ebuild 
b/app-emulation/containerd/containerd-1.0.3.ebuild
new file mode 100644
index 000..e516515b339
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.0.3.ebuild
@@ -0,0 +1,52 @@
+# 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="773c489"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_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}
+
+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
+}

1 2 >

1 - 100 of 160 matches

Mail list logo