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

2024-09-18 Thread Joonas Niilola
commit: fa0a128dea58f4b03aa9d381e13934a9f9536a49
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Sep 19 05:44:36 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Sep 19 05:44:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0a128d

app-containers/lxc: stabilize 6.0.1 for x86

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

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

diff --git a/app-containers/lxc/lxc-6.0.1.ebuild 
b/app-containers/lxc/lxc-6.0.1.ebuild
index eae2f21f0b05..f1948a2a6c3f 100644
--- a/app-containers/lxc/lxc-6.0.1.ebuild
+++ b/app-containers/lxc/lxc-6.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2024-09-18 Thread Joonas Niilola
commit: de48567ddd6bd01690cad506547cead13e088d54
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Sep 19 05:44:58 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Sep 19 05:44:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de48567d

app-containers/lxc: stabilize 6.0.1 for amd64

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

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

diff --git a/app-containers/lxc/lxc-6.0.1.ebuild 
b/app-containers/lxc/lxc-6.0.1.ebuild
index f1948a2a6c3f..415d5d6ed638 100644
--- a/app-containers/lxc/lxc-6.0.1.ebuild
+++ b/app-containers/lxc/lxc-6.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2024-09-17 Thread Joonas Niilola
commit: ac640b96efa510d1400bc85dae428baf28399244
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Sep 17 07:08:30 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Sep 17 07:17:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac640b96

app-containers/lxc: add 6.0.2

 - fix installing bash completion files.

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

 app-containers/lxc/Manifest |   2 +
 app-containers/lxc/lxc-6.0.2.ebuild | 175 
 2 files changed, 177 insertions(+)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 54133898f2bb..1f895e94df85 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -4,3 +4,5 @@ DIST lxc-6.0.0.tar.gz 964053 BLAKE2B 
d41bcab4e225c139d4d41df5291717e4d196fe3b48d
 DIST lxc-6.0.0.tar.gz.asc 833 BLAKE2B 
d2cda07e605d64dbb650506cf536c545e2c5746973c834f4d4f409064e2ba8265040b13a60e124e30e154bbc5a51c704bad0fa2ff5530effddfa449618aa60a7
 SHA512 
4e56ffa7395877714f993d9c54cf8b9df91cdced96c5a609b63f5e3896a0a51db8ba6f99bf2360d60af202df79123deea72215bf854d8798d3af361a4888445e
 DIST lxc-6.0.1.tar.gz 964526 BLAKE2B 
6fb6442e0a9a356433351f412c9a1e4f18155146e49f40ebe6e132ea770a8737793df0c7ca13ca70ce631a2308ff525fca2fd2d127b98edbd00e0af7efce6879
 SHA512 
7e8b9740178ae46a2ad3ba3f1e509f69f978d0a2a1f7e1938213ae9cb9a80f496d01be64958cad4aa6f01a73f1d8c3759c3e9df9df4f67c77e603ea0809d79c2
 DIST lxc-6.0.1.tar.gz.asc 833 BLAKE2B 
8469ff5603c48205c6451630ec8f03617c648e3d13f73ebd7d908017422b75613e5489b42ad0f598fcf5cf9e241fccaeb4b0ec3ac186a670ed56a252e282b16e
 SHA512 
e0ebd29c3e793e1159e350854e2ac7adacd918b76dfa2de1e0227fd45034ac9308d02b7da1c0c80eae471ebba44a0804a7a0bf17cbf1c18de45bc63974e017e0
+DIST lxc-6.0.2.tar.gz 964007 BLAKE2B 
55c0155a66194d4d10fff5ffc7edc6d6afab730245a401671f8d1bd6f54bd8558bd0644c0f42bd49b5b470bc343809091f1893c27b5830674870f6b91f23d6e0
 SHA512 
52841b5f48eeb4b2b63e0437e3abc38cec6a801778eb2fab264c78d7ee3be957bd45aa839c9fcd281396464fa0af84bb2fc8bf4bfadc9509fae3b4dc52b44da5
+DIST lxc-6.0.2.tar.gz.asc 833 BLAKE2B 
b4b6b56e65239c2125864e16e947a88c2d4d97a1b2dfa6920ca5c2f89b3df7d44d9ec8eb9a56753d6009143a53f6bb5bbd13f3b5b7f26e537aa6f1f1d0d0cc85
 SHA512 
741caccb3dc0ef1043c04122c75a3e3f6d8e6024a65bf905b186da0aabef971a1224e60f9adee069d1a2c24f43c408be1ccc32e5d4faba85860e9a19d9e4c0d9

diff --git a/app-containers/lxc/lxc-6.0.2.ebuild 
b/app-containers/lxc/lxc-6.0.2.ebuild
new file mode 100644
index ..3917c9589db5
--- /dev/null
+++ b/app-containers/lxc/lxc-6.0.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs 
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 
)"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   apparmor? ( sys-libs/libapparmor )
+   caps? ( sys-libs/libcap )
+   io-uring? ( >=sys-libs/liburing-2:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? ( dev-libs/openssl:0= )
+   systemd? (
+   sys-apps/dbus
+   sys-apps/systemd:=
+   )
+   tools? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+   caps? ( sys-libs/libcap[static-libs] )
+   tools? ( sys-libs/libcap[static-libs] )
+   sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+   man? ( app-text/docbook2X )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+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 interna

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

2024-08-02 Thread Joonas Niilola
commit: 436a4f58c0318a77a3ad2cefd950a0942ed39874
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Aug  2 13:21:01 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Aug  2 13:21:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436a4f58

app-containers/lxc: move libcap[static-libs] dep from RDEPEND to DEPEND

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

 app-containers/lxc/lxc-6.0.1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxc/lxc-6.0.1.ebuild 
b/app-containers/lxc/lxc-6.0.1.ebuild
index dcbf0d98541a..eae2f21f0b05 100644
--- a/app-containers/lxc/lxc-6.0.1.ebuild
+++ b/app-containers/lxc/lxc-6.0.1.ebuild
@@ -18,7 +18,7 @@ IUSE="apparmor +caps examples io-uring lto man pam seccomp 
selinux ssl systemd t
 RDEPEND="acct-group/lxc
acct-user/lxc
apparmor? ( sys-libs/libapparmor )
-   caps? ( sys-libs/libcap[static-libs] )
+   caps? ( sys-libs/libcap )
io-uring? ( >=sys-libs/liburing-2:= )
pam? ( sys-libs/pam )
seccomp? ( sys-libs/libseccomp )
@@ -28,8 +28,10 @@ RDEPEND="acct-group/lxc
sys-apps/dbus
sys-apps/systemd:=
)
-   tools? ( sys-libs/libcap[static-libs] )"
+   tools? ( sys-libs/libcap )"
 DEPEND="${RDEPEND}
+   caps? ( sys-libs/libcap[static-libs] )
+   tools? ( sys-libs/libcap[static-libs] )
sys-kernel/linux-headers"
 BDEPEND="virtual/pkgconfig
man? ( app-text/docbook2X )



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

2024-06-26 Thread Joonas Niilola
commit: 0b7d22d766c5ea9866c99f7e92f972987e525c97
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jun 27 05:25:02 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 27 05:25:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7d22d7

app-containers/lxc: add 6.0.1

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

 app-containers/lxc/Manifest |   2 +
 app-containers/lxc/lxc-6.0.1.ebuild | 172 
 2 files changed, 174 insertions(+)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 0257fd2ae87a..54133898f2bb 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -2,3 +2,5 @@ DIST lxc-5.0.3.tar.gz 975269 BLAKE2B 
533d97fe4d986acbf5d562bb2c295a63df2a9a8bfc2
 DIST lxc-5.0.3.tar.gz.asc 833 BLAKE2B 
c35278ed17cad76d2ea94b3985e0110731efea751fb5f1c2d1c9db71486e4844285f372a94c8611dcfe91fdb16459694843b9e0a8273cfc68a56f549c7162cfb
 SHA512 
a5ce5769d49abdf35d94de8273fd3e9c2a8ba4fafea71cf33ee6bce1d83531c8b550d972f7080409a4cc5a92e9d04ece50ed108f92c6aec4868d150e58d7d11a
 DIST lxc-6.0.0.tar.gz 964053 BLAKE2B 
d41bcab4e225c139d4d41df5291717e4d196fe3b48d978a993811b74a08e7a75e1528f4bf44f694a624537632bdec642cd80cf51a528dea848baa11c10471afa
 SHA512 
acff2fc70cf2c65af37b70a21239482c3d845c408f7132558b54980e4400c23670c63178a3a3dfb239f047f529004df93cd829d728852a8c8647ce6babf7857f
 DIST lxc-6.0.0.tar.gz.asc 833 BLAKE2B 
d2cda07e605d64dbb650506cf536c545e2c5746973c834f4d4f409064e2ba8265040b13a60e124e30e154bbc5a51c704bad0fa2ff5530effddfa449618aa60a7
 SHA512 
4e56ffa7395877714f993d9c54cf8b9df91cdced96c5a609b63f5e3896a0a51db8ba6f99bf2360d60af202df79123deea72215bf854d8798d3af361a4888445e
+DIST lxc-6.0.1.tar.gz 964526 BLAKE2B 
6fb6442e0a9a356433351f412c9a1e4f18155146e49f40ebe6e132ea770a8737793df0c7ca13ca70ce631a2308ff525fca2fd2d127b98edbd00e0af7efce6879
 SHA512 
7e8b9740178ae46a2ad3ba3f1e509f69f978d0a2a1f7e1938213ae9cb9a80f496d01be64958cad4aa6f01a73f1d8c3759c3e9df9df4f67c77e603ea0809d79c2
+DIST lxc-6.0.1.tar.gz.asc 833 BLAKE2B 
8469ff5603c48205c6451630ec8f03617c648e3d13f73ebd7d908017422b75613e5489b42ad0f598fcf5cf9e241fccaeb4b0ec3ac186a670ed56a252e282b16e
 SHA512 
e0ebd29c3e793e1159e350854e2ac7adacd918b76dfa2de1e0227fd45034ac9308d02b7da1c0c80eae471ebba44a0804a7a0bf17cbf1c18de45bc63974e017e0

diff --git a/app-containers/lxc/lxc-6.0.1.ebuild 
b/app-containers/lxc/lxc-6.0.1.ebuild
new file mode 100644
index ..dcbf0d98541a
--- /dev/null
+++ b/app-containers/lxc/lxc-6.0.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs 
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 
)"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   apparmor? ( sys-libs/libapparmor )
+   caps? ( sys-libs/libcap[static-libs] )
+   io-uring? ( >=sys-libs/liburing-2:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? ( dev-libs/openssl:0= )
+   systemd? (
+   sys-apps/dbus
+   sys-apps/systemd:=
+   )
+   tools? ( sys-libs/libcap[static-libs] )"
+DEPEND="${RDEPEND}
+   sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+   man? ( app-text/docbook2X )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+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"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINER

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

2024-06-01 Thread Joonas Niilola
commit: 5bd6a14a3861881a2fe96a55ce7056da2d5eedb7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jun  1 08:29:49 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jun  1 08:36:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd6a14a

app-containers/lxc: drop 6.0.0-r1

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

 app-containers/lxc/lxc-6.0.0-r1.ebuild | 171 -
 1 file changed, 171 deletions(-)

diff --git a/app-containers/lxc/lxc-6.0.0-r1.ebuild 
b/app-containers/lxc/lxc-6.0.0-r1.ebuild
deleted file mode 100644
index 63f9cfbf8e7e..
--- a/app-containers/lxc/lxc-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs 
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 
)"
-
-LICENSE="GPL-2 LGPL-2.1 LGPL-3"
-SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
-
-RDEPEND="acct-group/lxc
-   acct-user/lxc
-   sys-apps/dbus
-   apparmor? ( sys-libs/libapparmor )
-   caps? ( sys-libs/libcap[static-libs] )
-   io-uring? ( >=sys-libs/liburing-2:= )
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )
-   ssl? ( dev-libs/openssl:0= )
-   systemd? ( sys-apps/systemd:= )
-   tools? ( sys-libs/libcap[static-libs] )"
-DEPEND="${RDEPEND}
-   sys-kernel/linux-headers"
-BDEPEND="virtual/pkgconfig
-   man? ( app-text/docbook2X )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-RESTRICT="!test? ( test )"
-
-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"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-src_configure() {
-
-   # -Dtools-multicall=false: will create a single binary called 'lxc' 
that conflicts with LXD.
-   local emesonargs=(
-   --localstatedir "${EPREFIX}/var"
-
-   -Ddbus=true
-
-   -Dcoverity-build=false
-   -Dinstall-state-dirs=false
-   -Doss-fuzz=false
-   -Dspecfile=false
-   -Dtools-multicall=false
-
-   -Dcommands=true
-   -Dinstall-init-files=true
-   -Dmemfd-rexec=true
-   -Dthread-safety=true
-
-   $(meson_use apparmor)
-   $(meson_use caps capabilities)
-   $(meson_use examples)
-   $(meson_use io-uring io-uring-event-loop)
-   $(meson_use lto b_lto)
-   $(meson_use man)
-   $(meson_use pam pam-cgroup)
-   $(meson_use seccomp)
-   $(meson_use selinux)
-   $(meson_use ssl openssl)
-   $(meson_use test tests)
-   $(meson_use tools)
-
-   $(usex systemd -Dinit-script="systemd" -Dinit-script="sysvinit")
-
-   -Ddata-path=/var/lib/lxc
-   -Ddoc-path=/usr/share/doc/${PF}
-   -Dlog-path=/var/log/lxc
-   -Drootfs-mount-path=/var/lib/lxc/rootfs
-   -Druntime-path=/run
-   )
-
-   use tools && local emesonargs+=( -Dcapabilities=true )
-
-   if $(tc-ld-is-gold) || $(tc-ld-is-lld); then
-   local emesonargs+=( -Db_lto_mode=thin )
-   else
-   local emesonargs+=( -Db_lto_mode=default )
-   fi
-
-   meson_src_configure
-}
-
-src_install() {
-   meson_src_install
-
-   # The main bash-completion file will collide with lxd, need to relocate 
and u

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

2024-05-19 Thread Joonas Niilola
commit: 6d6b0b7aba4b361901acb6502ddcb8842221e411
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May 19 08:17:16 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May 19 08:17:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d6b0b7a

app-containers/lxc: stabilize 6.0.0-r2 for amd64

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

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

diff --git a/app-containers/lxc/lxc-6.0.0-r2.ebuild 
b/app-containers/lxc/lxc-6.0.0-r2.ebuild
index 0e6428f3f6b5..fe1eca7f8977 100644
--- a/app-containers/lxc/lxc-6.0.0-r2.ebuild
+++ b/app-containers/lxc/lxc-6.0.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2024-05-19 Thread Joonas Niilola
commit: 0415bbe8db1232e7aa9c57ee4a5f850c765629d6
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May 19 08:17:00 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May 19 08:17:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0415bbe8

app-containers/lxc: stabilize 6.0.0-r2 for x86

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

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

diff --git a/app-containers/lxc/lxc-6.0.0-r2.ebuild 
b/app-containers/lxc/lxc-6.0.0-r2.ebuild
index dcbf0d98541a..0e6428f3f6b5 100644
--- a/app-containers/lxc/lxc-6.0.0-r2.ebuild
+++ b/app-containers/lxc/lxc-6.0.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2024-05-07 Thread Joonas Niilola
commit: b3923e6675e2fb19224e6476f564f8ec00a23f84
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed May  8 06:45:28 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May  8 06:46:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3923e66

app-containers/lxc: move dbus dependency under 'systemd' use flag

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

 app-containers/lxc/lxc-6.0.0-r2.ebuild | 172 +
 1 file changed, 172 insertions(+)

diff --git a/app-containers/lxc/lxc-6.0.0-r2.ebuild 
b/app-containers/lxc/lxc-6.0.0-r2.ebuild
new file mode 100644
index ..dcbf0d98541a
--- /dev/null
+++ b/app-containers/lxc/lxc-6.0.0-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs 
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 
)"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   apparmor? ( sys-libs/libapparmor )
+   caps? ( sys-libs/libcap[static-libs] )
+   io-uring? ( >=sys-libs/liburing-2:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? ( dev-libs/openssl:0= )
+   systemd? (
+   sys-apps/dbus
+   sys-apps/systemd:=
+   )
+   tools? ( sys-libs/libcap[static-libs] )"
+DEPEND="${RDEPEND}
+   sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+   man? ( app-text/docbook2X )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+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"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+src_configure() {
+
+   # -Dtools-multicall=false: will create a single binary called 'lxc' 
that conflicts with LXD.
+   local emesonargs=(
+   --localstatedir "${EPREFIX}/var"
+
+   -Dcoverity-build=false
+   -Dinstall-state-dirs=false
+   -Doss-fuzz=false
+   -Dspecfile=false
+   -Dtools-multicall=false
+
+   -Dcommands=true
+   -Dinstall-init-files=true
+   -Dmemfd-rexec=true
+   -Dthread-safety=true
+
+   $(meson_use apparmor)
+   $(meson_use caps capabilities)
+   $(meson_use examples)
+   $(meson_use io-uring io-uring-event-loop)
+   $(meson_use lto b_lto)
+   $(meson_use man)
+   $(meson_use pam pam-cgroup)
+   $(meson_use seccomp)
+   $(meson_use selinux)
+   $(meson_use ssl openssl)
+   $(meson_use test tests)
+   $(meson_use tools)
+
+   $(usex systemd -Ddbus=true -Ddbus=false)
+   $(usex systemd -Dinit-script="systemd" -Dinit-script="sysvinit")
+
+   -Ddata-path=/var/lib/lxc
+   -Ddoc-path=/usr/share/doc/${PF}
+   -Dlog-path=/var/log/lxc
+   -Drootfs-mount-path=/var/lib/lxc/rootfs
+   -Druntime-path=/run
+   )
+
+   use tools && local emesonargs+=( -Dcapabilities=true )
+
+   if $(tc-ld-is-gold) || $(tc-ld-is-lld); then
+   local emesonargs+=( -Db_lto_mode=thin )
+   else
+   local emesonargs+=( -Db_lto_mode=default )
+   fi
+
+   meson_src_configure
+}
+
+sr

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

2024-05-04 Thread Joonas Niilola
commit: 900624d081f3b03ba32fb6bf4680e3001958a04b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May  5 06:26:50 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May  5 06:28:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900624d0

app-containers/lxc: stabilize 6.0.0-r1 for amd64

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

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

diff --git a/app-containers/lxc/lxc-6.0.0-r1.ebuild 
b/app-containers/lxc/lxc-6.0.0-r1.ebuild
index 64d7aef60e47..63f9cfbf8e7e 100644
--- a/app-containers/lxc/lxc-6.0.0-r1.ebuild
+++ b/app-containers/lxc/lxc-6.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2024-04-05 Thread Joonas Niilola
commit: 1e1b278d4fd7e09720ef65bb83d16c91d032f7c5
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Apr  5 13:21:29 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr  5 13:24:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1b278d

app-containers/lxc: flip -Dinstall-init-files from false to true

 - it installs more files, under /etc/default, /usr/libexec, etc, that
   may be important to some users.

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

 app-containers/lxc/{lxc-6.0.0.ebuild => lxc-6.0.0-r1.ebuild} | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxc/lxc-6.0.0.ebuild 
b/app-containers/lxc/lxc-6.0.0-r1.ebuild
similarity index 94%
rename from app-containers/lxc/lxc-6.0.0.ebuild
rename to app-containers/lxc/lxc-6.0.0-r1.ebuild
index 7452b2ec74ca..64d7aef60e47 100644
--- a/app-containers/lxc/lxc-6.0.0.ebuild
+++ b/app-containers/lxc/lxc-6.0.0-r1.ebuild
@@ -74,7 +74,6 @@ pkg_setup() {
 
 src_configure() {
 
-   # -Dinstall-init-files=false: prefer our own files from ${FILESDIR}
# -Dtools-multicall=false: will create a single binary called 'lxc' 
that conflicts with LXD.
local emesonargs=(
--localstatedir "${EPREFIX}/var"
@@ -82,13 +81,13 @@ src_configure() {
-Ddbus=true
 
-Dcoverity-build=false
-   -Dinstall-init-files=false
-Dinstall-state-dirs=false
-Doss-fuzz=false
-Dspecfile=false
-Dtools-multicall=false
 
-Dcommands=true
+   -Dinstall-init-files=true
-Dmemfd-rexec=true
-Dthread-safety=true
 
@@ -139,6 +138,13 @@ src_install() {
 
find "${ED}" -name '*.la' -delete -o -name '*.a' -delete || die
 
+   # Replace upstream sysvinit/systemd files.
+   if use systemd; then
+   rm -r "${D}$(systemd_get_systemunitdir)" || die "Failed to remove 
systemd lib dir"
+   else
+   rm "${ED}"/etc/init.d/lxc-{containers,net} || die "Failed to 
remove sysvinit scripts"
+   fi
+
newinitd "${FILESDIR}/${PN}.initd.9" ${PN}
systemd_newunit "${FILESDIR}"/lxc-monitord.service.5.0.0 
lxc-monitord.service
systemd_newunit "${FILESDIR}"/lxc-net.service.5.0.0 lxc-net.service



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

2024-04-05 Thread Joonas Niilola
commit: 8c2564478758efd37cf41ae72bf40a20b959acce
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Apr  5 07:40:53 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr  5 07:57:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c256447

app-containers/lxc: add 6.0.0

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

 app-containers/lxc/Manifest |   2 +
 app-containers/lxc/lxc-6.0.0.ebuild | 165 
 2 files changed, 167 insertions(+)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 49be2b841cfd..0257fd2ae87a 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,2 +1,4 @@
 DIST lxc-5.0.3.tar.gz 975269 BLAKE2B 
533d97fe4d986acbf5d562bb2c295a63df2a9a8bfc27aeff5056e4235f667102500debc586c5698482ec048c1b222a0fdc234db6fd6648c4b649f87a85de18f8
 SHA512 
0553be317431ab7ec0c450c0f85724a53de1f251c39c9716168e17cda6a8daec70b8221228c4be64027df28a327e0f1fd508e6bb48348ab540bbfeaf2b9ac974
 DIST lxc-5.0.3.tar.gz.asc 833 BLAKE2B 
c35278ed17cad76d2ea94b3985e0110731efea751fb5f1c2d1c9db71486e4844285f372a94c8611dcfe91fdb16459694843b9e0a8273cfc68a56f549c7162cfb
 SHA512 
a5ce5769d49abdf35d94de8273fd3e9c2a8ba4fafea71cf33ee6bce1d83531c8b550d972f7080409a4cc5a92e9d04ece50ed108f92c6aec4868d150e58d7d11a
+DIST lxc-6.0.0.tar.gz 964053 BLAKE2B 
d41bcab4e225c139d4d41df5291717e4d196fe3b48d978a993811b74a08e7a75e1528f4bf44f694a624537632bdec642cd80cf51a528dea848baa11c10471afa
 SHA512 
acff2fc70cf2c65af37b70a21239482c3d845c408f7132558b54980e4400c23670c63178a3a3dfb239f047f529004df93cd829d728852a8c8647ce6babf7857f
+DIST lxc-6.0.0.tar.gz.asc 833 BLAKE2B 
d2cda07e605d64dbb650506cf536c545e2c5746973c834f4d4f409064e2ba8265040b13a60e124e30e154bbc5a51c704bad0fa2ff5530effddfa449618aa60a7
 SHA512 
4e56ffa7395877714f993d9c54cf8b9df91cdced96c5a609b63f5e3896a0a51db8ba6f99bf2360d60af202df79123deea72215bf854d8798d3af361a4888445e

diff --git a/app-containers/lxc/lxc-6.0.0.ebuild 
b/app-containers/lxc/lxc-6.0.0.ebuild
new file mode 100644
index ..7452b2ec74ca
--- /dev/null
+++ b/app-containers/lxc/lxc-6.0.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs 
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 
)"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   sys-apps/dbus
+   apparmor? ( sys-libs/libapparmor )
+   caps? ( sys-libs/libcap[static-libs] )
+   io-uring? ( >=sys-libs/liburing-2:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? ( dev-libs/openssl:0= )
+   systemd? ( sys-apps/systemd:= )
+   tools? ( sys-libs/libcap[static-libs] )"
+DEPEND="${RDEPEND}
+   sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+   man? ( app-text/docbook2X )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+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"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+src_configure() {
+
+   # -Dinstall-init-files=false: prefer our own files from ${FILESDIR}
+   # -Dtools-multicall=false: will create a single binary called 'lxc' 
that conflicts with LXD.
+   local emesonargs=(
+   --localstatedir "${EPREFIX}/var"
+
+   -Ddbus=true
+
+   -Dcoverity-build=fals

[gentoo-commits] repo/gentoo:master commit in: app-containers/lxc/, sys-fs/fuse-exfat/, media-gfx/zbar/, media-gfx/pngcrush/, ...

2023-12-05 Thread Mike Frysinger
commit: 23d377b24fb52e31275b9af7304eebdbc6f11939
Author: Allen Webb  google  com>
AuthorDate: Mon Oct 23 17:33:26 2023 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Dec  5 16:41:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d377b2

Add more CPE strings for easier CVE tracking

Signed-off-by: Allen Webb  google.com>
Signed-off-by: Mike Frysinger  chromium.org>
Signed-off-by: Mike Frysinger  gentoo.org>

 app-containers/docker-cli/metadata.xml  | 1 +
 app-containers/docker/metadata.xml  | 1 +
 app-containers/lxc/metadata.xml | 1 +
 app-containers/lxd/metadata.xml | 1 +
 dev-embedded/openocd/metadata.xml   | 1 +
 dev-lang/mono/metadata.xml  | 1 +
 dev-libs/flatbuffers/metadata.xml   | 1 +
 dev-libs/libusb/metadata.xml| 1 +
 dev-libs/protobuf-c/metadata.xml| 1 +
 dev-python/cherrypy/metadata.xml| 1 +
 dev-util/pkgconf/metadata.xml   | 1 +
 dev-util/rt-tests/metadata.xml  | 3 +++
 dev-util/strace/metadata.xml| 1 +
 dev-util/valgrind/metadata.xml  | 3 +++
 media-gfx/pngcrush/metadata.xml | 1 +
 media-gfx/potrace/metadata.xml  | 1 +
 media-gfx/qrencode/metadata.xml | 3 +++
 media-gfx/zbar/metadata.xml | 1 +
 media-libs/dav1d/metadata.xml   | 1 +
 media-libs/leptonica/metadata.xml   | 1 +
 media-libs/libsamplerate/metadata.xml   | 1 +
 media-libs/libsndfile/metadata.xml  | 1 +
 media-libs/openh264/metadata.xml| 1 +
 media-libs/openjpeg/metadata.xml| 1 +
 media-plugins/live/metadata.xml | 3 +++
 media-sound/alsa-utils/metadata.xml | 1 +
 media-video/ffmpeg/metadata.xml | 1 +
 net-analyzer/net-snmp/metadata.xml  | 1 +
 net-analyzer/netdata/metadata.xml   | 1 +
 net-analyzer/traceroute/metadata.xml| 1 +
 net-analyzer/wireshark/metadata.xml | 1 +
 net-dialup/lrzsz/metadata.xml   | 3 +++
 net-dialup/picocom/metadata.xml | 1 +
 net-dns/bind-tools/metadata.xml | 3 +++
 net-libs/glib-networking/metadata.xml   | 1 +
 net-libs/libnftnl/metadata.xml  | 3 +++
 net-libs/libslirp/metadata.xml  | 1 +
 net-libs/libsoup/metadata.xml   | 1 +
 net-libs/libssh2/metadata.xml   | 1 +
 net-libs/libvncserver/metadata.xml  | 1 +
 net-libs/nodejs/metadata.xml| 1 +
 net-misc/linuxptp/metadata.xml  | 1 +
 net-misc/sslh/metadata.xml  | 1 +
 net-print/cups-filters/metadata.xml | 1 +
 net-proxy/tinyproxy/metadata.xml| 1 +
 sci-libs/gsl/metadata.xml   | 1 +
 sci-libs/tensorflow/metadata.xml| 1 +
 sys-apps/fwupd/metadata.xml | 1 +
 sys-apps/i2c-tools/metadata.xml | 3 +++
 sys-apps/man-db/metadata.xml| 1 +
 sys-apps/memtester/metadata.xml | 1 +
 sys-apps/smartmontools/metadata.xml | 1 +
 sys-apps/systemd-utils/metadata.xml | 1 +
 sys-apps/toybox/metadata.xml| 1 +
 sys-apps/usbguard/metadata.xml  | 1 +
 sys-block/blktrace/metadata.xml | 3 +++
 sys-block/parted/metadata.xml   | 1 +
 sys-cluster/libqb/metadata.xml  | 1 +
 sys-devel/llvm/metadata.xml | 1 +
 sys-firmware/edk2-ovmf-bin/metadata.xml | 3 +++
 sys-firmware/edk2-ovmf/metadata.xml | 1 +
 sys-fs/f2fs-tools/metadata.xml  | 1 +
 sys-fs/fuse-common/metadata.xml | 1 +
 sys-fs/fuse-exfat/metadata.xml  | 1 +
 sys-fs/lxcfs/metadata.xml   | 1 +
 sys-libs/libsemanage/metadata.xml   | 1 +
 sys-libs/newlib/metadata.xml| 3 +++
 sys-process/audit/metadata.xml  | 1 +
 www-apps/novnc/metadata.xml | 1 +
 www-servers/nginx/metadata.xml  | 1 +
 70 files changed, 92 insertions(+)

diff --git a/app-containers/docker-cli/metadata.xml 
b/app-containers/docker-cli/metadata.xml
index 46eed1b411a8..bf7820a5374d 100644
--- a/app-containers/docker-cli/metadata.xml
+++ b/app-containers/docker-cli/metadata.xml
@@ -11,5 +11,6 @@
 

docker/cli
+   cpe:/a:docker:command_line_interface

 

diff --git a/app-containers/docker/metadata.xml 
b/app-containers/docker/metadata.xml
index d58b9b295fb1..41b39202d85a 100644
--- a/app-containers/docker/metadata.xml
+++ b/app-containers/docker/metadata.xml
@@ -36,5 +36,6 @@


moby/moby
+   cpe:/a:docker:docker

 

diff --git a/app-containers/lxc/metadata.xml b/app-containers/lxc/metadata.xml
index 7656e64b5884..a2d77654dbe8 100644
--- a/app-containers/lxc/metadata.xml
+++ b/app-containers/lxc/metadata.xml
@@ -16,5 +16,6 @@
   
   
 lxc/lxc
+cpe:/a:linuxcontainers:lxc
   
 

diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml
index b2f6ed72c3df..ee1b9a718c31 100644
--- a/app-containers/lxd/metadata.xml
+++ b/app-containers/lxd/metadata.xml
@@ -30,5 +30,6 @@
   
   
 canonical/lxd

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

2023-09-09 Thread Joonas Niilola
commit: 4320b09b549e88a2a1cf5a287d3a3616ecc472eb
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Sep 10 06:25:31 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Sep 10 06:25:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4320b09b

app-containers/lxc: drop 5.0.2

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

 app-containers/lxc/Manifest  |   2 -
 app-containers/lxc/files/lxc.initd.8 | 131 ---
 app-containers/lxc/lxc-5.0.2.ebuild  | 168 ---
 3 files changed, 301 deletions(-)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 110ca14bf5ce..49be2b841cfd 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,4 +1,2 @@
-DIST lxc-5.0.2.tar.gz 973977 BLAKE2B 
e6017406b96f53525b576528814922a017a7d65fb04724046236307f4e85219b3c8ac725678e57ae3f77a4e817f718748e8c61fbc8147160e4ac87d3146b6567
 SHA512 
2e8800875e9c91cc0cbfdfc33c43d84bad9471d8a1b8ccd52d7d9c6fe44f280f9f701b8ccc2e0f5319a3e4c50d8c4331722f0dd9c0347575eb4f7b4ed110bef3
-DIST lxc-5.0.2.tar.gz.asc 833 BLAKE2B 
3d78f8a87b2f45d2b91a9a6595d286e2fc1dcfc7d28f3c1d86e968860a7e346506ab28d4dafffede8acf1f82e8b12f90eda2e6210cd6bdec702f59bad97295c6
 SHA512 
9bd1ef117cf256841b75d409e8f14b88ed54fdfc9c8c472b6baa5e9695e39cdb8c1f47ce612dc8263abb65511df0812554cc9a5820cdd6c1539a07283a4cd08f
 DIST lxc-5.0.3.tar.gz 975269 BLAKE2B 
533d97fe4d986acbf5d562bb2c295a63df2a9a8bfc27aeff5056e4235f667102500debc586c5698482ec048c1b222a0fdc234db6fd6648c4b649f87a85de18f8
 SHA512 
0553be317431ab7ec0c450c0f85724a53de1f251c39c9716168e17cda6a8daec70b8221228c4be64027df28a327e0f1fd508e6bb48348ab540bbfeaf2b9ac974
 DIST lxc-5.0.3.tar.gz.asc 833 BLAKE2B 
c35278ed17cad76d2ea94b3985e0110731efea751fb5f1c2d1c9db71486e4844285f372a94c8611dcfe91fdb16459694843b9e0a8273cfc68a56f549c7162cfb
 SHA512 
a5ce5769d49abdf35d94de8273fd3e9c2a8ba4fafea71cf33ee6bce1d83531c8b550d972f7080409a4cc5a92e9d04ece50ed108f92c6aec4868d150e58d7d11a

diff --git a/app-containers/lxc/files/lxc.initd.8 
b/app-containers/lxc/files/lxc.initd.8
deleted file mode 100644
index 727f6d504fb3..
--- a/app-containers/lxc/files/lxc.initd.8
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/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
-   # th

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

2023-08-31 Thread Joonas Niilola
commit: f57644ad15cccfee681fe93b2adbb2b073648a18
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Aug 31 06:21:23 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug 31 07:07:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57644ad

app-containers/lxc: stabilize 5.0.3 for x86

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

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

diff --git a/app-containers/lxc/lxc-5.0.3.ebuild 
b/app-containers/lxc/lxc-5.0.3.ebuild
index 983013b81eee..f4a5440f13e3 100644
--- a/app-containers/lxc/lxc-5.0.3.ebuild
+++ b/app-containers/lxc/lxc-5.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0/1.502" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2023-08-31 Thread Joonas Niilola
commit: 7879603f6a7f604e6953920d63ae51620414b166
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Aug 31 06:26:26 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug 31 07:07:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7879603f

app-containers/lxc: stabilize 5.0.3 for amd64

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

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

diff --git a/app-containers/lxc/lxc-5.0.3.ebuild 
b/app-containers/lxc/lxc-5.0.3.ebuild
index f4a5440f13e3..822b81d6575f 100644
--- a/app-containers/lxc/lxc-5.0.3.ebuild
+++ b/app-containers/lxc/lxc-5.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0/1.502" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2023-07-25 Thread Joonas Niilola
commit: 4ea8cb23e60acb7f8ba8a86b737b66ac7d346852
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Jul 26 05:31:18 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jul 26 05:31:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea8cb23

app-containers/lxc: add 5.0.3

 - add new openrc init.d script which fixes commented lines being
   injected into container's config.

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

 app-containers/lxc/Manifest  |   2 +
 app-containers/lxc/files/lxc.initd.9 | 132 +++
 app-containers/lxc/lxc-5.0.3.ebuild  | 169 +++
 3 files changed, 303 insertions(+)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 42ff946b34f8..110ca14bf5ce 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,2 +1,4 @@
 DIST lxc-5.0.2.tar.gz 973977 BLAKE2B 
e6017406b96f53525b576528814922a017a7d65fb04724046236307f4e85219b3c8ac725678e57ae3f77a4e817f718748e8c61fbc8147160e4ac87d3146b6567
 SHA512 
2e8800875e9c91cc0cbfdfc33c43d84bad9471d8a1b8ccd52d7d9c6fe44f280f9f701b8ccc2e0f5319a3e4c50d8c4331722f0dd9c0347575eb4f7b4ed110bef3
 DIST lxc-5.0.2.tar.gz.asc 833 BLAKE2B 
3d78f8a87b2f45d2b91a9a6595d286e2fc1dcfc7d28f3c1d86e968860a7e346506ab28d4dafffede8acf1f82e8b12f90eda2e6210cd6bdec702f59bad97295c6
 SHA512 
9bd1ef117cf256841b75d409e8f14b88ed54fdfc9c8c472b6baa5e9695e39cdb8c1f47ce612dc8263abb65511df0812554cc9a5820cdd6c1539a07283a4cd08f
+DIST lxc-5.0.3.tar.gz 975269 BLAKE2B 
533d97fe4d986acbf5d562bb2c295a63df2a9a8bfc27aeff5056e4235f667102500debc586c5698482ec048c1b222a0fdc234db6fd6648c4b649f87a85de18f8
 SHA512 
0553be317431ab7ec0c450c0f85724a53de1f251c39c9716168e17cda6a8daec70b8221228c4be64027df28a327e0f1fd508e6bb48348ab540bbfeaf2b9ac974
+DIST lxc-5.0.3.tar.gz.asc 833 BLAKE2B 
c35278ed17cad76d2ea94b3985e0110731efea751fb5f1c2d1c9db71486e4844285f372a94c8611dcfe91fdb16459694843b9e0a8273cfc68a56f549c7162cfb
 SHA512 
a5ce5769d49abdf35d94de8273fd3e9c2a8ba4fafea71cf33ee6bce1d83531c8b550d972f7080409a4cc5a92e9d04ece50ed108f92c6aec4868d150e58d7d11a

diff --git a/app-containers/lxc/files/lxc.initd.9 
b/app-containers/lxc/files/lxc.initd.9
new file mode 100644
index ..4958fbcbbc7b
--- /dev/null
+++ b/app-containers/lxc/files/lxc.initd.9
@@ -0,0 +1,132 @@
+#!/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() {
+   # gentoo bugfix 909640, drop commented lines before awk
+   grep -v '^#' ${CONFIGFILE} | 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="";
+   }; }'
+}
+
+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%:*}
+   

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

2023-02-21 Thread Joonas Niilola
commit: f565998a51b1e190e4595d726873e1775b2bc4c8
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Feb 22 07:11:49 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 22 07:11:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f565998a

app-containers/lxc: drop 5.0.1-r2

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

 app-containers/lxc/Manifest|   2 -
 .../lxc/files/lxc-5.0.1-glibc-2.36.patch   | 383 -
 ...d_bus_call_method_async-insteaf-of-asyncv.patch |  44 ---
 app-containers/lxc/lxc-5.0.1-r2.ebuild | 171 -
 4 files changed, 600 deletions(-)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 94adb342d397..42ff946b34f8 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,4 +1,2 @@
-DIST lxc-5.0.1.tar.gz 973206 BLAKE2B 
6d5cb1a03eb2612d0f8cb59783a64ec42bedd560cacfebf76383d9599dfc153e381f0e584a1c8c9a0b5b18a46bfb01863649dc5a019546e9ded6079b5ec69ddd
 SHA512 
c87563b556aec83c93a7c62932217791e92da950cc76983f0d5e1d603fe1ae298a63fb5e88ec9ef5173846d579babb5acd0836679b915de00844bb9edf9c8d7e
-DIST lxc-5.0.1.tar.gz.asc 833 BLAKE2B 
f85df5fc5bd88a738042f622ee4191b99e0a8e07db7ceb5824d634bc451f4bf93c8b64d1c72d4899f639ad30bbc9ee82be292dbe310218fa20566ee00f9bb752
 SHA512 
09de4e74d174b54cf9240ca4ef4793b9f63355c65f610abffb40e6dc2dc9130380761a50725e4dcee39b421e4b51c874d141fe22d5ecfd7ad3af35f7ebec09a0
 DIST lxc-5.0.2.tar.gz 973977 BLAKE2B 
e6017406b96f53525b576528814922a017a7d65fb04724046236307f4e85219b3c8ac725678e57ae3f77a4e817f718748e8c61fbc8147160e4ac87d3146b6567
 SHA512 
2e8800875e9c91cc0cbfdfc33c43d84bad9471d8a1b8ccd52d7d9c6fe44f280f9f701b8ccc2e0f5319a3e4c50d8c4331722f0dd9c0347575eb4f7b4ed110bef3
 DIST lxc-5.0.2.tar.gz.asc 833 BLAKE2B 
3d78f8a87b2f45d2b91a9a6595d286e2fc1dcfc7d28f3c1d86e968860a7e346506ab28d4dafffede8acf1f82e8b12f90eda2e6210cd6bdec702f59bad97295c6
 SHA512 
9bd1ef117cf256841b75d409e8f14b88ed54fdfc9c8c472b6baa5e9695e39cdb8c1f47ce612dc8263abb65511df0812554cc9a5820cdd6c1539a07283a4cd08f

diff --git a/app-containers/lxc/files/lxc-5.0.1-glibc-2.36.patch 
b/app-containers/lxc/files/lxc-5.0.1-glibc-2.36.patch
deleted file mode 100644
index e186c7fbb282..
--- a/app-containers/lxc/files/lxc-5.0.1-glibc-2.36.patch
+++ /dev/null
@@ -1,383 +0,0 @@
-From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001
-From: Christian Brauner 
-Date: Tue, 9 Aug 2022 16:14:25 +0200
-Subject: [PATCH 1/3] build: detect where struct mount_attr is declared
-
-Fixes: #4176
-Signed-off-by: Christian Brauner (Microsoft) 

- meson.build| 30 --
- src/lxc/conf.c |  6 +++---
- src/lxc/conf.h |  2 +-
- src/lxc/mount_utils.c  |  6 +++---
- src/lxc/syscall_wrappers.h | 12 ++--
- 5 files changed, 45 insertions(+), 11 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index a145faf069..f679aabbc8 100644
 a/meson.build
-+++ b/meson.build
-@@ -590,7 +590,6 @@ decl_headers = '''
- foreach decl: [
- '__aligned_u64',
- 'struct clone_args',
--'struct mount_attr',
- 'struct open_how',
- 'struct rtnl_link_stats64',
- ]
-@@ -610,7 +609,6 @@ foreach tuple: [
- ['struct seccomp_notif_sizes'],
- ['struct clone_args'],
- ['__aligned_u64'],
--['struct mount_attr'],
- ['struct open_how'],
- ['struct rtnl_link_stats64'],
- ]
-@@ -630,6 +628,34 @@ foreach tuple: [
- endif
- endforeach
- 
-+## Types.
-+decl_headers = '''
-+#include 
-+'''
-+
-+# We get -1 if the size cannot be determined
-+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: 
'-D_GNU_SOURCE') > 0
-+srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), 
true)
-+found_types += 'struct mount_attr (sys/mount.h)'
-+else
-+srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), 
false)
-+missing_types += 'struct mount_attr (sys/mount.h)'
-+endif
-+
-+## Types.
-+decl_headers = '''
-+#include 
-+'''
-+
-+# We get -1 if the size cannot be determined
-+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: 
'-D_GNU_SOURCE') > 0
-+srcconf.set10('HAVE_UAPI_' + 'struct 
mount_attr'.underscorify().to_upper(), true)
-+found_types += 'struct mount_attr (linux/mount.h)'
-+else
-+srcconf.set10('HAVE_UAPI_' + 'struct 
mount_attr'.underscorify().to_upper(), false)
-+missing_types += 'struct mount_attr (linux/mount.h)'
-+endif
-+
- ## Headers.
- foreach ident: [
- ['bpf',   '''#include 
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index ffbe74c2f6..4193cd07f5 100644
 a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct 
lxc_handler *handler, FILE *f)
-   struct lxc_mount_options opts = {};
-   int dfd_from;
-   const char *source_relative, *target_relative;
--  struct lxc_

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

2023-02-20 Thread Joonas Niilola
commit: 972e3c3bbf487fca8d11cf51f64d64848c65bbdb
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Feb 20 08:09:30 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb 20 08:09:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972e3c3b

app-containers/lxc: stabilize 5.0.2 for x86

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

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

diff --git a/app-containers/lxc/lxc-5.0.2.ebuild 
b/app-containers/lxc/lxc-5.0.2.ebuild
index 1017dcc156cd..de0e266a84c9 100644
--- a/app-containers/lxc/lxc-5.0.2.ebuild
+++ b/app-containers/lxc/lxc-5.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0/1.502" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2023-02-20 Thread Joonas Niilola
commit: 34b9132084289642173daf069ec92d67899a678c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Feb 20 07:31:51 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb 20 08:06:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b91320

app-containers/lxc: stabilize 5.0.2 for amd64

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

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

diff --git a/app-containers/lxc/lxc-5.0.2.ebuild 
b/app-containers/lxc/lxc-5.0.2.ebuild
index ee16591feeae..1017dcc156cd 100644
--- a/app-containers/lxc/lxc-5.0.2.ebuild
+++ b/app-containers/lxc/lxc-5.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0/1.502" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2023-01-19 Thread Joonas Niilola
commit: c2c4be8ee254b45ac05633a14fec9cff88c21ce9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jan 19 13:55:54 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 19 15:10:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c4be8e

app-containers/lxc: add 5.0.2

 - introduce subslot to lxc.

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

 app-containers/lxc/Manifest |   2 +
 app-containers/lxc/lxc-5.0.2.ebuild | 168 
 2 files changed, 170 insertions(+)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 6d1c784c3648..94adb342d397 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,2 +1,4 @@
 DIST lxc-5.0.1.tar.gz 973206 BLAKE2B 
6d5cb1a03eb2612d0f8cb59783a64ec42bedd560cacfebf76383d9599dfc153e381f0e584a1c8c9a0b5b18a46bfb01863649dc5a019546e9ded6079b5ec69ddd
 SHA512 
c87563b556aec83c93a7c62932217791e92da950cc76983f0d5e1d603fe1ae298a63fb5e88ec9ef5173846d579babb5acd0836679b915de00844bb9edf9c8d7e
 DIST lxc-5.0.1.tar.gz.asc 833 BLAKE2B 
f85df5fc5bd88a738042f622ee4191b99e0a8e07db7ceb5824d634bc451f4bf93c8b64d1c72d4899f639ad30bbc9ee82be292dbe310218fa20566ee00f9bb752
 SHA512 
09de4e74d174b54cf9240ca4ef4793b9f63355c65f610abffb40e6dc2dc9130380761a50725e4dcee39b421e4b51c874d141fe22d5ecfd7ad3af35f7ebec09a0
+DIST lxc-5.0.2.tar.gz 973977 BLAKE2B 
e6017406b96f53525b576528814922a017a7d65fb04724046236307f4e85219b3c8ac725678e57ae3f77a4e817f718748e8c61fbc8147160e4ac87d3146b6567
 SHA512 
2e8800875e9c91cc0cbfdfc33c43d84bad9471d8a1b8ccd52d7d9c6fe44f280f9f701b8ccc2e0f5319a3e4c50d8c4331722f0dd9c0347575eb4f7b4ed110bef3
+DIST lxc-5.0.2.tar.gz.asc 833 BLAKE2B 
3d78f8a87b2f45d2b91a9a6595d286e2fc1dcfc7d28f3c1d86e968860a7e346506ab28d4dafffede8acf1f82e8b12f90eda2e6210cd6bdec702f59bad97295c6
 SHA512 
9bd1ef117cf256841b75d409e8f14b88ed54fdfc9c8c472b6baa5e9695e39cdb8c1f47ce612dc8263abb65511df0812554cc9a5820cdd6c1539a07283a4cd08f

diff --git a/app-containers/lxc/lxc-5.0.2.ebuild 
b/app-containers/lxc/lxc-5.0.2.ebuild
new file mode 100644
index ..ee16591feeae
--- /dev/null
+++ b/app-containers/lxc/lxc-5.0.2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs 
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 
)"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0/1.502" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   apparmor? ( sys-libs/libapparmor )
+   caps? ( sys-libs/libcap[static-libs] )
+   io-uring? ( >=sys-libs/liburing-2:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? ( dev-libs/openssl:0= )
+   systemd? ( sys-apps/systemd:= )
+   tools? ( sys-libs/libcap[static-libs] )"
+DEPEND="${RDEPEND}
+   sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+   man? ( app-text/docbook2X )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+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"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+src_configure() {
+   local emesonargs=(
+   --localstatedir "${EPREFIX}/var"
+
+   -Dcoverity-build=false
+   -Doss-fuzz=false
+
+   -Dcommands=true
+   -Dmemfd-rexec=true
+   -Dthread-safety=true
+
+   $(meson_use apparmor)
+  

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

2022-11-01 Thread Joonas Niilola
commit: c6f1da6b01fa81265f3960519eb38b150e3f3b44
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Nov  1 12:18:06 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov  1 12:19:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f1da6b

app-containers/lxc: stabilize 5.0.1-r2 for x86

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

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

diff --git a/app-containers/lxc/lxc-5.0.1-r2.ebuild 
b/app-containers/lxc/lxc-5.0.1-r2.ebuild
index 42ae5e7a2d5a..5abe3f257413 100644
--- a/app-containers/lxc/lxc-5.0.1-r2.ebuild
+++ b/app-containers/lxc/lxc-5.0.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2022-11-01 Thread Joonas Niilola
commit: 97acc1924aeab37ac145082102cc83eacc76d6b1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Nov  1 12:17:24 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov  1 12:19:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97acc192

app-containers/lxc: define and fix --localstatedir

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

 app-containers/lxc/{lxc-5.0.1-r1.ebuild => lxc-5.0.1-r2.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-containers/lxc/lxc-5.0.1-r1.ebuild 
b/app-containers/lxc/lxc-5.0.1-r2.ebuild
similarity index 99%
rename from app-containers/lxc/lxc-5.0.1-r1.ebuild
rename to app-containers/lxc/lxc-5.0.1-r2.ebuild
index f4714bf4705c..4f9e7b7de868 100644
--- a/app-containers/lxc/lxc-5.0.1-r1.ebuild
+++ b/app-containers/lxc/lxc-5.0.1-r2.ebuild
@@ -76,6 +76,8 @@ pkg_setup() {
 
 src_configure() {
local emesonargs=(
+   --localstatedir "${EPREFIX}/var"
+
-Dcoverity-build=false
-Doss-fuzz=false
 



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

2022-11-01 Thread Joonas Niilola
commit: ca2d4fc1c3405c5535b940313cdb2690cc7d72de
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Nov  1 12:17:58 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov  1 12:19:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca2d4fc1

app-containers/lxc: stabilize 5.0.1-r2 for amd64

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

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

diff --git a/app-containers/lxc/lxc-5.0.1-r2.ebuild 
b/app-containers/lxc/lxc-5.0.1-r2.ebuild
index 4f9e7b7de868..42ae5e7a2d5a 100644
--- a/app-containers/lxc/lxc-5.0.1-r2.ebuild
+++ b/app-containers/lxc/lxc-5.0.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2022-11-01 Thread Joonas Niilola
commit: 222a933dba1d90a098c8181b3dc6d41430ac76ee
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Nov  1 12:18:15 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov  1 12:19:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222a933d

app-containers/lxc: drop old

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

 app-containers/lxc/lxc-5.0.1.ebuild | 159 
 1 file changed, 159 deletions(-)

diff --git a/app-containers/lxc/lxc-5.0.1.ebuild 
b/app-containers/lxc/lxc-5.0.1.ebuild
deleted file mode 100644
index c3c490dfe80a..
--- a/app-containers/lxc/lxc-5.0.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 linux-info meson optfeature 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 
)"
-
-LICENSE="GPL-2 LGPL-2.1 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools"
-
-RDEPEND="acct-group/lxc
-   acct-user/lxc
-   apparmor? ( sys-libs/libapparmor )
-   caps? ( sys-libs/libcap[static-libs] )
-   io-uring? ( >=sys-libs/liburing-2:= )
-   pam? ( sys-libs/pam )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sys-libs/libselinux )
-   ssl? ( dev-libs/openssl:0= )
-   systemd? ( sys-apps/systemd:= )
-   tools? ( sys-libs/libcap[static-libs] )"
-DEPEND="${RDEPEND}
-   sys-kernel/linux-headers"
-BDEPEND="virtual/pkgconfig
-   man? ( app-text/docbook2X )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-RESTRICT="!test? ( test )"
-
-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"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
-
-pkg_setup() {
-   linux-info_pkg_setup
-}
-
-src_configure() {
-   local emesonargs=(
-   -Dcoverity-build=false
-   -Doss-fuzz=false
-
-   -Dcommands=true
-   -Dmemfd-rexec=true
-   -Dthread-safety=true
-
-   $(meson_use apparmor)
-   $(meson_use caps capabilities)
-   $(meson_use examples)
-   $(meson_use io-uring io-uring-event-loop)
-   $(meson_use man)
-   $(meson_use pam pam-cgroup)
-   $(meson_use seccomp)
-   $(meson_use selinux)
-   $(meson_use ssl openssl)
-   $(meson_use test tests)
-   $(meson_use tools)
-
-   -Ddata-path=/var/lib/lxc
-   -Ddoc-path=/usr/share/doc/${PF}
-   -Dlog-path=/var/log/lxc
-   -Drootfs-mount-path=/var/lib/lxc/rootfs
-   -Druntime-path=/run
-   )
-
-   if use systemd; then
-   local emesonargs+=( -Dinit-script="systemd" )
-   local emesonargs+=( -Dsd-bus=enabled )
-   else
-   local emesonargs+=( -Dinit-script="sysvinit" )
-   local emesonargs+=( -Dsd-bus=disabled )
-   fi
-
-   use tools && local emesonargs+=( -Dcapabilities=true )
-
-   meson_src_configure
-}
-
-src_install() {
-   meson_src_install
-
-   # 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."
-
-   if use tools; then
-   bashcomp_alias lxc-start 
lxc-{attach,autostart,cgroup,checkpoint,config,console,copy,create,destroy,device,execute,freeze,info,ls,monitor,snapshot,stop,top,unfreeze,unshare,usernsexec,wait}
-   else
-   bashcomp_alias lxc-start lxc-usernsexec
-   fi
-
-   keepdir /var/lib/cache/lxc /var/lib/lib/lxc
-
-   find "${ED}" -name '*

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

2022-10-06 Thread Joonas Niilola
commit: 80f4ab584f09b64c538d5d1970de8eb66bae5d4a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Oct  6 11:11:29 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct  6 11:11:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f4ab58

app-containers/lxc: add a patch to fix arm64+systemd issue

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

 ...d_bus_call_method_async-insteaf-of-asyncv.patch | 44 ++
 app-containers/lxc/lxc-5.0.1-r1.ebuild |  3 +-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git 
a/app-containers/lxc/files/lxc-5.0.1-use-sd_bus_call_method_async-insteaf-of-asyncv.patch
 
b/app-containers/lxc/files/lxc-5.0.1-use-sd_bus_call_method_async-insteaf-of-asyncv.patch
new file mode 100644
index ..fe218ea0c3e6
--- /dev/null
+++ 
b/app-containers/lxc/files/lxc-5.0.1-use-sd_bus_call_method_async-insteaf-of-asyncv.patch
@@ -0,0 +1,44 @@
+From b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f Mon Sep 17 00:00:00 2001
+From: Chen Qi 
+Date: Thu, 25 Aug 2022 05:45:53 -0700
+Subject: [PATCH] use sd_bus_call_method_async to replace the asyncv one
+
+The sd_bus_call_method_asyncv's 10th parameter is of type
+va_list and supplying NULL when invoking it causes compilation
+error. Just replace it with the async one.
+
+Signed-off-by: Chen Qi 
+---
+ meson.build  | 4 ++--
+ src/lxc/cgroups/cgfsng.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 21955a0504..f8bdcf4e83 100644
+--- a/meson.build
 b/meson.build
+@@ -295,9 +295,9 @@ if not want_sd_bus.disabled()
+ has_sd_bus = false
+ endif
+ 
+-if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include 
', dependencies: libsystemd) 
++if not cc.has_function('sd_bus_call_method_async', prefix: '#include 
', dependencies: libsystemd) 
+ if not sd_bus_optional
+-error('libsystemd misses required sd_bus_call_method_asyncv 
function')
++error('libsystemd misses required sd_bus_call_method_async 
function')
+ endif
+ 
+ has_sd_bus = false
+diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
+index 8a3615893f..d90e5385e1 100644
+--- a/src/lxc/cgroups/cgfsng.c
 b/src/lxc/cgroups/cgfsng.c
+@@ -1232,7 +1232,7 @@ static int unpriv_systemd_create_scope(struct cgroup_ops 
*ops, struct lxc_conf *
+   if (r < 0)
+   return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to 
user bus: %s", strerror(-r));
+ 
+-  r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, 
"Subscribe", NULL, NULL, NULL, NULL);
++  r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, 
"Subscribe", NULL, NULL, NULL);
+   if (r < 0)
+   return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to 
signals: %s", strerror(-r));
+ 

diff --git a/app-containers/lxc/lxc-5.0.1-r1.ebuild 
b/app-containers/lxc/lxc-5.0.1-r1.ebuild
index 7a9e415fda2a..f4714bf4705c 100644
--- a/app-containers/lxc/lxc-5.0.1-r1.ebuild
+++ b/app-containers/lxc/lxc-5.0.1-r1.ebuild
@@ -67,7 +67,8 @@ 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
 
 DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
 
-PATCHES=( "${FILESDIR}"/lxc-5.0.1-glibc-2.36.patch )
+PATCHES=( "${FILESDIR}"/lxc-5.0.1-glibc-2.36.patch
+   
"${FILESDIR}"/lxc-5.0.1-use-sd_bus_call_method_async-insteaf-of-asyncv.patch )
 
 pkg_setup() {
linux-info_pkg_setup



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

2022-10-04 Thread Joonas Niilola
commit: 391bd314114a302c9c4b87da6991659d1356f064
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Oct  4 16:05:41 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct  4 16:09:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=391bd314

app-containers/lxc: fix on glibc-2.36

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

 .../lxc/files/lxc-5.0.1-glibc-2.36.patch   | 383 +
 app-containers/lxc/lxc-5.0.1-r1.ebuild |   2 +
 2 files changed, 385 insertions(+)

diff --git a/app-containers/lxc/files/lxc-5.0.1-glibc-2.36.patch 
b/app-containers/lxc/files/lxc-5.0.1-glibc-2.36.patch
new file mode 100644
index ..e186c7fbb282
--- /dev/null
+++ b/app-containers/lxc/files/lxc-5.0.1-glibc-2.36.patch
@@ -0,0 +1,383 @@
+From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001
+From: Christian Brauner 
+Date: Tue, 9 Aug 2022 16:14:25 +0200
+Subject: [PATCH 1/3] build: detect where struct mount_attr is declared
+
+Fixes: #4176
+Signed-off-by: Christian Brauner (Microsoft) 
+---
+ meson.build| 30 --
+ src/lxc/conf.c |  6 +++---
+ src/lxc/conf.h |  2 +-
+ src/lxc/mount_utils.c  |  6 +++---
+ src/lxc/syscall_wrappers.h | 12 ++--
+ 5 files changed, 45 insertions(+), 11 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a145faf069..f679aabbc8 100644
+--- a/meson.build
 b/meson.build
+@@ -590,7 +590,6 @@ decl_headers = '''
+ foreach decl: [
+ '__aligned_u64',
+ 'struct clone_args',
+-'struct mount_attr',
+ 'struct open_how',
+ 'struct rtnl_link_stats64',
+ ]
+@@ -610,7 +609,6 @@ foreach tuple: [
+ ['struct seccomp_notif_sizes'],
+ ['struct clone_args'],
+ ['__aligned_u64'],
+-['struct mount_attr'],
+ ['struct open_how'],
+ ['struct rtnl_link_stats64'],
+ ]
+@@ -630,6 +628,34 @@ foreach tuple: [
+ endif
+ endforeach
+ 
++## Types.
++decl_headers = '''
++#include 
++'''
++
++# We get -1 if the size cannot be determined
++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: 
'-D_GNU_SOURCE') > 0
++srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), 
true)
++found_types += 'struct mount_attr (sys/mount.h)'
++else
++srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), 
false)
++missing_types += 'struct mount_attr (sys/mount.h)'
++endif
++
++## Types.
++decl_headers = '''
++#include 
++'''
++
++# We get -1 if the size cannot be determined
++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: 
'-D_GNU_SOURCE') > 0
++srcconf.set10('HAVE_UAPI_' + 'struct 
mount_attr'.underscorify().to_upper(), true)
++found_types += 'struct mount_attr (linux/mount.h)'
++else
++srcconf.set10('HAVE_UAPI_' + 'struct 
mount_attr'.underscorify().to_upper(), false)
++missing_types += 'struct mount_attr (linux/mount.h)'
++endif
++
+ ## Headers.
+ foreach ident: [
+ ['bpf',   '''#include 
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index ffbe74c2f6..4193cd07f5 100644
+--- a/src/lxc/conf.c
 b/src/lxc/conf.c
+@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct 
lxc_handler *handler, FILE *f)
+   struct lxc_mount_options opts = {};
+   int dfd_from;
+   const char *source_relative, *target_relative;
+-  struct lxc_mount_attr attr = {};
++  struct mount_attr attr = {};
+ 
+   ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts);
+   if (ret < 0)
+@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct 
lxc_handler *handler, FILE *f)
+ 
+   /* Set propagation mount options. */
+   if (opts.attr.propagation) {
+-  attr = (struct lxc_mount_attr) {
++  attr = (struct mount_attr) {
+   .propagation = opts.attr.propagation,
+   };
+ 
+@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler 
*handler)
+ 
+   for (;;) {
+   __do_close int fd_from = -EBADF, fd_userns = -EBADF;
+-  struct lxc_mount_attr attr = {};
++  struct mount_attr attr = {};
+   struct lxc_mount_options opts = {};
+   ssize_t ret;
+ 
+diff --git a/src/lxc/conf.h b/src/lxc/conf.h
+index 7dc2f15b60..772479f9e1 100644
+--- a/src/lxc/conf.h
 b/src/lxc/conf.h
+@@ -223,7 +223,7 @@ struct lxc_mount_options {
+   unsigned long mnt_flags;
+   unsigned long prop_flags;
+   char *data;
+-  struct lxc_mount_attr attr;
++  struct mount_attr attr;
+   char *raw_options;
+ };
+ 
+diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c
+index bba75f933c..88dd73ee36 100644
+--- a/src/lxc/mount_utils.c
 b/src/lxc/mount_utils.c
+@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc);
+  * s

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

2022-09-18 Thread Joonas Niilola
commit: c67d9ff4be934959df1ae631fcb9c5c50c7a1faf
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Sep 18 07:18:28 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Sep 18 07:18:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67d9ff4

app-containers/lxc: add "lto" use flag

 - upstream enables lto unconditionally which causes all kinds of issues for
   us with different linkers available.

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

 app-containers/lxc/lxc-5.0.1-r1.ebuild | 166 +
 app-containers/lxc/metadata.xml|   1 +
 2 files changed, 167 insertions(+)

diff --git a/app-containers/lxc/lxc-5.0.1-r1.ebuild 
b/app-containers/lxc/lxc-5.0.1-r1.ebuild
new file mode 100644
index ..3f264e03d0c1
--- /dev/null
+++ b/app-containers/lxc/lxc-5.0.1-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs 
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 
)"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd 
test +tools"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   apparmor? ( sys-libs/libapparmor )
+   caps? ( sys-libs/libcap[static-libs] )
+   io-uring? ( >=sys-libs/liburing-2:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? ( dev-libs/openssl:0= )
+   systemd? ( sys-apps/systemd:= )
+   tools? ( sys-libs/libcap[static-libs] )"
+DEPEND="${RDEPEND}
+   sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+   man? ( app-text/docbook2X )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+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"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+src_configure() {
+   local emesonargs=(
+   -Dcoverity-build=false
+   -Doss-fuzz=false
+
+   -Dcommands=true
+   -Dmemfd-rexec=true
+   -Dthread-safety=true
+
+   $(meson_use apparmor)
+   $(meson_use caps capabilities)
+   $(meson_use examples)
+   $(meson_use io-uring io-uring-event-loop)
+   $(meson_use lto b_lto)
+   $(meson_use man)
+   $(meson_use pam pam-cgroup)
+   $(meson_use seccomp)
+   $(meson_use selinux)
+   $(meson_use ssl openssl)
+   $(meson_use test tests)
+   $(meson_use tools)
+
+   -Ddata-path=/var/lib/lxc
+   -Ddoc-path=/usr/share/doc/${PF}
+   -Dlog-path=/var/log/lxc
+   -Drootfs-mount-path=/var/lib/lxc/rootfs
+   -Druntime-path=/run
+   )
+
+   if use systemd; then
+   local emesonargs+=( -Dinit-script="systemd" )
+   local emesonargs+=( -Dsd-bus=enabled )
+   else
+   local emesonargs+=( -Dinit-script="sysvinit" )
+   local emesonargs+=( -Dsd-bus=disabled )
+   fi
+
+   use tools && local emesonargs+=( -Dcapabilities=true )
+
+   if $(tc-ld-is-gold) || $(tc-ld-is-lld); then
+   local emesonargs+=( -Db_lto_mode=thin )
+   else
+   local emesonargs+=( -Db_lto_mode=default )
+   fi
+
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+
+   # The main bash-completion file will collide with lxd, need to relocate 
and update symlinks.
+  

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

2022-09-18 Thread Joonas Niilola
commit: 080257750318a9ed5c1f290217b51b9ab8d967b3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Sep 18 07:21:42 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Sep 18 07:21:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08025775

app-containers/lxc: update lto description in metadata.xml

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

 app-containers/lxc/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxc/metadata.xml b/app-containers/lxc/metadata.xml
index 49920c7d4559..7656e64b5884 100644
--- a/app-containers/lxc/metadata.xml
+++ b/app-containers/lxc/metadata.xml
@@ -11,7 +11,7 @@
   
   
 Enable io_uring support, and use io_uring instead of 
epoll
-Build with Link Time Optimization (LTO)
+Enable Link Time Optimization (LTO)
 Build and install additional command line tools
   
   



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

2022-09-09 Thread Joonas Niilola
commit: 570bef9ccac133fb8eadc25beb2dbb16119c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Sep 10 05:19:00 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Sep 10 05:19:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570b

app-containers/lxc: drop 4.0.12

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

 app-containers/lxc/Manifest|   2 -
 .../lxc/files/lxc-2.0.5-omit-sysconfig.patch   |   5 -
 app-containers/lxc/files/lxc_at.service.4.0.0  |  15 --
 app-containers/lxc/lxc-4.0.12.ebuild   | 184 -
 4 files changed, 206 deletions(-)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 0c60e874b27b..6d1c784c3648 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,4 +1,2 @@
-DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B 
819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c687f4f8064e42d347113bdf50fcbb653a6fb26598db0daab0c83ad88fe0d27fd2842fac9d7f5fef73656d7976
 SHA512 
04437d9c891cd3a22f756c42f05e97398772587175d65aff9d394f0f3e810efc5c1fe7077c39573de3ec259e0605bc2a7ea51093613b2cef908372ae338df19d
-DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 
2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717
 SHA512 
4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b
 DIST lxc-5.0.1.tar.gz 973206 BLAKE2B 
6d5cb1a03eb2612d0f8cb59783a64ec42bedd560cacfebf76383d9599dfc153e381f0e584a1c8c9a0b5b18a46bfb01863649dc5a019546e9ded6079b5ec69ddd
 SHA512 
c87563b556aec83c93a7c62932217791e92da950cc76983f0d5e1d603fe1ae298a63fb5e88ec9ef5173846d579babb5acd0836679b915de00844bb9edf9c8d7e
 DIST lxc-5.0.1.tar.gz.asc 833 BLAKE2B 
f85df5fc5bd88a738042f622ee4191b99e0a8e07db7ceb5824d634bc451f4bf93c8b64d1c72d4899f639ad30bbc9ee82be292dbe310218fa20566ee00f9bb752
 SHA512 
09de4e74d174b54cf9240ca4ef4793b9f63355c65f610abffb40e6dc2dc9130380761a50725e4dcee39b421e4b51c874d141fe22d5ecfd7ad3af35f7ebec09a0

diff --git a/app-containers/lxc/files/lxc-2.0.5-omit-sysconfig.patch 
b/app-containers/lxc/files/lxc-2.0.5-omit-sysconfig.patch
deleted file mode 100644
index 3ec81356499e..
--- a/app-containers/lxc/files/lxc-2.0.5-omit-sysconfig.patch
+++ /dev/null
@@ -1,5 +0,0 @@
 /config/Makefile.am.orig   2016-05-19 02:56:11.891113982 +
-+++ /config/Makefile.am2016-05-19 02:56:32.596115476 +
-@@ -1 +1 @@
--SUBDIRS = apparmor bash etc init selinux templates yum sysconfig
-+SUBDIRS = apparmor bash etc init selinux templates yum

diff --git a/app-containers/lxc/files/lxc_at.service.4.0.0 
b/app-containers/lxc/files/lxc_at.service.4.0.0
deleted file mode 100644
index b354bc53e080..
--- a/app-containers/lxc/files/lxc_at.service.4.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-[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-containers/lxc/lxc-4.0.12.ebuild 
b/app-containers/lxc/lxc-4.0.12.ebuild
deleted file mode 100644
index 961d8c51761d..
--- a/app-containers/lxc/lxc-4.0.12.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 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-2:= )
-   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? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-   ~CGROUPS
-   ~CGROUP_CPUACCT
-   ~CGROUP_DEVICE
-   ~CGROUP_FREEZER
-
-   ~CGROUP_SCHED
-   ~CPUSETS
-   ~IPC_NS
-   ~MACVLAN
-

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

2022-08-30 Thread Joonas Niilola
commit: 31a1b57605bd8479d3723d9a067cae2203caa093
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug 31 06:04:04 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 31 06:09:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a1b576

app-containers/lxc: stabilize 5.0.1 for amd64

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

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

diff --git a/app-containers/lxc/lxc-5.0.1.ebuild 
b/app-containers/lxc/lxc-5.0.1.ebuild
index 88191a6aa5d7..c3c490dfe80a 100644
--- a/app-containers/lxc/lxc-5.0.1.ebuild
+++ b/app-containers/lxc/lxc-5.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2022-08-30 Thread Joonas Niilola
commit: c3e769b371915fcb6e5d12ad663c32e35bcdd768
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug 31 06:03:52 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 31 06:09:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e769b3

app-containers/lxc: stabilize 5.0.1 for x86

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

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

diff --git a/app-containers/lxc/lxc-5.0.1.ebuild 
b/app-containers/lxc/lxc-5.0.1.ebuild
index b014e03bb27b..88191a6aa5d7 100644
--- a/app-containers/lxc/lxc-5.0.1.ebuild
+++ b/app-containers/lxc/lxc-5.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools"
 
 RDEPEND="acct-group/lxc



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

2022-08-16 Thread Joonas Niilola
commit: ba5d9ca21d9fbceeeda1693e79fdffc2c2cb8286
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 16 07:51:44 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 07:55:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5d9ca2

app-containers/lxc: drop 5.0.0, 5.0.0-r1

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

 app-containers/lxc/Manifest|   2 -
 .../lxc-5.0.0-dont-depend-on-static-libcap.patch   |  27 
 .../lxc-5.0.0-fix-strerror-r-char-p-musl.patch |  36 -
 app-containers/lxc/lxc-5.0.0-r1.ebuild | 160 -
 app-containers/lxc/lxc-5.0.0.ebuild| 160 -
 5 files changed, 385 deletions(-)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 6462391f1a33..0c60e874b27b 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,6 +1,4 @@
 DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B 
819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c687f4f8064e42d347113bdf50fcbb653a6fb26598db0daab0c83ad88fe0d27fd2842fac9d7f5fef73656d7976
 SHA512 
04437d9c891cd3a22f756c42f05e97398772587175d65aff9d394f0f3e810efc5c1fe7077c39573de3ec259e0605bc2a7ea51093613b2cef908372ae338df19d
 DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 
2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717
 SHA512 
4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b
-DIST lxc-5.0.0.tar.gz 968678 BLAKE2B 
82fa15353bdd78a1cc4cdb915f4a8366790b4ac317247bb03ceae91137368ef953ec52f6882ba9d44f6b9bddd3ac20579339e6bbedb4e5642adc81473825a91d
 SHA512 
ecdce46a83602197716c9a4e50e0514a7e0764fbf34db6d5e3497e90669b4c8ced4b787fb220967d95dd8e50016075f3b118e85d9d63c21b2ba17de2e7aefb81
-DIST lxc-5.0.0.tar.gz.asc 833 BLAKE2B 
3519789f7a9797895c1b89371db28add0833b0db5a32b71f8fdff98f689a2ed6edd77db90fad89658e7c148a94a1008a718dca32bc3ce40dbfce9b44c9506dbd
 SHA512 
d475073543e82481675a4d7ffe642445b73698ad0675cfd996768c6f026786c694cea062d50139264362a516b8777fc4e1a5fb5592eeed35ac2f6d64460c505d
 DIST lxc-5.0.1.tar.gz 973206 BLAKE2B 
6d5cb1a03eb2612d0f8cb59783a64ec42bedd560cacfebf76383d9599dfc153e381f0e584a1c8c9a0b5b18a46bfb01863649dc5a019546e9ded6079b5ec69ddd
 SHA512 
c87563b556aec83c93a7c62932217791e92da950cc76983f0d5e1d603fe1ae298a63fb5e88ec9ef5173846d579babb5acd0836679b915de00844bb9edf9c8d7e
 DIST lxc-5.0.1.tar.gz.asc 833 BLAKE2B 
f85df5fc5bd88a738042f622ee4191b99e0a8e07db7ceb5824d634bc451f4bf93c8b64d1c72d4899f639ad30bbc9ee82be292dbe310218fa20566ee00f9bb752
 SHA512 
09de4e74d174b54cf9240ca4ef4793b9f63355c65f610abffb40e6dc2dc9130380761a50725e4dcee39b421e4b51c874d141fe22d5ecfd7ad3af35f7ebec09a0

diff --git 
a/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch 
b/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch
deleted file mode 100644
index 74f3d353c561..
--- a/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d72354898feac15bc4082130bcbe638bae02450 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Thu, 14 Jul 2022 17:03:40 +0200
-Subject: [PATCH] meson.build: fix build with -Dcapabilities=false
-
-Define libcap_static to an empty array to avoid the following build
-failure with -Dcapabilities=false:
-
-output/build/lxc-5.0.0/src/lxc/cmd/meson.build:64:4: ERROR: Unknown variable 
"libcap_static".
-
-Signed-off-by: Fabrice Fontaine 

- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 992fa08c72..4ed57a655b 100644
 a/meson.build
-+++ b/meson.build
-@@ -443,6 +443,7 @@ int main(int argc, char *argv[]) { return 0; };
- srcconf.set10('HAVE_STATIC_LIBCAP', false)
- endif
- else
-+libcap_static = []
- srcconf.set10('HAVE_LIBCAP', false)
- srcconf.set10('HAVE_STATIC_LIBCAP', false)
- endif

diff --git 
a/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch 
b/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch
deleted file mode 100644
index fdd7aa24ad8a..
--- a/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/lxc/lxc/commit/8ee8879083f40d2d0b9cef46d6a6907c1b5a814b
-
-From 8ee8879083f40d2d0b9cef46d6a6907c1b5a814b Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Thu, 14 Jul 2022 12:31:21 +0200
-Subject: [PATCH] src/lxc/log.h: fix STRERROR_R_CHAR_P
-
-STRERROR_R_CHAR_P is always defined to 0 or 1 depending on the value of
-have_func_strerror_r_char_p in meson.build so replace #ifdef by #if to
-avoid a redefinition build failure if char *strerror_r is not defined
-
-Signed-off-by: Fabrice Fontaine 

- src/lxc/log.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxc/log.h b/src/lxc/log.h
-index 554a2e1d48..fcddc

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

2022-07-28 Thread Joonas Niilola
commit: 4e00a3e2af73683ae3968ef6a717344b54cc0121
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jul 28 07:57:54 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 28 07:58:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e00a3e2

app-containers/lxc: add 5.0.1

 - update the installed bash comp file list.

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

 app-containers/lxc/Manifest |   2 +
 app-containers/lxc/lxc-5.0.1.ebuild | 159 
 2 files changed, 161 insertions(+)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index c367d0810b33..6462391f1a33 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -2,3 +2,5 @@ DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B 
819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c68
 DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 
2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717
 SHA512 
4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b
 DIST lxc-5.0.0.tar.gz 968678 BLAKE2B 
82fa15353bdd78a1cc4cdb915f4a8366790b4ac317247bb03ceae91137368ef953ec52f6882ba9d44f6b9bddd3ac20579339e6bbedb4e5642adc81473825a91d
 SHA512 
ecdce46a83602197716c9a4e50e0514a7e0764fbf34db6d5e3497e90669b4c8ced4b787fb220967d95dd8e50016075f3b118e85d9d63c21b2ba17de2e7aefb81
 DIST lxc-5.0.0.tar.gz.asc 833 BLAKE2B 
3519789f7a9797895c1b89371db28add0833b0db5a32b71f8fdff98f689a2ed6edd77db90fad89658e7c148a94a1008a718dca32bc3ce40dbfce9b44c9506dbd
 SHA512 
d475073543e82481675a4d7ffe642445b73698ad0675cfd996768c6f026786c694cea062d50139264362a516b8777fc4e1a5fb5592eeed35ac2f6d64460c505d
+DIST lxc-5.0.1.tar.gz 973206 BLAKE2B 
6d5cb1a03eb2612d0f8cb59783a64ec42bedd560cacfebf76383d9599dfc153e381f0e584a1c8c9a0b5b18a46bfb01863649dc5a019546e9ded6079b5ec69ddd
 SHA512 
c87563b556aec83c93a7c62932217791e92da950cc76983f0d5e1d603fe1ae298a63fb5e88ec9ef5173846d579babb5acd0836679b915de00844bb9edf9c8d7e
+DIST lxc-5.0.1.tar.gz.asc 833 BLAKE2B 
f85df5fc5bd88a738042f622ee4191b99e0a8e07db7ceb5824d634bc451f4bf93c8b64d1c72d4899f639ad30bbc9ee82be292dbe310218fa20566ee00f9bb752
 SHA512 
09de4e74d174b54cf9240ca4ef4793b9f63355c65f610abffb40e6dc2dc9130380761a50725e4dcee39b421e4b51c874d141fe22d5ecfd7ad3af35f7ebec09a0

diff --git a/app-containers/lxc/lxc-5.0.1.ebuild 
b/app-containers/lxc/lxc-5.0.1.ebuild
new file mode 100644
index ..b014e03bb27b
--- /dev/null
+++ b/app-containers/lxc/lxc-5.0.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature 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 
)"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   apparmor? ( sys-libs/libapparmor )
+   caps? ( sys-libs/libcap[static-libs] )
+   io-uring? ( >=sys-libs/liburing-2:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? ( dev-libs/openssl:0= )
+   systemd? ( sys-apps/systemd:= )
+   tools? ( sys-libs/libcap[static-libs] )"
+DEPEND="${RDEPEND}
+   sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+   man? ( app-text/docbook2X )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+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"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+src_configure() {
+  

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

2022-07-25 Thread Matthias Maier
commit: 319514d2fb6c6e9c00c986ada3f4fa1c46a18a73
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Jul 25 09:48:50 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Jul 25 09:53:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319514d2

app-containers/lxc: do not hardcode systemd paths

Use $(systemd_get_systemunitdir) instead of hardcoding paths.

Thanks to Arfrever for pointing this out.

Signed-off-by: Matthias Maier  gentoo.org>

 app-containers/lxc/lxc-5.0.0-r1.ebuild | 160 +
 1 file changed, 160 insertions(+)

diff --git a/app-containers/lxc/lxc-5.0.0-r1.ebuild 
b/app-containers/lxc/lxc-5.0.0-r1.ebuild
new file mode 100644
index ..1ab8d12bf9d6
--- /dev/null
+++ b/app-containers/lxc/lxc-5.0.0-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature 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 
)"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools verify-sig"
+
+RDEPEND="acct-group/lxc
+   acct-user/lxc
+   apparmor? ( sys-libs/libapparmor )
+   caps? ( sys-libs/libcap[static-libs] )
+   io-uring? ( >=sys-libs/liburing-2:= )
+   pam? ( sys-libs/pam )
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )
+   ssl? ( dev-libs/openssl:0= )
+   systemd? ( sys-apps/systemd )
+   tools? ( sys-libs/libcap[static-libs] )"
+DEPEND="${RDEPEND}
+   sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+   man? ( app-text/docbook2X )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+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"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
+
+PATCHES=( "${FILESDIR}"/lxc-5.0.0-dont-depend-on-static-libcap.patch
+   "${FILESDIR}"/${PN}-5.0.0-fix-strerror-r-char-p-musl.patch )
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+src_configure() {
+   local emesonargs=(
+   -Dcoverity-build=false
+   -Doss-fuzz=false
+
+   -Dcommands=true
+   -Dmemfd-rexec=true
+   -Dthread-safety=true
+
+   $(meson_use apparmor)
+   $(meson_use caps capabilities)
+   $(meson_use examples)
+   $(meson_use io-uring io-uring-event-loop)
+   $(meson_use man)
+   $(meson_use pam pam-cgroup)
+   $(meson_use seccomp)
+   $(meson_use selinux)
+   $(meson_use ssl openssl)
+   $(meson_use test tests)
+   $(meson_use tools)
+
+   -Ddata-path=/var/lib/lxc
+   -Ddoc-path=/usr/share/doc/${PF}
+   -Dlog-path=/var/log/lxc
+   -Drootfs-mount-path=/var/lib/lxc/rootfs
+   -Druntime-path=/run
+   )
+
+   if use systemd; then
+   local emesonargs+=( -Dinit-script="systemd" )
+   else
+   local emesonargs+=( -Dinit-script="sysvinit" )
+   fi
+
+   use tools && local emesonargs+=( -Dcapabilities=true )
+
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+
+   # 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."
+
+   if use tools; then
+   bashcomp_alias lxc-start 
lxc-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,usernsexec,wait}
+   else
+   bashc

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

2022-07-21 Thread Joonas Niilola
commit: fdaaf77024a0006d4cea03ee2959aab2dcf277c3
Author: Alfred Persson Forsberg  catcream  org>
AuthorDate: Thu Jul 21 08:33:14 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 21 08:37:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdaaf770

app-containers/lxc: Fix build on musl

From: https://github.com/lxc/lxc/commit/8ee8879083f40d2d0b9cef46d6a6907c1b5a814b

"STRERROR_R_CHAR_P is always defined to 0 or 1 depending on the value of
have_func_strerror_r_char_p in meson.build so replace #ifdef by #if to
avoid a redefinition build failure if char *strerror_r is not defined"

- strerror_r returns an int on musl (XSI compliant), not char * which
causes the build failure due to the reason above.

See: https://git.musl-libc.org/cgit/musl/tree/src/string/strerror_r.c#n4
Signed-off-by: Alfred Persson Forsberg  catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/26500
Signed-off-by: Joonas Niilola  gentoo.org>

 .../lxc-5.0.0-fix-strerror-r-char-p-musl.patch | 36 ++
 app-containers/lxc/lxc-5.0.0.ebuild|  3 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git 
a/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch 
b/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch
new file mode 100644
index ..fdd7aa24ad8a
--- /dev/null
+++ b/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch
@@ -0,0 +1,36 @@
+https://github.com/lxc/lxc/commit/8ee8879083f40d2d0b9cef46d6a6907c1b5a814b
+
+From 8ee8879083f40d2d0b9cef46d6a6907c1b5a814b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Thu, 14 Jul 2022 12:31:21 +0200
+Subject: [PATCH] src/lxc/log.h: fix STRERROR_R_CHAR_P
+
+STRERROR_R_CHAR_P is always defined to 0 or 1 depending on the value of
+have_func_strerror_r_char_p in meson.build so replace #ifdef by #if to
+avoid a redefinition build failure if char *strerror_r is not defined
+
+Signed-off-by: Fabrice Fontaine 
+---
+ src/lxc/log.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxc/log.h b/src/lxc/log.h
+index 554a2e1d48..fcddc679a8 100644
+--- a/src/lxc/log.h
 b/src/lxc/log.h
+@@ -304,13 +304,13 @@ __lxc_unused static inline void LXC_##LEVEL(struct 
lxc_log_locinfo* locinfo, \
+  * Helper macro to define errno string.
+  */
+ #if HAVE_STRERROR_R
+-  #ifdef STRERROR_R_CHAR_P
++  #if STRERROR_R_CHAR_P
+   char *strerror_r(int errnum, char *buf, size_t buflen);
+   #else
+   int strerror_r(int errnum, char *buf, size_t buflen);
+   #endif
+ 
+-  #ifdef STRERROR_R_CHAR_P
++  #if STRERROR_R_CHAR_P
+   #define lxc_log_strerror_r  
 \
+   char errno_buf[PATH_MAX / 2] = {"Failed to get errno 
string"};   \
+   char *ptr = NULL;   
 \

diff --git a/app-containers/lxc/lxc-5.0.0.ebuild 
b/app-containers/lxc/lxc-5.0.0.ebuild
index 32030fd52c47..975d697a0e5b 100644
--- a/app-containers/lxc/lxc-5.0.0.ebuild
+++ b/app-containers/lxc/lxc-5.0.0.ebuild
@@ -67,7 +67,8 @@ 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
 
 DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
 
-PATCHES=( "${FILESDIR}"/lxc-5.0.0-dont-depend-on-static-libcap.patch )
+PATCHES=( "${FILESDIR}"/lxc-5.0.0-dont-depend-on-static-libcap.patch
+   "${FILESDIR}"/${PN}-5.0.0-fix-strerror-r-char-p-musl.patch )
 
 pkg_setup() {
linux-info_pkg_setup



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

2022-07-18 Thread Sam James
commit: 61bc5ddf729f2cf9242e79d6107a6d6c5a14d295
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 12:51:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 12:51:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61bc5ddf

app-containers/lxc: Keyword 5.0.0 arm64, #858770

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

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

diff --git a/app-containers/lxc/lxc-5.0.0.ebuild 
b/app-containers/lxc/lxc-5.0.0.ebuild
index 48bb8430078c..9ce737a6a345 100644
--- a/app-containers/lxc/lxc-5.0.0.ebuild
+++ b/app-containers/lxc/lxc-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools verify-sig"
 
 RDEPEND="acct-group/lxc



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

2022-07-18 Thread Sam James
commit: 3e292372704d239b83d5692e15b6e3f43bc3
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 12:51:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 12:51:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e292372

app-containers/lxc: Keyword 5.0.0 arm, #858770

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

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

diff --git a/app-containers/lxc/lxc-5.0.0.ebuild 
b/app-containers/lxc/lxc-5.0.0.ebuild
index 40f95941aeac..48bb8430078c 100644
--- a/app-containers/lxc/lxc-5.0.0.ebuild
+++ b/app-containers/lxc/lxc-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools verify-sig"
 
 RDEPEND="acct-group/lxc



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

2022-07-18 Thread Sam James
commit: 546282a70ca7603bf937239389cf74e4c3d08f9a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 12:51:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 12:51:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=546282a7

app-containers/lxc: Keyword 5.0.0 ppc64, #858770

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

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

diff --git a/app-containers/lxc/lxc-5.0.0.ebuild 
b/app-containers/lxc/lxc-5.0.0.ebuild
index 9ce737a6a345..32030fd52c47 100644
--- a/app-containers/lxc/lxc-5.0.0.ebuild
+++ b/app-containers/lxc/lxc-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools verify-sig"
 
 RDEPEND="acct-group/lxc



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

2022-07-18 Thread Joonas Niilola
commit: 6880fd76eae807450a236e32b9a16c7b9a97b213
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 18 12:25:50 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 18 12:26:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6880fd76

app-containers/lxc: Keyword 5.0.0 riscv, #858770

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

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

diff --git a/app-containers/lxc/lxc-5.0.0.ebuild 
b/app-containers/lxc/lxc-5.0.0.ebuild
index ecab49bf8784..40f95941aeac 100644
--- a/app-containers/lxc/lxc-5.0.0.ebuild
+++ b/app-containers/lxc/lxc-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools verify-sig"
 
 RDEPEND="acct-group/lxc



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

2022-07-18 Thread Joonas Niilola
commit: 6d0ea00fe1515541c398bee704c9d57b0b0cc4cd
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 18 07:37:03 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 18 07:37:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0ea00f

app-containers/lxc: Keyword 5.0.0 x86, #858770

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

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

diff --git a/app-containers/lxc/lxc-5.0.0.ebuild 
b/app-containers/lxc/lxc-5.0.0.ebuild
index e613d9df3f45..ecab49bf8784 100644
--- a/app-containers/lxc/lxc-5.0.0.ebuild
+++ b/app-containers/lxc/lxc-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools verify-sig"
 
 RDEPEND="acct-group/lxc



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

2022-07-18 Thread Joonas Niilola
commit: 0d0aea3ac1915b42f6769703891e6fe50e840a50
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 18 06:50:43 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 18 07:01:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0aea3a

app-containers/lxc: add 5.0.0

 - build system switched to meson, so dropping all keywords off,
 - some changes to handling systemd in general - there's a chance gentoo-lxc
   on systemd breaks due to this (did my best to test it but...)

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

 app-containers/lxc/Manifest|   2 +
 .../lxc-5.0.0-dont-depend-on-static-libcap.patch   |  27 
 .../lxc/files/lxc-monitord.service.5.0.0   |  11 ++
 app-containers/lxc/files/lxc-net.service.5.0.0 |  15 ++
 app-containers/lxc/files/lxc.service-5.0.0 |  19 +++
 app-containers/lxc/files/lxc_at.service.5.0.0  |  19 +++
 app-containers/lxc/lxc-5.0.0.ebuild| 159 +
 7 files changed, 252 insertions(+)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index c736c09fa249..c367d0810b33 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,2 +1,4 @@
 DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B 
819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c687f4f8064e42d347113bdf50fcbb653a6fb26598db0daab0c83ad88fe0d27fd2842fac9d7f5fef73656d7976
 SHA512 
04437d9c891cd3a22f756c42f05e97398772587175d65aff9d394f0f3e810efc5c1fe7077c39573de3ec259e0605bc2a7ea51093613b2cef908372ae338df19d
 DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 
2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717
 SHA512 
4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b
+DIST lxc-5.0.0.tar.gz 968678 BLAKE2B 
82fa15353bdd78a1cc4cdb915f4a8366790b4ac317247bb03ceae91137368ef953ec52f6882ba9d44f6b9bddd3ac20579339e6bbedb4e5642adc81473825a91d
 SHA512 
ecdce46a83602197716c9a4e50e0514a7e0764fbf34db6d5e3497e90669b4c8ced4b787fb220967d95dd8e50016075f3b118e85d9d63c21b2ba17de2e7aefb81
+DIST lxc-5.0.0.tar.gz.asc 833 BLAKE2B 
3519789f7a9797895c1b89371db28add0833b0db5a32b71f8fdff98f689a2ed6edd77db90fad89658e7c148a94a1008a718dca32bc3ce40dbfce9b44c9506dbd
 SHA512 
d475073543e82481675a4d7ffe642445b73698ad0675cfd996768c6f026786c694cea062d50139264362a516b8777fc4e1a5fb5592eeed35ac2f6d64460c505d

diff --git 
a/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch 
b/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch
new file mode 100644
index ..74f3d353c561
--- /dev/null
+++ b/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch
@@ -0,0 +1,27 @@
+From 7d72354898feac15bc4082130bcbe638bae02450 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Thu, 14 Jul 2022 17:03:40 +0200
+Subject: [PATCH] meson.build: fix build with -Dcapabilities=false
+
+Define libcap_static to an empty array to avoid the following build
+failure with -Dcapabilities=false:
+
+output/build/lxc-5.0.0/src/lxc/cmd/meson.build:64:4: ERROR: Unknown variable 
"libcap_static".
+
+Signed-off-by: Fabrice Fontaine 
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 992fa08c72..4ed57a655b 100644
+--- a/meson.build
 b/meson.build
+@@ -443,6 +443,7 @@ int main(int argc, char *argv[]) { return 0; };
+ srcconf.set10('HAVE_STATIC_LIBCAP', false)
+ endif
+ else
++libcap_static = []
+ srcconf.set10('HAVE_LIBCAP', false)
+ srcconf.set10('HAVE_STATIC_LIBCAP', false)
+ endif

diff --git a/app-containers/lxc/files/lxc-monitord.service.5.0.0 
b/app-containers/lxc/files/lxc-monitord.service.5.0.0
new file mode 100644
index ..ff4a201152c0
--- /dev/null
+++ b/app-containers/lxc/files/lxc-monitord.service.5.0.0
@@ -0,0 +1,11 @@
+[Unit]
+Description=LXC Container Monitoring Daemon
+After=syslog.service network.target
+Documentation=man:lxc
+
+[Service]
+Type=simple
+ExecStart=/usr/libexec/lxc/lxc-monitord --daemon
+
+[Install]
+WantedBy=multi-user.target

diff --git a/app-containers/lxc/files/lxc-net.service.5.0.0 
b/app-containers/lxc/files/lxc-net.service.5.0.0
new file mode 100644
index ..8a037fcb7614
--- /dev/null
+++ b/app-containers/lxc/files/lxc-net.service.5.0.0
@@ -0,0 +1,15 @@
+[Unit]
+Description=LXC network bridge setup
+After=network-online.target
+Before=lxc.service
+Documentation=man:lxc
+ConditionVirtualization=!lxc
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/libexec/lxc/lxc-net start
+ExecStop=/usr/libexec/lxc/lxc-net stop
+
+[Install]
+WantedBy=multi-user.target

diff --git a/app-containers/lxc/files/lxc.service-5.0.0 
b/app-containers/lxc/files/lxc.service-5.0.0
new file mode 100644
index ..35d0dff241d0
--- /dev/null
+++ b/app-containers/lxc/files/lxc.service-5.0.0
@@ -0,0 +1,19 @@
+[Unit]

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

2022-04-14 Thread Joonas Niilola
commit: ff94e87fa07cb7c93bde70e2676aeec510a78e7d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Apr 14 11:48:25 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Apr 14 11:51:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff94e87f

app-containers/lxc: drop 4.0.11_p1-r1

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

 app-containers/lxc/Manifest|   2 -
 .../lxc/files/lxc-4.0.11_p1-liburing-sync1.patch   |  29 
 .../lxc/files/lxc-4.0.11_p1-liburing-sync2.patch   |  28 ---
 app-containers/lxc/lxc-4.0.11_p1-r1.ebuild | 188 -
 4 files changed, 247 deletions(-)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index e1145caad041..c736c09fa249 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,4 +1,2 @@
-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
 DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B 
819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c687f4f8064e42d347113bdf50fcbb653a6fb26598db0daab0c83ad88fe0d27fd2842fac9d7f5fef73656d7976
 SHA512 
04437d9c891cd3a22f756c42f05e97398772587175d65aff9d394f0f3e810efc5c1fe7077c39573de3ec259e0605bc2a7ea51093613b2cef908372ae338df19d
 DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 
2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717
 SHA512 
4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b

diff --git a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch 
b/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch
deleted file mode 100644
index cd497a755523..
--- a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch 
b/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch
deleted file mode 100644
index 33b8554193d3..
--- a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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(&descr, -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-containers/lxc/lxc-4.0.11_p1-r1.ebuild 
b/app-containers/lxc/lxc-4.0.11_p1-r1.ebuild
deleted file mode 100644
index 4e14a39d94fa..
--- a/app-containers/lxc/lxc-4.0.11_p1-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU Ge

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

2022-03-19 Thread Joonas Niilola
commit: e0c3e1563774cce5e2f781cb4183e4f7a0ae6663
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Mar 20 06:22:25 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 20 06:22:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0c3e156

app-containers/lxc: stabilize 4.0.12 on x86

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

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

diff --git a/app-containers/lxc/lxc-4.0.12.ebuild 
b/app-containers/lxc/lxc-4.0.12.ebuild
index fd65e6dd243e..961d8c51761d 100644
--- a/app-containers/lxc/lxc-4.0.12.ebuild
+++ b/app-containers/lxc/lxc-4.0.12.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="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"



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

2022-03-19 Thread Joonas Niilola
commit: 9f87150b64f1249ad11776b7c1c67f9b64a67d13
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Mar 20 06:17:33 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 20 06:17:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f87150b

app-containers/lxc: stabilize 4.0.12 for amd64

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

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

diff --git a/app-containers/lxc/lxc-4.0.12.ebuild 
b/app-containers/lxc/lxc-4.0.12.ebuild
index 002b011a8abf..fd65e6dd243e 100644
--- a/app-containers/lxc/lxc-4.0.12.ebuild
+++ b/app-containers/lxc/lxc-4.0.12.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="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"



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

2022-02-02 Thread Joonas Niilola
commit: 217d6f6451475d6649fe0697dbb6f5b1fc927c9b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Feb  2 07:05:04 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb  2 08:53:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217d6f64

app-containers/lxc: add 4.0.12

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

 app-containers/lxc/Manifest  |   2 +
 app-containers/lxc/lxc-4.0.12.ebuild | 184 +++
 2 files changed, 186 insertions(+)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index e2af36e0fe7a..e1145caad041 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,2 +1,4 @@
 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
+DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B 
819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c687f4f8064e42d347113bdf50fcbb653a6fb26598db0daab0c83ad88fe0d27fd2842fac9d7f5fef73656d7976
 SHA512 
04437d9c891cd3a22f756c42f05e97398772587175d65aff9d394f0f3e810efc5c1fe7077c39573de3ec259e0605bc2a7ea51093613b2cef908372ae338df19d
+DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 
2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717
 SHA512 
4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b

diff --git a/app-containers/lxc/lxc-4.0.12.ebuild 
b/app-containers/lxc/lxc-4.0.12.ebuild
new file mode 100644
index ..002b011a8abf
--- /dev/null
+++ b/app-containers/lxc/lxc-4.0.12.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 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-2:= )
+   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? ( sec-keys/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
+  

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

2021-12-21 Thread Joonas Niilola
commit: 26b3cf6e8249327f730696c3f7765a6b7fa0ef79
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Dec 22 07:09:58 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Dec 22 07:59:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b3cf6e

app-containers/lxc: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23464
Signed-off-by: Joonas Niilola  gentoo.org>

 .../lxc/files/lxc-3.0.0-bash-completion.patch  | 27 --
 1 file changed, 27 deletions(-)

diff --git a/app-containers/lxc/files/lxc-3.0.0-bash-completion.patch 
b/app-containers/lxc/files/lxc-3.0.0-bash-completion.patch
deleted file mode 100644
index 2a08eedb1c2d..
--- a/app-containers/lxc/files/lxc-3.0.0-bash-completion.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/config/bash/lxc.in b/config/bash/lxc.in
-index 43056882..0a22d4ad 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" ) )
- }
-@@ -108,4 +107,3 @@ _have lxc-start && {
- complete -o default -F _lxc_generic_t lxc-create
- 
- complete -o default -F _lxc_generic_o lxc-copy
--}
-diff --git a/configure.ac b/configure.ac
-index 50c99836..0569caec 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -395,7 +395,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)
-   ])