[gentoo-commits] repo/gentoo:master commit in: app-emulation/lxc-templates/files/, app-containers/lxc-templates/, ...

2021-12-20 Thread Georgy Yakovlev
commit: 34a0feee2c612f0449d00c918825bd12b7beb01c
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Dec 20 09:06:09 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Dec 21 02:24:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a0feee

Move {app-emulation -> app-containers}/lxc-templates

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

 {app-emulation => app-containers}/lxc-templates/Manifest| 0
 .../lxc-templates/files/lxc-templates-3.0.1-no-cache-dir.patch  | 0
 .../lxc-templates/lxc-templates-3.0.4.ebuild| 0
 {app-emulation => app-containers}/lxc-templates/metadata.xml| 0
 app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild   | 2 +-
 profiles/updates/4Q-2021| 1 +
 6 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lxc-templates/Manifest 
b/app-containers/lxc-templates/Manifest
similarity index 100%
rename from app-emulation/lxc-templates/Manifest
rename to app-containers/lxc-templates/Manifest

diff --git 
a/app-emulation/lxc-templates/files/lxc-templates-3.0.1-no-cache-dir.patch 
b/app-containers/lxc-templates/files/lxc-templates-3.0.1-no-cache-dir.patch
similarity index 100%
rename from 
app-emulation/lxc-templates/files/lxc-templates-3.0.1-no-cache-dir.patch
rename to 
app-containers/lxc-templates/files/lxc-templates-3.0.1-no-cache-dir.patch

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild 
b/app-containers/lxc-templates/lxc-templates-3.0.4.ebuild
similarity index 100%
rename from app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
rename to app-containers/lxc-templates/lxc-templates-3.0.4.ebuild

diff --git a/app-emulation/lxc-templates/metadata.xml 
b/app-containers/lxc-templates/metadata.xml
similarity index 100%
rename from app-emulation/lxc-templates/metadata.xml
rename to app-containers/lxc-templates/metadata.xml

diff --git a/app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild 
b/app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild
index d7dd487bfac1..4e14a39d94fa 100644
--- a/app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild
+++ b/app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild
@@ -182,7 +182,7 @@ pkg_postinst() {
 
elog "Please run 'lxc-checkconfig' to see optional kernel features."
elog
-   optfeature "automatic template scripts" app-emulation/lxc-templates
+   optfeature "automatic template scripts" app-containers/lxc-templates
optfeature "Debian-based distribution container image support" 
dev-util/debootstrap
optfeature "snapshot & restore functionality" sys-process/criu
 }

diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index d3a7b460e0e8..3441020687eb 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -64,3 +64,4 @@ move app-emulation/docker app-containers/docker
 move app-emulation/reg app-containers/reg
 move app-emulation/flannel app-containers/flannel
 move app-emulation/lxd app-containers/lxd
+move app-emulation/lxc-templates app-containers/lxc-templates



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

2021-12-16 Thread Joonas Niilola
commit: 45f2d948e4892ddacd50552f25930db883792d23
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 16 20:22:08 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 16 20:22:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f2d948

app-emulation/lxc: drop 4.0.10

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest  |   2 -
 app-emulation/lxc/lxc-4.0.10.ebuild | 173 
 2 files changed, 175 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index bbe03a12e013..e2af36e0fe7a 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,4 +1,2 @@
-DIST lxc-4.0.10.tar.gz 1515002 BLAKE2B 
2a5b94ad767c8a11a5c34d19f12d812bd284337045ad5021c80a5f69be608085ac465edde8c385cc558e45638c9f061793c0c9db616ccbe0614554b4fbf62005
 SHA512 
ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318
-DIST lxc-4.0.10.tar.gz.asc 833 BLAKE2B 
3dd6e8793d1b725ab9eb73d4fa78ce2767bf830fb70d6cc7052e70d2adbc46e4fcf6d986595322b64cb9c71417b801ef6ee3c7612c46dbeb10acba01a5bd69e0
 SHA512 
dd2d3ac4e066eca4e0358c9a2c371a227d3a0b5cf6e452fe34fa5c8cff46e25fa0555c9f707511a8603348fa969c1e7abf85ad7d27fdcaff613b733066861608
 DIST lxc-4.0.11.tar.gz 1543031 BLAKE2B 
0309bbb96938e60e4cbe145fa0cc3c0a85d9154282a889d74167128b6166a280bb4d53df266990a529a98935ef2c12e8d2214e9a8f6cb293d47aa5808ebad82f
 SHA512 
23287e468da8939334f4261bfcbb52eadcbe5806bd97896db38c84eb42f32143dc17bb8b9bb7f7f88584b72056553c9edc33ddb693a345ecf88f3177573fa9c0
 DIST lxc-4.0.11.tar.gz.asc 833 BLAKE2B 
68804d1d5ad09e388541b3a95a98ca14202c513ea3544a7389a49f4e13ecffc17715bb023675134fd99047c727cffe09cbd0a89883054b82650ebd23366823a7
 SHA512 
49a54aaf018772db40e1dadc0a10e7d727a2b14b34c0a3c704fd3f7a12e60082abf4628cc0a489ee620ef2210c7542abbdb6d1432e4297ceef52cdd6b158a5f8

diff --git a/app-emulation/lxc/lxc-4.0.10.ebuild 
b/app-emulation/lxc/lxc-4.0.10.ebuild
deleted file mode 100644
index f9e67a8c76f9..
--- a/app-emulation/lxc/lxc-4.0.10.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc man pam seccomp selinux +ssl +tools verify-sig"
-
-RDEPEND="acct-group/lxc
-   acct-user/lxc
-   app-misc/pax-utils
-   sys-apps/util-linux
-   sys-libs/libcap
-   virtual/awk
-   caps? ( sys-libs/libcap )
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )
-   ssl? (
-   dev-libs/openssl:0=
-   )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-4
-   apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )
-   man? ( app-text/docbook-sgml-utils )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-   ~CGROUPS
-   ~CGROUP_CPUACCT
-   ~CGROUP_DEVICE
-   ~CGROUP_FREEZER
-
-   ~CGROUP_SCHED
-   ~CPUSETS
-   ~IPC_NS
-   ~MACVLAN
-
-   ~MEMCG
-   ~NAMESPACES
-   ~NET_NS
-   ~PID_NS
-
-   ~POSIX_MQUEUE
-   ~USER_NS
-   ~UTS_NS
-   ~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   append-flags -fno-strict-aliasing
-
-   local myeconfargs=(
-   --bindir=/usr/bin
-   --localstatedir=/var
-   --sbindir=/usr/bin
-
-   --with-config-path=/var/lib/lxc
-   

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

2021-12-01 Thread Sam James
commit: a751b67fe6130761388e7d466d828caf7a4e
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  2 03:38:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  2 03:39:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a751b67f

app-emulation/lxc: depend on >=liburing-2 for io_uring_sqring_wait

Noticed after a report in #gentoo when configure failed
on an older liburing.

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

 app-emulation/lxc/{lxc-4.0.11_p1.ebuild => lxc-4.0.11_p1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc/lxc-4.0.11_p1.ebuild 
b/app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild
similarity index 99%
rename from app-emulation/lxc/lxc-4.0.11_p1.ebuild
rename to app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild
index 815157735941..47271c7dac54 100644
--- a/app-emulation/lxc/lxc-4.0.11_p1.ebuild
+++ b/app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="acct-group/lxc
sys-libs/libcap
virtual/awk
caps? ( sys-libs/libcap )
-   io-uring? ( sys-libs/liburing:= )
+   io-uring? ( >=sys-libs/liburing-2:= )
pam? ( sys-libs/pam )
seccomp? ( sys-libs/libseccomp )
selinux? ( sys-libs/libselinux )



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

2021-11-30 Thread Joonas Niilola
commit: 533d1029bc01f9768e797d2f3b4dfe2fd12213d9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Dec  1 06:55:23 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Dec  1 07:05:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=533d1029

app-emulation/lxc: stabilize 4.0.11_p1 for amd64

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.11_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc/lxc-4.0.11_p1.ebuild 
b/app-emulation/lxc/lxc-4.0.11_p1.ebuild
index e8c7a3f7e451..815157735941 100644
--- a/app-emulation/lxc/lxc-4.0.11_p1.ebuild
+++ b/app-emulation/lxc/lxc-4.0.11_p1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz
verify-sig? ( 
https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz.asc )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"



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

2021-11-30 Thread Joonas Niilola
commit: 354f7f9964faea99c76cdaf911852d7177253c1a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Dec  1 06:54:57 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Dec  1 07:05:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354f7f99

app-emulation/lxc: stabilize 4.0.11_p1 for x86

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.11_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc/lxc-4.0.11_p1.ebuild 
b/app-emulation/lxc/lxc-4.0.11_p1.ebuild
index e7de06da0aee..e8c7a3f7e451 100644
--- a/app-emulation/lxc/lxc-4.0.11_p1.ebuild
+++ b/app-emulation/lxc/lxc-4.0.11_p1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz
verify-sig? ( 
https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz.asc )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"



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

2021-10-29 Thread Joonas Niilola
commit: 209c7f847e6171230e125471c356512908fcce12
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Oct 29 07:14:02 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 29 07:14:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209c7f84

app-emulation/lxc: drop 4.0.11

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.11.ebuild | 183 
 1 file changed, 183 deletions(-)

diff --git a/app-emulation/lxc/lxc-4.0.11.ebuild 
b/app-emulation/lxc/lxc-4.0.11.ebuild
deleted file mode 100644
index 0a763d49521..000
--- a/app-emulation/lxc/lxc-4.0.11.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-LICENSE="GPL-2 LGPL-2.1 LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc io-uring man pam seccomp selinux +ssl +tools 
verify-sig"
-
-RDEPEND="acct-group/lxc
-   acct-user/lxc
-   app-misc/pax-utils
-   sys-apps/util-linux
-   sys-libs/libcap
-   virtual/awk
-   caps? ( sys-libs/libcap )
-   io-uring? ( sys-libs/liburing:= )
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )
-   ssl? (
-   dev-libs/openssl:0=
-   )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-4
-   apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen[dot] )
-   man? ( app-text/docbook-sgml-utils )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-   ~CGROUPS
-   ~CGROUP_CPUACCT
-   ~CGROUP_DEVICE
-   ~CGROUP_FREEZER
-
-   ~CGROUP_SCHED
-   ~CPUSETS
-   ~IPC_NS
-   ~MACVLAN
-
-   ~MEMCG
-   ~NAMESPACES
-   ~NET_NS
-   ~PID_NS
-
-   ~POSIX_MQUEUE
-   ~USER_NS
-   ~UTS_NS
-   ~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-   default
-
-   export bashcompdir="/etc/bash_completion.d"
-   eautoreconf
-}
-
-src_configure() {
-   append-flags -fno-strict-aliasing
-
-   local myeconfargs=(
-   --bindir=/usr/bin
-   --localstatedir=/var
-   --sbindir=/usr/bin
-
-   --with-config-path=/var/lib/lxc
-   --with-distro=gentoo
-   --with-init-script=systemd
-   --with-rootfs-path=/var/lib/lxc/rootfs
-   --with-runtime-path=/run
-   --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
-   --disable-coverity-build
-   --disable-dlog
-   --disable-fuzzers
-   --disable-mutex-debugging
-   --disable-no-undefined
-   --disable-rpath
-   --disable-sanitizers
-   --disable-tests
-   --disable-werror
-
-   --enable-bash
-   --enable-commands
-   --enable-memfd-rexec
-   --enable-thread-safety
-
-   $(use_enable apparmor)
-   $(use_enable caps capabilities)
-   $(use_enable doc api-docs)
-   $(use_enable doc examples)
-   $(use_enable io-uring liburing)
-   $(use_enable man doc)
-   $(use_enable pam)
-   $(use_enable seccomp)
-   $(use_enable selinux)
-   $(use_enable ssl openssl)
-   $(use_enable tools)
-
-   $(use_with pam pamdir $(getpam_mod_dir))
-   )
-
-   econf "${myeconfargs[@]}"
-}
-
-src_install() {
-   default
-
-   # The main bash-completion file will collide with lxd, need to relocate 
and update symlinks.
-   mkdir -p 

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

2021-10-29 Thread Joonas Niilola
commit: 190499d396a2eac96f71a02e4b9e65d1d169d0e7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Oct 29 07:11:32 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 29 07:14:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190499d3

app-emulation/lxc: add io-uring patches for 4.0.11

Bug: https://bugs.gentoo.org/820545
Signed-off-by: Joonas Niilola  gentoo.org>

 .../lxc/files/lxc-4.0.11_p1-liburing-sync1.patch   |  29 
 .../lxc/files/lxc-4.0.11_p1-liburing-sync2.patch   |  28 +++
 app-emulation/lxc/lxc-4.0.11_p1.ebuild | 188 +
 3 files changed, 245 insertions(+)

diff --git a/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch 
b/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch
new file mode 100644
index 000..cd497a75552
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch
@@ -0,0 +1,29 @@
+From aac3f106ff012e1d6835b20c250dcf09c364530c Mon Sep 17 00:00:00 2001
+From: Christian Brauner 
+Date: Thu, 28 Oct 2021 17:39:11 +0200
+Subject: [PATCH] mainloop: make sure that descr->ring is allocated
+
+This is future proofing more than anything else.
+
+Signed-off-by: Christian Brauner 
+---
+ src/lxc/mainloop.c | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c
+index 7c8f5d86af..17a4d55293 100644
+--- a/src/lxc/mainloop.c
 b/src/lxc/mainloop.c
+@@ -515,8 +515,10 @@ void lxc_mainloop_close(struct lxc_async_descr *descr)
+ 
+   if (descr->type == LXC_MAINLOOP_IO_URING) {
+ #if HAVE_LIBURING
+-  io_uring_queue_exit(descr->ring);
+-  munmap(descr->ring, sizeof(struct io_uring));
++  if (descr->ring) {
++  io_uring_queue_exit(descr->ring);
++  munmap(descr->ring, sizeof(struct io_uring));
++  }
+ #else
+   ERROR("Unsupported io_uring mainloop");
+ #endif

diff --git a/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch 
b/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch
new file mode 100644
index 000..33b8554193d
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch
@@ -0,0 +1,28 @@
+From a585382b972c25ee8489147d94918d001ef439a7 Mon Sep 17 00:00:00 2001
+From: Christian Brauner 
+Date: Thu, 28 Oct 2021 17:39:42 +0200
+Subject: [PATCH] start: check event loop type before closing fd
+
+Since this is a union we might otherwise stomp on io_uring mmap()ed
+memory.
+
+Fixes: #4016
+Signed-off-by: Christian Brauner 
+---
+ src/lxc/start.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lxc/start.c b/src/lxc/start.c
+index 8f7173ec8c..1a6046c7a4 100644
+--- a/src/lxc/start.c
 b/src/lxc/start.c
+@@ -629,7 +629,8 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
+   TRACE("Mainloop is ready");
+ 
+   ret = lxc_mainloop(, -1);
+-  close_prot_errno_disarm(descr.epfd);
++  if (descr.type == LXC_MAINLOOP_EPOLL)
++  close_prot_errno_disarm(descr.epfd);
+   if (ret < 0 || !handler->init_died)
+   goto out_mainloop_console;
+ 

diff --git a/app-emulation/lxc/lxc-4.0.11_p1.ebuild 
b/app-emulation/lxc/lxc-4.0.11_p1.ebuild
new file mode 100644
index 000..e7de06da0ae
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.11_p1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz
+   verify-sig? ( 
https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz.asc )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc io-uring man pam seccomp selinux +ssl +tools 
verify-sig"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   io-uring? ( sys-libs/liburing:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   dev-libs/openssl:0=
+   )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-4
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="virtual/pkgconfig
+   doc? ( app-doc/doxygen[dot] )
+   man? ( app-text/docbook-sgml-utils )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+   ~CGROUPS
+   ~CGROUP_CPUACCT
+   ~CGROUP_DEVICE
+   ~CGROUP_FREEZER
+
+   ~CGROUP_SCHED
+   ~CPUSETS
+   

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

2021-10-22 Thread Joonas Niilola
commit: 6e5072dce92397274fe53c96906a83a081bfde5f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Oct 22 15:17:17 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 22 15:17:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5072dc

app-emulation/lxc: fix 4.0.11 compile failure with bash-completion.pc

 - reported by arthurzam,
 - temporary fix, needs a full patch.

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.11.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lxc/lxc-4.0.11.ebuild 
b/app-emulation/lxc/lxc-4.0.11.ebuild
index 65cb5e5ee84..0a763d49521 100644
--- a/app-emulation/lxc/lxc-4.0.11.ebuild
+++ b/app-emulation/lxc/lxc-4.0.11.ebuild
@@ -80,6 +80,8 @@ 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
 
 src_prepare() {
default
+
+   export bashcompdir="/etc/bash_completion.d"
eautoreconf
 }
 
@@ -140,7 +142,7 @@ src_install() {
rm -r "${ED}"/etc/bash_completion.d || die "Failed to remove wrong 
bash_completion.d content."
 
if use tools; then
-   bashcomp_alias lxc-start 
lxc-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
+   bashcomp_alias lxc-start 
lxc-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,usernsexec,wait}
else
bashcomp_alias lxc-start lxc-usernsexec
fi



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

2021-10-22 Thread Joonas Niilola
commit: bc9d9ec1d7cc6584b61762649259265f37b56885
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Oct 22 07:45:08 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 22 08:39:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc9d9ec1

app-emulation/lxc: rework bash-completion logic in 4.0.11

 - since it collides with lxd's bash-completion file.

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.11.ebuild | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app-emulation/lxc/lxc-4.0.11.ebuild 
b/app-emulation/lxc/lxc-4.0.11.ebuild
index 4af531d3e74..65cb5e5ee84 100644
--- a/app-emulation/lxc/lxc-4.0.11.ebuild
+++ b/app-emulation/lxc/lxc-4.0.11.ebuild
@@ -134,9 +134,16 @@ src_configure() {
 src_install() {
default
 
-   mkdir -p "${ED}"/$(get_bashcompdir) || die
-   mv "${ED}"/etc/bash_completion.d/* "${ED}"/$(get_bashcompdir)/ || die
-   rmdir  "${ED}"/etc/bash_completion.d/ || die
+   # The main bash-completion file will collide with lxd, need to relocate 
and update symlinks.
+   mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create 
bashcompdir."
+   mv "${ED}"/etc/bash_completion.d/lxc 
"${ED}"/$(get_bashcompdir)/lxc-start || die "Failed to relocate lxc 
bash-completion file."
+   rm -r "${ED}"/etc/bash_completion.d || die "Failed to remove wrong 
bash_completion.d content."
+
+   if use tools; then
+   bashcomp_alias lxc-start 
lxc-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
+   else
+   bashcomp_alias lxc-start lxc-usernsexec
+   fi
 
keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"



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

2021-10-22 Thread Joonas Niilola
commit: 320db8b5ffcd4ce037c7d50ae5830010abc663b2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Oct 22 06:48:28 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 22 08:39:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320db8b5

app-emulation/lxc: add 4.0.11

 - add 'io_uring' support,
 - new "vanilla" upstream bash completions (non-patched),
 - update LICENSE.

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest  |   2 +
 app-emulation/lxc/lxc-4.0.11.ebuild | 174 
 app-emulation/lxc/metadata.xml  |   1 +
 3 files changed, 177 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 4733a92e509..bbe03a12e01 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,2 +1,4 @@
 DIST lxc-4.0.10.tar.gz 1515002 BLAKE2B 
2a5b94ad767c8a11a5c34d19f12d812bd284337045ad5021c80a5f69be608085ac465edde8c385cc558e45638c9f061793c0c9db616ccbe0614554b4fbf62005
 SHA512 
ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318
 DIST lxc-4.0.10.tar.gz.asc 833 BLAKE2B 
3dd6e8793d1b725ab9eb73d4fa78ce2767bf830fb70d6cc7052e70d2adbc46e4fcf6d986595322b64cb9c71417b801ef6ee3c7612c46dbeb10acba01a5bd69e0
 SHA512 
dd2d3ac4e066eca4e0358c9a2c371a227d3a0b5cf6e452fe34fa5c8cff46e25fa0555c9f707511a8603348fa969c1e7abf85ad7d27fdcaff613b733066861608
+DIST lxc-4.0.11.tar.gz 1543031 BLAKE2B 
0309bbb96938e60e4cbe145fa0cc3c0a85d9154282a889d74167128b6166a280bb4d53df266990a529a98935ef2c12e8d2214e9a8f6cb293d47aa5808ebad82f
 SHA512 
23287e468da8939334f4261bfcbb52eadcbe5806bd97896db38c84eb42f32143dc17bb8b9bb7f7f88584b72056553c9edc33ddb693a345ecf88f3177573fa9c0
+DIST lxc-4.0.11.tar.gz.asc 833 BLAKE2B 
68804d1d5ad09e388541b3a95a98ca14202c513ea3544a7389a49f4e13ecffc17715bb023675134fd99047c727cffe09cbd0a89883054b82650ebd23366823a7
 SHA512 
49a54aaf018772db40e1dadc0a10e7d727a2b14b34c0a3c704fd3f7a12e60082abf4628cc0a489ee620ef2210c7542abbdb6d1432e4297ceef52cdd6b158a5f8

diff --git a/app-emulation/lxc/lxc-4.0.11.ebuild 
b/app-emulation/lxc/lxc-4.0.11.ebuild
new file mode 100644
index 000..4af531d3e74
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.11.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc io-uring man pam seccomp selinux +ssl +tools 
verify-sig"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   io-uring? ( sys-libs/liburing:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   dev-libs/openssl:0=
+   )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-4
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen[dot] )
+   man? ( app-text/docbook-sgml-utils )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+   ~CGROUPS
+   ~CGROUP_CPUACCT
+   ~CGROUP_DEVICE
+   ~CGROUP_FREEZER
+
+   ~CGROUP_SCHED
+   ~CPUSETS
+   ~IPC_NS
+   ~MACVLAN
+
+   ~MEMCG
+   ~NAMESPACES
+   ~NET_NS
+   ~PID_NS
+
+   ~POSIX_MQUEUE
+   ~USER_NS
+   ~UTS_NS
+   ~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   append-flags -fno-strict-aliasing
+
+   local myeconfargs=(
+   

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

2021-10-03 Thread Joonas Niilola
commit: 4dc7966809327f076560b08c54b9823c05a53472
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Oct  4 05:35:35 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Oct  4 05:40:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc79668

app-emulation/lxc: drop 4.0.9-r1

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 -
 ...lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch |  93 ---
 app-emulation/lxc/lxc-4.0.9-r1.ebuild  | 174 -
 3 files changed, 269 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 09e200675c9..4733a92e509 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,4 +1,2 @@
 DIST lxc-4.0.10.tar.gz 1515002 BLAKE2B 
2a5b94ad767c8a11a5c34d19f12d812bd284337045ad5021c80a5f69be608085ac465edde8c385cc558e45638c9f061793c0c9db616ccbe0614554b4fbf62005
 SHA512 
ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318
 DIST lxc-4.0.10.tar.gz.asc 833 BLAKE2B 
3dd6e8793d1b725ab9eb73d4fa78ce2767bf830fb70d6cc7052e70d2adbc46e4fcf6d986595322b64cb9c71417b801ef6ee3c7612c46dbeb10acba01a5bd69e0
 SHA512 
dd2d3ac4e066eca4e0358c9a2c371a227d3a0b5cf6e452fe34fa5c8cff46e25fa0555c9f707511a8603348fa969c1e7abf85ad7d27fdcaff613b733066861608
-DIST lxc-4.0.9.tar.gz 1500310 BLAKE2B 
3796d36b6f76ec595dc28207e66ec9f5a7c1a39f5c5ebc851638c519be35f59b4ec06a71b2866cd8fef0a6140f61fd4b70c900f5a8ffd42d7da7a30d3ff59975
 SHA512 
4ef9d9efdd4118fdffde8b49c6ae71cf5eb060be51daaa4f4ceb804c743fbf3278e6518e6a694faefc720f2834f98ac48d67842d589a2120b8f7ec4c3b61fa84
-DIST lxc-4.0.9.tar.gz.asc 833 BLAKE2B 
2d275c968831410d987aa7f8062f4e35ba15043f92f38fd3bdd6bf80964906741d05ccd93789132d421ee1c8778cec6a2e76c4f0eb2165cf0107261495fa6856
 SHA512 
4c90dfbdba90959ee8df5da8ca8b240f65ab03ab91637833c677e2a73592c09f9c5a55b9a261be6efb0888156c916223ff1aa9003b18d46e667908aaa550c944

diff --git 
a/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch 
b/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch
deleted file mode 100644
index 6fba3c4154a..000
--- a/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 91ad9b94bcd964adfbaa8d84d8f39304d39835d0 Mon Sep 17 00:00:00 2001
-From: Christian Brauner 
-Date: Thu, 6 May 2021 18:16:45 +0200
-Subject: [PATCH] conf: handle kernels with CAP_SETFCAP
-
-LXC is being very clever and sometimes maps the caller's uid into the
-child userns. This means that the caller can technically write fscaps
-that are valid in the ancestor userns (which can be a security issue in
-some scenarios) so newer kernels require CAP_SETFCAP to do this. Until
-newuidmap/newgidmap are updated to account for this simply write the
-mapping directly in this case.
-
-Cc: stable-4.0
-Signed-off-by: Christian Brauner 

- src/lxc/conf.c | 25 -
- 1 file changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index 72e21b5300..f388946970 100644
 a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -2978,6 +2978,9 @@ static int lxc_map_ids_exec_wrapper(void *args)
-   return -1;
- }
- 
-+static struct id_map *find_mapped_hostid_entry(const struct lxc_list *idmap,
-+ unsigned id, enum idtype idtype);
-+
- int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
- {
-   int fill, left;
-@@ -2991,12 +2994,22 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
-   char mapbuf[STRLITERALLEN("new@idmap") + STRLITERALLEN(" ") +
-   INTTYPE_TO_STRLEN(pid_t) + STRLITERALLEN(" ") +
-   LXC_IDMAPLEN] = {0};
--  bool had_entry = false, use_shadow = false;
-+  bool had_entry = false, maps_host_root = false, use_shadow = false;
-   int hostuid, hostgid;
- 
-   hostuid = geteuid();
-   hostgid = getegid();
- 
-+  /*
-+   * Check whether caller wants to map host root.
-+   * Due to a security fix newer kernels require CAP_SETFCAP when mapping
-+   * host root into the child userns as you would be able to write fscaps
-+   * that would be valid in the ancestor userns. Mapping host root should
-+   * rarely be the case but LXC is being clever in a bunch of cases.
-+   */
-+  if (find_mapped_hostid_entry(idmap, 0, ID_TYPE_UID))
-+  maps_host_root = true;
-+
-   /* If new{g,u}idmap exists, that is, if shadow is handing out subuid
-* ranges, then insist that root also reserve ranges in subuid. This
-* will protected it by preventing another user from being handed the
-@@ -3014,7 +3027,9 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
-   else if (!gidmap)
-   WARN("newgidmap is lacking necessary privileges");
- 
--  if (uidmap > 0 && gidmap > 0) {
-+ 

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

2021-08-26 Thread Joonas Niilola
commit: 21be10cbf1511d285dec970158c8e8d7bc2f5ffe
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Aug 26 05:58:07 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug 26 06:42:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21be10cb

app-emulation/lxc: stabilize 4.0.10 for x86

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.10.ebuild 
b/app-emulation/lxc/lxc-4.0.10.ebuild
index 3048c43cfdc..f9e67a8c76f 100644
--- a/app-emulation/lxc/lxc-4.0.10.ebuild
+++ b/app-emulation/lxc/lxc-4.0.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2021-08-26 Thread Joonas Niilola
commit: 3bb339d7aeea718b46cd85a8efe2d472546e0893
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Aug 26 05:57:52 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug 26 06:42:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb339d7

app-emulation/lxc: stabilize 4.0.10 for amd64

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.10.ebuild 
b/app-emulation/lxc/lxc-4.0.10.ebuild
index 860a4e8b78f..3048c43cfdc 100644
--- a/app-emulation/lxc/lxc-4.0.10.ebuild
+++ b/app-emulation/lxc/lxc-4.0.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2021-07-26 Thread Yixun Lan
commit: 5d26cb5dec173b59f9fdbb3cd20faefc9224571f
Author: Yixun Lan  gentoo  org>
AuthorDate: Sat Jul 24 11:18:31 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Jul 26 07:42:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d26cb5d

app-emulation/lxc: keyword ~riscv

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

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

diff --git a/app-emulation/lxc/lxc-4.0.10.ebuild 
b/app-emulation/lxc/lxc-4.0.10.ebuild
index a2fdef11931..860a4e8b78f 100644
--- a/app-emulation/lxc/lxc-4.0.10.ebuild
+++ b/app-emulation/lxc/lxc-4.0.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2021-07-26 Thread Yixun Lan
commit: ba907dc0d33f0fad27c403b7762a642a14cef2ea
Author: Yixun Lan  gentoo  org>
AuthorDate: Sat Jul 24 11:24:09 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Jul 26 07:42:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba907dc0

app-emulation/lxc-templates: keyword ~riscv

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

 app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
index 744cb45be22..395bcc1afb3 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.4.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc-templates;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2021-07-19 Thread Joonas Niilola
commit: ca064f4a9d45cee09f2692f537cc28abbb95fa0f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 19 11:10:21 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 19 11:15:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca064f4a

app-emulation/lxc: drop 4.0.6

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 -
 app-emulation/lxc/lxc-4.0.6.ebuild | 172 -
 2 files changed, 174 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index a389e2a00dd..09e200675c9 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,6 +1,4 @@
 DIST lxc-4.0.10.tar.gz 1515002 BLAKE2B 
2a5b94ad767c8a11a5c34d19f12d812bd284337045ad5021c80a5f69be608085ac465edde8c385cc558e45638c9f061793c0c9db616ccbe0614554b4fbf62005
 SHA512 
ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318
 DIST lxc-4.0.10.tar.gz.asc 833 BLAKE2B 
3dd6e8793d1b725ab9eb73d4fa78ce2767bf830fb70d6cc7052e70d2adbc46e4fcf6d986595322b64cb9c71417b801ef6ee3c7612c46dbeb10acba01a5bd69e0
 SHA512 
dd2d3ac4e066eca4e0358c9a2c371a227d3a0b5cf6e452fe34fa5c8cff46e25fa0555c9f707511a8603348fa969c1e7abf85ad7d27fdcaff613b733066861608
-DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B 
e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43
 SHA512 
98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
-DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 
04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7
 SHA512 
baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
 DIST lxc-4.0.9.tar.gz 1500310 BLAKE2B 
3796d36b6f76ec595dc28207e66ec9f5a7c1a39f5c5ebc851638c519be35f59b4ec06a71b2866cd8fef0a6140f61fd4b70c900f5a8ffd42d7da7a30d3ff59975
 SHA512 
4ef9d9efdd4118fdffde8b49c6ae71cf5eb060be51daaa4f4ceb804c743fbf3278e6518e6a694faefc720f2834f98ac48d67842d589a2120b8f7ec4c3b61fa84
 DIST lxc-4.0.9.tar.gz.asc 833 BLAKE2B 
2d275c968831410d987aa7f8062f4e35ba15043f92f38fd3bdd6bf80964906741d05ccd93789132d421ee1c8778cec6a2e76c4f0eb2165cf0107261495fa6856
 SHA512 
4c90dfbdba90959ee8df5da8ca8b240f65ab03ab91637833c677e2a73592c09f9c5a55b9a261be6efb0888156c916223ff1aa9003b18d46e667908aaa550c944

diff --git a/app-emulation/lxc/lxc-4.0.6.ebuild 
b/app-emulation/lxc/lxc-4.0.6.ebuild
deleted file mode 100644
index e22cf583db2..000
--- a/app-emulation/lxc/lxc-4.0.6.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc examples man pam selinux +ssl +tools verify-sig"
-
-RDEPEND="acct-group/lxc
-   acct-user/lxc
-   app-misc/pax-utils
-   sys-apps/util-linux
-   sys-libs/libcap
-   sys-libs/libseccomp
-   virtual/awk
-   caps? ( sys-libs/libcap )
-   pam? ( sys-libs/pam )
-   selinux? ( sys-libs/libselinux )
-   ssl? (
-   dev-libs/openssl:0=
-   )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-4
-   apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )
-   man? ( app-text/docbook-sgml-utils )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-   ~CGROUPS
-   ~CGROUP_CPUACCT
-   ~CGROUP_DEVICE
-   ~CGROUP_FREEZER
-
-   ~CGROUP_SCHED
-   ~CPUSETS
-   ~IPC_NS
-   ~MACVLAN
-
-   ~MEMCG
-   ~NAMESPACES
-   ~NET_NS
-   ~PID_NS
-
-   ~POSIX_MQUEUE
-   ~USER_NS
-   ~UTS_NS
-   ~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   

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

2021-07-19 Thread Joonas Niilola
commit: 5e76b682329ae47e71affde1d99d11d3a3735aa3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 19 11:04:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 19 11:15:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e76b682

app-emulation/lxc: bump to 4.0.10

 - 'seccomp' USE flag added back.

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest  |   2 +
 app-emulation/lxc/lxc-4.0.10.ebuild | 173 
 2 files changed, 175 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 631ae5ca39e..a389e2a00dd 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,3 +1,5 @@
+DIST lxc-4.0.10.tar.gz 1515002 BLAKE2B 
2a5b94ad767c8a11a5c34d19f12d812bd284337045ad5021c80a5f69be608085ac465edde8c385cc558e45638c9f061793c0c9db616ccbe0614554b4fbf62005
 SHA512 
ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318
+DIST lxc-4.0.10.tar.gz.asc 833 BLAKE2B 
3dd6e8793d1b725ab9eb73d4fa78ce2767bf830fb70d6cc7052e70d2adbc46e4fcf6d986595322b64cb9c71417b801ef6ee3c7612c46dbeb10acba01a5bd69e0
 SHA512 
dd2d3ac4e066eca4e0358c9a2c371a227d3a0b5cf6e452fe34fa5c8cff46e25fa0555c9f707511a8603348fa969c1e7abf85ad7d27fdcaff613b733066861608
 DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B 
e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43
 SHA512 
98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
 DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 
04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7
 SHA512 
baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
 DIST lxc-4.0.9.tar.gz 1500310 BLAKE2B 
3796d36b6f76ec595dc28207e66ec9f5a7c1a39f5c5ebc851638c519be35f59b4ec06a71b2866cd8fef0a6140f61fd4b70c900f5a8ffd42d7da7a30d3ff59975
 SHA512 
4ef9d9efdd4118fdffde8b49c6ae71cf5eb060be51daaa4f4ceb804c743fbf3278e6518e6a694faefc720f2834f98ac48d67842d589a2120b8f7ec4c3b61fa84

diff --git a/app-emulation/lxc/lxc-4.0.10.ebuild 
b/app-emulation/lxc/lxc-4.0.10.ebuild
new file mode 100644
index 000..a2fdef11931
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.10.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc man pam seccomp selinux +ssl +tools verify-sig"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   dev-libs/openssl:0=
+   )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-4
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )
+   man? ( app-text/docbook-sgml-utils )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+   ~CGROUPS
+   ~CGROUP_CPUACCT
+   ~CGROUP_DEVICE
+   ~CGROUP_FREEZER
+
+   ~CGROUP_SCHED
+   ~CPUSETS
+   ~IPC_NS
+   ~MACVLAN
+
+   ~MEMCG
+   ~NAMESPACES
+   ~NET_NS
+   ~PID_NS
+
+   ~POSIX_MQUEUE
+   ~USER_NS
+   ~UTS_NS
+   ~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+

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

2021-06-01 Thread Joonas Niilola
commit: 2df2ba662d6a2b67cc60812dc4896a0ba8585c1d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun  1 08:39:59 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun  1 08:43:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df2ba66

app-emulation/lxc: stabilize 4.0.9-r1 on amd64

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc/lxc-4.0.9-r1.ebuild 
b/app-emulation/lxc/lxc-4.0.9-r1.ebuild
index 616457fe6bd..243fd583e98 100644
--- a/app-emulation/lxc/lxc-4.0.9-r1.ebuild
+++ b/app-emulation/lxc/lxc-4.0.9-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2021-06-01 Thread Joonas Niilola
commit: 5bd52322315734ded6860d62aef6405238c655a4
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun  1 08:18:48 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun  1 08:43:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd52322

app-emulation/lxc: stabilize 4.0.9-r1 on x86

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc/lxc-4.0.9-r1.ebuild 
b/app-emulation/lxc/lxc-4.0.9-r1.ebuild
index 8fbfeda5aca..616457fe6bd 100644
--- a/app-emulation/lxc/lxc-4.0.9-r1.ebuild
+++ b/app-emulation/lxc/lxc-4.0.9-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2021-05-09 Thread Joonas Niilola
commit: fb00aa98de17dba7ffb4ef5fed6608af8a6968d8
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May  9 09:27:30 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 10 05:01:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb00aa98

app-emulation/lxc: handle kernels with CAP_SETFCAP

Closes: https://bugs.gentoo.org/789012
Signed-off-by: Joonas Niilola  gentoo.org>

 ...lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch | 93 ++
 .../lxc/{lxc-4.0.9.ebuild => lxc-4.0.9-r1.ebuild}  |  1 +
 2 files changed, 94 insertions(+)

diff --git 
a/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch 
b/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch
new file mode 100644
index 000..6fba3c4154a
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch
@@ -0,0 +1,93 @@
+From 91ad9b94bcd964adfbaa8d84d8f39304d39835d0 Mon Sep 17 00:00:00 2001
+From: Christian Brauner 
+Date: Thu, 6 May 2021 18:16:45 +0200
+Subject: [PATCH] conf: handle kernels with CAP_SETFCAP
+
+LXC is being very clever and sometimes maps the caller's uid into the
+child userns. This means that the caller can technically write fscaps
+that are valid in the ancestor userns (which can be a security issue in
+some scenarios) so newer kernels require CAP_SETFCAP to do this. Until
+newuidmap/newgidmap are updated to account for this simply write the
+mapping directly in this case.
+
+Cc: stable-4.0
+Signed-off-by: Christian Brauner 
+---
+ src/lxc/conf.c | 25 -
+ 1 file changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 72e21b5300..f388946970 100644
+--- a/src/lxc/conf.c
 b/src/lxc/conf.c
+@@ -2978,6 +2978,9 @@ static int lxc_map_ids_exec_wrapper(void *args)
+   return -1;
+ }
+ 
++static struct id_map *find_mapped_hostid_entry(const struct lxc_list *idmap,
++ unsigned id, enum idtype idtype);
++
+ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
+ {
+   int fill, left;
+@@ -2991,12 +2994,22 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
+   char mapbuf[STRLITERALLEN("new@idmap") + STRLITERALLEN(" ") +
+   INTTYPE_TO_STRLEN(pid_t) + STRLITERALLEN(" ") +
+   LXC_IDMAPLEN] = {0};
+-  bool had_entry = false, use_shadow = false;
++  bool had_entry = false, maps_host_root = false, use_shadow = false;
+   int hostuid, hostgid;
+ 
+   hostuid = geteuid();
+   hostgid = getegid();
+ 
++  /*
++   * Check whether caller wants to map host root.
++   * Due to a security fix newer kernels require CAP_SETFCAP when mapping
++   * host root into the child userns as you would be able to write fscaps
++   * that would be valid in the ancestor userns. Mapping host root should
++   * rarely be the case but LXC is being clever in a bunch of cases.
++   */
++  if (find_mapped_hostid_entry(idmap, 0, ID_TYPE_UID))
++  maps_host_root = true;
++
+   /* If new{g,u}idmap exists, that is, if shadow is handing out subuid
+* ranges, then insist that root also reserve ranges in subuid. This
+* will protected it by preventing another user from being handed the
+@@ -3014,7 +3027,9 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
+   else if (!gidmap)
+   WARN("newgidmap is lacking necessary privileges");
+ 
+-  if (uidmap > 0 && gidmap > 0) {
++  if (maps_host_root) {
++  INFO("Caller maps host root. Writing mapping directly");
++  } else if (uidmap > 0 && gidmap > 0) {
+   DEBUG("Functional newuidmap and newgidmap binary found");
+   use_shadow = true;
+   } else {
+@@ -4229,14 +4244,14 @@ static struct id_map *mapped_nsid_add(const struct 
lxc_conf *conf, unsigned id,
+   return retmap;
+ }
+ 
+-static struct id_map *find_mapped_hostid_entry(const struct lxc_conf *conf,
++static struct id_map *find_mapped_hostid_entry(const struct lxc_list *idmap,
+  unsigned id, enum idtype idtype)
+ {
+   struct id_map *map;
+   struct lxc_list *it;
+   struct id_map *retmap = NULL;
+ 
+-  lxc_list_for_each (it, >id_map) {
++  lxc_list_for_each (it, idmap) {
+   map = it->elem;
+   if (map->idtype != idtype)
+   continue;
+@@ -4265,7 +4280,7 @@ static struct id_map *mapped_hostid_add(const struct 
lxc_conf *conf, uid_t id,
+   return NULL;
+ 
+   /* Reuse existing mapping. */
+-  tmp = find_mapped_hostid_entry(conf, id, type);
++  tmp = find_mapped_hostid_entry(>id_map, id, type);
+   if (tmp) {
+   memcpy(entry, tmp, sizeof(*entry));
+   } else {

diff --git a/app-emulation/lxc/lxc-4.0.9.ebuild 
b/app-emulation/lxc/lxc-4.0.9-r1.ebuild
similarity index 98%
rename from 

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

2021-05-04 Thread Joonas Niilola
commit: 91331d522c1c4d7da40a0d9e49039712418e5889
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed May  5 05:10:17 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May  5 05:10:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91331d52

app-emulation/lxc: drop 4.0.8

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 -
 app-emulation/lxc/lxc-4.0.8.ebuild | 173 -
 2 files changed, 175 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index ffdf2edce5d..631ae5ca39e 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,6 +1,4 @@
 DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B 
e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43
 SHA512 
98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
 DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 
04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7
 SHA512 
baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
-DIST lxc-4.0.8.tar.gz 1488025 BLAKE2B 
51bbbf968bc07472214edbad89ed703f54347d5dd78860a2954609d87a1971326a5fcc2254890756d769dcf5e6005e19f6eff34fd923bb594cffcea0b8100ebd
 SHA512 
b2b9887c5c4646fbd873fd15779a563954ac729bfbd546ccc2b9c7e5e283b3b3189290a31cc6c549881201ff29d955b56c084a72c080f48f83240c12b46ce85e
-DIST lxc-4.0.8.tar.gz.asc 833 BLAKE2B 
36e82957f878553b04dffc18aa82b81a55b400f4ceeddc2a47f3c1c28c34356f358626dbbc712dadd72678ef3340028817d5addc011fe5650419acf4bdd4f0f1
 SHA512 
138a17d971466c7a14f4da40af7163bb752be9008f00f6ce240fdc416ad97bd0b89b181b8565a95592bb2de456fba117e3263fb87eb92ced99ae3d7e984dc9b3
 DIST lxc-4.0.9.tar.gz 1500310 BLAKE2B 
3796d36b6f76ec595dc28207e66ec9f5a7c1a39f5c5ebc851638c519be35f59b4ec06a71b2866cd8fef0a6140f61fd4b70c900f5a8ffd42d7da7a30d3ff59975
 SHA512 
4ef9d9efdd4118fdffde8b49c6ae71cf5eb060be51daaa4f4ceb804c743fbf3278e6518e6a694faefc720f2834f98ac48d67842d589a2120b8f7ec4c3b61fa84
 DIST lxc-4.0.9.tar.gz.asc 833 BLAKE2B 
2d275c968831410d987aa7f8062f4e35ba15043f92f38fd3bdd6bf80964906741d05ccd93789132d421ee1c8778cec6a2e76c4f0eb2165cf0107261495fa6856
 SHA512 
4c90dfbdba90959ee8df5da8ca8b240f65ab03ab91637833c677e2a73592c09f9c5a55b9a261be6efb0888156c916223ff1aa9003b18d46e667908aaa550c944

diff --git a/app-emulation/lxc/lxc-4.0.8.ebuild 
b/app-emulation/lxc/lxc-4.0.8.ebuild
deleted file mode 100644
index 89a0b2e2b2d..000
--- a/app-emulation/lxc/lxc-4.0.8.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc man pam selinux +ssl +tools verify-sig"
-
-RDEPEND="acct-group/lxc
-   acct-user/lxc
-   app-misc/pax-utils
-   sys-apps/util-linux
-   sys-libs/libcap
-   sys-libs/libseccomp
-   virtual/awk
-   caps? ( sys-libs/libcap )
-   pam? ( sys-libs/pam )
-   selinux? ( sys-libs/libselinux )
-   ssl? (
-   dev-libs/openssl:0=
-   )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-4
-   apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )
-   man? ( app-text/docbook-sgml-utils )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-   ~CGROUPS
-   ~CGROUP_CPUACCT
-   ~CGROUP_DEVICE
-   ~CGROUP_FREEZER
-
-   ~CGROUP_SCHED
-   ~CPUSETS
-   ~IPC_NS
-   ~MACVLAN
-
-   ~MEMCG
-   ~NAMESPACES
-   ~NET_NS
-   ~PID_NS
-
-   ~POSIX_MQUEUE
-   ~USER_NS
-   ~UTS_NS
-   ~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   

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

2021-05-04 Thread Joonas Niilola
commit: 9454ee6cad81b87891086fe36e737469d69c23da
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed May  5 05:10:00 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May  5 05:10:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9454ee6c

app-emulation/lxc: bump to 4.0.9

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 +
 app-emulation/lxc/lxc-4.0.9.ebuild | 173 +
 2 files changed, 175 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 4e9ccf760fe..ffdf2edce5d 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -2,3 +2,5 @@ DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B 
e2d9d281cf521575aeecefbcba0c7b7f336ab73193
 DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 
04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7
 SHA512 
baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
 DIST lxc-4.0.8.tar.gz 1488025 BLAKE2B 
51bbbf968bc07472214edbad89ed703f54347d5dd78860a2954609d87a1971326a5fcc2254890756d769dcf5e6005e19f6eff34fd923bb594cffcea0b8100ebd
 SHA512 
b2b9887c5c4646fbd873fd15779a563954ac729bfbd546ccc2b9c7e5e283b3b3189290a31cc6c549881201ff29d955b56c084a72c080f48f83240c12b46ce85e
 DIST lxc-4.0.8.tar.gz.asc 833 BLAKE2B 
36e82957f878553b04dffc18aa82b81a55b400f4ceeddc2a47f3c1c28c34356f358626dbbc712dadd72678ef3340028817d5addc011fe5650419acf4bdd4f0f1
 SHA512 
138a17d971466c7a14f4da40af7163bb752be9008f00f6ce240fdc416ad97bd0b89b181b8565a95592bb2de456fba117e3263fb87eb92ced99ae3d7e984dc9b3
+DIST lxc-4.0.9.tar.gz 1500310 BLAKE2B 
3796d36b6f76ec595dc28207e66ec9f5a7c1a39f5c5ebc851638c519be35f59b4ec06a71b2866cd8fef0a6140f61fd4b70c900f5a8ffd42d7da7a30d3ff59975
 SHA512 
4ef9d9efdd4118fdffde8b49c6ae71cf5eb060be51daaa4f4ceb804c743fbf3278e6518e6a694faefc720f2834f98ac48d67842d589a2120b8f7ec4c3b61fa84
+DIST lxc-4.0.9.tar.gz.asc 833 BLAKE2B 
2d275c968831410d987aa7f8062f4e35ba15043f92f38fd3bdd6bf80964906741d05ccd93789132d421ee1c8778cec6a2e76c4f0eb2165cf0107261495fa6856
 SHA512 
4c90dfbdba90959ee8df5da8ca8b240f65ab03ab91637833c677e2a73592c09f9c5a55b9a261be6efb0888156c916223ff1aa9003b18d46e667908aaa550c944

diff --git a/app-emulation/lxc/lxc-4.0.9.ebuild 
b/app-emulation/lxc/lxc-4.0.9.ebuild
new file mode 100644
index 000..89a0b2e2b2d
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.9.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc man pam selinux +ssl +tools verify-sig"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   sys-libs/libseccomp
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   pam? ( sys-libs/pam )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   dev-libs/openssl:0=
+   )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-4
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )
+   man? ( app-text/docbook-sgml-utils )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+   ~CGROUPS
+   ~CGROUP_CPUACCT
+   ~CGROUP_DEVICE
+   ~CGROUP_FREEZER
+
+   ~CGROUP_SCHED
+   ~CPUSETS
+   ~IPC_NS
+   ~MACVLAN
+
+   ~MEMCG
+   ~NAMESPACES
+   ~NET_NS
+   ~PID_NS
+
+   ~POSIX_MQUEUE
+   ~USER_NS
+   ~UTS_NS
+   ~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+

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

2021-04-30 Thread Joonas Niilola
commit: 493e6846b57d0bf9ad6e56b8a5141b5cb16b8880
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat May  1 05:14:09 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat May  1 05:38:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493e6846

app-emulation/lxc: bump to 4.0.8

 - add installing examples behind 'doc' USE flag for consistency. Doesn't
   pull more deps and only installs files worth <100 kb.

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 +
 app-emulation/lxc/lxc-4.0.8.ebuild | 173 +
 2 files changed, 175 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 6a74af90230..025a73a758a 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -2,3 +2,5 @@ DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B 
e2d9d281cf521575aeecefbcba0c7b7f336ab73193
 DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 
04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7
 SHA512 
baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
 DIST lxc-4.0.7.tar.gz 1485130 BLAKE2B 
1b806282f3a07df1936f11a6c7c8f0f4dd10ca91aecb3cf881e4cd5c4106035828619ee4bcb163242206e6aafced7841fcd10c191f1b8d609d4e8cb19d81ba6c
 SHA512 
cc04332466090154cf1862fad7a52c9ad7f08462cbe113b12092face43c0e92d53e082af7744667d5397e6289f4ffcf6787c0cb17648013d267b13437be4d992
 DIST lxc-4.0.7.tar.gz.asc 833 BLAKE2B 
90e533b5fe96b1f8fd2d3dc08e45438b9211855c79ec514ab722ad5e5b6ec0cbd3579805143c81c854ac09d50ee14319404ee4523dff69c05f4a43137284235f
 SHA512 
a64624b2796d0dac2e0c274cfaaf7c42c23d77903f643005bd5433543318c81b0e715042332a1c120250d4ef23d51ef9be0b7cedeced4f7bfe53d1aee46a6822
+DIST lxc-4.0.8.tar.gz 1488025 BLAKE2B 
51bbbf968bc07472214edbad89ed703f54347d5dd78860a2954609d87a1971326a5fcc2254890756d769dcf5e6005e19f6eff34fd923bb594cffcea0b8100ebd
 SHA512 
b2b9887c5c4646fbd873fd15779a563954ac729bfbd546ccc2b9c7e5e283b3b3189290a31cc6c549881201ff29d955b56c084a72c080f48f83240c12b46ce85e
+DIST lxc-4.0.8.tar.gz.asc 833 BLAKE2B 
36e82957f878553b04dffc18aa82b81a55b400f4ceeddc2a47f3c1c28c34356f358626dbbc712dadd72678ef3340028817d5addc011fe5650419acf4bdd4f0f1
 SHA512 
138a17d971466c7a14f4da40af7163bb752be9008f00f6ce240fdc416ad97bd0b89b181b8565a95592bb2de456fba117e3263fb87eb92ced99ae3d7e984dc9b3

diff --git a/app-emulation/lxc/lxc-4.0.8.ebuild 
b/app-emulation/lxc/lxc-4.0.8.ebuild
new file mode 100644
index 000..89a0b2e2b2d
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.8.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc man pam selinux +ssl +tools verify-sig"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   sys-libs/libseccomp
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   pam? ( sys-libs/pam )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   dev-libs/openssl:0=
+   )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-4
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )
+   man? ( app-text/docbook-sgml-utils )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+   ~CGROUPS
+   ~CGROUP_CPUACCT
+   ~CGROUP_DEVICE
+   ~CGROUP_FREEZER
+
+   ~CGROUP_SCHED
+   ~CPUSETS
+   ~IPC_NS
+   ~MACVLAN
+
+   ~MEMCG
+   ~NAMESPACES
+   ~NET_NS
+   ~PID_NS
+
+   ~POSIX_MQUEUE
+   ~USER_NS
+   ~UTS_NS
+   ~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   

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

2021-04-30 Thread Joonas Niilola
commit: 4ff4b7430db7c14cff46590aa9d612318ecaa7d8
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat May  1 05:38:03 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat May  1 05:38:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff4b743

app-emulation/lxc: drop 4.0.7

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 -
 app-emulation/lxc/lxc-4.0.7.ebuild | 173 -
 2 files changed, 175 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 025a73a758a..4e9ccf760fe 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,6 +1,4 @@
 DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B 
e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43
 SHA512 
98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
 DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 
04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7
 SHA512 
baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
-DIST lxc-4.0.7.tar.gz 1485130 BLAKE2B 
1b806282f3a07df1936f11a6c7c8f0f4dd10ca91aecb3cf881e4cd5c4106035828619ee4bcb163242206e6aafced7841fcd10c191f1b8d609d4e8cb19d81ba6c
 SHA512 
cc04332466090154cf1862fad7a52c9ad7f08462cbe113b12092face43c0e92d53e082af7744667d5397e6289f4ffcf6787c0cb17648013d267b13437be4d992
-DIST lxc-4.0.7.tar.gz.asc 833 BLAKE2B 
90e533b5fe96b1f8fd2d3dc08e45438b9211855c79ec514ab722ad5e5b6ec0cbd3579805143c81c854ac09d50ee14319404ee4523dff69c05f4a43137284235f
 SHA512 
a64624b2796d0dac2e0c274cfaaf7c42c23d77903f643005bd5433543318c81b0e715042332a1c120250d4ef23d51ef9be0b7cedeced4f7bfe53d1aee46a6822
 DIST lxc-4.0.8.tar.gz 1488025 BLAKE2B 
51bbbf968bc07472214edbad89ed703f54347d5dd78860a2954609d87a1971326a5fcc2254890756d769dcf5e6005e19f6eff34fd923bb594cffcea0b8100ebd
 SHA512 
b2b9887c5c4646fbd873fd15779a563954ac729bfbd546ccc2b9c7e5e283b3b3189290a31cc6c549881201ff29d955b56c084a72c080f48f83240c12b46ce85e
 DIST lxc-4.0.8.tar.gz.asc 833 BLAKE2B 
36e82957f878553b04dffc18aa82b81a55b400f4ceeddc2a47f3c1c28c34356f358626dbbc712dadd72678ef3340028817d5addc011fe5650419acf4bdd4f0f1
 SHA512 
138a17d971466c7a14f4da40af7163bb752be9008f00f6ce240fdc416ad97bd0b89b181b8565a95592bb2de456fba117e3263fb87eb92ced99ae3d7e984dc9b3

diff --git a/app-emulation/lxc/lxc-4.0.7.ebuild 
b/app-emulation/lxc/lxc-4.0.7.ebuild
deleted file mode 100644
index d8de55261ce..000
--- a/app-emulation/lxc/lxc-4.0.7.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc examples man pam selinux +ssl +tools verify-sig"
-
-RDEPEND="acct-group/lxc
-   acct-user/lxc
-   app-misc/pax-utils
-   sys-apps/util-linux
-   sys-libs/libcap
-   sys-libs/libseccomp
-   virtual/awk
-   caps? ( sys-libs/libcap )
-   pam? ( sys-libs/pam )
-   selinux? ( sys-libs/libselinux )
-   ssl? (
-   dev-libs/openssl:0=
-   )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-4
-   apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )
-   man? ( app-text/docbook-sgml-utils )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-   ~CGROUPS
-   ~CGROUP_CPUACCT
-   ~CGROUP_DEVICE
-   ~CGROUP_FREEZER
-
-   ~CGROUP_SCHED
-   ~CPUSETS
-   ~IPC_NS
-   ~MACVLAN
-
-   ~MEMCG
-   ~NAMESPACES
-   ~NET_NS
-   ~PID_NS
-
-   ~POSIX_MQUEUE
-   ~USER_NS
-   ~UTS_NS
-   ~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   

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

2021-04-30 Thread Mikle Kolyada
commit: b77105464039d930c977e11e1d6b81912e819070
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Apr 30 19:01:06 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Apr 30 19:04:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7710546

app-emulation/lxc: remove libressl support

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

 app-emulation/lxc/lxc-4.0.6.ebuild | 5 ++---
 app-emulation/lxc/lxc-4.0.7.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-emulation/lxc/lxc-4.0.6.ebuild 
b/app-emulation/lxc/lxc-4.0.6.ebuild
index ff87b65cfbf..e22cf583db2 100644
--- a/app-emulation/lxc/lxc-4.0.6.ebuild
+++ b/app-emulation/lxc/lxc-4.0.6.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="apparmor +caps doc examples libressl man pam selinux +ssl +tools 
verify-sig"
+IUSE="apparmor +caps doc examples man pam selinux +ssl +tools verify-sig"
 
 RDEPEND="acct-group/lxc
acct-user/lxc
@@ -27,8 +27,7 @@ RDEPEND="acct-group/lxc
pam? ( sys-libs/pam )
selinux? ( sys-libs/libselinux )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)"
 DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-4

diff --git a/app-emulation/lxc/lxc-4.0.7.ebuild 
b/app-emulation/lxc/lxc-4.0.7.ebuild
index 546b2e6e450..d8de55261ce 100644
--- a/app-emulation/lxc/lxc-4.0.7.ebuild
+++ b/app-emulation/lxc/lxc-4.0.7.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="apparmor +caps doc examples libressl man pam selinux +ssl +tools 
verify-sig"
+IUSE="apparmor +caps doc examples man pam selinux +ssl +tools verify-sig"
 
 RDEPEND="acct-group/lxc
acct-user/lxc
@@ -27,8 +27,7 @@ RDEPEND="acct-group/lxc
pam? ( sys-libs/pam )
selinux? ( sys-libs/libselinux )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)"
 DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-4



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

2021-04-30 Thread Joonas Niilola
commit: 8b4b75e0c921746ee6c4a4b1cb93bedcae1e30d1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Apr 30 06:47:03 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr 30 07:01:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4b75e0

app-emulation/lxc: bump to 4.0.7

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 +
 app-emulation/lxc/lxc-4.0.7.ebuild | 174 +
 2 files changed, 176 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 3db082ff762..6a74af90230 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,2 +1,4 @@
 DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B 
e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43
 SHA512 
98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
 DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 
04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7
 SHA512 
baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
+DIST lxc-4.0.7.tar.gz 1485130 BLAKE2B 
1b806282f3a07df1936f11a6c7c8f0f4dd10ca91aecb3cf881e4cd5c4106035828619ee4bcb163242206e6aafced7841fcd10c191f1b8d609d4e8cb19d81ba6c
 SHA512 
cc04332466090154cf1862fad7a52c9ad7f08462cbe113b12092face43c0e92d53e082af7744667d5397e6289f4ffcf6787c0cb17648013d267b13437be4d992
+DIST lxc-4.0.7.tar.gz.asc 833 BLAKE2B 
90e533b5fe96b1f8fd2d3dc08e45438b9211855c79ec514ab722ad5e5b6ec0cbd3579805143c81c854ac09d50ee14319404ee4523dff69c05f4a43137284235f
 SHA512 
a64624b2796d0dac2e0c274cfaaf7c42c23d77903f643005bd5433543318c81b0e715042332a1c120250d4ef23d51ef9be0b7cedeced4f7bfe53d1aee46a6822

diff --git a/app-emulation/lxc/lxc-4.0.7.ebuild 
b/app-emulation/lxc/lxc-4.0.7.ebuild
new file mode 100644
index 000..546b2e6e450
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.7.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc examples libressl man pam selinux +ssl +tools 
verify-sig"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   sys-libs/libseccomp
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   pam? ( sys-libs/pam )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-4
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )
+   man? ( app-text/docbook-sgml-utils )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+   ~CGROUPS
+   ~CGROUP_CPUACCT
+   ~CGROUP_DEVICE
+   ~CGROUP_FREEZER
+
+   ~CGROUP_SCHED
+   ~CPUSETS
+   ~IPC_NS
+   ~MACVLAN
+
+   ~MEMCG
+   ~NAMESPACES
+   ~NET_NS
+   ~PID_NS
+
+   ~POSIX_MQUEUE
+   ~USER_NS
+   ~UTS_NS
+   ~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   append-flags -fno-strict-aliasing
+
+   local myeconfargs=(
+   --bindir=/usr/bin
+   --localstatedir=/var
+   --sbindir=/usr/bin
+
+   

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

2021-01-29 Thread Joonas Niilola
commit: ba5d5c5d07dd5d50b75be12b2fc0c6a679fd9ac3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jan 30 06:37:18 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan 30 06:37:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5d5c5d

app-emulation/lxc: remove old 4.0.5

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 -
 app-emulation/lxc/lxc-4.0.5.ebuild | 172 -
 2 files changed, 174 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 2a8b7300158..3db082ff762 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,4 +1,2 @@
-DIST lxc-4.0.5.tar.gz 1368909 BLAKE2B 
9fdef5600fe5fd427703312f07ed6499285a59d74c7c0572f036a108454192347166fe08df4551fa8df4e414167b7b081b8a1902036c7c8a012f27b99cc83335
 SHA512 
d536e767f4b7c1ea974469a19f89ddbcebbc3f8c7922b174b966fb2e80ae33199a8a915a962da9cbc7e075442555bc355525f2d4f8e76498b8a7e49f46dc006f
-DIST lxc-4.0.5.tar.gz.asc 833 BLAKE2B 
8cc3f00e3a3359b525f7ead48f4cce7b386a75c04b43eefe0ec939786e368712c2674a17fe9e9ef58649147c7f2d5682f5a0c280ddc8ca8c34664069d5efd4b5
 SHA512 
9e67932fa424224d39ec6c5c32a6e6c3cdf305d3e4d7c8ddbb8ab86a38392c30b56a20b11e4f85e3645a97c106a13ef868a5d3c78ac57bc8cb44cee20e83a700
 DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B 
e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43
 SHA512 
98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
 DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 
04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7
 SHA512 
baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db

diff --git a/app-emulation/lxc/lxc-4.0.5.ebuild 
b/app-emulation/lxc/lxc-4.0.5.ebuild
deleted file mode 100644
index 8fb4991a35b..000
--- a/app-emulation/lxc/lxc-4.0.5.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc examples libressl man pam seccomp selinux +ssl +tools 
verify-sig"
-
-RDEPEND="app-misc/pax-utils
-   sys-apps/util-linux
-   sys-libs/libcap
-   virtual/awk
-   caps? ( sys-libs/libcap )
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-4
-   apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )
-   man? ( app-text/docbook-sgml-utils )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-   ~CGROUPS
-   ~CGROUP_CPUACCT
-   ~CGROUP_DEVICE
-   ~CGROUP_FREEZER
-
-   ~CGROUP_SCHED
-   ~CPUSETS
-   ~IPC_NS
-   ~MACVLAN
-
-   ~MEMCG
-   ~NAMESPACES
-   ~NET_NS
-   ~PID_NS
-
-   ~POSIX_MQUEUE
-   ~USER_NS
-   ~UTS_NS
-   ~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   append-flags -fno-strict-aliasing
-
-   local myeconfargs=(
-   --bindir=/usr/bin
-   --localstatedir=/var
-   --sbindir=/usr/bin
-
-   --with-config-path=/var/lib/lxc
-  

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

2021-01-29 Thread Joonas Niilola
commit: fa678536f76084785c83e687ef473c38759df0a8
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jan 30 06:35:00 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan 30 06:35:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa678536

app-emulation/lxc: stabilize 4.0.6 on x86

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.6.ebuild 
b/app-emulation/lxc/lxc-4.0.6.ebuild
index aced70fcc0f..3e0295de76a 100644
--- a/app-emulation/lxc/lxc-4.0.6.ebuild
+++ b/app-emulation/lxc/lxc-4.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2021-01-29 Thread Joonas Niilola
commit: 9f6ddfdc472582bba299610e01543a964aacaad6
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jan 30 06:10:37 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan 30 06:10:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6ddfdc

app-emulation/lxc: stabilize 4.0.6 on amd64

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.6.ebuild 
b/app-emulation/lxc/lxc-4.0.6.ebuild
index c8596294b80..aced70fcc0f 100644
--- a/app-emulation/lxc/lxc-4.0.6.ebuild
+++ b/app-emulation/lxc/lxc-4.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2021-01-13 Thread Joonas Niilola
commit: 7e107ad831468a1840a501f2a3dfe1de2aafc6db
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jan 14 03:38:37 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 14 03:38:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e107ad8

app-emulation/lxc: bump to 4.0.6

 - always enable seccomp,
 - introduce acct-*/lxc for unprivileged container support.

Closes: https://bugs.gentoo.org/729322
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 +
 app-emulation/lxc/lxc-4.0.6.ebuild | 174 +
 2 files changed, 176 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 8026777cd7c..2a8b7300158 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,2 +1,4 @@
 DIST lxc-4.0.5.tar.gz 1368909 BLAKE2B 
9fdef5600fe5fd427703312f07ed6499285a59d74c7c0572f036a108454192347166fe08df4551fa8df4e414167b7b081b8a1902036c7c8a012f27b99cc83335
 SHA512 
d536e767f4b7c1ea974469a19f89ddbcebbc3f8c7922b174b966fb2e80ae33199a8a915a962da9cbc7e075442555bc355525f2d4f8e76498b8a7e49f46dc006f
 DIST lxc-4.0.5.tar.gz.asc 833 BLAKE2B 
8cc3f00e3a3359b525f7ead48f4cce7b386a75c04b43eefe0ec939786e368712c2674a17fe9e9ef58649147c7f2d5682f5a0c280ddc8ca8c34664069d5efd4b5
 SHA512 
9e67932fa424224d39ec6c5c32a6e6c3cdf305d3e4d7c8ddbb8ab86a38392c30b56a20b11e4f85e3645a97c106a13ef868a5d3c78ac57bc8cb44cee20e83a700
+DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B 
e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43
 SHA512 
98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
+DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 
04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7
 SHA512 
baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db

diff --git a/app-emulation/lxc/lxc-4.0.6.ebuild 
b/app-emulation/lxc/lxc-4.0.6.ebuild
new file mode 100644
index 000..c8596294b80
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.6.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc examples libressl man pam selinux +ssl +tools 
verify-sig"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   sys-libs/libseccomp
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   pam? ( sys-libs/pam )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-4
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )
+   man? ( app-text/docbook-sgml-utils )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+   ~CGROUPS
+   ~CGROUP_CPUACCT
+   ~CGROUP_DEVICE
+   ~CGROUP_FREEZER
+
+   ~CGROUP_SCHED
+   ~CPUSETS
+   ~IPC_NS
+   ~MACVLAN
+
+   ~MEMCG
+   ~NAMESPACES
+   ~NET_NS
+   ~PID_NS
+
+   ~POSIX_MQUEUE
+   ~USER_NS
+   ~UTS_NS
+   ~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   append-flags -fno-strict-aliasing
+
+   local myeconfargs=(
+   

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

2021-01-09 Thread Joonas Niilola
commit: 7d89562b994facb766e61d201efc9c57117f09f1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jan  9 12:42:55 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan  9 12:42:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d89562b

app-emulation/lxc: update DESCRIPTION

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.5.ebuild 
b/app-emulation/lxc/lxc-4.0.5.ebuild
index 2613f38a518..8fb4991a35b 100644
--- a/app-emulation/lxc/lxc-4.0.5.ebuild
+++ b/app-emulation/lxc/lxc-4.0.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
 
-DESCRIPTION="LinuX Containers userspace utilities"
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"



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

2020-11-25 Thread Joonas Niilola
commit: b4a8e11cfdbf13ebd7bbc8447ea4b68dd000d31a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Nov 25 12:24:49 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov 25 12:27:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a8e11c

app-emulation/lxc: remove old 4.0.4

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   1 -
 app-emulation/lxc/lxc-4.0.4.ebuild | 171 -
 app-emulation/lxc/metadata.xml |   1 -
 3 files changed, 173 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index b220bf8a468..8026777cd7c 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,3 +1,2 @@
-DIST lxc-4.0.4.tar.gz 844684 BLAKE2B 
438f9c79787cfab493a159a03dad214519b979c192264cb4acff21174f5642e2c10a899504ed2ac697906ca1ea9ad5cd92e01dbb8c6420651e7130b56022032a
 SHA512 
5c5bb3c474b37284e862cbaf35daab01be7606992eb101cbea7097951ccee81dad8ab8d2624ba5f62279ece17889b1245fd6b2b63e8b17ed728560c5d40309b2
 DIST lxc-4.0.5.tar.gz 1368909 BLAKE2B 
9fdef5600fe5fd427703312f07ed6499285a59d74c7c0572f036a108454192347166fe08df4551fa8df4e414167b7b081b8a1902036c7c8a012f27b99cc83335
 SHA512 
d536e767f4b7c1ea974469a19f89ddbcebbc3f8c7922b174b966fb2e80ae33199a8a915a962da9cbc7e075442555bc355525f2d4f8e76498b8a7e49f46dc006f
 DIST lxc-4.0.5.tar.gz.asc 833 BLAKE2B 
8cc3f00e3a3359b525f7ead48f4cce7b386a75c04b43eefe0ec939786e368712c2674a17fe9e9ef58649147c7f2d5682f5a0c280ddc8ca8c34664069d5efd4b5
 SHA512 
9e67932fa424224d39ec6c5c32a6e6c3cdf305d3e4d7c8ddbb8ab86a38392c30b56a20b11e4f85e3645a97c106a13ef868a5d3c78ac57bc8cb44cee20e83a700

diff --git a/app-emulation/lxc/lxc-4.0.4.ebuild 
b/app-emulation/lxc/lxc-4.0.4.ebuild
deleted file mode 100644
index fe6b7eea023..000
--- a/app-emulation/lxc/lxc-4.0.4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic pam 
readme.gentoo-r1 systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-   https://github.com/lxc/lxc/archive/${P}.tar.gz;
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates 
+tools"
-
-RDEPEND="app-misc/pax-utils
-   sys-apps/util-linux
-   sys-libs/libcap
-   virtual/awk
-   caps? ( sys-libs/libcap )
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )"
-DEPEND="${RDEPEND}
-   >=app-text/docbook-sgml-utils-0.6.14-r2
-   >=sys-kernel/linux-headers-3.2
-   apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )"
-PDEPEND="templates? ( app-emulation/lxc-templates )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-   ~CGROUPS
-   ~CGROUP_CPUACCT
-   ~CGROUP_DEVICE
-
-   ~CGROUP_FREEZER
-   ~CGROUP_SCHED
-   ~CPUSETS
-   ~IPC_NS
-
-   ~MACVLAN
-   ~MEMCG
-   ~NAMESPACES
-   ~NET_NS
-
-   ~PID_NS
-   ~POSIX_MQUEUE
-   ~USER_NS
-   ~UTS_NS
-
-   ~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-S="${WORKDIR}/lxc-${P}"
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   append-flags -fno-strict-aliasing
-
-   # --enable-doc is for manpages which is why we don't link it to a "doc"
-   # USE flag. We always want man pages.
-   local myeconfargs=(
-   --bindir=/usr/bin
-   --localstatedir=/var
-   --sbindir=/usr/bin
-
-   --with-config-path=/var/lib/lxc
-   --with-distro=gentoo
-   --with-init-script=systemd
-   --with-rootfs-path=/var/lib/lxc/rootfs
-   --with-runtime-path=/run
-   --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
-   --disable-asan
- 

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

2020-11-20 Thread Joonas Niilola
commit: 7f0381a4b36d125edd3590e1a115dfa1a4964725
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Nov 21 06:58:25 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Nov 21 06:58:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f0381a4

app-emulation/lxc: stabilize 4.0.5 on amd64

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.5.ebuild 
b/app-emulation/lxc/lxc-4.0.5.ebuild
index 49ed1aadcbe..2613f38a518 100644
--- a/app-emulation/lxc/lxc-4.0.5.ebuild
+++ b/app-emulation/lxc/lxc-4.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-11-20 Thread Joonas Niilola
commit: 4e6772b82059b96c9460f84908e19ebbcfb127be
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Nov 21 06:58:01 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Nov 21 06:58:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6772b8

app-emulation/lxc: stabilize 4.0.5 on x86

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.5.ebuild 
b/app-emulation/lxc/lxc-4.0.5.ebuild
index 5b2fa2cc8df..49ed1aadcbe 100644
--- a/app-emulation/lxc/lxc-4.0.5.ebuild
+++ b/app-emulation/lxc/lxc-4.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-10-22 Thread Joonas Niilola
commit: cafea5779617e7db79a8ef36a62405b59ec3bb77
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Oct 22 07:44:09 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 22 07:44:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafea577

app-emulation/lxc: remove Github tarball from SRC_URI on 4.0.5

Closes: https://bugs.gentoo.org/750731
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest | 2 +-
 app-emulation/lxc/lxc-4.0.5.ebuild | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index c8fd8697461..b220bf8a468 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,3 +1,3 @@
 DIST lxc-4.0.4.tar.gz 844684 BLAKE2B 
438f9c79787cfab493a159a03dad214519b979c192264cb4acff21174f5642e2c10a899504ed2ac697906ca1ea9ad5cd92e01dbb8c6420651e7130b56022032a
 SHA512 
5c5bb3c474b37284e862cbaf35daab01be7606992eb101cbea7097951ccee81dad8ab8d2624ba5f62279ece17889b1245fd6b2b63e8b17ed728560c5d40309b2
-DIST lxc-4.0.5.tar.gz 848325 BLAKE2B 
3a54d68f1b91bab2f8d851bf867f08eeb691a2884753f02c99056d24051b919f9400e4ee0d1035e7743c80cda3c1923013d06a4999664a5737e1330423a15c61
 SHA512 
bd8907370830b5c3015451581216bd4e40996c2a3cb4ad1865aff2a8704b4a707f7c094bc49e3c6e276b34ea1edc7cc5b4fcf58a55be55854931b76b93d2f4b8
+DIST lxc-4.0.5.tar.gz 1368909 BLAKE2B 
9fdef5600fe5fd427703312f07ed6499285a59d74c7c0572f036a108454192347166fe08df4551fa8df4e414167b7b081b8a1902036c7c8a012f27b99cc83335
 SHA512 
d536e767f4b7c1ea974469a19f89ddbcebbc3f8c7922b174b966fb2e80ae33199a8a915a962da9cbc7e075442555bc355525f2d4f8e76498b8a7e49f46dc006f
 DIST lxc-4.0.5.tar.gz.asc 833 BLAKE2B 
8cc3f00e3a3359b525f7ead48f4cce7b386a75c04b43eefe0ec939786e368712c2674a17fe9e9ef58649147c7f2d5682f5a0c280ddc8ca8c34664069d5efd4b5
 SHA512 
9e67932fa424224d39ec6c5c32a6e6c3cdf305d3e4d7c8ddbb8ab86a38392c30b56a20b11e4f85e3645a97c106a13ef868a5d3c78ac57bc8cb44cee20e83a700

diff --git a/app-emulation/lxc/lxc-4.0.5.ebuild 
b/app-emulation/lxc/lxc-4.0.5.ebuild
index a8205ac9eb4..5b2fa2cc8df 100644
--- a/app-emulation/lxc/lxc-4.0.5.ebuild
+++ b/app-emulation/lxc/lxc-4.0.5.ebuild
@@ -8,7 +8,6 @@ inherit autotools bash-completion-r1 linux-info flag-o-matic 
optfeature pam read
 DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-   https://github.com/lxc/lxc/archive/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"



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

2020-10-22 Thread Joonas Niilola
commit: 388383a270033c1f5fd6f519ad3e985e751d2c5e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Oct 22 07:12:43 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 22 07:15:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=388383a2

app-emulation/lxc: bump to 4.0.5

 - added 'man' USE flag because app-text/docbook-sgml-utils pulls in tons of
   dependencies,
 - moved some dependencies, and added few under 'optfeature' - please see
   https://wiki.gentoo.org/wiki//etc/portage/sets for an example of @optfeature
   set handling.

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   2 +
 app-emulation/lxc/lxc-4.0.5.ebuild | 173 +
 app-emulation/lxc/metadata.xml |   1 +
 3 files changed, 176 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 1f1a926377b..c8fd8697461 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1 +1,3 @@
 DIST lxc-4.0.4.tar.gz 844684 BLAKE2B 
438f9c79787cfab493a159a03dad214519b979c192264cb4acff21174f5642e2c10a899504ed2ac697906ca1ea9ad5cd92e01dbb8c6420651e7130b56022032a
 SHA512 
5c5bb3c474b37284e862cbaf35daab01be7606992eb101cbea7097951ccee81dad8ab8d2624ba5f62279ece17889b1245fd6b2b63e8b17ed728560c5d40309b2
+DIST lxc-4.0.5.tar.gz 848325 BLAKE2B 
3a54d68f1b91bab2f8d851bf867f08eeb691a2884753f02c99056d24051b919f9400e4ee0d1035e7743c80cda3c1923013d06a4999664a5737e1330423a15c61
 SHA512 
bd8907370830b5c3015451581216bd4e40996c2a3cb4ad1865aff2a8704b4a707f7c094bc49e3c6e276b34ea1edc7cc5b4fcf58a55be55854931b76b93d2f4b8
+DIST lxc-4.0.5.tar.gz.asc 833 BLAKE2B 
8cc3f00e3a3359b525f7ead48f4cce7b386a75c04b43eefe0ec939786e368712c2674a17fe9e9ef58649147c7f2d5682f5a0c280ddc8ca8c34664069d5efd4b5
 SHA512 
9e67932fa424224d39ec6c5c32a6e6c3cdf305d3e4d7c8ddbb8ab86a38392c30b56a20b11e4f85e3645a97c106a13ef868a5d3c78ac57bc8cb44cee20e83a700

diff --git a/app-emulation/lxc/lxc-4.0.5.ebuild 
b/app-emulation/lxc/lxc-4.0.5.ebuild
new file mode 100644
index 000..a8205ac9eb4
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.5.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam 
readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+   https://github.com/lxc/lxc/archive/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc examples libressl man pam seccomp selinux +ssl +tools 
verify-sig"
+
+RDEPEND="app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-4
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )
+   man? ( app-text/docbook-sgml-utils )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+   ~CGROUPS
+   ~CGROUP_CPUACCT
+   ~CGROUP_DEVICE
+   ~CGROUP_FREEZER
+
+   ~CGROUP_SCHED
+   ~CPUSETS
+   ~IPC_NS
+   ~MACVLAN
+
+   ~MEMCG
+   ~NAMESPACES
+   ~NET_NS
+   ~PID_NS
+
+   ~POSIX_MQUEUE
+   ~USER_NS
+   ~UTS_NS
+   ~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   append-flags -fno-strict-aliasing
+
+   local myeconfargs=(
+   --bindir=/usr/bin
+   --localstatedir=/var
+   --sbindir=/usr/bin
+
+   

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

2020-10-19 Thread Joonas Niilola
commit: 7967d9432c8565ca5e9c258f6096ac622f0b0650
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Oct 14 11:51:52 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct 20 05:43:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7967d943

app-emulation/lxc-templates: use verify-sig

Signed-off-by: Joonas Niilola  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/17922
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc-templates/Manifest   |  1 +
 app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild | 12 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app-emulation/lxc-templates/Manifest 
b/app-emulation/lxc-templates/Manifest
index 6606869c23c..292a5eb8bce 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1 +1,2 @@
 DIST lxc-templates-3.0.4.tar.gz 257015 BLAKE2B 
599c0cb083cf358c8252467b3870450e754b2aa30daf8d72e07e746ce37e2fb26fecc0adf416325c9e02b1f98f5745af5985360e9494e5ed54a242a3e17330d4
 SHA512 
e5b628b40e7108fca858dbd9ae92495016069ff3cba7feb34e9559c7f61dfc36944a9ef441369952a988e821f8b5d883ae97b81f6eef0683a22f1f702b5b913e
+DIST lxc-templates-3.0.4.tar.gz.asc 833 BLAKE2B 
a125e46200cbc1bce6a721ba338b6c896098711a7454ee18a153b9e7a3d25e08ea29cf13accf25e8af085865237fe4b20d633c92d71103213a49ba7d80de0154
 SHA512 
1195a3d835935606af405af77d5ee629dc7b7c0f05a17c05df191f6275c8e7ebec9eb05201bbfb46060af5a36aba4f17b53122904fd10f2d8b28524f4e5b5e71

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
index 32a572462f8..744cb45be22 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
@@ -3,25 +3,27 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools verify-sig
 
 DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc-templates;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
 
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
 
-RDEPEND="
-   >=app-emulation/lxc-3.0"
-
+RDEPEND=">=app-emulation/lxc-3.0"
 DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
 
 PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
 DOCS=()
 
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
 src_prepare() {
default
eautoreconf



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

2020-09-22 Thread Joonas Niilola
commit: a090599fc2830b2fdac898baf0508977eb9e6470
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Sep 22 06:51:22 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Sep 22 06:54:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a090599f

app-emulation/lxc-templates: become primary maintainer

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc-templates/metadata.xml 
b/app-emulation/lxc-templates/metadata.xml
index 2cf03a0ac7e..8c511deb056 100644
--- a/app-emulation/lxc-templates/metadata.xml
+++ b/app-emulation/lxc-templates/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+  
+juip...@gentoo.org
+Joonas Niilola
+  
   
 virtualizat...@gentoo.org
 Gentoo Virtualization Project



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

2020-09-22 Thread Joonas Niilola
commit: 6f1d429737ce216b40b8654ed54d48efaf2ffa05
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Sep 22 06:50:34 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Sep 22 06:54:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1d4297

app-emulation/lxc: become primary maintainer

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index ca4eb37df6c..20b6c295215 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+  
+juip...@gentoo.org
+Joonas Niilola
+  
   
 virtualizat...@gentoo.org
 Gentoo Virtualization Project



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

2020-09-13 Thread Joonas Niilola
commit: f91e2c096c0cc94133a233942cc1c79d694c98ff
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Sep 14 05:07:21 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Sep 14 05:11:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91e2c09

app-emulation/lxc: remove old 4.0.3

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   1 -
 app-emulation/lxc/lxc-4.0.3.ebuild | 162 -
 2 files changed, 163 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 814ef80d2ef..1f1a926377b 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,2 +1 @@
-DIST lxc-4.0.3.tar.gz 1368461 BLAKE2B 
861bd8f3736ecda9075c57338845d386811ae3aeceb72cd054023a25a9758d5d7c9ceec917fc634c118a13f8fb142b28bd93f27138b9ee1d0817f8360fda88da
 SHA512 
a5d45626b1f26c0f098f6f0f5852472ea065f65f9918b972826e087a9a71a34253c85dd6f1b6b6837ca97303f8d43478a66595057d65a6e72a72334a3257ef88
 DIST lxc-4.0.4.tar.gz 844684 BLAKE2B 
438f9c79787cfab493a159a03dad214519b979c192264cb4acff21174f5642e2c10a899504ed2ac697906ca1ea9ad5cd92e01dbb8c6420651e7130b56022032a
 SHA512 
5c5bb3c474b37284e862cbaf35daab01be7606992eb101cbea7097951ccee81dad8ab8d2624ba5f62279ece17889b1245fd6b2b63e8b17ed728560c5d40309b2

diff --git a/app-emulation/lxc/lxc-4.0.3.ebuild 
b/app-emulation/lxc/lxc-4.0.3.ebuild
deleted file mode 100644
index c5119e1d542..000
--- a/app-emulation/lxc/lxc-4.0.3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic pam 
readme.gentoo-r1 systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates 
+tools"
-
-RDEPEND="app-misc/pax-utils
-   sys-apps/util-linux
-   sys-libs/libcap
-   virtual/awk
-   caps? ( sys-libs/libcap )
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )"
-DEPEND="${RDEPEND}
-   >=app-text/docbook-sgml-utils-0.6.14-r2
-   >=sys-kernel/linux-headers-3.2
-   apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )"
-PDEPEND="templates? ( app-emulation/lxc-templates )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-   ~CPUSETS ~CGROUP_CPUACCT
-   ~CGROUP_SCHED
-   ~MEMCG
-
-   ~NAMESPACES
-   ~IPC_NS ~USER_NS ~PID_NS
-
-   ~CGROUP_FREEZER
-   ~UTS_NS ~NET_NS
-   ~VETH ~MACVLAN
-
-   ~POSIX_MQUEUE
-   ~!NETPRIO_CGROUP"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
-ERROR_MEMCG="CONFIG_MEMCG is not set. This is needed for memory resource 
control in containers."
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   append-flags -fno-strict-aliasing
-
-   # --enable-doc is for manpages which is why we don't link it to a "doc"
-   # USE flag. We always want man pages.
-   local myeconfargs=(
-   --bindir=/usr/bin
-   --localstatedir=/var
-   --sbindir=/usr/bin
-
-   --with-config-path=/var/lib/lxc
-   --with-distro=gentoo
-   --with-init-script=systemd
-   --with-rootfs-path=/var/lib/lxc/rootfs
-   --with-runtime-path=/run
-   --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
-   --disable-asan
-   --disable-coverity-build
-   --disable-dlog
-   --disable-mutex-debugging
-   --disable-rpath
-   --disable-tests
-   --disable-ubsan
-   --disable-werror
-
-   --enable-bash
-   --enable-commands
-   --enable-doc
-   

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

2020-09-03 Thread Joonas Niilola
commit: 4cabd24c081f4caa18b992ec30080ed12b72873d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Sep  4 05:41:35 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep  4 05:47:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cabd24c

app-emulation/lxc: stabilize 4.0.4 on x86

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.4.ebuild 
b/app-emulation/lxc/lxc-4.0.4.ebuild
index cbd914e7061..b5598625ec7 100644
--- a/app-emulation/lxc/lxc-4.0.4.ebuild
+++ b/app-emulation/lxc/lxc-4.0.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
https://github.com/lxc/lxc/archive/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-09-03 Thread Joonas Niilola
commit: 1be9b507c9d14e45e3a978241bcacb4b24f3c088
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Sep  4 05:44:38 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep  4 05:47:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be9b507

app-emulation/lxc: stabilize 4.0.4 on amd64

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.4.ebuild 
b/app-emulation/lxc/lxc-4.0.4.ebuild
index b5598625ec7..fe6b7eea023 100644
--- a/app-emulation/lxc/lxc-4.0.4.ebuild
+++ b/app-emulation/lxc/lxc-4.0.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ 
https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
https://github.com/lxc/lxc/archive/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-08-05 Thread Joonas Niilola
commit: 22571aa100b404068b27c28b2365855c1426fce0
Author: Stephen Bosch  vodacomm  ca>
AuthorDate: Tue Aug  4 15:46:09 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  5 06:43:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22571aa1

app-emulation/lxc: Add MEMCG to config checks

Closes: https://bugs.gentoo.org/735132
Signed-off-by: Stephen Bosch  vodacomm.ca>
Closes: https://github.com/gentoo/gentoo/pull/17000
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.3.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-emulation/lxc/lxc-4.0.3.ebuild 
b/app-emulation/lxc/lxc-4.0.3.ebuild
index 18554a5e703..c5119e1d542 100644
--- a/app-emulation/lxc/lxc-4.0.3.ebuild
+++ b/app-emulation/lxc/lxc-4.0.3.ebuild
@@ -37,6 +37,7 @@ PDEPEND="templates? ( app-emulation/lxc-templates )"
 CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
~CPUSETS ~CGROUP_CPUACCT
~CGROUP_SCHED
+   ~MEMCG
 
~NAMESPACES
~IPC_NS ~USER_NS ~PID_NS
@@ -55,6 +56,7 @@ ERROR_VETH="CONFIG_VETH:  needed for internal 
(host-to-container) networking"
 ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
 ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
 ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
+ERROR_MEMCG="CONFIG_MEMCG is not set. This is needed for memory resource 
control in containers."
 
 DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
 



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

2020-08-05 Thread Joonas Niilola
commit: 90f4beab1004a26f4ab0957021769ab0a077df07
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug  5 06:43:37 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  5 06:43:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f4beab

app-emulation/lxc: bump to 4.0.4

 - clean kernel config checks, remove some old.

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   1 +
 app-emulation/lxc/lxc-4.0.4.ebuild | 171 +
 2 files changed, 172 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index ae4ea385e37..814ef80d2ef 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1 +1,2 @@
 DIST lxc-4.0.3.tar.gz 1368461 BLAKE2B 
861bd8f3736ecda9075c57338845d386811ae3aeceb72cd054023a25a9758d5d7c9ceec917fc634c118a13f8fb142b28bd93f27138b9ee1d0817f8360fda88da
 SHA512 
a5d45626b1f26c0f098f6f0f5852472ea065f65f9918b972826e087a9a71a34253c85dd6f1b6b6837ca97303f8d43478a66595057d65a6e72a72334a3257ef88
+DIST lxc-4.0.4.tar.gz 844684 BLAKE2B 
438f9c79787cfab493a159a03dad214519b979c192264cb4acff21174f5642e2c10a899504ed2ac697906ca1ea9ad5cd92e01dbb8c6420651e7130b56022032a
 SHA512 
5c5bb3c474b37284e862cbaf35daab01be7606992eb101cbea7097951ccee81dad8ab8d2624ba5f62279ece17889b1245fd6b2b63e8b17ed728560c5d40309b2

diff --git a/app-emulation/lxc/lxc-4.0.4.ebuild 
b/app-emulation/lxc/lxc-4.0.4.ebuild
new file mode 100644
index 000..cbd914e7061
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.4.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic pam 
readme.gentoo-r1 systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+   https://github.com/lxc/lxc/archive/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates 
+tools"
+
+RDEPEND="app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
+DEPEND="${RDEPEND}
+   >=app-text/docbook-sgml-utils-0.6.14-r2
+   >=sys-kernel/linux-headers-3.2
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )"
+PDEPEND="templates? ( app-emulation/lxc-templates )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+   ~CGROUPS
+   ~CGROUP_CPUACCT
+   ~CGROUP_DEVICE
+
+   ~CGROUP_FREEZER
+   ~CGROUP_SCHED
+   ~CPUSETS
+   ~IPC_NS
+
+   ~MACVLAN
+   ~MEMCG
+   ~NAMESPACES
+   ~NET_NS
+
+   ~PID_NS
+   ~POSIX_MQUEUE
+   ~USER_NS
+   ~UTS_NS
+
+   ~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+S="${WORKDIR}/lxc-${P}"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   append-flags -fno-strict-aliasing
+
+   # --enable-doc is for manpages which is why we don't link it to a "doc"
+   # USE flag. We always want man pages.
+   local myeconfargs=(
+   --bindir=/usr/bin
+   --localstatedir=/var
+   --sbindir=/usr/bin
+
+   --with-config-path=/var/lib/lxc
+   --with-distro=gentoo
+   --with-init-script=systemd
+   --with-rootfs-path=/var/lib/lxc/rootfs
+   --with-runtime-path=/run
+   --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+
+   --disable-asan
+   --disable-coverity-build
+   --disable-dlog
+   --disable-mutex-debugging
+   --disable-rpath
+   --disable-tests
+   --disable-ubsan
+   --disable-werror
+
+   --enable-bash
+   --enable-commands

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

2020-08-04 Thread Joonas Niilola
commit: b824610e1689d5ae336e7df1980d81611e61f441
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  4 12:23:49 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  4 16:50:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b824610e

app-emulation/lxc: stabilize 4.0.3 on x86

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.3.ebuild 
b/app-emulation/lxc/lxc-4.0.3.ebuild
index 9f71458a5e7..85b0edb9721 100644
--- a/app-emulation/lxc/lxc-4.0.3.ebuild
+++ b/app-emulation/lxc/lxc-4.0.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-08-04 Thread Joonas Niilola
commit: 8f25237a03d0ebee04ab63daca474638dbc85bce
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  4 13:22:09 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  4 16:50:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f25237a

app-emulation/lxc: stabilize 4.0.3 on amd64

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-4.0.3.ebuild 
b/app-emulation/lxc/lxc-4.0.3.ebuild
index 85b0edb9721..18554a5e703 100644
--- a/app-emulation/lxc/lxc-4.0.3.ebuild
+++ b/app-emulation/lxc/lxc-4.0.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-08-04 Thread Joonas Niilola
commit: ad27beecb02d908d61387e0a87af4f340e536b26
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  4 13:58:09 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  4 16:50:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad27beec

app-emulation/lxc: remove old 4.0.2-r2

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest|   1 -
 app-emulation/lxc/lxc-4.0.2-r2.ebuild | 160 --
 2 files changed, 161 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 22458719259..ae4ea385e37 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,2 +1 @@
-DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 
2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c
 SHA512 
0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3
 DIST lxc-4.0.3.tar.gz 1368461 BLAKE2B 
861bd8f3736ecda9075c57338845d386811ae3aeceb72cd054023a25a9758d5d7c9ceec917fc634c118a13f8fb142b28bd93f27138b9ee1d0817f8360fda88da
 SHA512 
a5d45626b1f26c0f098f6f0f5852472ea065f65f9918b972826e087a9a71a34253c85dd6f1b6b6837ca97303f8d43478a66595057d65a6e72a72334a3257ef88

diff --git a/app-emulation/lxc/lxc-4.0.2-r2.ebuild 
b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
deleted file mode 100644
index 18554a5e703..000
--- a/app-emulation/lxc/lxc-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic pam 
readme.gentoo-r1 systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates 
+tools"
-
-RDEPEND="app-misc/pax-utils
-   sys-apps/util-linux
-   sys-libs/libcap
-   virtual/awk
-   caps? ( sys-libs/libcap )
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )"
-DEPEND="${RDEPEND}
-   >=app-text/docbook-sgml-utils-0.6.14-r2
-   >=sys-kernel/linux-headers-3.2
-   apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )"
-PDEPEND="templates? ( app-emulation/lxc-templates )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-   ~CPUSETS ~CGROUP_CPUACCT
-   ~CGROUP_SCHED
-
-   ~NAMESPACES
-   ~IPC_NS ~USER_NS ~PID_NS
-
-   ~CGROUP_FREEZER
-   ~UTS_NS ~NET_NS
-   ~VETH ~MACVLAN
-
-   ~POSIX_MQUEUE
-   ~!NETPRIO_CGROUP"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   append-flags -fno-strict-aliasing
-
-   # --enable-doc is for manpages which is why we don't link it to a "doc"
-   # USE flag. We always want man pages.
-   local myeconfargs=(
-   --bindir=/usr/bin
-   --localstatedir=/var
-   --sbindir=/usr/bin
-
-   --with-config-path=/var/lib/lxc
-   --with-distro=gentoo
-   --with-init-script=systemd
-   --with-rootfs-path=/var/lib/lxc/rootfs
-   --with-runtime-path=/run
-   --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
-   --disable-asan
-   --disable-coverity-build
-   --disable-dlog
-   --disable-mutex-debugging
-   --disable-rpath
-   --disable-tests
-   --disable-ubsan
-   --disable-werror
-
-   --enable-bash
-   --enable-commands
-   --enable-doc
-   --enable-memfd-rexec
-   --enable-thread-safety
-
-   

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

2020-06-29 Thread Joonas Niilola
commit: 7957d655295b302e80f808fa621921575a948723
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jun 29 06:08:14 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jun 29 06:08:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7957d655

app-emulation/lxc: 4.0.3 release

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   1 +
 app-emulation/lxc/lxc-4.0.3.ebuild | 160 +
 2 files changed, 161 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index f8760f06bb4..22458719259 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1 +1,2 @@
 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 
2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c
 SHA512 
0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3
+DIST lxc-4.0.3.tar.gz 1368461 BLAKE2B 
861bd8f3736ecda9075c57338845d386811ae3aeceb72cd054023a25a9758d5d7c9ceec917fc634c118a13f8fb142b28bd93f27138b9ee1d0817f8360fda88da
 SHA512 
a5d45626b1f26c0f098f6f0f5852472ea065f65f9918b972826e087a9a71a34253c85dd6f1b6b6837ca97303f8d43478a66595057d65a6e72a72334a3257ef88

diff --git a/app-emulation/lxc/lxc-4.0.3.ebuild 
b/app-emulation/lxc/lxc-4.0.3.ebuild
new file mode 100644
index 000..9f71458a5e7
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.3.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic pam 
readme.gentoo-r1 systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates 
+tools"
+
+RDEPEND="app-misc/pax-utils
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
+DEPEND="${RDEPEND}
+   >=app-text/docbook-sgml-utils-0.6.14-r2
+   >=sys-kernel/linux-headers-3.2
+   apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )"
+PDEPEND="templates? ( app-emulation/lxc-templates )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+   ~CPUSETS ~CGROUP_CPUACCT
+   ~CGROUP_SCHED
+
+   ~NAMESPACES
+   ~IPC_NS ~USER_NS ~PID_NS
+
+   ~CGROUP_FREEZER
+   ~UTS_NS ~NET_NS
+   ~VETH ~MACVLAN
+
+   ~POSIX_MQUEUE
+   ~!NETPRIO_CGROUP"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   append-flags -fno-strict-aliasing
+
+   # --enable-doc is for manpages which is why we don't link it to a "doc"
+   # USE flag. We always want man pages.
+   local myeconfargs=(
+   --bindir=/usr/bin
+   --localstatedir=/var
+   --sbindir=/usr/bin
+
+   --with-config-path=/var/lib/lxc
+   --with-distro=gentoo
+   --with-init-script=systemd
+   --with-rootfs-path=/var/lib/lxc/rootfs
+   --with-runtime-path=/run
+   --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+
+   --disable-asan
+   --disable-coverity-build
+   --disable-dlog
+   --disable-mutex-debugging
+   --disable-rpath
+   --disable-tests
+   --disable-ubsan
+   --disable-werror
+
+   --enable-bash
+   --enable-commands
+   --enable-doc
+   --enable-memfd-rexec
+   --enable-thread-safety
+
+   $(use_enable apparmor)
+   

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

2020-06-26 Thread Joonas Niilola
commit: d1aca1548db0efdbda7c9dd6a1e51985f605685f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jun 26 07:55:57 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun 26 08:13:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1aca154

app-emulation/lxc-templates: remove old 3.0.3

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc-templates/Manifest   |  1 -
 .../lxc-templates/lxc-templates-3.0.3.ebuild   | 28 --
 2 files changed, 29 deletions(-)

diff --git a/app-emulation/lxc-templates/Manifest 
b/app-emulation/lxc-templates/Manifest
index 66e89bab71f..6606869c23c 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1,2 +1 @@
-DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B 
b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0
 SHA512 
3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632
 DIST lxc-templates-3.0.4.tar.gz 257015 BLAKE2B 
599c0cb083cf358c8252467b3870450e754b2aa30daf8d72e07e746ce37e2fb26fecc0adf416325c9e02b1f98f5745af5985360e9494e5ed54a242a3e17330d4
 SHA512 
e5b628b40e7108fca858dbd9ae92495016069ff3cba7feb34e9559c7f61dfc36944a9ef441369952a988e821f8b5d883ae97b81f6eef0683a22f1f702b5b913e

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
deleted file mode 100644
index 38950a11f0a..000
--- a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Old style template scripts for LXC"
-HOMEPAGE="https://linuxcontainers.org/;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-RDEPEND="
-   >=app-emulation/lxc-3.0"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
-DOCS=()
-
-src_prepare() {
-   default
-   eautoreconf
-}



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

2020-06-26 Thread Joonas Niilola
commit: 6c40eb984e49764b0684e1823d2805adaea69c52
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jun 26 07:54:21 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun 26 08:13:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c40eb98

app-emulation/lxc: remove old 3.0.3

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest   |   1 -
 app-emulation/lxc/files/lxc.initd.7  | 124 ---
 app-emulation/lxc/files/lxc_at.service.4 |  14 ---
 app-emulation/lxc/lxc-3.0.3.ebuild   | 163 ---
 4 files changed, 302 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 768faa21194..f8760f06bb4 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,2 +1 @@
-DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 
77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6
 SHA512 
cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 
2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c
 SHA512 
0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3

diff --git a/app-emulation/lxc/files/lxc.initd.7 
b/app-emulation/lxc/files/lxc.initd.7
deleted file mode 100644
index 6a42b6aac52..000
--- a/app-emulation/lxc/files/lxc.initd.7
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONTAINER=${SVCNAME#*.}
-
-LXC_PATH=`lxc-config lxc.lxcpath`
-
-lxc_get_configfile() {
-   if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
-   echo "${LXC_PATH}/${CONTAINER}.conf"
-   elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
-   echo "${LXC_PATH}/${CONTAINER}/config"
-   else
-   eerror "Unable to find a suitable configuration file."
-   eerror "If you set up the container in a non-standard"
-   eerror "location, please set the CONFIGFILE variable."
-   return 1
-   fi
-}
-
-[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
-
-lxc_get_var() {
-   awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' 
${CONFIGFILE}
-}
-
-lxc_get_net_link_type() {
-   awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" }
-   $1 == "lxc.network.type" {_type=$2;}
-   $1 == "lxc.network.link" {_link=$2;}
-   match($1, /lxc\.net\.[[:digit:]]+\.type/) {_type=$2;}
-   match($1, /lxc\.net\.[[:digit:]]+\.link/) {_link=$2;}
-   {if(_link != "" && _type != ""){
-   printf("%s:%s\n", _link, _type );
-   _link=""; _type="";
-   }; }' <${CONFIGFILE}
-}
-
-checkconfig() {
-   if [ ${CONTAINER} = ${SVCNAME} ]; then
-   eerror "You have to create an init script for each container:"
-   eerror " ln -s lxc /etc/init.d/lxc.container"
-   return 1
-   fi
-
-   # no need to output anything, the function takes care of that.
-   [ -z "${CONFIGFILE}" ] && return 1
-
-   utsname=$(lxc_get_var lxc.uts.name)
-   if [ -z "$utsname" ] ; then
-   utsname=$(lxc_get_var lxc.utsname)
-   fi
-
-   if [ "${CONTAINER}" != "${utsname}" ]; then
-   eerror "You should use the same name for the service and the"
-   eerror "container. Right now the container is called ${utsname}"
-   return 1
-   fi
-}
-
-depend() {
-   # be quiet, since we have to run depend() also for the
-   # non-muxed init script, unfortunately.
-   checkconfig 2>/dev/null || return 0
-
-   config ${CONFIGFILE}
-   need localmount
-   use lxcfs
-
-   local _x _if
-   for _x in $(lxc_get_net_link_type); do
-   _if=${_x%:*}
-   case "${_x##*:}" in
-   # when the network type is set to phys, we can make use 
of a
-   # network service (for instance to set it up before we 
disable
-   # the net_admin capability), but we might also not set 
it up
-   # at all on the host and leave the net_admin capable 
service
-   # to take care of it.
-   phys)   use net.${_if} ;;
-   *)  need net.${_if} ;;
-   esac
-   done
-}
-
-start() {
-   checkconfig || return 1
-   rm -f /var/log/lxc/${CONTAINER}.log
-
-   rootpath=$(lxc_get_var lxc.rootfs)
-
-   # Check the format of our init and the chroot's init, to see
-   # if we have to use 

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

2020-06-21 Thread Joonas Niilola
commit: 4d6c00262fffbb38127b488c7ea3843cb4b24311
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jun 21 16:57:51 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun 21 17:02:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6c0026

app-emulation/lxc-templates: stabilize 3.0.4 on amd64

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
index 21a39bd84ea..32a572462f8 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc-templates;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-06-21 Thread Joonas Niilola
commit: c0e088d8055f24471304ac4fd2d2ab3d8a79fb49
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jun 21 16:49:22 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun 21 17:02:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e088d8

app-emulation/lxc: stabilize 4.0.2-r2 on x86

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc/lxc-4.0.2-r2.ebuild 
b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
index 9f71458a5e7..85b0edb9721 100644
--- a/app-emulation/lxc/lxc-4.0.2-r2.ebuild
+++ b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-06-21 Thread Joonas Niilola
commit: 94aed243fe67639e1877ca54c1e360c61e5c579a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jun 21 16:48:52 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun 21 17:02:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94aed243

app-emulation/lxc-templates: stabilize 3.0.4 on x86

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
index 2c8e085f0d2..21a39bd84ea 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc-templates;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-06-21 Thread Joonas Niilola
commit: 4dd373fc03501ff7bdb6255215b4b476b5b863ec
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jun 21 16:58:14 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun 21 17:02:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd373fc

app-emulation/lxc: stabilize 4.0.2-r2 on amd64

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc/lxc-4.0.2-r2.ebuild 
b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
index 85b0edb9721..18554a5e703 100644
--- a/app-emulation/lxc/lxc-4.0.2-r2.ebuild
+++ b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2020-05-29 Thread Joonas Niilola
commit: e6fffc5b9d9ed704179a53f98367aa8ebe6f17f0
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri May 29 13:13:12 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 29 13:15:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6fffc5b

app-emulation/lxc: remove unused patch files

Signed-off-by: Joonas Niilola  gentoo.org>

 .../lxc/files/lxc-2.0.6-bash-completion.patch  |  27 
 ...ps-enable-container-without-CAP_SYS_ADMIN.patch | 164 -
 .../lxc/files/lxc-2.1.1-cve-2018-6556.patch| 118 ---
 .../files/lxc-2.1.1-fix-cgroup2-detection.patch|  26 
 4 files changed, 335 deletions(-)

diff --git a/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch 
b/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch
deleted file mode 100644
index 6033e36c798..000
--- a/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/config/bash/lxc.in b/config/bash/lxc.in
-index 7dcf302..5927fe2 100644
 a/config/bash/lxc.in
-+++ b/config/bash/lxc.in
-@@ -1,4 +1,3 @@
--_have lxc-start && {
- _lxc_names() {
- COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
- }
-@@ -100,4 +99,3 @@ _have lxc-start && {
- 
- complete -o default -F _lxc_generic_o lxc-copy
- complete -o default -F _lxc_generic_o lxc-start-ephemeral
--}
-diff --git a/configure.ac b/configure.ac
-index 4640c0d..14ccdd3 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -478,7 +478,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = 
"xyes"])
- AM_COND_IF([ENABLE_BASH],
-   [AC_MSG_CHECKING([bash completion directory])
-   PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
--  bashcompdir="${sysconfdir}/bash_completion.d")
-+  bashcompdir="$datadir/bash-completion/completions")
-   AC_MSG_RESULT([$bashcompdir])
-   AC_SUBST(bashcompdir)
-   ])

diff --git 
a/app-emulation/lxc/files/lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch
 
b/app-emulation/lxc/files/lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch
deleted file mode 100644
index 8493491d0d6..000
--- 
a/app-emulation/lxc/files/lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From b635e92d21d2a4d71a553388f18cfa08f44bf1ba Mon Sep 17 00:00:00 2001
-From: Christian Brauner 
-Date: Mon, 30 Oct 2017 14:16:46 +0100
-Subject: [PATCH] cgroups: enable container without CAP_SYS_ADMIN
-
-In case cgroup namespaces are supported but we do not have CAP_SYS_ADMIN we
-need to mount cgroups for the container. This patch enables both privileged and
-unprivileged containers without CAP_SYS_ADMIN.
-
-Closes #1737.
-
-Signed-off-by: Christian Brauner 

- src/lxc/cgroups/cgfs.c   |  3 ++-
- src/lxc/cgroups/cgfsng.c | 52 +---
- src/lxc/cgroups/cgroup.c |  2 +-
- src/lxc/conf.c   |  3 ---
- src/lxc/conf.h   |  1 +
- 5 files changed, 53 insertions(+), 8 deletions(-)
-
-diff --git a/src/lxc/cgroups/cgfs.c b/src/lxc/cgroups/cgfs.c
-index bcbd6613..efd627f0 100644
 a/src/lxc/cgroups/cgfs.c
-+++ b/src/lxc/cgroups/cgfs.c
-@@ -1418,11 +1418,12 @@ static bool cgroupfs_mount_cgroup(void *hdata, const 
char *root, int type)
-   struct cgfs_data *cgfs_d;
-   struct cgroup_process_info *info, *base_info;
-   int r, saved_errno = 0;
-+  struct lxc_handler *handler = hdata;
- 
-   if (cgns_supported())
-   return true;
- 
--  cgfs_d = hdata;
-+  cgfs_d = handler->cgroup_data;
-   if (!cgfs_d)
-   return false;
-   base_info = cgfs_d->info;
-diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
-index e43edd7d..ec6440c1 100644
 a/src/lxc/cgroups/cgfsng.c
-+++ b/src/lxc/cgroups/cgfsng.c
-@@ -50,6 +50,7 @@
- #include 
- #include 
- 
-+#include "caps.h"
- #include "cgroup.h"
- #include "cgroup_utils.h"
- #include "commands.h"
-@@ -1616,17 +1617,49 @@ do_secondstage_mounts_if_needed(int type, struct 
hierarchy *h,
-   return 0;
- }
- 
-+static int mount_cgroup_cgns_supported(struct hierarchy *h, const char 
*controllerpath)
-+{
-+   int ret;
-+   char *controllers = NULL;
-+   char *type = "cgroup2";
-+
-+  if (!h->is_cgroup_v2) {
-+  controllers = lxc_string_join(",", (const char 
**)h->controllers, false);
-+  if (!controllers)
-+  return -ENOMEM;
-+  type = "cgroup";
-+  }
-+
-+  ret = mount("cgroup", controllerpath, type, 
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RELATIME, controllers);
-+  free(controllers);
-+  if (ret < 0) {
-+  SYSERROR("Failed to mount %s with cgroup filesystem type %s", 
controllerpath, type);
-+  return -1;
-+  }
-+
-+  DEBUG("Mounted %s with cgroup filesystem type %s", controllerpath, 
type);
-+  return 0;
-+}
-+
- static bool 

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

2020-05-29 Thread Joonas Niilola
commit: 26616d14e48974220a2b6a9ce0a41f971e241270
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri May 29 13:10:23 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 29 13:15:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26616d14

app-emulation/lxc: clean old 2.1.1

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest|   1 -
 app-emulation/lxc/lxc-2.1.1-r1.ebuild | 215 --
 app-emulation/lxc/metadata.xml|   1 -
 3 files changed, 217 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 98668716a5d..658b60ca595 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,4 +1,3 @@
-DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 
77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6
 SHA512 
cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B 
e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30
 SHA512 
706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 
2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c
 SHA512 
0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3

diff --git a/app-emulation/lxc/lxc-2.1.1-r1.ebuild 
b/app-emulation/lxc/lxc-2.1.1-r1.ebuild
deleted file mode 100644
index 57389b97c89..000
--- a/app-emulation/lxc/lxc-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools bash-completion-r1 distutils-r1 linux-info versionator 
flag-o-matic systemd readme.gentoo-r1
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="cgmanager examples lua python seccomp selinux"
-
-RDEPEND="
-   net-libs/gnutls
-   sys-libs/libcap
-   cgmanager? ( app-admin/cgmanager )
-   lua? ( >=dev-lang/lua-5.1:= )
-   python? ( ${PYTHON_DEPS} )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-   app-text/docbook-sgml-utils
-   >=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-   sys-apps/util-linux
-   app-misc/pax-utils
-   virtual/awk"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-   ~CPUSETS ~CGROUP_CPUACCT
-   ~CGROUP_SCHED
-
-   ~NAMESPACES
-   ~IPC_NS ~USER_NS ~PID_NS
-
-   ~NETLINK_DIAG ~PACKET_DIAG
-   ~INET_UDP_DIAG ~INET_TCP_DIAG
-   ~UNIX_DIAG ~CHECKPOINT_RESTORE
-
-   ~CGROUP_FREEZER
-   ~UTS_NS ~NET_NS
-   ~VETH ~MACVLAN
-
-   ~POSIX_MQUEUE
-   ~!NETPRIO_CGROUP
-
-   ~!GRKERNSEC_CHROOT_MOUNT
-   ~!GRKERNSEC_CHROOT_DOUBLE
-   ~!GRKERNSEC_CHROOT_PIVOT
-   ~!GRKERNSEC_CHROOT_CHMOD
-   ~!GRKERNSEC_CHROOT_CAPS
-   ~!GRKERNSEC_PROC
-   ~!GRKERNSEC_SYSFS_RESTRICT
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for 
pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
-
-ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
-ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
-ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
-ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for 
lxc-checkpoint"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
-

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

2020-05-29 Thread Joonas Niilola
commit: 20b9c7959ccd39f84b5d6366f092f16b5e5602c1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri May 29 13:10:47 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 29 13:15:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20b9c795

app-emulation/lxc: clean old 3.1.0

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest|   1 -
 app-emulation/lxc/lxc-3.1.0-r1.ebuild | 161 --
 2 files changed, 162 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 658b60ca595..768faa21194 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,3 +1,2 @@
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 
77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6
 SHA512 
cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
-DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B 
e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30
 SHA512 
706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 
2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c
 SHA512 
0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3

diff --git a/app-emulation/lxc/lxc-3.1.0-r1.ebuild 
b/app-emulation/lxc/lxc-3.1.0-r1.ebuild
deleted file mode 100644
index 138938369b9..000
--- a/app-emulation/lxc/lxc-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic systemd 
readme.gentoo-r1 pam
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor examples pam seccomp selinux +templates"
-
-RDEPEND="
-   net-libs/gnutls
-   sys-libs/libcap
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-   >=app-text/docbook-sgml-utils-0.6.14-r2
-   >=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-   sys-apps/util-linux
-   app-misc/pax-utils
-   virtual/awk"
-
-PDEPEND="templates? ( app-emulation/lxc-templates )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-   ~CPUSETS ~CGROUP_CPUACCT
-   ~CGROUP_SCHED
-
-   ~NAMESPACES
-   ~IPC_NS ~USER_NS ~PID_NS
-
-   ~CGROUP_FREEZER
-   ~UTS_NS ~NET_NS
-   ~VETH ~MACVLAN
-
-   ~POSIX_MQUEUE
-   ~!NETPRIO_CGROUP
-
-   ~!GRKERNSEC_CHROOT_MOUNT
-   ~!GRKERNSEC_CHROOT_DOUBLE
-   ~!GRKERNSEC_CHROOT_PIVOT
-   ~!GRKERNSEC_CHROOT_CHMOD
-   ~!GRKERNSEC_CHROOT_CAPS
-   ~!GRKERNSEC_PROC
-   ~!GRKERNSEC_SYSFS_RESTRICT
-   ~!GRKERNSEC_CHROOT_FINDTASK
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for 
pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is 
incompatible with unprivileged containers"
-ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC 
feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-pkg_setup() {
-   

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

2020-05-26 Thread Joonas Niilola
commit: 55ac41e9cf4593b775311a4572c187684cb9c732
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 26 09:47:00 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 26 10:16:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ac41e9

app-emulation/lxc: clean old

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.2.ebuild | 133 -
 1 file changed, 133 deletions(-)

diff --git a/app-emulation/lxc/lxc-4.0.2.ebuild 
b/app-emulation/lxc/lxc-4.0.2.ebuild
deleted file mode 100644
index d3eae71be36..000
--- a/app-emulation/lxc/lxc-4.0.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic pam 
readme.gentoo-r1 systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor examples pam seccomp selinux +templates"
-
-RDEPEND="app-misc/pax-utils
-   net-libs/gnutls
-   sys-apps/util-linux
-   sys-libs/libcap
-   virtual/awk
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-   >=app-text/docbook-sgml-utils-0.6.14-r2
-   >=sys-kernel/linux-headers-3.2
-   apparmor? ( sys-apps/apparmor )"
-PDEPEND="templates? ( app-emulation/lxc-templates )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-   ~CPUSETS ~CGROUP_CPUACCT
-   ~CGROUP_SCHED
-
-   ~NAMESPACES
-   ~IPC_NS ~USER_NS ~PID_NS
-
-   ~CGROUP_FREEZER
-   ~UTS_NS ~NET_NS
-   ~VETH ~MACVLAN
-
-   ~POSIX_MQUEUE
-   ~!NETPRIO_CGROUP"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   append-flags -fno-strict-aliasing
-
-   # --enable-doc is for manpages which is why we don't link it to a "doc"
-   # USE flag. We always want man pages.
-   local myeconfargs=(
-   --localstatedir=/var
-   --bindir=/usr/bin
-   --sbindir=/usr/bin
-   --with-config-path=/var/lib/lxc
-   --with-rootfs-path=/var/lib/lxc/rootfs
-   --with-distro=gentoo
-   --with-runtime-path=/run
-   --disable-werror
-   --enable-doc
-   --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-   $(use_enable apparmor)
-   $(use_enable examples)
-   $(use_enable pam)
-   $(use_with pam pamdir $(getpam_mod_dir))
-   $(use_enable seccomp)
-   $(use_enable selinux)
-   )
-   econf "${myeconfargs[@]}"
-}
-
-src_install() {
-   default
-
-   mv "${ED}"/usr/share/bash-completion/completions/${PN} 
"${ED}"/$(get_bashcompdir)/${PN}-start || die
-   bashcomp_alias ${PN}-start \
-   
${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
-
-   keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-   rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
-
-   find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
-
-   # Gentoo-specific additions!
-   newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
-
-   # Remember to compare our systemd unit file with the upstream one
-   # config/init/systemd/lxc.service.in
-   systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service"
-
-   DOC_CONTENTS="
-   For openrc, there is an init script provided with the package.
-   You _should_ only need to symlink /etc/init.d/lxc to
-   /etc/init.d/lxc.configname to start the container defined in
-   /etc/lxc/configname.conf.
-
-   Correspondingly, for systemd a service file lxc@.service is installed.
-   Enable and start lxc@configname in order to start the container defined
-  

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

2020-05-20 Thread Joonas Niilola
commit: e5e95d8829dc62500b61289f79a8d54128920142
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed May 20 13:09:38 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May 20 13:09:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e95d88

app-emulation/lxc: remove useless gnutls dep

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/{lxc-4.0.2-r1.ebuild => lxc-4.0.2-r2.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/lxc/lxc-4.0.2-r1.ebuild 
b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
similarity index 99%
rename from app-emulation/lxc/lxc-4.0.2-r1.ebuild
rename to app-emulation/lxc/lxc-4.0.2-r2.ebuild
index e09aa6bc06f..9f71458a5e7 100644
--- a/app-emulation/lxc/lxc-4.0.2-r1.ebuild
+++ b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
@@ -16,7 +16,6 @@ SLOT="0"
 IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates 
+tools"
 
 RDEPEND="app-misc/pax-utils
-   net-libs/gnutls
sys-apps/util-linux
sys-libs/libcap
virtual/awk



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

2020-05-19 Thread Stefan Strogin
commit: 479ab941e94c4b25d3d3a877e2a6e4f121175108
Author: Stefan Strogin  gentoo  org>
AuthorDate: Tue May 19 15:26:10 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue May 19 15:26:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479ab941

app-emulation/lxc: add USE=libressl

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Stefan Strogin  gentoo.org>

 app-emulation/lxc/lxc-4.0.2-r1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc/lxc-4.0.2-r1.ebuild 
b/app-emulation/lxc/lxc-4.0.2-r1.ebuild
index f752ea7dc38..e09aa6bc06f 100644
--- a/app-emulation/lxc/lxc-4.0.2-r1.ebuild
+++ b/app-emulation/lxc/lxc-4.0.2-r1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="apparmor +caps doc examples pam seccomp selinux +ssl +templates +tools"
+IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates 
+tools"
 
 RDEPEND="app-misc/pax-utils
net-libs/gnutls
@@ -24,7 +24,10 @@ RDEPEND="app-misc/pax-utils
pam? ( sys-libs/pam )
seccomp? ( sys-libs/libseccomp )
selinux? ( sys-libs/libselinux )
-   ssl? ( dev-libs/openssl:0= )"
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
 DEPEND="${RDEPEND}
>=app-text/docbook-sgml-utils-0.6.14-r2
>=sys-kernel/linux-headers-3.2



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

2020-05-19 Thread Joonas Niilola
commit: d17623626e57938794236da5b0aa6099b4ed84ff
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 19 13:26:39 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 19 13:27:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1762362

app-emulation/lxc: add 'docs' USE flag

Closes: https://bugs.gentoo.org/723968
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.2-r1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc/lxc-4.0.2-r1.ebuild 
b/app-emulation/lxc/lxc-4.0.2-r1.ebuild
index 07e3149ff2b..f752ea7dc38 100644
--- a/app-emulation/lxc/lxc-4.0.2-r1.ebuild
+++ b/app-emulation/lxc/lxc-4.0.2-r1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="apparmor +caps examples pam seccomp selinux +ssl +templates +tools"
+IUSE="apparmor +caps doc examples pam seccomp selinux +ssl +templates +tools"
 
 RDEPEND="app-misc/pax-utils
net-libs/gnutls
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
>=app-text/docbook-sgml-utils-0.6.14-r2
>=sys-kernel/linux-headers-3.2
apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )"
 PDEPEND="templates? ( app-emulation/lxc-templates )"
 
 CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
@@ -95,7 +96,6 @@ src_configure() {
--disable-ubsan
--disable-werror
 
-   --enable-api-docs
--enable-bash
--enable-commands
--enable-doc
@@ -104,6 +104,7 @@ src_configure() {
 
$(use_enable apparmor)
$(use_enable caps capabilities)
+   $(use_enable doc api-docs)
$(use_enable examples)
$(use_enable pam)
$(use_enable seccomp)



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

2020-05-19 Thread Joonas Niilola
commit: 355c9e38d5aa95657add1cf52e0a11f9df88bd18
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 19 07:53:00 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 19 07:56:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=355c9e38

app-emulation/lxc: add more configure options

 - add 'caps', 'ssl' and 'tools' USE flags,
 - make all relevant upstream configure options visible.

Closes: https://bugs.gentoo.org/689150
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/lxc-4.0.2-r1.ebuild | 157 ++
 app-emulation/lxc/metadata.xml|   1 +
 2 files changed, 158 insertions(+)

diff --git a/app-emulation/lxc/lxc-4.0.2-r1.ebuild 
b/app-emulation/lxc/lxc-4.0.2-r1.ebuild
new file mode 100644
index 000..07e3149ff2b
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic pam 
readme.gentoo-r1 systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps examples pam seccomp selinux +ssl +templates +tools"
+
+RDEPEND="app-misc/pax-utils
+   net-libs/gnutls
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/awk
+   caps? ( sys-libs/libcap )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   >=app-text/docbook-sgml-utils-0.6.14-r2
+   >=sys-kernel/linux-headers-3.2
+   apparmor? ( sys-apps/apparmor )"
+PDEPEND="templates? ( app-emulation/lxc-templates )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+   ~CPUSETS ~CGROUP_CPUACCT
+   ~CGROUP_SCHED
+
+   ~NAMESPACES
+   ~IPC_NS ~USER_NS ~PID_NS
+
+   ~CGROUP_FREEZER
+   ~UTS_NS ~NET_NS
+   ~VETH ~MACVLAN
+
+   ~POSIX_MQUEUE
+   ~!NETPRIO_CGROUP"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   append-flags -fno-strict-aliasing
+
+   # --enable-doc is for manpages which is why we don't link it to a "doc"
+   # USE flag. We always want man pages.
+   local myeconfargs=(
+   --bindir=/usr/bin
+   --localstatedir=/var
+   --sbindir=/usr/bin
+
+   --with-config-path=/var/lib/lxc
+   --with-distro=gentoo
+   --with-init-script=systemd
+   --with-rootfs-path=/var/lib/lxc/rootfs
+   --with-runtime-path=/run
+   --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+
+   --disable-asan
+   --disable-coverity-build
+   --disable-dlog
+   --disable-mutex-debugging
+   --disable-rpath
+   --disable-tests
+   --disable-ubsan
+   --disable-werror
+
+   --enable-api-docs
+   --enable-bash
+   --enable-commands
+   --enable-doc
+   --enable-memfd-rexec
+   --enable-thread-safety
+
+   $(use_enable apparmor)
+   $(use_enable caps capabilities)
+   $(use_enable examples)
+   $(use_enable pam)
+   $(use_enable seccomp)
+   $(use_enable selinux)
+   $(use_enable ssl openssl)
+   $(use_enable tools)
+
+   $(use_with pam pamdir $(getpam_mod_dir))
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+
+   mv "${ED}"/usr/share/bash-completion/completions/${PN} 
"${ED}"/$(get_bashcompdir)/${PN}-start || die
+   bashcomp_alias ${PN}-start \
+   
${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
+
+   keepdir 

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

2020-05-18 Thread Joonas Niilola
commit: 783b1942f464f427259026436ed8ca0479dd10ee
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon May 18 13:31:51 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 18 13:39:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783b1942

app-emulation/lxc: remove old 4.0.1

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   1 -
 app-emulation/lxc/lxc-4.0.1.ebuild | 132 -
 2 files changed, 133 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 294553b27b9..98668716a5d 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,5 +1,4 @@
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 
77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6
 SHA512 
cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B 
e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30
 SHA512 
706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
-DIST lxc-4.0.1.tar.gz 1352119 BLAKE2B 
0146091c7704397c097f74bfec1e30c0fc542f1cdd58d4359157f01921e916529280ec96c89c8822ab4051e489216a9518f93a630cc324c7ec5b23a3d1f71386
 SHA512 
e4c0129c9351a46f5bd37d908c69adc2a30359d9d879f11d75860691bf106f08f4fe205f49e511986a33f0b0498b5f613712496893b3e56286a78a341bbaf365
 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 
2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c
 SHA512 
0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3

diff --git a/app-emulation/lxc/lxc-4.0.1.ebuild 
b/app-emulation/lxc/lxc-4.0.1.ebuild
deleted file mode 100644
index 9b599232595..000
--- a/app-emulation/lxc/lxc-4.0.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic systemd 
readme.gentoo-r1 pam
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor examples pam seccomp selinux +templates"
-
-RDEPEND="app-misc/pax-utils
-   net-libs/gnutls
-   sys-apps/util-linux
-   sys-libs/libcap
-   virtual/awk
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-   >=app-text/docbook-sgml-utils-0.6.14-r2
-   >=sys-kernel/linux-headers-3.2
-   apparmor? ( sys-apps/apparmor )"
-PDEPEND="templates? ( app-emulation/lxc-templates )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-   ~CPUSETS ~CGROUP_CPUACCT
-   ~CGROUP_SCHED
-
-   ~NAMESPACES
-   ~IPC_NS ~USER_NS ~PID_NS
-
-   ~CGROUP_FREEZER
-   ~UTS_NS ~NET_NS
-   ~VETH ~MACVLAN
-
-   ~POSIX_MQUEUE
-   ~!NETPRIO_CGROUP"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   append-flags -fno-strict-aliasing
-
-   # --enable-doc is for manpages which is why we don't link it to a "doc"
-   # USE flag. We always want man pages.
-   local myeconfargs=(
-   --localstatedir=/var
-   --bindir=/usr/bin
-   --sbindir=/usr/bin
-   --with-config-path=/var/lib/lxc
-   

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

2020-05-18 Thread Joonas Niilola
commit: b81652e7f5f0a438d3f9617d4d7103908873da9d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon May 18 13:31:25 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 18 13:39:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b81652e7

app-emulation/lxc: bump to 4.0.2

 - delete all static libraries.

Closes: https://bugs.gentoo.org/723532
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest   |   1 +
 app-emulation/lxc/files/lxc_at.service.4.0.0 |  15 +++
 app-emulation/lxc/lxc-4.0.2.ebuild   | 133 +++
 3 files changed, 149 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 8887f39f223..294553b27b9 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -2,3 +2,4 @@ DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 
77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6
 SHA512 
cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B 
e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30
 SHA512 
706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
 DIST lxc-4.0.1.tar.gz 1352119 BLAKE2B 
0146091c7704397c097f74bfec1e30c0fc542f1cdd58d4359157f01921e916529280ec96c89c8822ab4051e489216a9518f93a630cc324c7ec5b23a3d1f71386
 SHA512 
e4c0129c9351a46f5bd37d908c69adc2a30359d9d879f11d75860691bf106f08f4fe205f49e511986a33f0b0498b5f613712496893b3e56286a78a341bbaf365
+DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 
2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c
 SHA512 
0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3

diff --git a/app-emulation/lxc/files/lxc_at.service.4.0.0 
b/app-emulation/lxc/files/lxc_at.service.4.0.0
new file mode 100644
index 000..b354bc53e08
--- /dev/null
+++ b/app-emulation/lxc/files/lxc_at.service.4.0.0
@@ -0,0 +1,15 @@
+[Unit]
+Description=Linux Container %i
+After=network.target
+Wants=lxcfs.service
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/lxc-start -d -n %i -p /run/lxc-%i.pid
+PIDFile=/run/lxc-%i.pid
+ExecStop=/usr/bin/lxc-stop -n %i
+Delegate=true
+TasksMax=32768
+
+[Install]
+WantedBy=multi-user.target

diff --git a/app-emulation/lxc/lxc-4.0.2.ebuild 
b/app-emulation/lxc/lxc-4.0.2.ebuild
new file mode 100644
index 000..d3eae71be36
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic pam 
readme.gentoo-r1 systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor examples pam seccomp selinux +templates"
+
+RDEPEND="app-misc/pax-utils
+   net-libs/gnutls
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/awk
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+   >=app-text/docbook-sgml-utils-0.6.14-r2
+   >=sys-kernel/linux-headers-3.2
+   apparmor? ( sys-apps/apparmor )"
+PDEPEND="templates? ( app-emulation/lxc-templates )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+   ~CPUSETS ~CGROUP_CPUACCT
+   ~CGROUP_SCHED
+
+   ~NAMESPACES
+   ~IPC_NS ~USER_NS ~PID_NS
+
+   ~CGROUP_FREEZER
+   ~UTS_NS ~NET_NS
+   ~VETH ~MACVLAN
+
+   ~POSIX_MQUEUE
+   ~!NETPRIO_CGROUP"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+

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

2020-05-14 Thread Joonas Niilola
commit: e3b2cd01a302471357250fd86b29b22287800da7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu May 14 15:42:34 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 15 05:20:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b2cd01

app-emulation/lxc-templates: bump to 3.0.4

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc-templates/Manifest   |  1 +
 .../lxc-templates/lxc-templates-3.0.4.ebuild   | 28 ++
 2 files changed, 29 insertions(+)

diff --git a/app-emulation/lxc-templates/Manifest 
b/app-emulation/lxc-templates/Manifest
index c25ef6c9343..66e89bab71f 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1 +1,2 @@
 DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B 
b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0
 SHA512 
3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632
+DIST lxc-templates-3.0.4.tar.gz 257015 BLAKE2B 
599c0cb083cf358c8252467b3870450e754b2aa30daf8d72e07e746ce37e2fb26fecc0adf416325c9e02b1f98f5745af5985360e9494e5ed54a242a3e17330d4
 SHA512 
e5b628b40e7108fca858dbd9ae92495016069ff3cba7feb34e9559c7f61dfc36944a9ef441369952a988e821f8b5d883ae97b81f6eef0683a22f1f702b5b913e

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
new file mode 100644
index 000..2c8e085f0d2
--- /dev/null
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Old style template scripts for LXC"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc-templates;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+RDEPEND="
+   >=app-emulation/lxc-3.0"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
+DOCS=()
+
+src_prepare() {
+   default
+   eautoreconf
+}



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

2020-05-14 Thread Joonas Niilola
commit: 38e26cd54c82a7635a012ab34d1206d7f01136e2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu May 14 15:47:15 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 15 05:20:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e26cd5

app-emulation/lxc: bump to 4.0.1

- basically a copypaste of old ebuild,
- remove grsec kernel checks.

Closes: https://bugs.gentoo.org/701372
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxc/Manifest |   1 +
 app-emulation/lxc/lxc-4.0.1.ebuild | 132 +
 2 files changed, 133 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 94f3dfd504e..8887f39f223 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,3 +1,4 @@
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 
77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6
 SHA512 
cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B 
e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30
 SHA512 
706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
+DIST lxc-4.0.1.tar.gz 1352119 BLAKE2B 
0146091c7704397c097f74bfec1e30c0fc542f1cdd58d4359157f01921e916529280ec96c89c8822ab4051e489216a9518f93a630cc324c7ec5b23a3d1f71386
 SHA512 
e4c0129c9351a46f5bd37d908c69adc2a30359d9d879f11d75860691bf106f08f4fe205f49e511986a33f0b0498b5f613712496893b3e56286a78a341bbaf365

diff --git a/app-emulation/lxc/lxc-4.0.1.ebuild 
b/app-emulation/lxc/lxc-4.0.1.ebuild
new file mode 100644
index 000..9b599232595
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic systemd 
readme.gentoo-r1 pam
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor examples pam seccomp selinux +templates"
+
+RDEPEND="app-misc/pax-utils
+   net-libs/gnutls
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/awk
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+   >=app-text/docbook-sgml-utils-0.6.14-r2
+   >=sys-kernel/linux-headers-3.2
+   apparmor? ( sys-apps/apparmor )"
+PDEPEND="templates? ( app-emulation/lxc-templates )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+   ~CPUSETS ~CGROUP_CPUACCT
+   ~CGROUP_SCHED
+
+   ~NAMESPACES
+   ~IPC_NS ~USER_NS ~PID_NS
+
+   ~CGROUP_FREEZER
+   ~UTS_NS ~NET_NS
+   ~VETH ~MACVLAN
+
+   ~POSIX_MQUEUE
+   ~!NETPRIO_CGROUP"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+   "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   append-flags -fno-strict-aliasing
+
+   # --enable-doc is for manpages which is why we don't link it to a "doc"
+   # USE flag. We always want man pages.
+   local myeconfargs=(
+   --localstatedir=/var
+   --bindir=/usr/bin
+   --sbindir=/usr/bin
+   --with-config-path=/var/lib/lxc
+   --with-rootfs-path=/var/lib/lxc/rootfs
+   --with-distro=gentoo
+   --with-runtime-path=/run
+   --disable-werror
+   --enable-doc
+   

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

2019-10-12 Thread Mikle Kolyada
commit: 84d9b6509a32600ef7e332ce406c919297321c75
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 12 18:34:53 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 12 18:34:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d9b650

app-emulation/lxc: migrate to sys-libs/pam

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

 app-emulation/lxc/lxc-3.0.3.ebuild| 2 +-
 app-emulation/lxc/lxc-3.1.0-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc/lxc-3.0.3.ebuild 
b/app-emulation/lxc/lxc-3.0.3.ebuild
index bf7dc89a778..136493184f4 100644
--- a/app-emulation/lxc/lxc-3.0.3.ebuild
+++ b/app-emulation/lxc/lxc-3.0.3.ebuild
@@ -18,7 +18,7 @@ IUSE="apparmor examples pam python seccomp selinux +templates"
 RDEPEND="
net-libs/gnutls
sys-libs/libcap
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
seccomp? ( sys-libs/libseccomp )
selinux? ( sys-libs/libselinux )"
 

diff --git a/app-emulation/lxc/lxc-3.1.0-r1.ebuild 
b/app-emulation/lxc/lxc-3.1.0-r1.ebuild
index abe9c6c7cb4..138938369b9 100644
--- a/app-emulation/lxc/lxc-3.1.0-r1.ebuild
+++ b/app-emulation/lxc/lxc-3.1.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="apparmor examples pam seccomp selinux +templates"
 RDEPEND="
net-libs/gnutls
sys-libs/libcap
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
seccomp? ( sys-libs/libseccomp )
selinux? ( sys-libs/libselinux )"
 



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

2019-07-05 Thread Virgil Dupras
commit: 29e210c6e660f2897a3d33654f465b566327db9f
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Jul  5 19:03:59 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Jul  5 19:03:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e210c6

app-emulation/lxc-templates: remove myself as maintainer

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 app-emulation/lxc-templates/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-emulation/lxc-templates/metadata.xml 
b/app-emulation/lxc-templates/metadata.xml
index 17c33883e5b..2cf03a0ac7e 100644
--- a/app-emulation/lxc-templates/metadata.xml
+++ b/app-emulation/lxc-templates/metadata.xml
@@ -1,9 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-vdup...@gentoo.org
-  
   
 virtualizat...@gentoo.org
 Gentoo Virtualization Project



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

2019-07-05 Thread Virgil Dupras
commit: b44d08705e92a9ed828aa366d5b64a3908b265d3
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Jul  5 18:57:09 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Jul  5 18:57:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b44d0870

app-emulation/lxc: remove myself as maintainer

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 app-emulation/lxc/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index 7381f9b1768..c5f8986b911 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -1,9 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-vdup...@gentoo.org
-  
   
 virtualizat...@gentoo.org
 Gentoo Virtualization Project



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

2019-04-22 Thread Alexey Shvetsov
commit: 681c0364b0b3877c811e0db49bf4c55d7103d1cd
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Mon Apr 22 14:48:41 2019 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Mon Apr 22 14:48:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=681c0364

app-emulation/lxc: Fix init.d

Closes: https://bugs.gentoo.org/675540
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Alexey Shvetsov  gentoo.org>

 app-emulation/lxc/files/lxc.initd.8| 131 +
 .../lxc/{lxc-3.1.0.ebuild => lxc-3.1.0-r1.ebuild}  |   4 +-
 2 files changed, 133 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc/files/lxc.initd.8 
b/app-emulation/lxc/files/lxc.initd.8
new file mode 100644
index 000..727f6d504fb
--- /dev/null
+++ b/app-emulation/lxc/files/lxc.initd.8
@@ -0,0 +1,131 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CONTAINER=${SVCNAME#*.}
+
+LXC_PATH=`lxc-config lxc.lxcpath`
+
+lxc_get_configfile() {
+   if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
+   echo "${LXC_PATH}/${CONTAINER}.conf"
+   elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
+   echo "${LXC_PATH}/${CONTAINER}/config"
+   else
+   eerror "Unable to find a suitable configuration file."
+   eerror "If you set up the container in a non-standard"
+   eerror "location, please set the CONFIGFILE variable."
+   return 1
+   fi
+}
+
+[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
+
+lxc_get_var() {
+   awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' 
${CONFIGFILE}
+}
+
+lxc_get_net_link_type() {
+   awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" }
+   $1 == "lxc.network.type" {_type=$2;}
+   $1 == "lxc.network.link" {_link=$2;}
+   match($1, /lxc\.net\.[[:digit:]]+\.type/) {_type=$2;}
+   match($1, /lxc\.net\.[[:digit:]]+\.link/) {_link=$2;}
+   {if(_link != "" && _type != ""){
+   printf("%s:%s\n", _link, _type );
+   _link=""; _type="";
+   }; }' <${CONFIGFILE}
+}
+
+checkconfig() {
+   if [ ${CONTAINER} = ${SVCNAME} ]; then
+   eerror "You have to create an init script for each container:"
+   eerror " ln -s lxc /etc/init.d/lxc.container"
+   return 1
+   fi
+
+   # no need to output anything, the function takes care of that.
+   [ -z "${CONFIGFILE}" ] && return 1
+
+   utsname=$(lxc_get_var lxc.uts.name)
+   if [ -z "$utsname" ] ; then
+   utsname=$(lxc_get_var lxc.utsname)
+   fi
+
+   if [ "${CONTAINER}" != "${utsname}" ]; then
+   eerror "You should use the same name for the service and the"
+   eerror "container. Right now the container is called ${utsname}"
+   return 1
+   fi
+}
+
+depend() {
+   # be quiet, since we have to run depend() also for the
+   # non-muxed init script, unfortunately.
+   checkconfig 2>/dev/null || return 0
+
+   config ${CONFIGFILE}
+   need localmount
+   use lxcfs
+
+   local _x _if
+   for _x in $(lxc_get_net_link_type); do
+   _if=${_x%:*}
+   case "${_x##*:}" in
+   # when the network type is set to phys, we can make use 
of a
+   # network service (for instance to set it up before we 
disable
+   # the net_admin capability), but we might also  not set 
it up
+   # at all on the host and leave the net_admin capable 
service
+   # to take care of it.
+   phys)   use net.${_if} ;;
+   *)  need net.${_if} ;;
+   esac
+   done
+}
+
+start() {
+   checkconfig || return 1
+   rm -f /var/log/lxc/${CONTAINER}.log
+
+   rootpath=$(lxc_get_var lxc.rootfs)
+
+   # Check the format of our init and the chroot's init, to see
+   # if we have to use linux32 or linux64; always use setarch
+   # when required, as that makes it easier to deal with
+   # x32-based containers.
+   case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
+   EM_X86_64)  setarch=linux64;;
+   EM_386) setarch=linux32;;
+   esac
+
+   ebegin "Starting LXC container ${CONTAINER}"
+   env -i ${setarch} $(which lxc-start) -n ${CONTAINER} -f ${CONFIGFILE} 
-d -o /var/log/lxc/${CONTAINER}.log
+   sleep 1
+
+   # lxc-start -d will _always_ report a correct startup, even if it
+   # failed, so rather than trust that, check that the cgroup exists.
+   # fix for LXC 3.1   
+
+   STATE="$(lxc-info -s -H ${CONTAINER})"
+   [ "$STATE" = "RUNNING" ]
+   
+   eend $?
+}
+
+stop() {
+   checkconfig 

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

2019-02-17 Thread Virgil Dupras
commit: dc5b9b90aa80d80bca3009cb58ff41f9800a348a
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sun Feb 17 18:06:34 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sun Feb 17 18:10:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc5b9b90

app-emulation/lxc-templates: remove old

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-emulation/lxc-templates/Manifest   |  1 -
 .../lxc-templates/lxc-templates-3.0.1.ebuild   | 28 --
 2 files changed, 29 deletions(-)

diff --git a/app-emulation/lxc-templates/Manifest 
b/app-emulation/lxc-templates/Manifest
index 94c37e69f3d..c25ef6c9343 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1,2 +1 @@
-DIST lxc-templates-3.0.1.tar.gz 256074 BLAKE2B 
8a5dab2d69fbc29e0246a0853690726c07d24e0fe6d4e761d8ec8b4559cdf285a82e17c8f4d2a6bf2355896c667000d4341511b3c5f1805a55849b4812eb7efe
 SHA512 
cae47b670654dc6c143827d196f0477c5354cb6d81ae4028192622fb73912e8bb3b62a0a68786e9212885bb52b593c6e742cfbfefb70ec33260d599e5d5c8290
 DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B 
b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0
 SHA512 
3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
deleted file mode 100644
index df31caace62..000
--- a/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Old style template scripts for LXC"
-HOMEPAGE="https://linuxcontainers.org/;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-RDEPEND="
-   >=app-emulation/lxc-3.0"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-no-cache-dir.patch" )
-DOCS=()
-
-src_prepare() {
-   default
-   eautoreconf
-}



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

2019-02-17 Thread Sergei Trofimovich
commit: 066a07fc6555de9b7a977133635ef19f17978e7c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Feb 17 17:59:32 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Feb 17 17:59:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066a07fc

app-emulation/lxc: stable 3.0.3 for ppc64, bug #669030

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-emulation/lxc/lxc-3.0.3.ebuild 
b/app-emulation/lxc/lxc-3.0.3.ebuild
index 7b8927d98fb..bf7dc89a778 100644
--- a/app-emulation/lxc/lxc-3.0.3.ebuild
+++ b/app-emulation/lxc/lxc-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2019-02-17 Thread Sergei Trofimovich
commit: 50c021a4fb00dd9a1a940c990437acbde1da5471
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Feb 17 17:59:35 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Feb 17 17:59:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c021a4

app-emulation/lxc-templates: stable 3.0.3 for ppc64, bug #669030

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
index c52d602d521..38950a11f0a 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2019-01-01 Thread Virgil Dupras
commit: 5fc61426a3794a2e6fb43a2df58ea81566792a36
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Jan  1 13:48:08 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Jan  1 13:48:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc61426

app-emulation/lxc-templates: remove old

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-emulation/lxc-templates/Manifest   |  1 -
 .../lxc-templates/lxc-templates-3.0.2.ebuild   | 28 --
 2 files changed, 29 deletions(-)

diff --git a/app-emulation/lxc-templates/Manifest 
b/app-emulation/lxc-templates/Manifest
index d5ddd3e6b0e..94c37e69f3d 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1,3 +1,2 @@
 DIST lxc-templates-3.0.1.tar.gz 256074 BLAKE2B 
8a5dab2d69fbc29e0246a0853690726c07d24e0fe6d4e761d8ec8b4559cdf285a82e17c8f4d2a6bf2355896c667000d4341511b3c5f1805a55849b4812eb7efe
 SHA512 
cae47b670654dc6c143827d196f0477c5354cb6d81ae4028192622fb73912e8bb3b62a0a68786e9212885bb52b593c6e742cfbfefb70ec33260d599e5d5c8290
-DIST lxc-templates-3.0.2.tar.gz 255721 BLAKE2B 
6f3a09982833ae832623bf448a0cc8a5c3c6639606a1cd8e306e41fa86a1135eae5490cd93043c397e5be727b12b0fdae48709a5ff3e3dd2e590bc6aa7154f34
 SHA512 
1e4b271c86d3cc382a6c4cc5ad8a44362f731325b4657fbee29542837a2684ee7274b92985da1a2f8aa0f808e263bf50d682ee969ba137229e54528fa529f77f
 DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B 
b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0
 SHA512 
3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
deleted file mode 100644
index 92e3e2aa239..000
--- a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Old style template scripts for LXC"
-HOMEPAGE="https://linuxcontainers.org/;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-RDEPEND="
-   >=app-emulation/lxc-3.0"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
-DOCS=()
-
-src_prepare() {
-   default
-   eautoreconf
-}



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

2019-01-01 Thread Virgil Dupras
commit: 6356d95461f57492ee62e30b5d0c731826be9974
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Jan  1 13:47:23 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Jan  1 13:47:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6356d954

app-emulation/lxc-templates: stabilize 3.0.3 for amd64 and x86

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
index 4a4dcd5d0e2..c52d602d521 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-12-31 Thread Virgil Dupras
commit: a0bccf8edd136667f1144f14bcc9580998300604
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Dec 31 18:55:14 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Dec 31 18:55:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0bccf8e

app-emulation/lxc: remove old

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-emulation/lxc/Manifest |   1 -
 app-emulation/lxc/lxc-3.0.2.ebuild | 160 -
 2 files changed, 161 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index dc17a9b8b4a..94f3dfd504e 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,4 +1,3 @@
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
-DIST lxc-3.0.2.tar.gz 1236975 BLAKE2B 
68047f6374b9081fb308586726797ed94fa66b5e94eb3fc12ad1a0aedc15ac1ee518ca5a341db79a715015e34ad38659200ad6aaf21f74639ebb55e7e1360645
 SHA512 
d7f5e3f91e5c8800e3e092ab209158a4d3e3c2816623249aeaaf2e0950428484ac5d1432d71298787721e1419cd962c0798ba14979e62161299fa15a299efde8
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 
77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6
 SHA512 
cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B 
e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30
 SHA512 
706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20

diff --git a/app-emulation/lxc/lxc-3.0.2.ebuild 
b/app-emulation/lxc/lxc-3.0.2.ebuild
deleted file mode 100644
index 9d075f8a2a6..000
--- a/app-emulation/lxc/lxc-3.0.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic systemd 
readme.gentoo-r1 pam
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor examples pam python seccomp selinux +templates"
-
-RDEPEND="
-   net-libs/gnutls
-   sys-libs/libcap
-   pam? ( virtual/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-   >=app-text/docbook-sgml-utils-0.6.14-r2
-   >=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-   sys-apps/util-linux
-   app-misc/pax-utils
-   virtual/awk"
-
-PDEPEND="templates? ( app-emulation/lxc-templates )
-   python? ( dev-python/python3-lxc )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-   ~CPUSETS ~CGROUP_CPUACCT
-   ~CGROUP_SCHED
-
-   ~NAMESPACES
-   ~IPC_NS ~USER_NS ~PID_NS
-
-   ~CGROUP_FREEZER
-   ~UTS_NS ~NET_NS
-   ~VETH ~MACVLAN
-
-   ~POSIX_MQUEUE
-   ~!NETPRIO_CGROUP
-
-   ~!GRKERNSEC_CHROOT_MOUNT
-   ~!GRKERNSEC_CHROOT_DOUBLE
-   ~!GRKERNSEC_CHROOT_PIVOT
-   ~!GRKERNSEC_CHROOT_CHMOD
-   ~!GRKERNSEC_CHROOT_CAPS
-   ~!GRKERNSEC_PROC
-   ~!GRKERNSEC_SYSFS_RESTRICT
-   ~!GRKERNSEC_CHROOT_FINDTASK
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for 
pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  

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

2018-12-31 Thread Virgil Dupras
commit: 1687c1e8597ba5b6a96819921dbe51cee6c9cef0
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Dec 31 18:54:31 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Dec 31 18:54:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1687c1e8

app-emulation/lxc: stabilize 3.0.3 on amd64 and x86

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

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

diff --git a/app-emulation/lxc/lxc-3.0.3.ebuild 
b/app-emulation/lxc/lxc-3.0.3.ebuild
index 5cb34ceb504..7b8927d98fb 100644
--- a/app-emulation/lxc/lxc-3.0.3.ebuild
+++ b/app-emulation/lxc/lxc-3.0.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-12-23 Thread Virgil Dupras
commit: 5fc9d68d74987bb791230b7403b0eac791da7437
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sun Dec 23 15:52:21 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sun Dec 23 15:52:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc9d68d

app-emulation/lxc: bump to 3.1.0

Also, remove obsolete kernel flag check and python USE flag (it was kept
around to ease the transition to the dev-python/python3-lxc package).

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-emulation/lxc/Manifest |   1 +
 app-emulation/lxc/lxc-3.1.0.ebuild | 161 +
 2 files changed, 162 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 9389c82001b..dc17a9b8b4a 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,3 +1,4 @@
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.2.tar.gz 1236975 BLAKE2B 
68047f6374b9081fb308586726797ed94fa66b5e94eb3fc12ad1a0aedc15ac1ee518ca5a341db79a715015e34ad38659200ad6aaf21f74639ebb55e7e1360645
 SHA512 
d7f5e3f91e5c8800e3e092ab209158a4d3e3c2816623249aeaaf2e0950428484ac5d1432d71298787721e1419cd962c0798ba14979e62161299fa15a299efde8
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 
77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6
 SHA512 
cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
+DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B 
e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30
 SHA512 
706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20

diff --git a/app-emulation/lxc/lxc-3.1.0.ebuild 
b/app-emulation/lxc/lxc-3.1.0.ebuild
new file mode 100644
index 000..29c023f6527
--- /dev/null
+++ b/app-emulation/lxc/lxc-3.1.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic systemd 
readme.gentoo-r1 pam
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor examples pam seccomp selinux +templates"
+
+RDEPEND="
+   net-libs/gnutls
+   sys-libs/libcap
+   pam? ( virtual/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${RDEPEND}
+   >=app-text/docbook-sgml-utils-0.6.14-r2
+   >=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+   sys-apps/util-linux
+   app-misc/pax-utils
+   virtual/awk"
+
+PDEPEND="templates? ( app-emulation/lxc-templates )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+   ~CPUSETS ~CGROUP_CPUACCT
+   ~CGROUP_SCHED
+
+   ~NAMESPACES
+   ~IPC_NS ~USER_NS ~PID_NS
+
+   ~CGROUP_FREEZER
+   ~UTS_NS ~NET_NS
+   ~VETH ~MACVLAN
+
+   ~POSIX_MQUEUE
+   ~!NETPRIO_CGROUP
+
+   ~!GRKERNSEC_CHROOT_MOUNT
+   ~!GRKERNSEC_CHROOT_DOUBLE
+   ~!GRKERNSEC_CHROOT_PIVOT
+   ~!GRKERNSEC_CHROOT_CHMOD
+   ~!GRKERNSEC_CHROOT_CAPS
+   ~!GRKERNSEC_PROC
+   ~!GRKERNSEC_SYSFS_RESTRICT
+   ~!GRKERNSEC_CHROOT_FINDTASK
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for 
pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC 
features make LXC unusable see postinst 

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

2018-11-25 Thread Virgil Dupras
commit: 4eb6e23eaf0ace99ce34c7a73ecac9f269d8ef2f
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Nov 26 01:38:53 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Nov 26 01:49:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb6e23e

app-emulation/lxc-templates: bump to 3.0.3

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Virgil Dupras  gentoo.org>

 app-emulation/lxc-templates/Manifest   |  1 +
 .../lxc-templates/lxc-templates-3.0.3.ebuild   | 28 ++
 2 files changed, 29 insertions(+)

diff --git a/app-emulation/lxc-templates/Manifest 
b/app-emulation/lxc-templates/Manifest
index 5dbbb316b5f..d5ddd3e6b0e 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1,2 +1,3 @@
 DIST lxc-templates-3.0.1.tar.gz 256074 BLAKE2B 
8a5dab2d69fbc29e0246a0853690726c07d24e0fe6d4e761d8ec8b4559cdf285a82e17c8f4d2a6bf2355896c667000d4341511b3c5f1805a55849b4812eb7efe
 SHA512 
cae47b670654dc6c143827d196f0477c5354cb6d81ae4028192622fb73912e8bb3b62a0a68786e9212885bb52b593c6e742cfbfefb70ec33260d599e5d5c8290
 DIST lxc-templates-3.0.2.tar.gz 255721 BLAKE2B 
6f3a09982833ae832623bf448a0cc8a5c3c6639606a1cd8e306e41fa86a1135eae5490cd93043c397e5be727b12b0fdae48709a5ff3e3dd2e590bc6aa7154f34
 SHA512 
1e4b271c86d3cc382a6c4cc5ad8a44362f731325b4657fbee29542837a2684ee7274b92985da1a2f8aa0f808e263bf50d682ee969ba137229e54528fa529f77f
+DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B 
b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0
 SHA512 
3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
new file mode 100644
index 000..4a4dcd5d0e2
--- /dev/null
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Old style template scripts for LXC"
+HOMEPAGE="https://linuxcontainers.org/;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+RDEPEND="
+   >=app-emulation/lxc-3.0"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
+DOCS=()
+
+src_prepare() {
+   default
+   eautoreconf
+}



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

2018-11-25 Thread Virgil Dupras
commit: c4fbdd6a3bea051b8d22d6fd644fa896df74bd14
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Nov 26 01:32:56 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Nov 26 01:49:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4fbdd6a

app-emulation/lxc: bump to 3.0.3

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Virgil Dupras  gentoo.org>

 app-emulation/lxc/Manifest |   1 +
 app-emulation/lxc/lxc-3.0.3.ebuild | 163 +
 2 files changed, 164 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 06d28c40ad9..9389c82001b 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,2 +1,3 @@
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.2.tar.gz 1236975 BLAKE2B 
68047f6374b9081fb308586726797ed94fa66b5e94eb3fc12ad1a0aedc15ac1ee518ca5a341db79a715015e34ad38659200ad6aaf21f74639ebb55e7e1360645
 SHA512 
d7f5e3f91e5c8800e3e092ab209158a4d3e3c2816623249aeaaf2e0950428484ac5d1432d71298787721e1419cd962c0798ba14979e62161299fa15a299efde8
+DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 
77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6
 SHA512 
cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a

diff --git a/app-emulation/lxc/lxc-3.0.3.ebuild 
b/app-emulation/lxc/lxc-3.0.3.ebuild
new file mode 100644
index 000..5cb34ceb504
--- /dev/null
+++ b/app-emulation/lxc/lxc-3.0.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic systemd 
readme.gentoo-r1 pam
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor examples pam python seccomp selinux +templates"
+
+RDEPEND="
+   net-libs/gnutls
+   sys-libs/libcap
+   pam? ( virtual/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${RDEPEND}
+   >=app-text/docbook-sgml-utils-0.6.14-r2
+   >=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+   sys-apps/util-linux
+   app-misc/pax-utils
+   virtual/awk"
+
+PDEPEND="templates? ( app-emulation/lxc-templates )
+   python? ( dev-python/python3-lxc )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+   ~CPUSETS ~CGROUP_CPUACCT
+   ~CGROUP_SCHED
+
+   ~NAMESPACES
+   ~IPC_NS ~USER_NS ~PID_NS
+
+   ~CGROUP_FREEZER
+   ~UTS_NS ~NET_NS
+   ~VETH ~MACVLAN
+
+   ~POSIX_MQUEUE
+   ~!NETPRIO_CGROUP
+
+   ~!GRKERNSEC_CHROOT_MOUNT
+   ~!GRKERNSEC_CHROOT_DOUBLE
+   ~!GRKERNSEC_CHROOT_PIVOT
+   ~!GRKERNSEC_CHROOT_CHMOD
+   ~!GRKERNSEC_CHROOT_CAPS
+   ~!GRKERNSEC_PROC
+   ~!GRKERNSEC_SYSFS_RESTRICT
+   ~!GRKERNSEC_CHROOT_FINDTASK
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for 
pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is 
incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC 
feature is incompatible with unprivileged containers"
+
+DOCS=(AUTHORS 

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

2018-11-05 Thread Mikle Kolyada
commit: 4314b57feddc5bce794c1bf35575e0292e5cdcee
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Nov  5 18:54:13 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Nov  5 18:54:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4314b57f

app-emulation/lxc-templates: amd64 stable wrt bug #669030

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

 app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
index 1bc8d87f19f..92e3e2aa239 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-10-06 Thread Virgil Dupras
commit: 8d9eb3429c0bf701bde2eb67c43d9147c225dfdd
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sun Oct  7 02:24:34 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sun Oct  7 02:24:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9eb342

app-emulation/lxc: remove old

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-emulation/lxc/Manifest |   1 -
 .../lxc/files/lxc-3.0.1-cve-2018-6556.patch| 110 --
 app-emulation/lxc/lxc-3.0.1-r1.ebuild  | 163 -
 3 files changed, 274 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 8682903f737..06d28c40ad9 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,3 +1,2 @@
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
-DIST lxc-3.0.1.tar.gz 1239920 BLAKE2B 
7be668c11d7211540fe7e2fb6318d38eac0d8d493914f4705d097fca4c004a8d2191609d02bd9e1d9204c3c0b9ea937084d3f9050fc841f6d68067af3d19
 SHA512 
f51b0844f61f64d4efc530454eae1fa499f7f1b908bd3b40d7031e7f311a402893a7504bddbc53f2ef9da2b3154d1b047fc4d876b99f0d487d7c79de64eea505
 DIST lxc-3.0.2.tar.gz 1236975 BLAKE2B 
68047f6374b9081fb308586726797ed94fa66b5e94eb3fc12ad1a0aedc15ac1ee518ca5a341db79a715015e34ad38659200ad6aaf21f74639ebb55e7e1360645
 SHA512 
d7f5e3f91e5c8800e3e092ab209158a4d3e3c2816623249aeaaf2e0950428484ac5d1432d71298787721e1419cd962c0798ba14979e62161299fa15a299efde8

diff --git a/app-emulation/lxc/files/lxc-3.0.1-cve-2018-6556.patch 
b/app-emulation/lxc/files/lxc-3.0.1-cve-2018-6556.patch
deleted file mode 100644
index 198e835e6c5..000
--- a/app-emulation/lxc/files/lxc-3.0.1-cve-2018-6556.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From f2314625c5702cfd25974929599fa439bdac8bdf Mon Sep 17 00:00:00 2001
-From: Christian Brauner 
-Date: Wed, 25 Jul 2018 19:56:54 +0200
-Subject: [PATCH] CVE 2018-6556: verify netns fd in lxc-user-nic
-
-Signed-off-by: Christian Brauner 

- src/lxc/cmd/lxc_user_nic.c | 35 ---
- src/lxc/utils.c| 12 
- src/lxc/utils.h|  5 +
- 3 files changed, 49 insertions(+), 3 deletions(-)
-
-diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c
-index ec9cd97e..c5beb6c8 100644
 a/src/lxc/cmd/lxc_user_nic.c
-+++ b/src/lxc/cmd/lxc_user_nic.c
-@@ -1179,12 +1179,41 @@ int main(int argc, char *argv[])
-   exit(EXIT_FAILURE);
-   }
-   } else if (request == LXC_USERNIC_DELETE) {
--  netns_fd = open(args.pid, O_RDONLY);
-+  char opath[LXC_PROC_PID_FD_LEN];
-+
-+  /* Open the path with O_PATH which will not trigger an actual
-+   * open(). Don't report an errno to the caller to not leak
-+   * information whether the path exists or not.
-+   * When stracing setuid is stripped so this is not a concern
-+   * either.
-+   */
-+  netns_fd = open(args.pid, O_PATH | O_CLOEXEC);
-   if (netns_fd < 0) {
--  usernic_error("Could not open \"%s\": %s\n", args.pid,
--strerror(errno));
-+  usernic_error("Failed to open \"%s\"\n", args.pid);
-+  exit(EXIT_FAILURE);
-+  }
-+
-+  if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) {
-+  usernic_error("Path \"%s\" does not refer to a network 
namespace path\n", args.pid);
-+  close(netns_fd);
-+  exit(EXIT_FAILURE);
-+  }
-+
-+  ret = snprintf(opath, sizeof(opath), "/proc/self/fd/%d", 
netns_fd);
-+  if (ret < 0 || (size_t)ret >= sizeof(opath)) {
-+  close(netns_fd);
-+  exit(EXIT_FAILURE);
-+  }
-+
-+  /* Now get an fd that we can use in setns() calls. */
-+  ret = open(opath, O_RDONLY | O_CLOEXEC);
-+  if (ret < 0) {
-+  usernic_error("Failed to open \"%s\": %s\n", args.pid, 
strerror(errno));
-+  close(netns_fd);
-   exit(EXIT_FAILURE);
-   }
-+  close(netns_fd);
-+  netns_fd = ret;
-   }
- 
-   if (!create_db_dir(LXC_USERNIC_DB)) {
-diff --git a/src/lxc/utils.c b/src/lxc/utils.c
-index 26f1b058..69d362dc 100644
 a/src/lxc/utils.c
-+++ b/src/lxc/utils.c
-@@ -2548,6 +2548,18 @@ bool has_fs_type(const char *path, fs_type_magic 
magic_val)
-   return has_type;
- }
- 
-+bool fhas_fs_type(int fd, fs_type_magic magic_val)
-+{
-+  int ret;
-+ 

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

2018-10-06 Thread Thomas Deutschmann
commit: 0a37cdb4c1aa0b4add7d7a0487bfc0289d81578e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Oct  6 23:02:28 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Oct  6 23:04:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a37cdb4

app-emulation/lxc: x86 stable (bug #667806)

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

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

diff --git a/app-emulation/lxc/lxc-3.0.2.ebuild 
b/app-emulation/lxc/lxc-3.0.2.ebuild
index 6b6df80f826..9d075f8a2a6 100644
--- a/app-emulation/lxc/lxc-3.0.2.ebuild
+++ b/app-emulation/lxc/lxc-3.0.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-10-05 Thread Virgil Dupras
commit: f50a50f8f7b2f3c8c1c8fb0200e03f4b59f1af4f
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Oct  5 12:49:23 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Oct  5 12:49:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f50a50f8

app-emulation/lxc: stabilize 3.0.2 on amd64

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

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

diff --git a/app-emulation/lxc/lxc-3.0.2.ebuild 
b/app-emulation/lxc/lxc-3.0.2.ebuild
index a80befa826a..6b6df80f826 100644
--- a/app-emulation/lxc/lxc-3.0.2.ebuild
+++ b/app-emulation/lxc/lxc-3.0.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=7
@@ -11,7 +11,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-10-05 Thread Virgil Dupras
commit: e709437df6e86a391037b725a67492ed61fe914a
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Oct  5 12:17:05 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Oct  5 12:45:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e709437d

app-emulation/lxc-templates: bump to 3.0.2

with some delay...

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-emulation/lxc-templates/Manifest   |  1 +
 .../lxc-templates/lxc-templates-3.0.2.ebuild   | 28 ++
 2 files changed, 29 insertions(+)

diff --git a/app-emulation/lxc-templates/Manifest 
b/app-emulation/lxc-templates/Manifest
index 09f2ddd54d9..5dbbb316b5f 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1 +1,2 @@
 DIST lxc-templates-3.0.1.tar.gz 256074 BLAKE2B 
8a5dab2d69fbc29e0246a0853690726c07d24e0fe6d4e761d8ec8b4559cdf285a82e17c8f4d2a6bf2355896c667000d4341511b3c5f1805a55849b4812eb7efe
 SHA512 
cae47b670654dc6c143827d196f0477c5354cb6d81ae4028192622fb73912e8bb3b62a0a68786e9212885bb52b593c6e742cfbfefb70ec33260d599e5d5c8290
+DIST lxc-templates-3.0.2.tar.gz 255721 BLAKE2B 
6f3a09982833ae832623bf448a0cc8a5c3c6639606a1cd8e306e41fa86a1135eae5490cd93043c397e5be727b12b0fdae48709a5ff3e3dd2e590bc6aa7154f34
 SHA512 
1e4b271c86d3cc382a6c4cc5ad8a44362f731325b4657fbee29542837a2684ee7274b92985da1a2f8aa0f808e263bf50d682ee969ba137229e54528fa529f77f

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
new file mode 100644
index 000..4a4dcd5d0e2
--- /dev/null
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Old style template scripts for LXC"
+HOMEPAGE="https://linuxcontainers.org/;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+RDEPEND="
+   >=app-emulation/lxc-3.0"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
+DOCS=()
+
+src_prepare() {
+   default
+   eautoreconf
+}



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

2018-08-23 Thread Virgil Dupras
commit: 8ba2817d4256afc23ffebc2ad9224d41a7c37401
Author: Virgil Dupras  gentoo  org>
AuthorDate: Thu Aug 23 17:52:19 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Thu Aug 23 17:53:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba2817d

app-emulation/lxc: properly pin automake

Closes: https://bugs.gentoo.org/664260
Package-Manager: Portage-2.3.47, Repoman-2.3.10

 app-emulation/lxc/lxc-3.0.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-emulation/lxc/lxc-3.0.2.ebuild 
b/app-emulation/lxc/lxc-3.0.2.ebuild
index 37cf503a5c8..a80befa826a 100644
--- a/app-emulation/lxc/lxc-3.0.2.ebuild
+++ b/app-emulation/lxc/lxc-3.0.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+WANT_AUTOMAKE="1.15"
+
 inherit autotools bash-completion-r1 linux-info flag-o-matic systemd 
readme.gentoo-r1 pam
 
 DESCRIPTION="LinuX Containers userspace utilities"



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

2018-08-22 Thread Virgil Dupras
commit: f63fbe792e3f4db205f04df2376a5aa0f92de494
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Aug 21 21:45:23 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Wed Aug 22 12:24:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f63fbe79

app-emulation/lxc: Bump to 3.0.2.

Closes: https://bugs.gentoo.org/583886
Closes: https://bugs.gentoo.org/657816
Closes: https://bugs.gentoo.org/663780
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9651

 app-emulation/lxc/Manifest |   1 +
 app-emulation/lxc/lxc-3.0.2.ebuild | 158 +
 app-emulation/lxc/metadata.xml |   1 +
 3 files changed, 160 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index e8d8e7473f5..8682903f737 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,2 +1,3 @@
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.1.tar.gz 1239920 BLAKE2B 
7be668c11d7211540fe7e2fb6318d38eac0d8d493914f4705d097fca4c004a8d2191609d02bd9e1d9204c3c0b9ea937084d3f9050fc841f6d68067af3d19
 SHA512 
f51b0844f61f64d4efc530454eae1fa499f7f1b908bd3b40d7031e7f311a402893a7504bddbc53f2ef9da2b3154d1b047fc4d876b99f0d487d7c79de64eea505
+DIST lxc-3.0.2.tar.gz 1236975 BLAKE2B 
68047f6374b9081fb308586726797ed94fa66b5e94eb3fc12ad1a0aedc15ac1ee518ca5a341db79a715015e34ad38659200ad6aaf21f74639ebb55e7e1360645
 SHA512 
d7f5e3f91e5c8800e3e092ab209158a4d3e3c2816623249aeaaf2e0950428484ac5d1432d71298787721e1419cd962c0798ba14979e62161299fa15a299efde8

diff --git a/app-emulation/lxc/lxc-3.0.2.ebuild 
b/app-emulation/lxc/lxc-3.0.2.ebuild
new file mode 100644
index 000..37cf503a5c8
--- /dev/null
+++ b/app-emulation/lxc/lxc-3.0.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic systemd 
readme.gentoo-r1 pam
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/;
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor examples pam python seccomp selinux +templates"
+
+RDEPEND="
+   net-libs/gnutls
+   sys-libs/libcap
+   pam? ( virtual/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${RDEPEND}
+   >=app-text/docbook-sgml-utils-0.6.14-r2
+   >=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+   sys-apps/util-linux
+   app-misc/pax-utils
+   virtual/awk"
+
+PDEPEND="templates? ( app-emulation/lxc-templates )
+   python? ( dev-python/python3-lxc )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+   ~CPUSETS ~CGROUP_CPUACCT
+   ~CGROUP_SCHED
+
+   ~NAMESPACES
+   ~IPC_NS ~USER_NS ~PID_NS
+
+   ~CGROUP_FREEZER
+   ~UTS_NS ~NET_NS
+   ~VETH ~MACVLAN
+
+   ~POSIX_MQUEUE
+   ~!NETPRIO_CGROUP
+
+   ~!GRKERNSEC_CHROOT_MOUNT
+   ~!GRKERNSEC_CHROOT_DOUBLE
+   ~!GRKERNSEC_CHROOT_PIVOT
+   ~!GRKERNSEC_CHROOT_CHMOD
+   ~!GRKERNSEC_CHROOT_CAPS
+   ~!GRKERNSEC_PROC
+   ~!GRKERNSEC_SYSFS_RESTRICT
+   ~!GRKERNSEC_CHROOT_FINDTASK
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for 
pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC 
features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is 
incompatible with unprivileged 

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

2018-08-12 Thread Virgil Dupras
commit: f6083e4cfd2b9d5cdcd94c58a40b08f3ad8eb33d
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Aug 13 00:55:29 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Aug 13 00:55:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6083e4c

app-emulation/lxc: remove old and vulnerable

Bug: https://bugs.gentoo.org/662780
Package-Manager: Portage-2.3.45, Repoman-2.3.10

 app-emulation/lxc/lxc-2.1.1.ebuild | 214 -
 app-emulation/lxc/lxc-3.0.1.ebuild | 162 
 2 files changed, 376 deletions(-)

diff --git a/app-emulation/lxc/lxc-2.1.1.ebuild 
b/app-emulation/lxc/lxc-2.1.1.ebuild
deleted file mode 100644
index a3c804d0176..000
--- a/app-emulation/lxc/lxc-2.1.1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools bash-completion-r1 distutils-r1 linux-info versionator 
flag-o-matic systemd readme.gentoo-r1
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="cgmanager examples lua python seccomp selinux"
-
-RDEPEND="
-   net-libs/gnutls
-   sys-libs/libcap
-   cgmanager? ( app-admin/cgmanager )
-   lua? ( >=dev-lang/lua-5.1:= )
-   python? ( ${PYTHON_DEPS} )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-   app-text/docbook-sgml-utils
-   >=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-   sys-apps/util-linux
-   app-misc/pax-utils
-   virtual/awk"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-   ~CPUSETS ~CGROUP_CPUACCT
-   ~CGROUP_SCHED
-
-   ~NAMESPACES
-   ~IPC_NS ~USER_NS ~PID_NS
-
-   ~NETLINK_DIAG ~PACKET_DIAG
-   ~INET_UDP_DIAG ~INET_TCP_DIAG
-   ~UNIX_DIAG ~CHECKPOINT_RESTORE
-
-   ~CGROUP_FREEZER
-   ~UTS_NS ~NET_NS
-   ~VETH ~MACVLAN
-
-   ~POSIX_MQUEUE
-   ~!NETPRIO_CGROUP
-
-   ~!GRKERNSEC_CHROOT_MOUNT
-   ~!GRKERNSEC_CHROOT_DOUBLE
-   ~!GRKERNSEC_CHROOT_PIVOT
-   ~!GRKERNSEC_CHROOT_CHMOD
-   ~!GRKERNSEC_CHROOT_CAPS
-   ~!GRKERNSEC_PROC
-   ~!GRKERNSEC_SYSFS_RESTRICT
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for 
pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
-
-ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
-ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
-ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
-ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for 
lxc-checkpoint"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC 
features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is 
incompatible with unprivileged containers"
-ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC 
feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-   kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} 
~DEVPTS_MULTIPLE_INSTANCES"
-   linux-info_pkg_setup
-}
-
-src_prepare() {
-   eapply "${FILESDIR}"/${PN}-2.0.6-bash-completion.patch
-   #558854
-   eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
-   eapply "${FILESDIR}"/${PN}-2.1.1-fix-cgroup2-detection.patch
-   eapply 

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

2018-08-07 Thread Agostino Sarubbo
commit: b099a9b2c36856db3b0e02e198509abf802443ad
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug  7 08:48:59 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug  7 08:48:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b099a9b2

app-emulation/lxc: amd64 stable wrt bug #662780

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="amd64"

 app-emulation/lxc/lxc-2.1.1-r1.ebuild | 2 +-
 app-emulation/lxc/lxc-3.0.1-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc/lxc-2.1.1-r1.ebuild 
b/app-emulation/lxc/lxc-2.1.1-r1.ebuild
index dc65717584e..921619a1f75 100644
--- a/app-emulation/lxc/lxc-2.1.1-r1.ebuild
+++ b/app-emulation/lxc/lxc-2.1.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"

diff --git a/app-emulation/lxc/lxc-3.0.1-r1.ebuild 
b/app-emulation/lxc/lxc-3.0.1-r1.ebuild
index 225d8153439..bf2c75e44b8 100644
--- a/app-emulation/lxc/lxc-3.0.1-r1.ebuild
+++ b/app-emulation/lxc/lxc-3.0.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-08-06 Thread Thomas Deutschmann
commit: 5e7f5bd24f90f2659d47e6ab059fd0dde646cdaa
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Aug  6 22:18:14 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Aug  6 22:18:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7f5bd2

app-emulation/lxc: x86 stable (bug #662780)

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 app-emulation/lxc/lxc-2.1.1-r1.ebuild | 2 +-
 app-emulation/lxc/lxc-3.0.1-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc/lxc-2.1.1-r1.ebuild 
b/app-emulation/lxc/lxc-2.1.1-r1.ebuild
index e5915426973..dc65717584e 100644
--- a/app-emulation/lxc/lxc-2.1.1-r1.ebuild
+++ b/app-emulation/lxc/lxc-2.1.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"

diff --git a/app-emulation/lxc/lxc-3.0.1-r1.ebuild 
b/app-emulation/lxc/lxc-3.0.1-r1.ebuild
index be0d3a86f25..225d8153439 100644
--- a/app-emulation/lxc/lxc-3.0.1-r1.ebuild
+++ b/app-emulation/lxc/lxc-3.0.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-08-06 Thread Virgil Dupras
commit: 29dedb39a6a6587a6d71b11444de28f24a98b0bb
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sun Aug  5 15:11:40 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Aug  6 16:08:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dedb39

app-emulation/lxc: fix CVE-2018-6556

Apply patches from upstream. In the case of the 2.1.1 patch, I had to
modify it to make the code compile. See ADDENDUM in patch.

Bug: https://bugs.gentoo.org/662780
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 .../lxc/files/lxc-2.1.1-cve-2018-6556.patch| 118 +++
 .../lxc/files/lxc-3.0.1-cve-2018-6556.patch| 110 +++
 app-emulation/lxc/lxc-2.1.1-r1.ebuild  | 215 +
 app-emulation/lxc/lxc-3.0.1-r1.ebuild  | 163 
 4 files changed, 606 insertions(+)

diff --git a/app-emulation/lxc/files/lxc-2.1.1-cve-2018-6556.patch 
b/app-emulation/lxc/files/lxc-2.1.1-cve-2018-6556.patch
new file mode 100644
index 000..bad1e274527
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-2.1.1-cve-2018-6556.patch
@@ -0,0 +1,118 @@
+From d183654ec1a2cd1149bdb92601ccb7246bddb14e Mon Sep 17 00:00:00 2001
+From: Christian Brauner 
+Date: Wed, 25 Jul 2018 19:56:54 +0200
+Subject: [PATCH] CVE 2018-6556: verify netns fd in lxc-user-nic
+
+Signed-off-by: Christian Brauner 
+---
+ src/lxc/lxc_user_nic.c | 35 ---
+ src/lxc/utils.c| 12 
+ src/lxc/utils.h|  5 +
+ 3 files changed, 49 insertions(+), 3 deletions(-)
+
+ADDENDUM from vdup...@gentoo.org: Original patch from Christian didn't
+include LXC_PROC_PID_FD_LEN define, but referenced it. This resulted in
+code that doesn't compile. I fetched the definition from the stable-3.0
+branch and included it to this patch. Also, this diff is regenerated
+from lxc-2.1.1 tag instead of stable-2.0 branch.
+
+diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c
+index 6f550f0d..09a342ac 100644
+--- a/src/lxc/lxc_user_nic.c
 b/src/lxc/lxc_user_nic.c
+@@ -1124,12 +1124,41 @@ int main(int argc, char *argv[])
+   exit(EXIT_FAILURE);
+   }
+   } else if (request == LXC_USERNIC_DELETE) {
+-  netns_fd = open(args.pid, O_RDONLY);
++  char opath[LXC_PROC_PID_FD_LEN];
++
++  /* Open the path with O_PATH which will not trigger an actual
++   * open(). Don't report an errno to the caller to not leak
++   * information whether the path exists or not.
++   * When stracing setuid is stripped so this is not a concern
++   * either.
++   */
++  netns_fd = open(args.pid, O_PATH | O_CLOEXEC);
+   if (netns_fd < 0) {
+-  usernic_error("Could not open \"%s\": %s\n", args.pid,
+-strerror(errno));
++  usernic_error("Failed to open \"%s\"\n", args.pid);
+   exit(EXIT_FAILURE);
+   }
++
++  if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) {
++  usernic_error("Path \"%s\" does not refer to a network 
namespace path\n", args.pid);
++  close(netns_fd);
++  exit(EXIT_FAILURE);
++  }
++
++  ret = snprintf(opath, sizeof(opath), "/proc/self/fd/%d", 
netns_fd);
++  if (ret < 0 || (size_t)ret >= sizeof(opath)) {
++  close(netns_fd);
++  exit(EXIT_FAILURE);
++  }
++
++  /* Now get an fd that we can use in setns() calls. */
++  ret = open(opath, O_RDONLY | O_CLOEXEC);
++  if (ret < 0) {
++  usernic_error("Failed to open \"%s\": %s\n", args.pid, 
strerror(errno));
++  close(netns_fd);
++  exit(EXIT_FAILURE);
++  }
++  close(netns_fd);
++  netns_fd = ret;
+   }
+ 
+   if (!create_db_dir(LXC_USERNIC_DB)) {
+diff --git a/src/lxc/utils.c b/src/lxc/utils.c
+index e6a44a51..c2a08a9d 100644
+--- a/src/lxc/utils.c
 b/src/lxc/utils.c
+@@ -2380,6 +2380,18 @@ bool has_fs_type(const char *path, fs_type_magic 
magic_val)
+   return has_type;
+ }
+ 
++bool fhas_fs_type(int fd, fs_type_magic magic_val)
++{
++  int ret;
++  struct statfs sb;
++
++  ret = fstatfs(fd, );
++  if (ret < 0)
++  return false;
++
++  return is_fs_type(, magic_val);
++}
++
+ bool lxc_nic_exists(char *nic)
+ {
+ #define __LXC_SYS_CLASS_NET_LEN 15 + IFNAMSIZ + 1
+diff --git a/src/lxc/utils.h b/src/lxc/utils.h
+index e83ed49e..06ec74d7 100644
+--- a/src/lxc/utils.h
 b/src/lxc/utils.h
+@@ -46,11 +46,16 @@
+ #define __S_ISTYPE(mode, mask) (((mode)_IFMT) == (mask))
+ #endif
+ 
++#ifndef NSFS_MAGIC
++#define NSFS_MAGIC 0x6e736673
++#endif
++
+ /* Useful macros */
+ /* Maximum number for 64 bit 

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

2018-07-30 Thread Virgil Dupras
commit: 0d591c9d3e741c4567665b4e62e2205dbe96730c
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Jul 30 22:54:30 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Jul 30 22:54:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d591c9d

app-emulation/lxc: remove old

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 app-emulation/lxc/Manifest |   1 -
 app-emulation/lxc/files/lxc_at.service |  12 ---
 app-emulation/lxc/lxc-3.0.0.ebuild | 170 -
 3 files changed, 183 deletions(-)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 0d31b16fc38..e8d8e7473f5 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,3 +1,2 @@
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
-DIST lxc-3.0.0.tar.gz 1233316 BLAKE2B 
ba726a07f48b1d32366012c8d885a853e33f88d8c45c910b061d9deecf472d940f7d45a1e742c8194517ba3231e1875a49bbf303b2c3fd2c9ece33b941670bb7
 SHA512 
21372e6fe4d38e2cf54707fab4133137793deff1dd500ed7ed02c03bbaa809de56c7490971594cddbdcb2b96f0c03ab5dfb43a8582a584598a12c5943b7ca490
 DIST lxc-3.0.1.tar.gz 1239920 BLAKE2B 
7be668c11d7211540fe7e2fb6318d38eac0d8d493914f4705d097fca4c004a8d2191609d02bd9e1d9204c3c0b9ea937084d3f9050fc841f6d68067af3d19
 SHA512 
f51b0844f61f64d4efc530454eae1fa499f7f1b908bd3b40d7031e7f311a402893a7504bddbc53f2ef9da2b3154d1b047fc4d876b99f0d487d7c79de64eea505

diff --git a/app-emulation/lxc/files/lxc_at.service 
b/app-emulation/lxc/files/lxc_at.service
deleted file mode 100644
index 1ef44977530..000
--- a/app-emulation/lxc/files/lxc_at.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Linux Container %I
-After=network.target
-
-[Service]
-Restart=always
-ExecStart=/usr/sbin/lxc-start -n %i
-ExecReload=/usr/sbin/lxc-restart -n %i
-ExecStop=/usr/sbin/lxc-stop -n %i
-
-[Install]
-WantedBy=multi-user.target

diff --git a/app-emulation/lxc/lxc-3.0.0.ebuild 
b/app-emulation/lxc/lxc-3.0.0.ebuild
deleted file mode 100644
index 4122c2e8599..000
--- a/app-emulation/lxc/lxc-3.0.0.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic systemd 
readme.gentoo-r1 pam
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/;
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="examples pam seccomp selinux"
-
-RDEPEND="
-   net-libs/gnutls
-   sys-libs/libcap
-   pam? ( virtual/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-   >=app-text/docbook-sgml-utils-0.6.14-r2
-   >=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-   sys-apps/util-linux
-   app-misc/pax-utils
-   virtual/awk"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-   ~CPUSETS ~CGROUP_CPUACCT
-   ~CGROUP_SCHED
-
-   ~NAMESPACES
-   ~IPC_NS ~USER_NS ~PID_NS
-
-   ~NETLINK_DIAG ~PACKET_DIAG
-   ~INET_UDP_DIAG ~INET_TCP_DIAG
-   ~UNIX_DIAG ~CHECKPOINT_RESTORE
-
-   ~CGROUP_FREEZER
-   ~UTS_NS ~NET_NS
-   ~VETH ~MACVLAN
-
-   ~POSIX_MQUEUE
-   ~!NETPRIO_CGROUP
-
-   ~!GRKERNSEC_CHROOT_MOUNT
-   ~!GRKERNSEC_CHROOT_DOUBLE
-   ~!GRKERNSEC_CHROOT_PIVOT
-   ~!GRKERNSEC_CHROOT_CHMOD
-   ~!GRKERNSEC_CHROOT_CAPS
-   ~!GRKERNSEC_PROC
-   ~!GRKERNSEC_SYSFS_RESTRICT
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for 
pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
-
-ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
-ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
-ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
-ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for 
lxc-checkpoint"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."
-

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

2018-07-30 Thread Mikle Kolyada
commit: f8907d2cc6434c9d6f8417dc5e30e8e31176beaf
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jul 30 21:17:11 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jul 30 21:17:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8907d2c

app-emulation/lxc: amd64 stable wrt bug #661930

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/app-emulation/lxc/lxc-3.0.1.ebuild 
b/app-emulation/lxc/lxc-3.0.1.ebuild
index 81d85831741..8c26d2c163c 100644
--- a/app-emulation/lxc/lxc-3.0.1.ebuild
+++ b/app-emulation/lxc/lxc-3.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-07-30 Thread Mikle Kolyada
commit: 5bf47df6a943bcf707d53ad001587bfbf49a6c0c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jul 30 21:16:44 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jul 30 21:17:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf47df6

app-emulation/lxc-templates: amd64 stable wrt bug #661930

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
index 82a3c0271af..df31caace62 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-07-29 Thread Sergei Trofimovich
commit: 6abbd49d825f0cf9ecbca4c4edcd8975370ca086
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 29 10:31:36 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 29 10:31:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abbd49d

app-emulation/lxc: stable 3.0.1 for ppc64, bug #661930

Package-Manager: Portage-2.3.44, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc64"

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

diff --git a/app-emulation/lxc/lxc-3.0.1.ebuild 
b/app-emulation/lxc/lxc-3.0.1.ebuild
index 56bfc08cd4e..81d85831741 100644
--- a/app-emulation/lxc/lxc-3.0.1.ebuild
+++ b/app-emulation/lxc/lxc-3.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-07-29 Thread Sergei Trofimovich
commit: b37e0eed243cbeb2b4a97d75862e8a50030a2826
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 29 10:26:44 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 29 10:26:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37e0eed

app-emulation/lxc-templates: stable 3.0.1 for ppc64, bug #661930

Package-Manager: Portage-2.3.44, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc64"

 app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
index 9f28149cbe8..82a3c0271af 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-07-28 Thread Thomas Deutschmann
commit: 8a980c35a755a24dd07754730de4d77ac049fc67
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Jul 28 13:14:34 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jul 28 13:24:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a980c35

app-emulation/lxc: x86 stable (bug #661930)

Package-Manager: Portage-2.3.43, Repoman-2.3.10

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

diff --git a/app-emulation/lxc/lxc-3.0.1.ebuild 
b/app-emulation/lxc/lxc-3.0.1.ebuild
index a13e4267ee5..56bfc08cd4e 100644
--- a/app-emulation/lxc/lxc-3.0.1.ebuild
+++ b/app-emulation/lxc/lxc-3.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-07-28 Thread Thomas Deutschmann
commit: 4e2743cddc0c61e1a0eadcda240308a1a2d5772f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Jul 28 13:15:20 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jul 28 13:24:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e2743cd

app-emulation/lxc-templates: x86 stable (bug #661930)

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild 
b/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
index 528f6b711d1..9f28149cbe8 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"



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

2018-06-25 Thread Virgil Dupras
commit: a350f433c0d440a48dc41d64752dfcdc5155810d
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Jun 26 02:18:20 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Jun 26 02:18:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a350f433

app-emulation/lxc: remove spurious kernel flag checks

Remove kernel flags checks related to lxc-checkpoint. sys-process/criu
already checks for those flags and is a dependency to the lxc-checkpoint
utility.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/lxc/lxc-3.0.1.ebuild | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/app-emulation/lxc/lxc-3.0.1.ebuild 
b/app-emulation/lxc/lxc-3.0.1.ebuild
index a36f4c15daa..a13e4267ee5 100644
--- a/app-emulation/lxc/lxc-3.0.1.ebuild
+++ b/app-emulation/lxc/lxc-3.0.1.ebuild
@@ -41,10 +41,6 @@ CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
~NAMESPACES
~IPC_NS ~USER_NS ~PID_NS
 
-   ~NETLINK_DIAG ~PACKET_DIAG
-   ~INET_UDP_DIAG ~INET_TCP_DIAG
-   ~UNIX_DIAG ~CHECKPOINT_RESTORE
-
~CGROUP_FREEZER
~UTS_NS ~NET_NS
~VETH ~MACVLAN
@@ -71,13 +67,6 @@ ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
 ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
 ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) 
networking"
 
-ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
-ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
-ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
-ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for 
lxc-checkpoint"
-
 ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
 
 ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 
0.8.0_rc1 this causes LXCs to fail booting."



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

2018-06-25 Thread Virgil Dupras
commit: ceeade69cb23d383cc7a9ffafb10646445f53507
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Jun 26 02:12:13 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Jun 26 02:12:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceeade69

app-emulation/lxc: re-add python USE flag

With LXC 3.0 de-bundling its python bindings, the python USE flag was
temporarily removed, but now that dev-python/python3-lxc has been added,
we can add it back again.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/lxc/lxc-3.0.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc/lxc-3.0.1.ebuild 
b/app-emulation/lxc/lxc-3.0.1.ebuild
index 79af8e18850..a36f4c15daa 100644
--- a/app-emulation/lxc/lxc-3.0.1.ebuild
+++ b/app-emulation/lxc/lxc-3.0.1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="examples pam seccomp selinux +templates"
+IUSE="examples pam python seccomp selinux +templates"
 
 RDEPEND="
net-libs/gnutls
@@ -31,7 +31,8 @@ RDEPEND="${RDEPEND}
app-misc/pax-utils
virtual/awk"
 
-PDEPEND="templates? ( app-emulation/lxc-templates )"
+PDEPEND="templates? ( app-emulation/lxc-templates )
+   python? ( dev-python/python3-lxc )"
 
 CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
~CPUSETS ~CGROUP_CPUACCT



  1   2   >