subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-containers\/lxd\/"

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

2024-05-13 Thread Joonas Niilola

commit: 4d9f99471e8359ba6ad2d372f5558e99290d04a9
Author: Brahmajit Das  gmail  com>
AuthorDate: Mon May 13 17:37:35 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 13 18:26:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d9f9947

app-containers/lxd: Fix lxd-5.21.1 requiring go >= 1.22.0

Closes: https://bugs.gentoo.org/931863
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36664
Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-containers/lxd/lxd-5.21.1.ebuild 
b/app-containers/lxd/lxd-5.21.1.ebuild
index d7165784ee4d..b501e2db6a66 100644
--- a/app-containers/lxd/lxd-5.21.1.ebuild
+++ b/app-containers/lxd/lxd-5.21.1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
>=sys-fs/lxcfs-5.0.0
sys-fs/squashfs-tools[lzma]
virtual/acl"
-BDEPEND=">=dev-lang/go-1.20
+BDEPEND=">=dev-lang/go-1.22
nls? ( sys-devel/gettext )
verify-sig? ( sec-keys/openpgp-keys-canonical )"

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

2024-04-22 Thread Joonas Niilola

commit: 01321ad937dffa3af288b4272c0e997ea96b23a7
Author: Brahmajit Das  gmail  com>
AuthorDate: Sat Apr 20 19:08:51 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 22 06:26:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01321ad9

app-containers/lxd: add 5.21.1

Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36335
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/Manifest  |   2 +
 app-containers/lxd/lxd-5.21.1.ebuild | 187 +++
 2 files changed, 189 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 4a6f6672e70e..224db03baf4c 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -8,3 +8,5 @@ DIST lxd-5.19.tar.gz 22506800 BLAKE2B 
94940a9e886d005495fd4491e5a8f8beee60c4
 DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 
591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1
 SHA512 
2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed
 DIST lxd-5.20.tar.gz 22825821 BLAKE2B 
616e6659c75e87027883dc6643c8c42cce75f69e7781b93371ca8d00078a7c5086679d70dfd5497ec6be9f917f07d81ef826fc0bdd09317d7b98e435f053c465
 SHA512 
cf593f967d9d595577ab9b05bad99d04b9c30031461fdd4769f4746e651b3aa8e94fca53548da1aec22ff312a91ff46710ab88043a633fbd78ffafe130fed3e3
 DIST lxd-5.20.tar.gz.asc 833 BLAKE2B 
03d469429fee81e6b061de458eeffe7aacf19ccc1dacb73e2e9cf3530439c82fcd016496aa7757d3ff54af2da7372c5ecf0642b3adddff950065b1ceb1e64103
 SHA512 
e48af466194523903a472a246dfa81cd67ec4ad7b1be6edb1ce9135945be8a810fca3f98de5a4d8b93390119cb0e4eda78a323d5dea0330b0c92e755781982a3
+DIST lxd-5.21.1.tar.gz 23753867 BLAKE2B 
102f3c83faa956f6a5f052912417f595a7374c13ff1da21e43b76e267908323f3db05aed8b83fb99a0b70ee03af9b1df0551a2c535db146d5ea6f415f7671e7a
 SHA512 
809099d16ffd12b785a03ad3ed527fa6f0c7503a41b7c93d41fd3418d18f8c68c79e5a689c8df2ed4157d434742bfb5cc267a5afb9734091b224be644a3a6958
+DIST lxd-5.21.1.tar.gz.asc 833 BLAKE2B 
1c43b7750e505ef66d4f9fcf3723abf28a7b4e2785866604b88f6dfa80f7e3d0ed33734bc49606ecff16659de9dabfbeb08ba71c36eafc8d05a28397e3e73a89
 SHA512 
8ec81d1df6d3b9aec58cbde08306a865f9c27e86be04da11a2b5566c78865b51f91edb6fa26e8b5d25202bf33657bd0f867ec986e4e8b39f379b25e03cd6a5d3

diff --git a/app-containers/lxd/lxd-5.21.1.ebuild 
b/app-containers/lxd/lxd-5.21.1.ebuild
new file mode 100644
index ..d7165784ee4d
--- /dev/null
+++ b/app-containers/lxd/lxd-5.21.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd;
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+   verify-sig? ( 
https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 AGPL-3+ BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   >=dev-libs/dqlite-1.16.4:=[lz4]
+   dev-libs/lzo
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+   || (
+   net-firewall/nftables[json]
+   (
+   net-firewall/ebtables
+   net-firewall/iptables
+   )
+   )
+   sys-apps/iproute2
+   sys-fs/fuse:3
+   >=sys-fs/lxcfs-5.0.0
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND=">=dev-lang/go-1.20
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-canonical )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+
+   ~KVM
+   ~MACVTAP
+   ~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+   /usr/bin/lxc
+   /usr/bin/lxc-to-lxd
+   /usr/bin/lxd-agent
+   /usr/bin/lxd-benchmark
+   /usr/bin/lxd-migrate
+   /usr/sbin/lxd"
+

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

2024-02-28 Thread Joonas Niilola

commit: 5c99f075b5b63218fb477def9138949ea269a5cf
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Feb 29 07:22:41 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 29 07:29:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c99f075

app-containers/lxd: stabilize 5.0.3-r2 for amd64

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

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

diff --git a/app-containers/lxd/lxd-5.0.3-r2.ebuild 
b/app-containers/lxd/lxd-5.0.3-r2.ebuild
index 7e0beb10eb7b..2a37a0ddeac2 100644
--- a/app-containers/lxd/lxd-5.0.3-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.3-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/lts"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 
 DEPEND="acct-group/lxd

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

2024-02-26 Thread Joonas Niilola

commit: 2eb87936f7045bfd287ac4d3364a8757779fa997
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Feb 27 07:25:13 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb 27 07:28:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb87936

app-containers/lxd: revbump stable 5.0.2 to match dqlite changes

 - accidentally pushed new dqlite straight-to-stable, stable lxd
   needs to follow its changes.

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

 app-containers/lxd/{lxd-5.0.2-r3.ebuild => lxd-5.0.2-r4.ebuild} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r3.ebuild 
b/app-containers/lxd/lxd-5.0.2-r4.ebuild
similarity index 98%
rename from app-containers/lxd/lxd-5.0.2-r3.ebuild
rename to app-containers/lxd/lxd-5.0.2-r4.ebuild
index 16d15f1b9488..f74e0a523ad9 100644
--- a/app-containers/lxd/lxd-5.0.2-r3.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,9 +19,8 @@ DEPEND="acct-group/lxd
app-arch/xz-utils
>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
dev-db/sqlite:3
-   >=dev-libs/dqlite-1.13.0:=
+   >=dev-libs/dqlite-1.16.4:=[lz4]
dev-libs/lzo
-   >=dev-libs/raft-0.17.1:=[lz4]
>=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp]
sys-libs/libcap

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

2024-02-25 Thread Joonas Niilola

commit: 8b8825bdc837424e00e4f32701f180aa881cb97c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Feb 25 09:30:58 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Feb 25 09:30:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8825bd

app-containers/lxd: revbump to update dqlite<->raft deps on unstable

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

 app-containers/lxd/{lxd-5.19.ebuild => lxd-5.19-r1.ebuild} | 5 ++---
 app-containers/lxd/{lxd-5.20.ebuild => lxd-5.20-r1.ebuild} | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-containers/lxd/lxd-5.19.ebuild 
b/app-containers/lxd/lxd-5.19-r1.ebuild
similarity index 98%
rename from app-containers/lxd/lxd-5.19.ebuild
rename to app-containers/lxd/lxd-5.19-r1.ebuild
index 2693dbf72267..5ffa910f85e6 100644
--- a/app-containers/lxd/lxd-5.19.ebuild
+++ b/app-containers/lxd/lxd-5.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,9 +20,8 @@ DEPEND="acct-group/lxd
app-arch/xz-utils
>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
dev-db/sqlite:3
-   >=dev-libs/dqlite-1.13.0:=
+   >=dev-libs/dqlite-1.13.0:=[lz4]
dev-libs/lzo
-   >=dev-libs/raft-0.17.1:=[lz4]
>=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp]
sys-libs/libcap

diff --git a/app-containers/lxd/lxd-5.20.ebuild 
b/app-containers/lxd/lxd-5.20-r1.ebuild
similarity index 98%
rename from app-containers/lxd/lxd-5.20.ebuild
rename to app-containers/lxd/lxd-5.20-r1.ebuild
index 13dabf6c..830c03e24fb5 100644
--- a/app-containers/lxd/lxd-5.20.ebuild
+++ b/app-containers/lxd/lxd-5.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,9 +20,8 @@ DEPEND="acct-group/lxd
app-arch/xz-utils
>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
dev-db/sqlite:3
-   >=dev-libs/dqlite-1.13.0:=
+   >=dev-libs/dqlite-1.13.0:=[lz4]
dev-libs/lzo
-   >=dev-libs/raft-0.17.1:=[lz4]
>=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp]
sys-libs/libcap

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

2024-02-25 Thread Joonas Niilola

commit: 62628c3c6543da2a58ce7126569b1403543badd7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Feb 25 09:34:37 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Feb 25 09:34:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62628c3c

app-containers/lxd: bump the dqlite version req on unstable pkgs

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

 app-containers/lxd/lxd-5.0.3-r2.ebuild | 2 +-
 app-containers/lxd/lxd-5.19-r1.ebuild  | 2 +-
 app-containers/lxd/lxd-5.20-r1.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.3-r2.ebuild 
b/app-containers/lxd/lxd-5.0.3-r2.ebuild
index 36023d313b1e..7e0beb10eb7b 100644
--- a/app-containers/lxd/lxd-5.0.3-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.3-r2.ebuild
@@ -20,7 +20,7 @@ DEPEND="acct-group/lxd
app-arch/xz-utils
>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
dev-db/sqlite:3
-   >=dev-libs/dqlite-1.13.0:=[lz4]
+   >=dev-libs/dqlite-1.16.4:=[lz4]
dev-libs/lzo
>=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp]

diff --git a/app-containers/lxd/lxd-5.19-r1.ebuild 
b/app-containers/lxd/lxd-5.19-r1.ebuild
index 5ffa910f85e6..43ca84883aa1 100644
--- a/app-containers/lxd/lxd-5.19-r1.ebuild
+++ b/app-containers/lxd/lxd-5.19-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="acct-group/lxd
app-arch/xz-utils
>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
dev-db/sqlite:3
-   >=dev-libs/dqlite-1.13.0:=[lz4]
+   >=dev-libs/dqlite-1.16.4:=[lz4]
dev-libs/lzo
>=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp]

diff --git a/app-containers/lxd/lxd-5.20-r1.ebuild 
b/app-containers/lxd/lxd-5.20-r1.ebuild
index 830c03e24fb5..d7165784ee4d 100644
--- a/app-containers/lxd/lxd-5.20-r1.ebuild
+++ b/app-containers/lxd/lxd-5.20-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="acct-group/lxd
app-arch/xz-utils
>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
dev-db/sqlite:3
-   >=dev-libs/dqlite-1.13.0:=[lz4]
+   >=dev-libs/dqlite-1.16.4:=[lz4]
dev-libs/lzo
>=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp]

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

2024-02-25 Thread Joonas Niilola

commit: 2f1d0ea846bd5c47e46fedacce82cfcf5c5240b5
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Feb 25 09:32:22 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Feb 25 09:32:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1d0ea8

app-containers/lxd: revbump lts 5.0.3 due to dqlite<->raft update

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

 app-containers/lxd/{lxd-5.0.3-r1.ebuild => lxd-5.0.3-r2.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.3-r1.ebuild 
b/app-containers/lxd/lxd-5.0.3-r2.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-5.0.3-r1.ebuild
rename to app-containers/lxd/lxd-5.0.3-r2.ebuild
index 0cb951baf4e3..36023d313b1e 100644
--- a/app-containers/lxd/lxd-5.0.3-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.3-r2.ebuild
@@ -20,9 +20,8 @@ DEPEND="acct-group/lxd
app-arch/xz-utils
>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
dev-db/sqlite:3
-   >=dev-libs/dqlite-1.13.0:=
+   >=dev-libs/dqlite-1.13.0:=[lz4]
dev-libs/lzo
-   >=dev-libs/raft-0.17.1:=[lz4]
>=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp]
sys-libs/libcap

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

2024-02-25 Thread Joonas Niilola

commit: 4786fda0544b736e852914bc34c1aa21fc6e3403
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Feb 25 09:31:21 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Feb 25 09:31:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4786fda0

app-containers/lxd: drop 5.0.3

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

 app-containers/lxd/lxd-5.0.3.ebuild | 214 
 1 file changed, 214 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.3.ebuild 
b/app-containers/lxd/lxd-5.0.3.ebuild
deleted file mode 100644
index ff98d497f293..
--- a/app-containers/lxd/lxd-5.0.3.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
-HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd;
-SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
-   verify-sig? ( 
https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
-)"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/lts"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="apparmor nls"
-
-DEPEND="acct-group/lxd
-   app-arch/xz-utils
-   >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-   dev-db/sqlite:3
-   >=dev-libs/dqlite-1.13.0:=
-   dev-libs/lzo
-   >=dev-libs/raft-0.17.1:=[lz4]
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp]
-   sys-libs/libcap
-   virtual/udev"
-RDEPEND="${DEPEND}
-   || (
-   net-firewall/nftables[json]
-   (
-   net-firewall/ebtables
-   net-firewall/iptables
-   )
-   )
-   sys-apps/iproute2
-   sys-fs/fuse:*
-   >=sys-fs/lxcfs-5.0.0
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-canonical )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-
-   ~KVM
-   ~MACVTAP
-   ~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-   /usr/bin/lxc
-   /usr/bin/lxc-to-lxd
-   /usr/bin/lxd-agent
-   /usr/bin/lxd-benchmark
-   /usr/bin/lxd-migrate
-   /usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/canonical.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-PATCHES=(
-   "${FILESDIR}"/lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch
-)
-
-src_prepare() {
-   export GOPATH="${S}/_dist"
-
-   default
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   # Fix hardcoded ovmf file path, see bug 763180
-   sed -i \
-   -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-   -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-   doc/environment.md \
-   lxd/apparmor/instance.go \
-   lxd/apparmor/instance_qemu.go \
-   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
-
-   # Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-   sed -i \
-   -e 
"s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-   lxd/device/device_utils_disk.go || die "Failed to fix 
virtfs-proxy-helper path."
-
-   cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
-   if use apparmor; then
-   sed -i \
-   '/^EnvironmentFile=.*/a 
ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-   "${T}"/lxd.service || die
-   fi
-
-   # Disable -Werror's from go modules.
-   find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-   export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-   for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-   go install -v -x "${S}/${k}" || die "failed compiling ${k}"
-   done
-

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

2024-02-13 Thread Joonas Niilola

commit: a85b57f6ae5fa4ee0a703d6bc18ea904a4eed4aa
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Feb 13 12:57:17 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb 13 12:57:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85b57f6

app-containers/lxd: allow 5.0.3 to pull images from lxc image server

 - the LTS version of LXD is still allowed to pull images. Add upstream
   (Canonical) fixes to lxd-5.0.3.

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

 ...0.3-pr-12834-dont-stop-parsing-image-info.patch |  79 
 .../lxd-5.0.3-pr-12847-ignore-incus-archives.patch |  26 +++
 app-containers/lxd/lxd-5.0.3-r1.ebuild | 216 +
 3 files changed, 321 insertions(+)

diff --git 
a/app-containers/lxd/files/lxd-5.0.3-pr-12834-dont-stop-parsing-image-info.patch
 
b/app-containers/lxd/files/lxd-5.0.3-pr-12834-dont-stop-parsing-image-info.patch
new file mode 100644
index ..768e4d160132
--- /dev/null
+++ 
b/app-containers/lxd/files/lxd-5.0.3-pr-12834-dont-stop-parsing-image-info.patch
@@ -0,0 +1,79 @@
+From fe71f2135bdc3aa6ea28de7ed1ac324f7d689ed6 Mon Sep 17 00:00:00 2001
+From: Thomas Parrott 
+Date: Wed, 7 Feb 2024 16:53:29 +
+Subject: [PATCH 1/2] shared/simplestreams/products: Fix regression in parsing
+ version files
+
+Don't stop when finding first matching version file because the index is parsed
+in random order and LXD calls it multiple times when figuring out which image
+file to download and so stopping early can cause mismatches when trying to 
match
+a converted alias to a specific file fingerprint.
+
+Introduced with 3e9acc4
+
+Signed-off-by: Thomas Parrott 
+(cherry picked from commit 3681d5e54649fcc2fc9375b6820c1133f140228d)
+---
+ shared/simplestreams/products.go | 4 
+ 1 file changed, 4 deletions(-)
+
+diff --git a/shared/simplestreams/products.go 
b/shared/simplestreams/products.go
+index a07e4d5b1b5b..542051403899 100644
+--- a/shared/simplestreams/products.go
 b/shared/simplestreams/products.go
+@@ -279,8 +279,6 @@ func (s *Products) ToLXD() ([]api.Image, 
map[string][][]string) {
+   if err != nil {
+   continue
+   }
+-
+-  break // Stop at first compatible item 
found.
+   } else if shared.StringInSlice(item.FileType, 
lxdCompatItems) {
+   // Locate the root files
+   for _, subItem := range version.Items {
+@@ -291,8 +289,6 @@ func (s *Products) ToLXD() ([]api.Image, 
map[string][][]string) {
+   }
+   }
+   }
+-
+-  break // Stop at first compatible item 
found.
+   }
+   }
+   }
+
+From d3253e4cbc85b97e3bc6dba9a27fd2ab0c4d8685 Mon Sep 17 00:00:00 2001
+From: Thomas Parrott 
+Date: Wed, 7 Feb 2024 10:28:36 +
+Subject: [PATCH 2/2] shared/simplestreams/simplestreams: Improve error
+ messages
+
+Signed-off-by: Thomas Parrott 
+(cherry picked from commit 56364f5a97373155d5e6a5a6b10d06d16a25fb3c)
+---
+ shared/simplestreams/simplestreams.go | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/shared/simplestreams/simplestreams.go 
b/shared/simplestreams/simplestreams.go
+index 3f3255cac913..68e1d96278a3 100644
+--- a/shared/simplestreams/simplestreams.go
 b/shared/simplestreams/simplestreams.go
+@@ -377,7 +377,7 @@ func (s *SimpleStreams) GetFiles(fingerprint string) 
(map[string]DownloadableFil
+   }
+   }
+ 
+-  return nil, fmt.Errorf("Couldn't find the requested image")
++  return nil, fmt.Errorf("Couldn't find the requested image for 
fingerprint %q", fingerprint)
+ }
+ 
+ // ListAliases returns a list of image aliases for the provided image 
fingerprint.
+@@ -501,9 +501,9 @@ func (s *SimpleStreams) GetImage(fingerprint string) 
(*api.Image, error) {
+   }
+ 
+   if len(matches) == 0 {
+-  return nil, fmt.Errorf("The requested image couldn't be found")
++  return nil, fmt.Errorf("The requested image couldn't be found 
for fingerprint %q", fingerprint)
+   } else if len(matches) > 1 {
+-  return nil, fmt.Errorf("More than one match for the provided 
partial fingerprint")
++  return nil, fmt.Errorf("More than one match for the provided 
partial fingerprint %q", fingerprint)
+   }
+ 
+   return [0], nil

diff --git 
a/app-containers/lxd/files/lxd-5.0.3-pr-12847-ignore-incus-archives.patch 
b/app-containers/lxd/files/lxd-5.0.3-pr-12847-ignore-incus-archives.patch
new file mode 100644
index ..76a6a1476de8
--- /dev/null
+++

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

2024-02-03 Thread Joonas Niilola

commit: e287403e01c9ebbbd9a5ee96cce419ca3d0798b5
Author: Brahmajit Das  gmail  com>
AuthorDate: Fri Feb  2 19:58:09 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Feb  3 08:17:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e287403e

app-containers/lxd: add 5.0.3

Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35153
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/Manifest|   2 +
 0.3-remove-shellcheck-buildsystem-checks.patch |  33 
 app-containers/lxd/lxd-5.0.3.ebuild| 214 +
 3 files changed, 249 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 4a4a8cde8103..4a6f6672e70e 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -2,6 +2,8 @@ DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb43
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B 
a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b
 SHA512 
e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 
606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21
 SHA512 
884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
+DIST lxd-5.0.3.tar.gz 16628656 BLAKE2B 
d24b4b2e40635b109b69196995a434fac26e1ffb023bfd2181588ff7543a9022fcd82a0a4ac84d40a7a3f0dceda0167a55e64c40b91c3719dbbeac6e102dd211
 SHA512 
87f5d9fbe2cef5970c0a95f61dc615f26e4168202d39f53c7323787a246fa1d6a378c7b957d90f6afd02e048fb3080a06f7202d02652973fb33421f18680d9bf
+DIST lxd-5.0.3.tar.gz.asc 833 BLAKE2B 
c6ef26dc8ba4033dbc98367609826389640bfd31da25113f9285dc67b2a69da4fe06a3cacbb83fe5b1b984b5eed8ff3a373d5f88693c2999c10b25a7cfd4cd8d
 SHA512 
424e969de30e4fcfabf65062f387d15bd1cc99ed2c984944c529df92d520b3d5de306a8d444850b3916889d318a88e521d275c62353b25853471efb713d58d18
 DIST lxd-5.19.tar.gz 22506800 BLAKE2B 
94940a9e886d005495fd4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386
 SHA512 
11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f
 DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 
591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1
 SHA512 
2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed
 DIST lxd-5.20.tar.gz 22825821 BLAKE2B 
616e6659c75e87027883dc6643c8c42cce75f69e7781b93371ca8d00078a7c5086679d70dfd5497ec6be9f917f07d81ef826fc0bdd09317d7b98e435f053c465
 SHA512 
cf593f967d9d595577ab9b05bad99d04b9c30031461fdd4769f4746e651b3aa8e94fca53548da1aec22ff312a91ff46710ab88043a633fbd78ffafe130fed3e3

diff --git 
a/app-containers/lxd/files/lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch 
b/app-containers/lxd/files/lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch
new file mode 100644
index ..d3efd72ecb37
--- /dev/null
+++ 
b/app-containers/lxd/files/lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch
@@ -0,0 +1,33 @@
+diff --git a/Makefile b/Makefile
+index 8061227..c9b85d2 100644
+--- a/Makefile
 b/Makefile
+@@ -258,28 +258,6 @@ endif
+ .PHONY: build-mo
+ build-mo: $(MOFILES)
+ 
+-.PHONY: static-analysis
+-static-analysis:
+-ifeq ($(shell command -v golangci-lint),)
+-  curl -sSfL 
https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh 
-s -- -b $$(go env GOPATH)/bin
+-endif
+-ifeq ($(shell command -v shellcheck),)
+-  echo "Please install shellcheck"
+-  exit 1
+-else
+-ifneq "$(shell shellcheck --version | grep version: | cut -d ' ' -f2)" "0.8.0"
+-  @echo "WARN: shellcheck version is not 0.8.0"
+-endif
+-endif
+-ifeq ($(shell command -v flake8),)
+-  echo "Please install flake8"
+-  exit 1
+-endif
+-  flake8 test/deps/import-busybox
+-  shellcheck --shell sh test/*.sh test/includes/*.sh test/suites/*.sh 
test/backends/*.sh test/lint/*.sh
+-  shellcheck test/extras/*.sh
+-  run-parts --exit-on-error --regex '.sh' test/lint
+-
+ .PHONY: staticcheck
+ staticcheck:
+ ifeq ($(shell command -v staticcheck),)

diff --git a/app-containers/lxd/lxd-5.0.3.ebuild 
b/app-containers/lxd/lxd-5.0.3.ebuild
new file mode 100644
index

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

2023-12-12 Thread Joonas Niilola

commit: a151520795aa968794db41f60af6bf2821eef84f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Dec 12 19:50:15 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec 12 19:50:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1515207

app-containers/lxd: require >=go-1.20 per upstream for 5.20

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

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

diff --git a/app-containers/lxd/lxd-5.20.ebuild 
b/app-containers/lxd/lxd-5.20.ebuild
index b9350b4d6f5b..13dabf6c 100644
--- a/app-containers/lxd/lxd-5.20.ebuild
+++ b/app-containers/lxd/lxd-5.20.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
>=sys-fs/lxcfs-5.0.0
sys-fs/squashfs-tools[lzma]
virtual/acl"
-BDEPEND="dev-lang/go
+BDEPEND=">=dev-lang/go-1.20
nls? ( sys-devel/gettext )
verify-sig? ( sec-keys/openpgp-keys-canonical )"

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

2023-12-12 Thread Joonas Niilola

commit: 9ae02659749fd779009a2d26be66afb0aae46602
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Dec 12 18:05:14 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec 12 18:05:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae02659

app-containers/lxd: update LICENSE

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

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

diff --git a/app-containers/lxd/lxd-5.20.ebuild 
b/app-containers/lxd/lxd-5.20.ebuild
index 2693dbf72267..b9350b4d6f5b 100644
--- a/app-containers/lxd/lxd-5.20.ebuild
+++ b/app-containers/lxd/lxd-5.20.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
verify-sig? ( 
https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
 )"
 
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+LICENSE="Apache-2.0 AGPL-3+ BSD LGPL-3 MIT"
 SLOT="0/stable"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="apparmor nls"

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

2023-12-12 Thread Joonas Niilola

commit: b0e643e25e7cf704d47ebe7ef8ab1389e33511f8
Author: Brahmajit Das  gmail  com>
AuthorDate: Tue Dec 12 15:56:49 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec 12 16:54:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e643e2

app-containers/lxd: add 5.20

Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34253
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/Manifest|   2 +
 app-containers/lxd/lxd-5.20.ebuild | 188 +
 2 files changed, 190 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index dd8673ce2dd6..4a4a8cde8103 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -4,3 +4,5 @@ DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B 
a0d4e3108664724c064fb8c16031ff7dfa3f49735
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 
606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21
 SHA512 
884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
 DIST lxd-5.19.tar.gz 22506800 BLAKE2B 
94940a9e886d005495fd4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386
 SHA512 
11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f
 DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 
591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1
 SHA512 
2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed
+DIST lxd-5.20.tar.gz 22825821 BLAKE2B 
616e6659c75e87027883dc6643c8c42cce75f69e7781b93371ca8d00078a7c5086679d70dfd5497ec6be9f917f07d81ef826fc0bdd09317d7b98e435f053c465
 SHA512 
cf593f967d9d595577ab9b05bad99d04b9c30031461fdd4769f4746e651b3aa8e94fca53548da1aec22ff312a91ff46710ab88043a633fbd78ffafe130fed3e3
+DIST lxd-5.20.tar.gz.asc 833 BLAKE2B 
03d469429fee81e6b061de458eeffe7aacf19ccc1dacb73e2e9cf3530439c82fcd016496aa7757d3ff54af2da7372c5ecf0642b3adddff950065b1ceb1e64103
 SHA512 
e48af466194523903a472a246dfa81cd67ec4ad7b1be6edb1ce9135945be8a810fca3f98de5a4d8b93390119cb0e4eda78a323d5dea0330b0c92e755781982a3

diff --git a/app-containers/lxd/lxd-5.20.ebuild 
b/app-containers/lxd/lxd-5.20.ebuild
new file mode 100644
index ..2693dbf72267
--- /dev/null
+++ b/app-containers/lxd/lxd-5.20.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd;
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+   verify-sig? ( 
https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   >=dev-libs/dqlite-1.13.0:=
+   dev-libs/lzo
+   >=dev-libs/raft-0.17.1:=[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+   || (
+   net-firewall/nftables[json]
+   (
+   net-firewall/ebtables
+   net-firewall/iptables
+   )
+   )
+   sys-apps/iproute2
+   sys-fs/fuse:3
+   >=sys-fs/lxcfs-5.0.0
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-canonical )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+
+   ~KVM
+   ~MACVTAP
+   ~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+   /usr/bin/lxc
+   /usr/bin/lxc-to-lxd
+   /usr/bin/lxd-agent
+   /usr/bin/lxd-benchmark
+   /usr/bin/lxd-migrate
+   /usr/sbin/lxd"
+

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

2023-12-07 Thread Joonas Niilola

commit: b56e3dd559943516619fffa88fef7f99a8dcad73
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Dec  8 06:48:12 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Dec  8 06:48:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56e3dd5

app-containers/lxd: drop 5.18

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

 app-containers/lxd/Manifest|   2 -
 ...egression-in-lxd_combined.tar.gz-handling.patch |  21 ---
 app-containers/lxd/lxd-5.18.ebuild | 192 -
 3 files changed, 215 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 76125c249aa7..dd8673ce2dd6 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -2,7 +2,5 @@ DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb43
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B 
a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b
 SHA512 
e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 
606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21
 SHA512 
884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
-DIST lxd-5.18.tar.gz 22536474 BLAKE2B 
44dabd50c137adde794ed266484a071d1aecff9300f8710d748a550415bd5f21b5f4ab40602f7b648cc05f9acc403782209636bdb8fe9720ff2808e8816aa27b
 SHA512 
a9bdc276fb040413bad47579fb420951a007d725319c89abfde14062933267c7e5c67c546f905232231997a8f47fa097ed603d93dde2b9990b3e7018103f
-DIST lxd-5.18.tar.gz.asc 833 BLAKE2B 
2eee2786d2930bce45b5f23943d3e9b0dab61595608a38077429585c3191476915d0ba7ef5eb05633a014dd92542cc5a5bfa70c4c0a63b94733297d37d78717e
 SHA512 
959911019bffeca1cddae6b44c65b2cdbd71658cf9f714e41dd3de755629aedc0e8de196dac6ba0de0f27247e859f7090dc23edf4896e7a6c028b87e3665a5e2
 DIST lxd-5.19.tar.gz 22506800 BLAKE2B 
94940a9e886d005495fd4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386
 SHA512 
11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f
 DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 
591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1
 SHA512 
2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed

diff --git 
a/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch
 
b/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch
deleted file mode 100644
index 025a9e6a8e6c..
--- 
a/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/canonical/lxd/commit/2d8481712055d0cbb3bd952e25a1df469939990d.patch
-From: Thomas Parrott 
-Date: Thu, 21 Sep 2023 22:12:19 +0100
-Subject: [PATCH] shared/simplestreams/products: Fix regression in
- lxd_combined.tar.gz handling
-
-For reasons that are likely lost to history simplestreams uses lxd.tar.xz
-whereas the combined file is lxd_combined.tar.gz (not xz).
-
-Signed-off-by: Thomas Parrott 
 a/shared/simplestreams/products.go
-+++ b/shared/simplestreams/products.go
-@@ -10,7 +10,7 @@ import (
-   "github.com/canonical/lxd/shared/osarch"
- )
- 
--var lxdCompatCombinedItems = []string{"lxd_combined.tar.xz", 
"incus_combined.tar.xz"}
-+var lxdCompatCombinedItems = []string{"lxd_combined.tar.gz", 
"incus_combined.tar.gz"}
- var lxdCompatItems = []string{"lxd.tar.xz", "incus.tar.xz"}
- 
- // Products represents the base of download.json.

diff --git a/app-containers/lxd/lxd-5.18.ebuild 
b/app-containers/lxd/lxd-5.18.ebuild
deleted file mode 100644
index 4dd097200fa7..
--- a/app-containers/lxd/lxd-5.18.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
-HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd;
-SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
-   verify-sig? (

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

2023-10-19 Thread Joonas Niilola

commit: 285ccadc969f51887a9fbf74d678a7993fa44535
Author: Brahmajit Das  gmail  com>
AuthorDate: Thu Oct 19 12:59:36 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 19 16:02:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285ccadc

app-containers/lxd: add 5.19

Signed-off-by: Brahmajit Das  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/Manifest|   2 +
 app-containers/lxd/lxd-5.19.ebuild | 188 +
 2 files changed, 190 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index e1ebd6ab8100..ecf436ba8e57 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -6,3 +6,5 @@ DIST lxd-5.17.tar.gz 22319517 BLAKE2B 
b9dfd934fad6b21b6f2b1d25291b4201f647b2b09a
 DIST lxd-5.17.tar.gz.asc 833 BLAKE2B 
bc781d520b8314261b6681603f17fcb82d045bb969ebf8eec64c82ef73f493892d48d50c870f72e9f4f1f6c7dd4b63239a5039949e4f7bb49539c69538b4a2f2
 SHA512 
7e76a6cfcb1bf5b7b864125b412d5bd4766b4af6cdab40d70324c4103d1a716c39dfa5cf0eccf2cb7862f182c7c469f18ca46b981a1be3fc0fac8c47537d6c1c
 DIST lxd-5.18.tar.gz 22536474 BLAKE2B 
44dabd50c137adde794ed266484a071d1aecff9300f8710d748a550415bd5f21b5f4ab40602f7b648cc05f9acc403782209636bdb8fe9720ff2808e8816aa27b
 SHA512 
a9bdc276fb040413bad47579fb420951a007d725319c89abfde14062933267c7e5c67c546f905232231997a8f47fa097ed603d93dde2b9990b3e7018103f
 DIST lxd-5.18.tar.gz.asc 833 BLAKE2B 
2eee2786d2930bce45b5f23943d3e9b0dab61595608a38077429585c3191476915d0ba7ef5eb05633a014dd92542cc5a5bfa70c4c0a63b94733297d37d78717e
 SHA512 
959911019bffeca1cddae6b44c65b2cdbd71658cf9f714e41dd3de755629aedc0e8de196dac6ba0de0f27247e859f7090dc23edf4896e7a6c028b87e3665a5e2
+DIST lxd-5.19.tar.gz 22506800 BLAKE2B 
94940a9e886d005495fd4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386
 SHA512 
11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f
+DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 
591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1
 SHA512 
2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed

diff --git a/app-containers/lxd/lxd-5.19.ebuild 
b/app-containers/lxd/lxd-5.19.ebuild
new file mode 100644
index ..50e2b165276b
--- /dev/null
+++ b/app-containers/lxd/lxd-5.19.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd;
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+   verify-sig? ( 
https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   >=dev-libs/dqlite-1.13.0:=
+   dev-libs/lzo
+   >=dev-libs/raft-0.17.1:=[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+   || (
+   net-firewall/nftables[json]
+   (
+   net-firewall/ebtables
+   net-firewall/iptables
+   )
+   )
+   sys-apps/iproute2
+   sys-fs/fuse:3
+   >=sys-fs/lxcfs-5.0.0
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-canonical )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+
+   ~KVM
+   ~MACVTAP
+   ~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+   /usr/bin/lxc
+   /usr/bin/lxc-to-lxd
+   /usr/bin/lxd-agent
+   /usr/bin/lxd-benchmark
+   /usr/bin/lxd-migrate
+   /usr/sbin/lxd"
+

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

2023-10-19 Thread Joonas Niilola

commit: 54e26b24956184b52b6aae02802b95af4168af3c
Author: Brahmajit Das  gmail  com>
AuthorDate: Thu Oct 19 13:03:41 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 19 16:03:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e26b24

app-containers/lxd: drop 5.17

Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33408
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/Manifest|   2 -
 ...5.17-remove-shellcheck-buildsystem-checks.patch |  31 
 app-containers/lxd/lxd-5.17.ebuild | 192 -
 3 files changed, 225 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index ecf436ba8e57..76125c249aa7 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -2,8 +2,6 @@ DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb43
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B 
a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b
 SHA512 
e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 
606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21
 SHA512 
884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
-DIST lxd-5.17.tar.gz 22319517 BLAKE2B 
b9dfd934fad6b21b6f2b1d25291b4201f647b2b09a1ae155577a88257c021cc36b43a08802411d0f3268b726da7fa38b8627302696f670a1747e3795db0b0efe
 SHA512 
f5feca34fff0b01a9db8041dd18fde82ad089f36ab171cf338556ebec9b2accfa450b0734d72b25bbb7296aaaeafed247aac2117c32f3ebfce5ae716e4b196bf
-DIST lxd-5.17.tar.gz.asc 833 BLAKE2B 
bc781d520b8314261b6681603f17fcb82d045bb969ebf8eec64c82ef73f493892d48d50c870f72e9f4f1f6c7dd4b63239a5039949e4f7bb49539c69538b4a2f2
 SHA512 
7e76a6cfcb1bf5b7b864125b412d5bd4766b4af6cdab40d70324c4103d1a716c39dfa5cf0eccf2cb7862f182c7c469f18ca46b981a1be3fc0fac8c47537d6c1c
 DIST lxd-5.18.tar.gz 22536474 BLAKE2B 
44dabd50c137adde794ed266484a071d1aecff9300f8710d748a550415bd5f21b5f4ab40602f7b648cc05f9acc403782209636bdb8fe9720ff2808e8816aa27b
 SHA512 
a9bdc276fb040413bad47579fb420951a007d725319c89abfde14062933267c7e5c67c546f905232231997a8f47fa097ed603d93dde2b9990b3e7018103f
 DIST lxd-5.18.tar.gz.asc 833 BLAKE2B 
2eee2786d2930bce45b5f23943d3e9b0dab61595608a38077429585c3191476915d0ba7ef5eb05633a014dd92542cc5a5bfa70c4c0a63b94733297d37d78717e
 SHA512 
959911019bffeca1cddae6b44c65b2cdbd71658cf9f714e41dd3de755629aedc0e8de196dac6ba0de0f27247e859f7090dc23edf4896e7a6c028b87e3665a5e2
 DIST lxd-5.19.tar.gz 22506800 BLAKE2B 
94940a9e886d005495fd4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386
 SHA512 
11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f

diff --git 
a/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch 
b/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
deleted file mode 100644
index b0e3a7500b89..
--- 
a/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 a/Makefile
-+++ b/Makefile
-@@ -249,28 +249,6 @@ endif
- .PHONY: build-mo
- build-mo: $(MOFILES)
- 
--.PHONY: static-analysis
--static-analysis:
--ifeq ($(shell command -v golangci-lint),)
--  curl -sSfL 
https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh 
-s -- -b $$(go env GOPATH)/bin
--endif
--ifeq ($(shell command -v shellcheck),)
--  echo "Please install shellcheck"
--  exit 1
--endif
--ifneq "$(shell shellcheck --version | grep version: | cut -d ' ' -f2)" "0.8.0"
--  @echo "WARN: shellcheck version is not 0.8.0"
--endif
--ifeq ($(shell command -v flake8),)
--  echo "Please install flake8"
--  exit 1
--endif
--  golangci-lint run --timeout 5m
--  flake8 test/deps/import-busybox
--  shellcheck --shell sh test/*.sh test/includes/*.sh test/suites/*.sh 
test/backends/*.sh test/lint/*.sh
--  shellcheck test/extras/*.sh
--  run-parts --exit-on-error --regex '.sh' test/lint
--
- .PHONY: tags
- tags: *.go lxd/*.go shared/*.go lxc/*.go
-   find . -type f -name '*.go' | xargs gotags > tags

diff --git a/app-containers/lxd/lxd-5.17.ebuild 
b/app-containers/lxd/lxd-5.17.ebuild
deleted file mode 100644
index

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

2023-10-19 Thread Joonas Niilola

commit: d9e9b91bd22cfa3744d6cebec1bae991a0bb570e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Oct 19 16:03:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 19 16:03:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e9b91b

app-containers/lxd: complete optfeature for lxd-migrate

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

 app-containers/lxd/lxd-5.0.2-r3.ebuild | 2 +-
 app-containers/lxd/lxd-5.18.ebuild | 2 +-
 app-containers/lxd/lxd-5.19.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r3.ebuild 
b/app-containers/lxd/lxd-5.0.2-r3.ebuild
index 8d110b892d9d..f0c1f274db2c 100644
--- a/app-containers/lxd/lxd-5.0.2-r3.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild
@@ -182,7 +182,7 @@ pkg_postinst() {
optfeature "virtual machine support" 
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-   optfeature "full lxd-migrate support"
+   optfeature "full lxd-migrate support" net-misc/rsync
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs
elog

diff --git a/app-containers/lxd/lxd-5.18.ebuild 
b/app-containers/lxd/lxd-5.18.ebuild
index a7b9cee3c03f..d4b3da597693 100644
--- a/app-containers/lxd/lxd-5.18.ebuild
+++ b/app-containers/lxd/lxd-5.18.ebuild
@@ -184,7 +184,7 @@ pkg_postinst() {
optfeature "virtual machine support" 
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-   optfeature "full lxd-migrate support"
+   optfeature "full lxd-migrate support" net-misc/rsync
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs
elog

diff --git a/app-containers/lxd/lxd-5.19.ebuild 
b/app-containers/lxd/lxd-5.19.ebuild
index 50e2b165276b..681eaf740cbf 100644
--- a/app-containers/lxd/lxd-5.19.ebuild
+++ b/app-containers/lxd/lxd-5.19.ebuild
@@ -180,7 +180,7 @@ pkg_postinst() {
optfeature "virtual machine support" 
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-   optfeature "full lxd-migrate support"
+   optfeature "full lxd-migrate support" net-misc/rsync
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs
elog

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

2023-10-16 Thread Joonas Niilola

commit: 34661ada368076b6dfa3904d47102bad870b5595
Author: Lucio Sauer  posteo  net>
AuthorDate: Mon Oct 16 11:44:40 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Oct 16 13:22:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34661ada

app-containers/lxd: add missing nftables dependency

At least one functional firewall implementation has to be present at
runtime to setup a bridge network.

Closes: https://bugs.gentoo.org/915650
Signed-off-by: Lucio Sauer  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/33355
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/lxd-4.0.9-r4.ebuild | 9 +++--
 app-containers/lxd/lxd-5.0.2-r3.ebuild | 9 +++--
 app-containers/lxd/lxd-5.17.ebuild | 9 +++--
 app-containers/lxd/lxd-5.18.ebuild | 9 +++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app-containers/lxd/lxd-4.0.9-r4.ebuild 
b/app-containers/lxd/lxd-4.0.9-r4.ebuild
index 246f3a898406..c15490e20960 100644
--- a/app-containers/lxd/lxd-4.0.9-r4.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r4.ebuild
@@ -27,8 +27,13 @@ DEPEND="acct-group/lxd
sys-libs/libcap
virtual/udev"
 RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6(+)?]
+   || (
+   net-firewall/nftables[json]
+   (
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6(+)?]
+   )
+   )
sys-apps/iproute2[ipv6(+)?]
sys-fs/fuse:*
sys-fs/lxcfs

diff --git a/app-containers/lxd/lxd-5.0.2-r3.ebuild 
b/app-containers/lxd/lxd-5.0.2-r3.ebuild
index 3949502b2989..8d110b892d9d 100644
--- a/app-containers/lxd/lxd-5.0.2-r3.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild
@@ -27,8 +27,13 @@ DEPEND="acct-group/lxd
sys-libs/libcap
virtual/udev"
 RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables
+   || (
+   net-firewall/nftables[json]
+   (
+   net-firewall/ebtables
+   net-firewall/iptables
+   )
+   )
sys-apps/iproute2
sys-fs/fuse:*
>=sys-fs/lxcfs-5.0.0

diff --git a/app-containers/lxd/lxd-5.17.ebuild 
b/app-containers/lxd/lxd-5.17.ebuild
index 76c54a54d503..ea17b562f52c 100644
--- a/app-containers/lxd/lxd-5.17.ebuild
+++ b/app-containers/lxd/lxd-5.17.ebuild
@@ -28,8 +28,13 @@ DEPEND="acct-group/lxd
sys-libs/libcap
virtual/udev"
 RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables
+   || (
+   net-firewall/nftables[json]
+   (
+   net-firewall/ebtables
+   net-firewall/iptables
+   )
+   )
sys-apps/iproute2
sys-fs/fuse:3
>=sys-fs/lxcfs-5.0.0

diff --git a/app-containers/lxd/lxd-5.18.ebuild 
b/app-containers/lxd/lxd-5.18.ebuild
index de51e5e5b7dd..a7b9cee3c03f 100644
--- a/app-containers/lxd/lxd-5.18.ebuild
+++ b/app-containers/lxd/lxd-5.18.ebuild
@@ -28,8 +28,13 @@ DEPEND="acct-group/lxd
sys-libs/libcap
virtual/udev"
 RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables
+   || (
+   net-firewall/nftables[json]
+   (
+   net-firewall/ebtables
+   net-firewall/iptables
+   )
+   )
sys-apps/iproute2
sys-fs/fuse:3
>=sys-fs/lxcfs-5.0.0

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

2023-09-22 Thread Joonas Niilola

commit: 0ccf56f02bdc0a70367a3f06afd78f504eaf1a84
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Sep 22 08:41:45 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep 22 08:41:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccf56f0

app-containers/lxd: update maintainers

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

 app-containers/lxd/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml
index fd92d5b3194e..b2f6ed72c3df 100644
--- a/app-containers/lxd/metadata.xml
+++ b/app-containers/lxd/metadata.xml
@@ -13,10 +13,6 @@
 virtualizat...@gentoo.org
 Gentoo Virtualization Project
   
-  
-proxy-ma...@gentoo.org
-Proxy Maintainers
-  
   
 LXD is a modern, secure and powerful system container and virtual machine 
manager.

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

2023-09-22 Thread Joonas Niilola

commit: a2eb46747b2c6c8fb59728f858de0f93f6cfa63e
Author: Brahmajit Das  gmail  com>
AuthorDate: Fri Sep 22 08:03:24 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep 22 08:41:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2eb4674

app-containers/lxd: add 5.18

Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32968
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/Manifest|   2 +
 ...egression-in-lxd_combined.tar.gz-handling.patch |  21 +++
 app-containers/lxd/lxd-5.18.ebuild | 187 +
 3 files changed, 210 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 798dacc3f7da..e1ebd6ab8100 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -4,3 +4,5 @@ DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B 
a0d4e3108664724c064fb8c16031ff7dfa3f49735
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 
606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21
 SHA512 
884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
 DIST lxd-5.17.tar.gz 22319517 BLAKE2B 
b9dfd934fad6b21b6f2b1d25291b4201f647b2b09a1ae155577a88257c021cc36b43a08802411d0f3268b726da7fa38b8627302696f670a1747e3795db0b0efe
 SHA512 
f5feca34fff0b01a9db8041dd18fde82ad089f36ab171cf338556ebec9b2accfa450b0734d72b25bbb7296aaaeafed247aac2117c32f3ebfce5ae716e4b196bf
 DIST lxd-5.17.tar.gz.asc 833 BLAKE2B 
bc781d520b8314261b6681603f17fcb82d045bb969ebf8eec64c82ef73f493892d48d50c870f72e9f4f1f6c7dd4b63239a5039949e4f7bb49539c69538b4a2f2
 SHA512 
7e76a6cfcb1bf5b7b864125b412d5bd4766b4af6cdab40d70324c4103d1a716c39dfa5cf0eccf2cb7862f182c7c469f18ca46b981a1be3fc0fac8c47537d6c1c
+DIST lxd-5.18.tar.gz 22536474 BLAKE2B 
44dabd50c137adde794ed266484a071d1aecff9300f8710d748a550415bd5f21b5f4ab40602f7b648cc05f9acc403782209636bdb8fe9720ff2808e8816aa27b
 SHA512 
a9bdc276fb040413bad47579fb420951a007d725319c89abfde14062933267c7e5c67c546f905232231997a8f47fa097ed603d93dde2b9990b3e7018103f
+DIST lxd-5.18.tar.gz.asc 833 BLAKE2B 
2eee2786d2930bce45b5f23943d3e9b0dab61595608a38077429585c3191476915d0ba7ef5eb05633a014dd92542cc5a5bfa70c4c0a63b94733297d37d78717e
 SHA512 
959911019bffeca1cddae6b44c65b2cdbd71658cf9f714e41dd3de755629aedc0e8de196dac6ba0de0f27247e859f7090dc23edf4896e7a6c028b87e3665a5e2

diff --git 
a/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch
 
b/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch
new file mode 100644
index ..025a9e6a8e6c
--- /dev/null
+++ 
b/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch
@@ -0,0 +1,21 @@
+https://github.com/canonical/lxd/commit/2d8481712055d0cbb3bd952e25a1df469939990d.patch
+From: Thomas Parrott 
+Date: Thu, 21 Sep 2023 22:12:19 +0100
+Subject: [PATCH] shared/simplestreams/products: Fix regression in
+ lxd_combined.tar.gz handling
+
+For reasons that are likely lost to history simplestreams uses lxd.tar.xz
+whereas the combined file is lxd_combined.tar.gz (not xz).
+
+Signed-off-by: Thomas Parrott 
+--- a/shared/simplestreams/products.go
 b/shared/simplestreams/products.go
+@@ -10,7 +10,7 @@ import (
+   "github.com/canonical/lxd/shared/osarch"
+ )
+ 
+-var lxdCompatCombinedItems = []string{"lxd_combined.tar.xz", 
"incus_combined.tar.xz"}
++var lxdCompatCombinedItems = []string{"lxd_combined.tar.gz", 
"incus_combined.tar.gz"}
+ var lxdCompatItems = []string{"lxd.tar.xz", "incus.tar.xz"}
+ 
+ // Products represents the base of download.json.

diff --git a/app-containers/lxd/lxd-5.18.ebuild 
b/app-containers/lxd/lxd-5.18.ebuild
new file mode 100644
index ..de51e5e5b7dd
--- /dev/null
+++ b/app-containers/lxd/lxd-5.18.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd;
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+   verify-sig? ( 
https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   >=dev-libs/dqlite-1.13.0:=
+   dev-libs/lzo
+   >=dev-libs/raft-0.17.1:=[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+

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

2023-09-10 Thread Joonas Niilola

commit: 7166d1adba75660f5a87e1411b1595157b8f2ee5
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Sep 10 13:21:43 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Sep 10 13:21:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7166d1ad

app-containers/lxd: revbump and add lts subslot on 4.0.9 and 5.0.2

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

 app-containers/lxd/{lxd-4.0.9-r3.ebuild => lxd-4.0.9-r4.ebuild} | 2 +-
 app-containers/lxd/{lxd-5.0.2-r2.ebuild => lxd-5.0.2-r3.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-4.0.9-r3.ebuild 
b/app-containers/lxd/lxd-4.0.9-r4.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-4.0.9-r3.ebuild
rename to app-containers/lxd/lxd-4.0.9-r4.ebuild
index f8d5b8f837b9..246f3a898406 100644
--- a/app-containers/lxd/lxd-4.0.9-r3.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/lts"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild 
b/app-containers/lxd/lxd-5.0.2-r3.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-5.0.2-r2.ebuild
rename to app-containers/lxd/lxd-5.0.2-r3.ebuild
index a567f5520d4e..3949502b2989 100644
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0"
+SLOT="0/lts"
 KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"

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

2023-09-10 Thread Joonas Niilola

commit: 9e4cb55e7bf022bb3e37e069472543fdb11e4797
Author: Brahmajit Das  gmail  com>
AuthorDate: Mon Sep  4 15:32:05 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Sep 10 13:20:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e4cb55e

app-containers/lxd: add 5.17

Closes: https://bugs.gentoo.org/903870
Signed-off-by: Brahmajit Das  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/Manifest|   2 +
 ...5.17-remove-shellcheck-buildsystem-checks.patch |  31 
 app-containers/lxd/lxd-5.17.ebuild | 187 +
 app-containers/lxd/metadata.xml|   8 +
 4 files changed, 228 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 7a4e3af6d38c..798dacc3f7da 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -2,3 +2,5 @@ DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb43
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B 
a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b
 SHA512 
e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 
606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21
 SHA512 
884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
+DIST lxd-5.17.tar.gz 22319517 BLAKE2B 
b9dfd934fad6b21b6f2b1d25291b4201f647b2b09a1ae155577a88257c021cc36b43a08802411d0f3268b726da7fa38b8627302696f670a1747e3795db0b0efe
 SHA512 
f5feca34fff0b01a9db8041dd18fde82ad089f36ab171cf338556ebec9b2accfa450b0734d72b25bbb7296aaaeafed247aac2117c32f3ebfce5ae716e4b196bf
+DIST lxd-5.17.tar.gz.asc 833 BLAKE2B 
bc781d520b8314261b6681603f17fcb82d045bb969ebf8eec64c82ef73f493892d48d50c870f72e9f4f1f6c7dd4b63239a5039949e4f7bb49539c69538b4a2f2
 SHA512 
7e76a6cfcb1bf5b7b864125b412d5bd4766b4af6cdab40d70324c4103d1a716c39dfa5cf0eccf2cb7862f182c7c469f18ca46b981a1be3fc0fac8c47537d6c1c

diff --git 
a/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch 
b/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
new file mode 100644
index ..b0e3a7500b89
--- /dev/null
+++ 
b/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
@@ -0,0 +1,31 @@
+--- a/Makefile
 b/Makefile
+@@ -249,28 +249,6 @@ endif
+ .PHONY: build-mo
+ build-mo: $(MOFILES)
+ 
+-.PHONY: static-analysis
+-static-analysis:
+-ifeq ($(shell command -v golangci-lint),)
+-  curl -sSfL 
https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh 
-s -- -b $$(go env GOPATH)/bin
+-endif
+-ifeq ($(shell command -v shellcheck),)
+-  echo "Please install shellcheck"
+-  exit 1
+-endif
+-ifneq "$(shell shellcheck --version | grep version: | cut -d ' ' -f2)" "0.8.0"
+-  @echo "WARN: shellcheck version is not 0.8.0"
+-endif
+-ifeq ($(shell command -v flake8),)
+-  echo "Please install flake8"
+-  exit 1
+-endif
+-  golangci-lint run --timeout 5m
+-  flake8 test/deps/import-busybox
+-  shellcheck --shell sh test/*.sh test/includes/*.sh test/suites/*.sh 
test/backends/*.sh test/lint/*.sh
+-  shellcheck test/extras/*.sh
+-  run-parts --exit-on-error --regex '.sh' test/lint
+-
+ .PHONY: tags
+ tags: *.go lxd/*.go shared/*.go lxc/*.go
+   find . -type f -name '*.go' | xargs gotags > tags

diff --git a/app-containers/lxd/lxd-5.17.ebuild 
b/app-containers/lxd/lxd-5.17.ebuild
new file mode 100644
index ..76c54a54d503
--- /dev/null
+++ b/app-containers/lxd/lxd-5.17.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd;
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+   verify-sig? ( 
https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+

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

2023-07-05 Thread Joonas Niilola

commit: dfdd198d358292a3c5445451ba6671282cdf9dee
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Jul  5 06:11:41 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jul  5 06:11:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfdd198d

app-containers/lxd: update HOMEPAGE

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

 app-containers/lxd/lxd-5.0.2-r2.ebuild | 2 +-
 app-containers/lxd/metadata.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild 
b/app-containers/lxd/lxd-5.0.2-r2.ebuild
index 9e5eeb783945..a567f5520d4e 100644
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
 
 DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd;
 SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
 

diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml
index dd209643cdb4..0367880cdf4c 100644
--- a/app-containers/lxd/metadata.xml
+++ b/app-containers/lxd/metadata.xml
@@ -25,6 +25,6 @@
 machines, or in general run and manage your infrastructure in a 
cost-effective way.
   
   
-lxc/lxd
+canonical/lxd

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

2023-06-15 Thread Joonas Niilola

commit: 40c6fc1cec1bf99653c8572db9635d4991bb2bef
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jun 15 12:13:44 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 15 12:13:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c6fc1c

app-containers/lxd: add new optfeature for rsync

 - provides a full lxd-migrate support.

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

 app-containers/lxd/lxd-5.0.2-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild 
b/app-containers/lxd/lxd-5.0.2-r2.ebuild
index 133cbce8f682..9e5eeb783945 100644
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r2.ebuild
@@ -177,6 +177,7 @@ pkg_postinst() {
optfeature "virtual machine support" 
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
+   optfeature "full lxd-migrate support"
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs
elog

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

2023-03-25 Thread Joonas Niilola

commit: d2ec14d403f815b51e856daf28c75b8463971ebc
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Mar 25 05:44:53 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar 25 06:32:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ec14d4

app-containers/lxd: drop 5.0.2-r1

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

 app-containers/lxd/lxd-5.0.2-r1.ebuild | 205 -
 1 file changed, 205 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r1.ebuild 
b/app-containers/lxd/lxd-5.0.2-r1.ebuild
deleted file mode 100644
index c71e17124ef0..
--- a/app-containers/lxd/lxd-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="apparmor nls"
-
-DEPEND="acct-group/lxd
-   app-arch/xz-utils
-   >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-   dev-db/sqlite:3
-   >=dev-libs/dqlite-1.13.0:=
-   dev-libs/lzo
-   >=dev-libs/raft-0.17.1:=[lz4]
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp]
-   sys-libs/libcap
-   virtual/udev"
-RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables
-   sys-apps/iproute2
-   sys-fs/fuse:*
-   >=sys-fs/lxcfs-5.0.0
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-
-   ~KVM
-   ~MACVTAP
-   ~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-   /usr/bin/lxc
-   /usr/bin/lxc-to-lxd
-   /usr/bin/lxd-agent
-   /usr/bin/lxd-benchmark
-   /usr/bin/lxd-migrate
-   /usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-PATCHES=( "${FILESDIR}"/lxd-5.0.2-remove-shellcheck-buildsystem-checks.patch )
-
-src_prepare() {
-   export GOPATH="${S}/_dist"
-
-   default
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   # Fix hardcoded ovmf file path, see bug 763180
-   sed -i \
-   -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-   -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-   doc/environment.md \
-   lxd/apparmor/instance.go \
-   lxd/apparmor/instance_qemu.go \
-   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
-
-   # Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-   sed -i \
-   -e 
"s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-   lxd/device/device_utils_disk.go || die "Failed to fix 
virtfs-proxy-helper path."
-
-   cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
-   if use apparmor; then
-   sed -i \
-   '/^EnvironmentFile=.*/a 
ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-   "${T}"/lxd.service || die
-   fi
-
-   # Disable -Werror's from go modules.
-   find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-   export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-   for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-   go install -v -x "${S}/${k}" || die "failed compiling ${k}"
-   done
-
-   go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build 
the daemon"
-
-   # Needs to be built statically
-   CGO_ENABLED=0 go install -v

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

2023-03-08 Thread Joonas Niilola

commit: 6a453f8528ed2ca612f8a3ba3a7c7653e566e943
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Mar  9 06:41:04 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar  9 06:50:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a453f85

app-containers/lxd: stabilize 5.0.2-r2 for amd64

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

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

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild 
b/app-containers/lxd/lxd-5.0.2-r2.ebuild
index 6725606f6ba2..133cbce8f682 100644
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 
 DEPEND="acct-group/lxd

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

2023-03-08 Thread Joonas Niilola

commit: 6faea023ba8b7428c4b8570c09c42fd1c970f692
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Mar  8 16:12:36 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar  8 16:12:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6faea023

app-containers/lxd: include >=btrfs-6.1 fix from upstream

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

 .../files/lxd-5.0.3-btrfs-quota-group-fix.patch|  52 ++
 app-containers/lxd/lxd-5.0.2-r2.ebuild | 206 +
 2 files changed, 258 insertions(+)

diff --git a/app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch 
b/app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch
new file mode 100644
index ..4e993b7e7054
--- /dev/null
+++ b/app-containers/lxd/files/lxd-5.0.3-btrfs-quota-group-fix.patch
@@ -0,0 +1,52 @@
+From e7c852e43c0479060e630adb50342d2552a6cdad Mon Sep 17 00:00:00 2001
+From: Thomas Parrott 
+Date: Tue, 7 Feb 2023 10:04:27 +
+Subject: [PATCH] lxd/storage/drivers/driver/btrfs/utils: Only check for
+ minimum number of columns in `btrfs qgroup show` command
+
+Previously we expected 4 columns, but in btrfs-progs >= 6.0 this has changed 
to 5 columns.
+
+E.g. in Jammy btrfs-progs v5.16.2:
+
+```
+sudo btrfs qgroup show /var/lib/lxd/storage-pools/btrfs
+qgroupid rfer excl
+  
+0/5  16.00KiB 16.00KiB
+0/256 9.66MiB400.00KiB
+0/257 9.66MiB392.00KiB
+```
+
+And in Lunar btrfs-progs v6.1.3:
+
+```
+btrfs qgroup show /var/lib/lxd/storage-pools/btrfs
+QgroupidReferencedExclusive   Path
+---   
+0/5   16.00KiB 16.00KiB   
+0/256  9.63MiB400.00KiB   
images/1f81470478d136f0008c856e3a47369e0ac863f0402ce0e31c56dd29e9fdd4d7
+0/257  9.64MiB404.00KiB   containers/c1
+```
+
+Fixes #11210
+
+Signed-off-by: Thomas Parrott 
+---
+ lxd/storage/drivers/driver_btrfs_utils.go | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lxd/storage/drivers/driver_btrfs_utils.go 
b/lxd/storage/drivers/driver_btrfs_utils.go
+index e1468e4b1a59..722a2de20978 100644
+--- a/lxd/storage/drivers/driver_btrfs_utils.go
 b/lxd/storage/drivers/driver_btrfs_utils.go
+@@ -253,7 +253,9 @@ func (d *btrfs) getQGroup(path string) (string, int64, 
error) {
+   }
+ 
+   fields := strings.Fields(line)
+-  if len(fields) != 4 {
++
++  // The BTRFS tooling changed the number of columns between 
versions so we only check for minimum.
++  if len(fields) < 3 {
+   continue
+   }
+ 

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild 
b/app-containers/lxd/lxd-5.0.2-r2.ebuild
new file mode 100644
index ..6725606f6ba2
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.2-r2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   >=dev-libs/dqlite-1.13.0:=
+   dev-libs/lzo
+   >=dev-libs/raft-0.17.1:=[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+   net-firewall/ebtables
+   net-firewall/iptables
+   sys-apps/iproute2
+   sys-fs/fuse:*
+   >=sys-fs/lxcfs-5.0.0
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+
+   ~KVM
+   ~MACVTAP
+   ~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+   /usr/bin/lxc
+   /usr/bin/lxc-to-lxd
+

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

2023-03-02 Thread Joonas Niilola

commit: c6f02344816966e98f4f41d014b30855e9355410
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Mar  3 06:40:04 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Mar  3 07:14:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f02344

app-containers/lxd: drop 5.0.1-r7

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

 app-containers/lxd/Manifest|   4 -
 ...0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch |  27 ---
 app-containers/lxd/lxd-5.0.1-r7.ebuild | 217 -
 3 files changed, 248 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index fd079b683160..7a4e3af6d38c 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,8 +1,4 @@
 DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2
 SHA512 
657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
-DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 
81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e
 SHA512 
b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
-DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B 
d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12
 SHA512 
bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294
-DIST lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch 882 
BLAKE2B 
4c4cb8b19709939c0c14ed87e5d9c917ac967471400de07c14ea049c0a8aae9a2ed0e3755d554cb1077ee7c607fcdc71431d57a55becd0a46c1f177bc9b33aed
 SHA512 
266788186ca9aabda4ad0fe5fa47ef3acfa31bee64c742c011c58a39f4da833f768e8bb71ec81b57af8d4f124d733f2c22ab33f9ee1bc4ecbd21f5bbbae1f6e7
 DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B 
a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b
 SHA512 
e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 
606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21
 SHA512 
884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
-DIST lxd-5.8-add-tcp-keepalives-to-exec-channels.patch 15702 BLAKE2B 
ee834b86284e36f87ad3e54df04eb2968dc0fefdf81b116bd640e611ac4ca2eb93763ed2c2f3cfd1e9473da1a3e66bd90858eb4bab08a47f86306a0903a19e6e
 SHA512 
5e7c56f5ffbc8cecb27c6916abbbf4bb3d268c0936b9fdb2b80b4b306c911bdcf782059290243988feb49c9209e55de9ea168ea7041636bf9ae1b7d88ff541c9

diff --git 
a/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch
 
b/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch
deleted file mode 100644
index c6cf6c97b013..
--- 
a/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 37779fd75dbcd02fab03a8327a1ec7a6f3273371 Mon Sep 17 00:00:00 2001
-From: Thomas Parrott 
-Date: Wed, 4 Jan 2023 09:59:37 +
-Subject: [PATCH] lxd/storage/drivers/driver/btrfs/utils: Fix getQGroup to
- suport BTRFS >= 6.0.1
-
-Fixes #11210
-
-Signed-off-by: Thomas Parrott 

- lxd/storage/drivers/driver_btrfs_utils.go | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lxd/storage/drivers/driver_btrfs_utils.go 
b/lxd/storage/drivers/driver_btrfs_utils.go
-index 8f0846d2fc9f..e1468e4b1a59 100644
 a/lxd/storage/drivers/driver_btrfs_utils.go
-+++ b/lxd/storage/drivers/driver_btrfs_utils.go
-@@ -247,7 +247,8 @@ func (d *btrfs) getQGroup(path string) (string, int64, 
error) {
-   var qgroup string
-   usage := int64(-1)
-   for _, line := range strings.Split(output, "\n") {
--  if line == "" || strings.HasPrefix(line, "qgroupid") || 
strings.HasPrefix(line, "---") {
-+  // Use case-insensitive field title match because BTRFS tooling 
changed casing between versions.
-+  if line == "" || strings.HasPrefix(strings.ToLower(line), 
"qgroupid") || strings.HasPrefix(line, "-") {
-   continue
-   }
- 

diff --git a/app-containers/lxd/lxd-5.0.1-r7.ebuild

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

2023-02-21 Thread Joonas Niilola

commit: a29385a59262671a79e9fb596eab2b75d019c00e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Feb 22 07:11:05 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 22 07:11:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29385a5

app-containers/lxd: stabilize 5.0.2-r1 for amd64

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

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

diff --git a/app-containers/lxd/lxd-5.0.2-r1.ebuild 
b/app-containers/lxd/lxd-5.0.2-r1.ebuild
index 71d742a84eeb..c71e17124ef0 100644
--- a/app-containers/lxd/lxd-5.0.2-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 
 DEPEND="acct-group/lxd

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

2023-02-21 Thread Joonas Niilola

commit: 453d1bf23d6300c59b8fba583417f3ffba937693
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Feb 22 06:23:13 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 22 06:23:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453d1bf2

app-containers/lxd: revbump stable and add subslot binder for raft

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

 app-containers/lxd/{lxd-5.0.1-r6.ebuild => lxd-5.0.1-r7.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r6.ebuild 
b/app-containers/lxd/lxd-5.0.1-r7.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-5.0.1-r6.ebuild
rename to app-containers/lxd/lxd-5.0.1-r7.ebuild
index 94090ea58185..fb1952e6d9c7 100644
--- a/app-containers/lxd/lxd-5.0.1-r6.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r7.ebuild
@@ -23,7 +23,7 @@ DEPEND="acct-group/lxd
dev-db/sqlite:3
dev-libs/dqlite:=
dev-libs/lzo
-   dev-libs/raft[lz4]
+   dev-libs/raft:=[lz4]
>=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp]
sys-libs/libcap

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

2023-01-31 Thread Joonas Niilola

commit: d16b97d50adcc81c90a0035365310594e7b19a1f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jan 31 10:30:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jan 31 10:30:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16b97d5

app-containers/lxd: re-add 4.0.9 to the tree

 - it's needed, and it's only purpose is to provide an update path
   from lxd-3 to lxd-5. lxd-3 is supported until June 2023.

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

 app-containers/lxd/Manifest|   2 +
 .../lxd/files/lxd-4.0.9-glibc-2.36-fix.patch   |  74 +
 app-containers/lxd/lxd-4.0.9-r3.ebuild | 181 +
 3 files changed, 257 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 8c94a3ceb31e..fd079b683160 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,3 +1,5 @@
+DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2
 SHA512 
657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
+DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 
81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e
 SHA512 
b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
 DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B 
d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12
 SHA512 
bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294
 DIST lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch 882 
BLAKE2B 
4c4cb8b19709939c0c14ed87e5d9c917ac967471400de07c14ea049c0a8aae9a2ed0e3755d554cb1077ee7c607fcdc71431d57a55becd0a46c1f177bc9b33aed
 SHA512 
266788186ca9aabda4ad0fe5fa47ef3acfa31bee64c742c011c58a39f4da833f768e8bb71ec81b57af8d4f124d733f2c22ab33f9ee1bc4ecbd21f5bbbae1f6e7

diff --git a/app-containers/lxd/files/lxd-4.0.9-glibc-2.36-fix.patch 
b/app-containers/lxd/files/lxd-4.0.9-glibc-2.36-fix.patch
new file mode 100644
index ..d05ff2c81bd9
--- /dev/null
+++ b/app-containers/lxd/files/lxd-4.0.9-glibc-2.36-fix.patch
@@ -0,0 +1,74 @@
+From cc7bab602e6b967fdd31c5feed0f3f6321c0a0a7 Mon Sep 17 00:00:00 2001
+From: Luca Barbato 
+Date: Fri, 13 Jan 2023 21:43:22 +
+Subject: [PATCH] Fix syscall wrappers
+
+---
+ lxd/include/syscall_wrappers.h | 7 ---
+ lxd/main_nsexec.go | 2 +-
+ shared/idmap/shift_linux.go| 2 +-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/lxd/include/syscall_wrappers.h b/lxd/include/syscall_wrappers.h
+index 2c28133a8..a6975ab4d 100644
+--- a/lxd/include/syscall_wrappers.h
 b/lxd/include/syscall_wrappers.h
+@@ -26,10 +26,10 @@ static inline int lxd_close_range(unsigned int fd, 
unsigned int max_fd, unsigned
+   return syscall(__NR_close_range, fd, max_fd, flags);
+ }
+ 
+-static inline int open_tree(int dfd, const char *filename, unsigned int flags)
++/* static inline int open_tree(int dfd, const char *filename, unsigned int 
flags)
+ {
+   return syscall(__NR_open_tree, dfd, filename, flags);
+-}
++}*/
+ 
+ /*
+  * mount_setattr()
+@@ -40,7 +40,7 @@ struct lxc_mount_attr {
+   __u64 propagation;
+   __u64 userns_fd;
+ };
+-
++/*
+ static inline int mount_setattr(int dfd, const char *path, unsigned int flags,
+   struct lxc_mount_attr *attr, size_t size)
+ {
+@@ -53,6 +53,7 @@ static inline int move_mount(int from_dfd, const char 
*from_pathname, int to_dfd
+   return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd,
+  to_pathname, flags);
+ }
++*/
+ 
+ /* arg1 of prctl() */
+ #ifndef PR_SCHED_CORE
+diff --git a/lxd/main_nsexec.go b/lxd/main_nsexec.go
+index f11c0d4cb..753024283 100644
+--- a/lxd/main_nsexec.go
 b/lxd/main_nsexec.go
+@@ -298,7 +298,7 @@ static char *file_to_buf(char *path, ssize_t *length)
+ int mount_detach_idmap(const char *path, int fd_userns)
+ {
+   __do_close int fd_tree = -EBADF;
+-  struct lxc_mount_attr attr = {
++  struct mount_attr attr = {
+   .attr_set   = MOUNT_ATTR_IDMAP,
+ 
+   };
+diff --git a/shared/idmap/shift_linux.go b/shared/idmap/shift_linux.go
+index daaf37275..e219ac01c 100644
+--- a/shared/idmap/shift_linux.go
 b/shared/idmap/shift_linux.go
+@@ -314,7 +314,7

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

2023-01-22 Thread Joonas Niilola

commit: 118dd8850381cac4b159027643f50b95172ea940
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jan 22 17:20:53 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jan 22 17:21:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118dd885

app-containers/lxd: update the ipv6 optfeatures

 - iproute2 and iptables should have it enabled unconditionally already.

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

 app-containers/lxd/lxd-5.0.1-r6.ebuild | 2 +-
 app-containers/lxd/lxd-5.0.2-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r6.ebuild 
b/app-containers/lxd/lxd-5.0.1-r6.ebuild
index 944e9f88133b..94090ea58185 100644
--- a/app-containers/lxd/lxd-5.0.1-r6.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r6.ebuild
@@ -187,7 +187,7 @@ pkg_postinst() {
elog
optfeature "virtual machine support" 
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
-   optfeature "ipv6 support" net-dns/dnsmasq[ipv6] 
net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6]
+   optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs
elog

diff --git a/app-containers/lxd/lxd-5.0.2-r1.ebuild 
b/app-containers/lxd/lxd-5.0.2-r1.ebuild
index f361e6e12a6d..71d742a84eeb 100644
--- a/app-containers/lxd/lxd-5.0.2-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r1.ebuild
@@ -175,7 +175,7 @@ pkg_postinst() {
elog
optfeature "virtual machine support" 
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
-   optfeature "ipv6 support" net-dns/dnsmasq[ipv6] 
net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6]
+   optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs
elog

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

2023-01-21 Thread Joonas Niilola

commit: e088f567c2ddad70a2ca1c8a9e9c64cd2932af8c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jan 22 07:07:19 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jan 22 07:24:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e088f567

app-containers/lxd: hint ipv6 functionality with optfeature

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

 app-containers/lxd/{lxd-5.0.1-r5.ebuild => lxd-5.0.1-r6.ebuild} | 7 ---
 app-containers/lxd/{lxd-5.0.2.ebuild => lxd-5.0.2-r1.ebuild}| 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r5.ebuild 
b/app-containers/lxd/lxd-5.0.1-r6.ebuild
similarity index 97%
rename from app-containers/lxd/lxd-5.0.1-r5.ebuild
rename to app-containers/lxd/lxd-5.0.1-r6.ebuild
index 86323cc0f95d..944e9f88133b 100644
--- a/app-containers/lxd/lxd-5.0.1-r5.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r6.ebuild
@@ -25,13 +25,13 @@ DEPEND="acct-group/lxd
dev-libs/lzo
dev-libs/raft[lz4]
>=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6(+)]
+   net-dns/dnsmasq[dhcp]
sys-libs/libcap
virtual/udev"
 RDEPEND="${DEPEND}
net-firewall/ebtables
-   net-firewall/iptables[ipv6(+)]
-   sys-apps/iproute2[ipv6(+)]
+   net-firewall/iptables
+   sys-apps/iproute2
sys-fs/fuse:*
>=sys-fs/lxcfs-5.0.0
sys-fs/squashfs-tools[lzma]
@@ -187,6 +187,7 @@ pkg_postinst() {
elog
optfeature "virtual machine support" 
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
+   optfeature "ipv6 support" net-dns/dnsmasq[ipv6] 
net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6]
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs
elog

diff --git a/app-containers/lxd/lxd-5.0.2.ebuild 
b/app-containers/lxd/lxd-5.0.2-r1.ebuild
similarity index 97%
rename from app-containers/lxd/lxd-5.0.2.ebuild
rename to app-containers/lxd/lxd-5.0.2-r1.ebuild
index 4ce69e48b15f..f361e6e12a6d 100644
--- a/app-containers/lxd/lxd-5.0.2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r1.ebuild
@@ -23,13 +23,13 @@ DEPEND="acct-group/lxd
dev-libs/lzo
>=dev-libs/raft-0.17.1:=[lz4]
>=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6(+)]
+   net-dns/dnsmasq[dhcp]
sys-libs/libcap
virtual/udev"
 RDEPEND="${DEPEND}
net-firewall/ebtables
-   net-firewall/iptables[ipv6(+)]
-   sys-apps/iproute2[ipv6(+)]
+   net-firewall/iptables
+   sys-apps/iproute2
sys-fs/fuse:*
>=sys-fs/lxcfs-5.0.0
sys-fs/squashfs-tools[lzma]
@@ -175,6 +175,7 @@ pkg_postinst() {
elog
optfeature "virtual machine support" 
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
+   optfeature "ipv6 support" net-dns/dnsmasq[ipv6] 
net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6]
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs
elog

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

2023-01-21 Thread Joonas Niilola

commit: 89e2e41d3bdf383fece4fd8d20bb7534d16346e6
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jan 22 07:20:51 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jan 22 07:24:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e2e41d

app-containers/lxd: clean old

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

 app-containers/lxd/lxd-5.0.1-r2.ebuild | 190 -
 1 file changed, 190 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r2.ebuild 
b/app-containers/lxd/lxd-5.0.1-r2.ebuild
deleted file mode 100644
index 6ef72f36e908..
--- a/app-containers/lxd/lxd-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="acct-group/lxd
-   app-arch/xz-utils
-   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-db/sqlite:3
-   dev-libs/dqlite:=
-   dev-libs/lzo
-   dev-libs/raft[lz4]
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6(+)?]
-   sys-libs/libcap
-   virtual/udev"
-RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6(+)?]
-   sys-apps/iproute2[ipv6(+)?]
-   sys-fs/fuse:*
-   >=sys-fs/lxcfs-5.0.0
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-
-   ~KVM
-   ~MACVTAP
-   ~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-   /usr/bin/lxc
-   /usr/bin/lxc-to-lxd
-   /usr/bin/lxd-agent
-   /usr/bin/lxd-benchmark
-   /usr/bin/lxd-migrate
-   /usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_prepare() {
-   export GOPATH="${S}/_dist"
-
-   default
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   # Fix hardcoded ovmf file path, see bug 763180
-   sed -i \
-   -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-   -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-   doc/environment.md \
-   lxd/apparmor/instance.go \
-   lxd/apparmor/instance_qemu.go \
-   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
-
-   # Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-   sed -i \
-   -e 
"s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-   lxd/device/device_utils_disk.go || die "Failed to fix 
virtfs-proxy-helper path."
-
-   cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
-   if use apparmor; then
-   sed -i \
-   '/^EnvironmentFile=.*/a 
ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-   "${T}"/lxd.service || die
-   fi
-
-   # Disable -Werror's from go modules.
-   find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-   export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-   for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-   go install -v -x "${S}/${k}" || die "failed compiling ${k}"
-   done
-
-   go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build 
the daemon"
-
-   # Needs to be built statically
-   CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate
-   CGO_ENABLED=0 go install -v -tags

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

2023-01-19 Thread Joonas Niilola

commit: e92f93c57aadbd458501110e79a467d806dae91e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jan 19 15:09:59 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 19 15:10:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92f93c5

app-containers/lxd: add 5.0.2

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

 app-containers/lxd/Manifest|   2 +
 0.2-remove-shellcheck-buildsystem-checks.patch |  32 
 app-containers/lxd/lxd-5.0.2.ebuild| 204 +
 3 files changed, 238 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 8f71fcdedb69..8c94a3ceb31e 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,4 +1,6 @@
 DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 
81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e
 SHA512 
b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
 DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B 
d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12
 SHA512 
bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294
 DIST lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch 882 
BLAKE2B 
4c4cb8b19709939c0c14ed87e5d9c917ac967471400de07c14ea049c0a8aae9a2ed0e3755d554cb1077ee7c607fcdc71431d57a55becd0a46c1f177bc9b33aed
 SHA512 
266788186ca9aabda4ad0fe5fa47ef3acfa31bee64c742c011c58a39f4da833f768e8bb71ec81b57af8d4f124d733f2c22ab33f9ee1bc4ecbd21f5bbbae1f6e7
+DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B 
a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b
 SHA512 
e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa
+DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 
606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21
 SHA512 
884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
 DIST lxd-5.8-add-tcp-keepalives-to-exec-channels.patch 15702 BLAKE2B 
ee834b86284e36f87ad3e54df04eb2968dc0fefdf81b116bd640e611ac4ca2eb93763ed2c2f3cfd1e9473da1a3e66bd90858eb4bab08a47f86306a0903a19e6e
 SHA512 
5e7c56f5ffbc8cecb27c6916abbbf4bb3d268c0936b9fdb2b80b4b306c911bdcf782059290243988feb49c9209e55de9ea168ea7041636bf9ae1b7d88ff541c9

diff --git 
a/app-containers/lxd/files/lxd-5.0.2-remove-shellcheck-buildsystem-checks.patch 
b/app-containers/lxd/files/lxd-5.0.2-remove-shellcheck-buildsystem-checks.patch
new file mode 100644
index ..a8e457387ee6
--- /dev/null
+++ 
b/app-containers/lxd/files/lxd-5.0.2-remove-shellcheck-buildsystem-checks.patch
@@ -0,0 +1,32 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile 2023-01-16 21:10:45.0 -
 b/Makefile 2023-01-19 14:52:28.488204725 -
+@@ -248,28 +248,6 @@
+ .PHONY: build-mo
+ build-mo: $(MOFILES)
+ 
+-.PHONY: static-analysis
+-static-analysis:
+-ifeq ($(shell command -v golangci-lint 2> /dev/null),)
+-  go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2
+-endif
+-ifeq ($(shell command -v shellcheck 2> /dev/null),)
+-  echo "Please install shellcheck"
+-  exit 1
+-endif
+-ifneq "$(shell shellcheck --version | grep version: | cut -d ' ' -f2)" "0.8.0"
+-  @echo "WARN: shellcheck version is not 0.8.0"
+-endif
+-ifeq ($(shell command -v flake8 2> /dev/null),)
+-  echo "Please install flake8"
+-  exit 1
+-endif
+-  golangci-lint run --timeout 5m
+-  flake8 test/deps/import-busybox
+-  shellcheck --shell sh test/*.sh test/includes/*.sh test/suites/*.sh 
test/backends/*.sh test/lint/*.sh
+-  shellcheck test/extras/*.sh
+-  run-parts --regex '.sh' test/lint
+-
+ .PHONY: tags
+ tags: *.go lxd/*.go shared/*.go lxc/*.go
+   find . -type f -name '*.go' | xargs gotags > tags

diff --git a/app-containers/lxd/lxd-5.0.2.ebuild 
b/app-containers/lxd/lxd-5.0.2.ebuild
new file mode 100644
index ..4ce69e48b15f
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
+
+LICENSE="Apache-2.0 BSD LGPL-3

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

2023-01-10 Thread Joonas Niilola

commit: 88efb3b0ad2b4a7c102dc82265eb22cf170f8b3a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jan 10 14:03:38 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jan 10 14:03:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88efb3b0

app-containers/lxd: stabilize 5.0.1-r5 for amd64

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

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

diff --git a/app-containers/lxd/lxd-5.0.1-r5.ebuild 
b/app-containers/lxd/lxd-5.0.1-r5.ebuild
index 53901400ca67..86323cc0f95d 100644
--- a/app-containers/lxd/lxd-5.0.1-r5.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 
 DEPEND="acct-group/lxd

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

2023-01-10 Thread Joonas Niilola

commit: 33183001e60a019c10dda8dcbc5e89997ae5a88a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jan 10 13:24:47 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jan 10 13:24:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33183001

app-containers/lxd: drop 5.0.1-r4

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

 app-containers/lxd/lxd-5.0.1-r4.ebuild | 215 -
 1 file changed, 215 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r4.ebuild 
b/app-containers/lxd/lxd-5.0.1-r4.ebuild
deleted file mode 100644
index 9f824c73165d..
--- a/app-containers/lxd/lxd-5.0.1-r4.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-   
https://github.com/lxc/lxd/commit/d55a590ea50a75c3cb2ea67894be8253074d6093.patch
 -> lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch
-   https://patch-diff.githubusercontent.com/raw/lxc/lxd/pull/11011.patch 
-> lxd-5.8-add-tcp-keepalives-to-exec-channels.patch
-   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="apparmor nls"
-
-DEPEND="acct-group/lxd
-   app-arch/xz-utils
-   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-db/sqlite:3
-   dev-libs/dqlite:=
-   dev-libs/lzo
-   dev-libs/raft[lz4]
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6(+)]
-   sys-libs/libcap
-   virtual/udev"
-RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6(+)]
-   sys-apps/iproute2[ipv6(+)]
-   sys-fs/fuse:*
-   >=sys-fs/lxcfs-5.0.0
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-
-   ~KVM
-   ~MACVTAP
-   ~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-   /usr/bin/lxc
-   /usr/bin/lxc-to-lxd
-   /usr/bin/lxd-agent
-   /usr/bin/lxd-benchmark
-   /usr/bin/lxd-migrate
-   /usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-PATCHES=( 
"${DISTDIR}"/lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch
-   "${DISTDIR}"/lxd-5.8-add-tcp-keepalives-to-exec-channels.patch )
-
-src_unpack() {
-   if use verify-sig; then
-   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-   fi
-
-   default
-}
-
-src_prepare() {
-   export GOPATH="${S}/_dist"
-
-   default
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   # Fix hardcoded ovmf file path, see bug 763180
-   sed -i \
-   -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-   -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-   doc/environment.md \
-   lxd/apparmor/instance.go \
-   lxd/apparmor/instance_qemu.go \
-   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
-
-   # Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-   sed -i \
-   -e 
"s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-   lxd/device/device_utils_disk.go || die "Failed to fix 
virtfs-proxy-helper path."
-
-   cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
-   if use apparmor; then
-   sed -i \
-   '/^EnvironmentFile=.*/a 
ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-   "${T}"/lxd.service || die
-   fi
-
-   # Disable -Werror's from go modules.
-

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

2023-01-10 Thread Joonas Niilola

commit: 276816d0be7ad1b45b5f53d7ac6768415818090a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jan 10 13:24:10 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jan 10 13:24:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276816d0

app-containers/lxd: fix >=btrfs-6.0 storage pool compatibility

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

 ...0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch |  27 +++
 app-containers/lxd/lxd-5.0.1-r5.ebuild | 216 +
 2 files changed, 243 insertions(+)

diff --git 
a/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch
 
b/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch
new file mode 100644
index ..c6cf6c97b013
--- /dev/null
+++ 
b/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch
@@ -0,0 +1,27 @@
+From 37779fd75dbcd02fab03a8327a1ec7a6f3273371 Mon Sep 17 00:00:00 2001
+From: Thomas Parrott 
+Date: Wed, 4 Jan 2023 09:59:37 +
+Subject: [PATCH] lxd/storage/drivers/driver/btrfs/utils: Fix getQGroup to
+ suport BTRFS >= 6.0.1
+
+Fixes #11210
+
+Signed-off-by: Thomas Parrott 
+---
+ lxd/storage/drivers/driver_btrfs_utils.go | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lxd/storage/drivers/driver_btrfs_utils.go 
b/lxd/storage/drivers/driver_btrfs_utils.go
+index 8f0846d2fc9f..e1468e4b1a59 100644
+--- a/lxd/storage/drivers/driver_btrfs_utils.go
 b/lxd/storage/drivers/driver_btrfs_utils.go
+@@ -247,7 +247,8 @@ func (d *btrfs) getQGroup(path string) (string, int64, 
error) {
+   var qgroup string
+   usage := int64(-1)
+   for _, line := range strings.Split(output, "\n") {
+-  if line == "" || strings.HasPrefix(line, "qgroupid") || 
strings.HasPrefix(line, "---") {
++  // Use case-insensitive field title match because BTRFS tooling 
changed casing between versions.
++  if line == "" || strings.HasPrefix(strings.ToLower(line), 
"qgroupid") || strings.HasPrefix(line, "-") {
+   continue
+   }
+ 

diff --git a/app-containers/lxd/lxd-5.0.1-r5.ebuild 
b/app-containers/lxd/lxd-5.0.1-r5.ebuild
new file mode 100644
index ..53901400ca67
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.1-r5.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+   
https://github.com/lxc/lxd/commit/d55a590ea50a75c3cb2ea67894be8253074d6093.patch
 -> lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch
+   https://patch-diff.githubusercontent.com/raw/lxc/lxd/pull/11011.patch 
-> lxd-5.8-add-tcp-keepalives-to-exec-channels.patch
+   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   dev-libs/dqlite:=
+   dev-libs/lzo
+   dev-libs/raft[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp,ipv6(+)]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6(+)]
+   sys-apps/iproute2[ipv6(+)]
+   sys-fs/fuse:*
+   >=sys-fs/lxcfs-5.0.0
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+
+   ~KVM
+   ~MACVTAP
+   ~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+   /usr/bin/lxc
+   /usr/bin/lxc-to-lxd
+   /usr/bin/lxd-agent
+   /usr/bin/lxd-benchmark
+   /usr/bin/lxd-migrate
+   /usr/sbin/lxd"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+

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

2023-01-09 Thread Joonas Niilola

commit: b63796659bcdbafbc03d6bc45cad15ef9b6cd1d9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jan  9 12:49:43 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jan  9 12:49:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6379665

app-containers/lxd: drop 5.0.1-r3

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

 app-containers/lxd/files/lxd-5.0.2.initd |  54 
 app-containers/lxd/lxd-5.0.1-r3.ebuild   | 203 ---
 2 files changed, 257 deletions(-)

diff --git a/app-containers/lxd/files/lxd-5.0.2.initd 
b/app-containers/lxd/files/lxd-5.0.2.initd
deleted file mode 100644
index 575129a8f7e8..
--- a/app-containers/lxd/files/lxd-5.0.2.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-depend() {
-   need net
-   need lxcfs
-}
-
-start() {
-   ebegin "Starting lxd service"
-
-   modprobe -f loop > /dev/null 2>&1
-
-   # Fix permissions on /var/lib/lxd and make sure it exists.
-   # Create a log directory for lxd with correct permissions.
-   install -d /var/lib/lxd --group lxd --owner root --mode 0775
-   install -d /var/log/lxd --group lxd --owner root
-
-   start-stop-daemon --start \
-   --pidfile ${PIDFILE} \
-   --exec ${DAEMON} \
-   --background \
-   --make-pidfile \
-   -- \
-   ${LXD_OPTIONS}
-   eend ${?}
-
-   # Create necessary systemd paths in order for systemd containers to 
work on openrc host.
-   install -d /sys/fs/cgroup/systemd --group lxd --owner root
-   mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd
-}
-
-stop() {
-   if [ "${RC_CMD}" = restart ]; then
-   ebegin "Stopping lxd service (but not containers)"
-   # start-stop-daemon sends SIGTERM with a timeout of 5s by 
default.
-   # SIGTERM indicates to LXD that it will be stopped temporarily.
-   # Instances will keep running.
-   start-stop-daemon --stop --quiet -p "${PIDFILE}"
-   eend ${?}
-   else
-   ebegin "Stopping lxd service and containers, waiting 40s"
-   # SIGPWR indicates to LXD that the host is going down.
-   # LXD will do a clean shutdown of all instances.
-   # After 30s all remaining instances will be killed.
-   # We wait up to 40s for LXD.
-   start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
-   eend ${?}
-   fi
-}

diff --git a/app-containers/lxd/lxd-5.0.1-r3.ebuild 
b/app-containers/lxd/lxd-5.0.1-r3.ebuild
deleted file mode 100644
index 703f56669164..
--- a/app-containers/lxd/lxd-5.0.1-r3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-   
https://github.com/lxc/lxd/commit/d55a590ea50a75c3cb2ea67894be8253074d6093.patch
 -> lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch
-   https://patch-diff.githubusercontent.com/raw/lxc/lxd/pull/11011.patch 
-> lxd-5.8-add-tcp-keepalives-to-exec-channels.patch
-   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="apparmor ipv6 nls"
-
-DEPEND="acct-group/lxd
-   app-arch/xz-utils
-   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-db/sqlite:3
-   dev-libs/dqlite:=
-   dev-libs/lzo
-   dev-libs/raft[lz4]
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6(+)?]
-   sys-libs/libcap
-   virtual/udev"
-RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6(+)?]
-   sys-apps/iproute2[ipv6(+)?]
-   sys-fs/fuse:*
-   >=sys-fs/lxcfs-5.0.0
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-
-   ~KVM
-   ~MACVTAP
-   ~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and

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

2023-01-07 Thread Joonas Niilola

commit: 2b33c4e01bd347ae6fdce2ad634218548cdd1e19
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jan  8 06:16:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jan  8 06:16:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b33c4e0

app-containers/lxd: edit the latest openrc init.d file again

 - remove suggestion for 'rc_cgroup_controllers="yes"' which is the default
   value in rc.conf.

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

 app-containers/lxd/files/lxd-5.0.2-r1.initd | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-containers/lxd/files/lxd-5.0.2-r1.initd 
b/app-containers/lxd/files/lxd-5.0.2-r1.initd
index 85b27a45e448..7c74c0fdc308 100644
--- a/app-containers/lxd/files/lxd-5.0.2-r1.initd
+++ b/app-containers/lxd/files/lxd-5.0.2-r1.initd
@@ -31,8 +31,7 @@ start() {
 
# Create necessary systemd paths in order for systemd containers to 
work on openrc host.
# /etc/rc.conf should have following values:
-   # rc_cgroup_mode="hybrid"
-   # rc_cgroup_controllers="yes"
+   #   rc_cgroup_mode="hybrid"
if [ -d /sys/fs/cgroup/unified ] &&
[ ! -d /sys/fs/cgroup/systemd ]; then
install -d /sys/fs/cgroup/systemd --group lxd --owner root

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

2023-01-07 Thread Joonas Niilola

commit: 61e6146248d24f24ead8828d5db13cd468670b9b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jan  7 13:15:33 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan  7 13:15:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e61462

app-containers/lxd: update Copyright year to 2023 in the init.d file

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

 app-containers/lxd/files/lxd-5.0.2-r1.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/files/lxd-5.0.2-r1.initd 
b/app-containers/lxd/files/lxd-5.0.2-r1.initd
index 288729a6831c..85b27a45e448 100644
--- a/app-containers/lxd/files/lxd-5.0.2-r1.initd
+++ b/app-containers/lxd/files/lxd-5.0.2-r1.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 DAEMON=/usr/sbin/lxd

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

2023-01-07 Thread Joonas Niilola

commit: 67e0c923557984eda05b09fcad093c0840ef8a12
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jan  7 13:01:32 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan  7 13:13:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e0c923

app-containers/lxd: enhance openrc init.d file

 - attempt to only create /sys/fs/cgroup/systemd if rc.conf has support for it,
 - enhance the pkg_postinst messages,
 - remove 'ipv6' use flag as the dependencies already enable it by default.

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

 app-containers/lxd/files/lxd-5.0.2-r1.initd |  60 
 app-containers/lxd/lxd-5.0.1-r4.ebuild  | 215 
 2 files changed, 275 insertions(+)

diff --git a/app-containers/lxd/files/lxd-5.0.2-r1.initd 
b/app-containers/lxd/files/lxd-5.0.2-r1.initd
new file mode 100644
index ..288729a6831c
--- /dev/null
+++ b/app-containers/lxd/files/lxd-5.0.2-r1.initd
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+   need net
+   need lxcfs
+}
+
+start() {
+   ebegin "Starting lxd service"
+
+   modprobe -f loop > /dev/null 2>&1
+
+   # Fix permissions on /var/lib/lxd and make sure it exists.
+   # Create a log directory for lxd with correct permissions.
+   install -d /var/lib/lxd --group lxd --owner root --mode 0775
+   install -d /var/log/lxd --group lxd --owner root
+
+   start-stop-daemon --start \
+   --pidfile ${PIDFILE} \
+   --exec ${DAEMON} \
+   --background \
+   --make-pidfile \
+   -- \
+   ${LXD_OPTIONS}
+   eend ${?}
+
+   # Create necessary systemd paths in order for systemd containers to 
work on openrc host.
+   # /etc/rc.conf should have following values:
+   # rc_cgroup_mode="hybrid"
+   # rc_cgroup_controllers="yes"
+   if [ -d /sys/fs/cgroup/unified ] &&
+   [ ! -d /sys/fs/cgroup/systemd ]; then
+   install -d /sys/fs/cgroup/systemd --group lxd --owner root
+   mount -t cgroup -o none,name=systemd systemd 
/sys/fs/cgroup/systemd
+   fi
+}
+
+stop() {
+   if [ "${RC_CMD}" = restart ]; then
+   ebegin "Stopping lxd service (but not containers)"
+   # start-stop-daemon sends SIGTERM with a timeout of 5s by 
default.
+   # SIGTERM indicates to LXD that it will be stopped temporarily.
+   # Instances will keep running.
+   start-stop-daemon --stop --quiet -p "${PIDFILE}"
+   eend ${?}
+   else
+   ebegin "Stopping lxd service and containers, waiting 40s"
+   # SIGPWR indicates to LXD that the host is going down.
+   # LXD will do a clean shutdown of all instances.
+   # After 30s all remaining instances will be killed.
+   # We wait up to 40s for LXD.
+   start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
+   eend ${?}
+   fi
+}

diff --git a/app-containers/lxd/lxd-5.0.1-r4.ebuild 
b/app-containers/lxd/lxd-5.0.1-r4.ebuild
new file mode 100644
index ..9f824c73165d
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.1-r4.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+   
https://github.com/lxc/lxd/commit/d55a590ea50a75c3cb2ea67894be8253074d6093.patch
 -> lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch
+   https://patch-diff.githubusercontent.com/raw/lxc/lxd/pull/11011.patch 
-> lxd-5.8-add-tcp-keepalives-to-exec-channels.patch
+   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   dev-libs/dqlite:=
+   dev-libs/lzo
+   dev-libs/raft[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp,ipv6(+)]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6(+)]
+   sys-apps/iproute2[ipv6(+)]
+   sys-fs/fuse:*
+   >=sys-fs/lxcfs-5.0.0
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers

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

2022-12-08 Thread Joonas Niilola

commit: 0fcc7c7e18b0e57e53c5aaf487744ca426dc949c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec  8 09:17:18 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec  8 09:55:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fcc7c7e

app-containers/lxd: add backported fixes etc before 5.0.2

 - update init file to create necessary paths to run systemd containers on
   openrc host. NOTE: Last this was enabled, some openrc on openrc containers
   were broken. Haven't had this happen in a while, let's try again. I'm aware
   some more expert setups, such as lxd-in-lxd (nested) needs _more_ manual
   tweaking now.

   As majority of containers are systemd based, I feel like it's more
   important to support that out-of-the-box and figure other issues
   case-by-case when they arise.

 - fix calling non-existent commands, upstream issue 10795,
 - fix timeouts on exec channels, upstream issue 10034.

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

 app-containers/lxd/Manifest  |   2 +
 app-containers/lxd/files/lxd-5.0.2.initd |  54 
 app-containers/lxd/lxd-5.0.1-r3.ebuild   | 203 +++
 3 files changed, 259 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 637337b043a2..8f71fcdedb69 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 
81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e
 SHA512 
b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
 DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B 
d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12
 SHA512 
bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294
+DIST lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch 882 
BLAKE2B 
4c4cb8b19709939c0c14ed87e5d9c917ac967471400de07c14ea049c0a8aae9a2ed0e3755d554cb1077ee7c607fcdc71431d57a55becd0a46c1f177bc9b33aed
 SHA512 
266788186ca9aabda4ad0fe5fa47ef3acfa31bee64c742c011c58a39f4da833f768e8bb71ec81b57af8d4f124d733f2c22ab33f9ee1bc4ecbd21f5bbbae1f6e7
+DIST lxd-5.8-add-tcp-keepalives-to-exec-channels.patch 15702 BLAKE2B 
ee834b86284e36f87ad3e54df04eb2968dc0fefdf81b116bd640e611ac4ca2eb93763ed2c2f3cfd1e9473da1a3e66bd90858eb4bab08a47f86306a0903a19e6e
 SHA512 
5e7c56f5ffbc8cecb27c6916abbbf4bb3d268c0936b9fdb2b80b4b306c911bdcf782059290243988feb49c9209e55de9ea168ea7041636bf9ae1b7d88ff541c9

diff --git a/app-containers/lxd/files/lxd-5.0.2.initd 
b/app-containers/lxd/files/lxd-5.0.2.initd
new file mode 100644
index ..575129a8f7e8
--- /dev/null
+++ b/app-containers/lxd/files/lxd-5.0.2.initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+   need net
+   need lxcfs
+}
+
+start() {
+   ebegin "Starting lxd service"
+
+   modprobe -f loop > /dev/null 2>&1
+
+   # Fix permissions on /var/lib/lxd and make sure it exists.
+   # Create a log directory for lxd with correct permissions.
+   install -d /var/lib/lxd --group lxd --owner root --mode 0775
+   install -d /var/log/lxd --group lxd --owner root
+
+   start-stop-daemon --start \
+   --pidfile ${PIDFILE} \
+   --exec ${DAEMON} \
+   --background \
+   --make-pidfile \
+   -- \
+   ${LXD_OPTIONS}
+   eend ${?}
+
+   # Create necessary systemd paths in order for systemd containers to 
work on openrc host.
+   install -d /sys/fs/cgroup/systemd --group lxd --owner root
+   mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd
+}
+
+stop() {
+   if [ "${RC_CMD}" = restart ]; then
+   ebegin "Stopping lxd service (but not containers)"
+   # start-stop-daemon sends SIGTERM with a timeout of 5s by 
default.
+   # SIGTERM indicates to LXD that it will be stopped temporarily.
+   # Instances will keep running.
+   start-stop-daemon --stop --quiet -p "${PIDFILE}"
+   eend ${?}
+   else
+   ebegin "Stopping lxd service and containers, waiting 40s"
+   # SIGPWR indicates to LXD that the host is going down.
+   # LXD will do a clean shutdown of all instances.
+   # After 30s all remaining instances will be killed.
+   # We wait up to 40s for LXD.
+   start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
+   eend ${?}

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

2022-11-18 Thread Joonas Niilola

commit: 9c441b542f88794137e3ad41bd9f508b8169d29f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Nov 19 07:35:50 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Nov 19 07:35:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c441b54

app-containers/lxd: add a subslot binder against dqlite

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

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

diff --git a/app-containers/lxd/lxd-5.0.1-r1.ebuild 
b/app-containers/lxd/lxd-5.0.1-r2.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-5.0.1-r1.ebuild
rename to app-containers/lxd/lxd-5.0.1-r2.ebuild
index 5bb5f99e42cf..6ef72f36e908 100644
--- a/app-containers/lxd/lxd-5.0.1-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r2.ebuild
@@ -19,7 +19,7 @@ DEPEND="acct-group/lxd
app-arch/xz-utils
>=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
dev-db/sqlite:3
-   dev-libs/dqlite
+   dev-libs/dqlite:=
dev-libs/lzo
dev-libs/raft[lz4]
>=dev-util/xdelta-3.0[lzma(+)]

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

2022-11-13 Thread Joonas Niilola

commit: 2dcf85ca2e26153521ba95635bdb2e4e41e398a8
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Nov 14 07:16:00 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 14 07:16:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcf85ca

app-containers/lxd: drop 5.0.1

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

 app-containers/lxd/lxd-5.0.1.ebuild | 190 
 1 file changed, 190 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1.ebuild 
b/app-containers/lxd/lxd-5.0.1.ebuild
deleted file mode 100644
index fbff2a88cfc5..
--- a/app-containers/lxd/lxd-5.0.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="acct-group/lxd
-   app-arch/xz-utils
-   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-db/sqlite:3
-   dev-libs/dqlite
-   dev-libs/lzo
-   dev-libs/raft[lz4]
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6(+)?]
-   sys-libs/libcap
-   virtual/udev"
-RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6(+)?]
-   sys-apps/iproute2[ipv6(+)?]
-   sys-fs/fuse:*
-   >=sys-fs/lxcfs-5.0.0
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-
-   ~KVM
-   ~MACVTAP
-   ~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-   /usr/bin/lxc
-   /usr/bin/lxc-to-lxd
-   /usr/bin/lxd-agent
-   /usr/bin/lxd-benchmark
-   /usr/bin/lxd-migrate
-   /usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_prepare() {
-   export GOPATH="${S}/_dist"
-
-   default
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   # Fix hardcoded ovmf file path, see bug 763180
-   sed -i \
-   -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-   -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-   doc/environment.md \
-   lxd/apparmor/instance.go \
-   lxd/apparmor/instance_qemu.go \
-   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
-
-   # Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-   sed -i \
-   -e 
"s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-   lxd/device/device_utils_disk.go || die "Failed to fix 
virtfs-proxy-helper path."
-
-   cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
-   if use apparmor; then
-   sed -i \
-   '/^EnvironmentFile=.*/a 
ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-   "${T}"/lxd.service || die
-   fi
-
-   # Disable -Werror's from go modules.
-   find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-   export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-   for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-   go install -v -x "${S}/${k}" || die "failed compiling ${k}"
-   done
-
-   go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build 
the daemon"
-
-   # Needs to be built statically
-   CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate
-   CGO_ENABLED=0 go install -v -tags

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

2022-11-11 Thread Joonas Niilola

commit: a04b48a498a0456c5d77d3fa9ca01fda1a85f040
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Nov 12 06:22:22 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Nov 12 06:23:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04b48a4

app-containers/lxd: stabilize 5.0.1-r1 for amd64

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

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

diff --git a/app-containers/lxd/lxd-5.0.1-r1.ebuild 
b/app-containers/lxd/lxd-5.0.1-r1.ebuild
index d09573af7d3b..5bb5f99e42cf 100644
--- a/app-containers/lxd/lxd-5.0.1-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd

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

2022-10-12 Thread Joonas Niilola

commit: 595a3534d50588cb5fcb9f5a2be13401ed7b0f34
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Oct 12 16:39:50 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Oct 12 16:39:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=595a3534

app-containers/lxd: fix ebuild to support secure boot with VMs

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

 app-containers/lxd/lxd-5.0.1-r1.ebuild | 190 +
 1 file changed, 190 insertions(+)

diff --git a/app-containers/lxd/lxd-5.0.1-r1.ebuild 
b/app-containers/lxd/lxd-5.0.1-r1.ebuild
new file mode 100644
index ..d09573af7d3b
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.1-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp,ipv6(+)?]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6(+)?]
+   sys-apps/iproute2[ipv6(+)?]
+   sys-fs/fuse:*
+   >=sys-fs/lxcfs-5.0.0
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+
+   ~KVM
+   ~MACVTAP
+   ~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+   /usr/bin/lxc
+   /usr/bin/lxc-to-lxd
+   /usr/bin/lxd-agent
+   /usr/bin/lxd-benchmark
+   /usr/bin/lxd-migrate
+   /usr/sbin/lxd"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+
+GOPATH="${S}/_dist"
+
+src_prepare() {
+   export GOPATH="${S}/_dist"
+
+   default
+
+   sed -i \
+   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
+   -e "s:make:make ${MAKEOPTS}:g" \
+   Makefile || die
+
+   # Fix hardcoded ovmf file path, see bug 763180
+   sed -i \
+   -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+   -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
+   doc/environment.md \
+   lxd/apparmor/instance.go \
+   lxd/apparmor/instance_qemu.go \
+   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
+
+   # Fix hardcoded virtfs-proxy-helper file path, see bug 798924
+   sed -i \
+   -e 
"s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
+   lxd/device/device_utils_disk.go || die "Failed to fix 
virtfs-proxy-helper path."
+
+   cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
+   if use apparmor; then
+   sed -i \
+   '/^EnvironmentFile=.*/a 
ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
+   "${T}"/lxd.service || die
+   fi
+
+   # Disable -Werror's from go modules.
+   find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
+}
+
+src_configure() { :; }
+
+src_compile() {
+   export GOPATH="${S}/_dist"
+   export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
+
+   for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
+   go install -v -x "${S}/${k}" || die "failed compiling ${k}"
+   done
+
+   go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build 
the daemon"
+
+   # Needs to be built statically
+   CGO_ENABLED=0 go install -v -tags

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

2022-09-24 Thread Joonas Niilola

commit: 86fe0c44cc53fe28b0c1fd377a5e49859f9faf1e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Sep 24 05:59:49 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Sep 24 13:57:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86fe0c44

app-containers/lxd: drop 5.0.0

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

 app-containers/lxd/Manifest |   2 -
 app-containers/lxd/lxd-5.0.0.ebuild | 180 
 2 files changed, 182 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 8c0c9f43f578..637337b043a2 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-5.0.0.tar.gz 17706199 BLAKE2B 
5559bdd479e03b43407e58aa240a00dae488cbf799cec39cbe74b636c907d247341132a49b414fa573c5d5d366643d296522efb6d71c1c0f83cc8edc038f1432
 SHA512 
e74c14a2642ee4ea738629b1da9c4b416f3bdbb26a49c8c920eb0e5e0467236fd610276541af1d481d6b069093cb1c35c705008652ff2cd55d2d15e9b7433696
-DIST lxd-5.0.0.tar.gz.asc 833 BLAKE2B 
7e8fc6f6892294fb8a6384f5767cb74b0a4b941c39da3b097c2196b328fb4f0b1816c46adae0bb343022bd558e77612ab3d93884053c1db5f7c1067c13444fb5
 SHA512 
d3d583175437cee37b6d7d8d137ab1440dd6ac1c91200616fe68e5f38197f11ab2ed85f1aba06dfb0d32f88153defb2bb3f897601902e66fe0a5eff6042e57c0
 DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 
81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e
 SHA512 
b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
 DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B 
d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12
 SHA512 
bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294

diff --git a/app-containers/lxd/lxd-5.0.0.ebuild 
b/app-containers/lxd/lxd-5.0.0.ebuild
deleted file mode 100644
index 04dab07a5718..
--- a/app-containers/lxd/lxd-5.0.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="acct-group/lxd
-   app-arch/xz-utils
-   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-db/sqlite:3
-   dev-libs/dqlite
-   dev-libs/lzo
-   dev-libs/raft[lz4]
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6(+)?]
-   sys-libs/libcap
-   virtual/udev"
-RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6(+)?]
-   sys-apps/iproute2[ipv6(+)?]
-   sys-fs/fuse:*
-   >=sys-fs/lxcfs-5.0.0
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-
-   ~KVM
-   ~MACVTAP
-   ~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-   /usr/bin/lxc
-   /usr/bin/lxc-to-lxd
-   /usr/bin/lxd-agent
-   /usr/bin/lxd-benchmark
-   /usr/bin/lxd-migrate
-   /usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_prepare() {
-   export GOPATH="${S}/_dist"
-
-   default
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   # Fix hardcoded ovmf file path, see bug 763180
-   sed -i \
-   -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-   -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-

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

2022-09-19 Thread Joonas Niilola

commit: aea9cb18ab4e1842eef97131cddc62a45fe8b3fd
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Sep 19 06:06:32 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Sep 19 06:06:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea9cb18

app-containers/lxd: stabilize 5.0.1 for amd64

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

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

diff --git a/app-containers/lxd/lxd-5.0.1.ebuild 
b/app-containers/lxd/lxd-5.0.1.ebuild
index 3d6d3f2abe58..fbff2a88cfc5 100644
--- a/app-containers/lxd/lxd-5.0.1.ebuild
+++ b/app-containers/lxd/lxd-5.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd

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

2022-08-19 Thread Joonas Niilola

commit: 3cb2817c7134c02d1401f282e9992823c951efde
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Aug 19 08:43:06 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Aug 19 08:44:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb2817c

app-containers/lxd: add a vm-related update note to 5.0.1

 - virtual machines may require a manual restart after an update to 5.0.1 due
   to incompatibilities in the lxd-agent product.

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

 app-containers/lxd/lxd-5.0.1.ebuild | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.1.ebuild 
b/app-containers/lxd/lxd-5.0.1.ebuild
index b761f3d0f2b8..3d6d3f2abe58 100644
--- a/app-containers/lxd/lxd-5.0.1.ebuild
+++ b/app-containers/lxd/lxd-5.0.1.ebuild
@@ -125,7 +125,7 @@ src_compile() {
go install -v -x "${S}/${k}" || die "failed compiling ${k}"
done
 
-   go install -v -x -tags libsqlite3 ${S}/lxd || die "Failed to build the 
daemon"
+   go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build 
the daemon"
 
# Needs to be built statically
CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate
@@ -177,4 +177,14 @@ pkg_postinst() {
optfeature "zfs storage backend" sys-fs/zfs
elog
elog "Be sure to add your local user to the lxd group."
+
+   if [[ -n ${REPLACING_VERSIONS} ]] && has_version 
app-emulation/qemu[spice,usbredir,virtfs]; then
+   ewarn ""
+   ewarn "You're updating from <5.0.1. Due to incompatible API 
updates in the lxd-agent"
+   ewarn "product, you'll have to restart any running virtual 
machines before they work"
+   ewarn "properly."
+   ewarn ""
+   ewarn "Run: 'lxc restart your-vm' after the update for your 
vm's managed by lxd."
+   ewarn ""
+   fi
 }

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

2022-08-17 Thread Joonas Niilola

commit: 5e109607c953a4b24f85acd2a0df55bc14c6e039
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug 17 06:16:01 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 17 06:17:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e109607

app-containers/lxd: add 5.0.1

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

 app-containers/lxd/Manifest |   2 +
 app-containers/lxd/lxd-5.0.1.ebuild | 180 
 app-containers/lxd/metadata.xml |  17 +++-
 3 files changed, 195 insertions(+), 4 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index ed62839a3b77..8c0c9f43f578 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-5.0.0.tar.gz 17706199 BLAKE2B 
5559bdd479e03b43407e58aa240a00dae488cbf799cec39cbe74b636c907d247341132a49b414fa573c5d5d366643d296522efb6d71c1c0f83cc8edc038f1432
 SHA512 
e74c14a2642ee4ea738629b1da9c4b416f3bdbb26a49c8c920eb0e5e0467236fd610276541af1d481d6b069093cb1c35c705008652ff2cd55d2d15e9b7433696
 DIST lxd-5.0.0.tar.gz.asc 833 BLAKE2B 
7e8fc6f6892294fb8a6384f5767cb74b0a4b941c39da3b097c2196b328fb4f0b1816c46adae0bb343022bd558e77612ab3d93884053c1db5f7c1067c13444fb5
 SHA512 
d3d583175437cee37b6d7d8d137ab1440dd6ac1c91200616fe68e5f38197f11ab2ed85f1aba06dfb0d32f88153defb2bb3f897601902e66fe0a5eff6042e57c0
+DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 
81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e
 SHA512 
b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
+DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B 
d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12
 SHA512 
bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294

diff --git a/app-containers/lxd/lxd-5.0.1.ebuild 
b/app-containers/lxd/lxd-5.0.1.ebuild
new file mode 100644
index ..b761f3d0f2b8
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine 
manager"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp,ipv6(+)?]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6(+)?]
+   sys-apps/iproute2[ipv6(+)?]
+   sys-fs/fuse:*
+   >=sys-fs/lxcfs-5.0.0
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+
+   ~KVM
+   ~MACVTAP
+   ~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+   /usr/bin/lxc
+   /usr/bin/lxc-to-lxd
+   /usr/bin/lxd-agent
+   /usr/bin/lxd-benchmark
+   /usr/bin/lxd-migrate
+   /usr/sbin/lxd"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+
+GOPATH="${S}/_dist"
+
+src_prepare() {
+   export GOPATH="${S}/_dist"
+
+   default
+
+   sed -i \
+   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
+   -e "s:make:make ${MAKEOPTS}:g" \
+   Makefile || die
+
+   # Fix hardcoded ovmf file path, see bug 763180
+   sed -i \
+   -e

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

2022-07-18 Thread Joonas Niilola

commit: 887d6ba405ba4da3f4e08315d60ee675214baf28
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 18 07:00:08 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 18 07:01:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=887d6ba4

app-containers/lxd: drop 4.0.9-r3

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

 app-containers/lxd/Manifest|   2 -
 app-containers/lxd/lxd-4.0.9-r3.ebuild | 179 -
 2 files changed, 181 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index a408e2bad9b6..ed62839a3b77 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2
 SHA512 
657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
-DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.0.tar.gz 17706199 BLAKE2B 
5559bdd479e03b43407e58aa240a00dae488cbf799cec39cbe74b636c907d247341132a49b414fa573c5d5d366643d296522efb6d71c1c0f83cc8edc038f1432
 SHA512 
e74c14a2642ee4ea738629b1da9c4b416f3bdbb26a49c8c920eb0e5e0467236fd610276541af1d481d6b069093cb1c35c705008652ff2cd55d2d15e9b7433696
 DIST lxd-5.0.0.tar.gz.asc 833 BLAKE2B 
7e8fc6f6892294fb8a6384f5767cb74b0a4b941c39da3b097c2196b328fb4f0b1816c46adae0bb343022bd558e77612ab3d93884053c1db5f7c1067c13444fb5
 SHA512 
d3d583175437cee37b6d7d8d137ab1440dd6ac1c91200616fe68e5f38197f11ab2ed85f1aba06dfb0d32f88153defb2bb3f897601902e66fe0a5eff6042e57c0

diff --git a/app-containers/lxd/lxd-4.0.9-r3.ebuild 
b/app-containers/lxd/lxd-4.0.9-r3.ebuild
deleted file mode 100644
index 781b306647ce..
--- a/app-containers/lxd/lxd-4.0.9-r3.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="acct-group/lxd
-   app-arch/xz-utils
-   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-db/sqlite:3
-   dev-libs/dqlite
-   dev-libs/lzo
-   dev-libs/raft[lz4]
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6(+)?]
-   sys-libs/libcap
-   virtual/udev"
-RDEPEND="${DEPEND}
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6(+)?]
-   sys-apps/iproute2[ipv6(+)?]
-   sys-fs/fuse:*
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-
-   ~KVM
-   ~MACVTAP
-   ~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-   /usr/bin/lxc
-   /usr/bin/lxc-to-lxd
-   /usr/bin/lxd-agent
-   /usr/bin/lxd-benchmark
-   /usr/bin/lxd-p2c
-   /usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_prepare() {
-   export GOPATH="${S}/_dist"
-
-   default
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   # Fix hardcoded ovmf file path, see bug 763180
-   sed -i \
-   -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-   -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-

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

2022-06-14 Thread Joonas Niilola

commit: 77ec2ec2e1bf05bb1b05defdabd8532324e1acb2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun 14 08:19:52 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun 14 14:35:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ec2ec2

app-containers/lxd: stabilize 5.0.0 for amd64

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

 app-containers/lxd/lxd-5.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.0.ebuild 
b/app-containers/lxd/lxd-5.0.0.ebuild
index c8b54efd4968..04dab07a5718 100644
--- a/app-containers/lxd/lxd-5.0.0.ebuild
+++ b/app-containers/lxd/lxd-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
net-firewall/iptables[ipv6(+)?]
sys-apps/iproute2[ipv6(+)?]
sys-fs/fuse:*
-   sys-fs/lxcfs
+   >=sys-fs/lxcfs-5.0.0
sys-fs/squashfs-tools[lzma]
virtual/acl"
 BDEPEND="dev-lang/go

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

2022-06-11 Thread Joonas Niilola

commit: 9d7431f16c4fb0bb1c5f823578f6414bcfdbdbdc
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jun 11 09:17:14 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jun 11 09:17:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7431f1

app-containers/lxd: add 5.0.0

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

 app-containers/lxd/Manifest |   2 +
 app-containers/lxd/lxd-5.0.0.ebuild | 180 
 2 files changed, 182 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 0a5674f099fa..a408e2bad9b6 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2
 SHA512 
657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
+DIST lxd-5.0.0.tar.gz 17706199 BLAKE2B 
5559bdd479e03b43407e58aa240a00dae488cbf799cec39cbe74b636c907d247341132a49b414fa573c5d5d366643d296522efb6d71c1c0f83cc8edc038f1432
 SHA512 
e74c14a2642ee4ea738629b1da9c4b416f3bdbb26a49c8c920eb0e5e0467236fd610276541af1d481d6b069093cb1c35c705008652ff2cd55d2d15e9b7433696
+DIST lxd-5.0.0.tar.gz.asc 833 BLAKE2B 
7e8fc6f6892294fb8a6384f5767cb74b0a4b941c39da3b097c2196b328fb4f0b1816c46adae0bb343022bd558e77612ab3d93884053c1db5f7c1067c13444fb5
 SHA512 
d3d583175437cee37b6d7d8d137ab1440dd6ac1c91200616fe68e5f38197f11ab2ed85f1aba06dfb0d32f88153defb2bb3f897601902e66fe0a5eff6042e57c0

diff --git a/app-containers/lxd/lxd-5.0.0.ebuild 
b/app-containers/lxd/lxd-5.0.0.ebuild
new file mode 100644
index ..c8b54efd4968
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.0.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-db/sqlite:3
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp,ipv6(+)?]
+   sys-libs/libcap
+   virtual/udev"
+RDEPEND="${DEPEND}
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6(+)?]
+   sys-apps/iproute2[ipv6(+)?]
+   sys-fs/fuse:*
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+
+   ~KVM
+   ~MACVTAP
+   ~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+   /usr/bin/lxc
+   /usr/bin/lxc-to-lxd
+   /usr/bin/lxd-agent
+   /usr/bin/lxd-benchmark
+   /usr/bin/lxd-migrate
+   /usr/sbin/lxd"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+
+GOPATH="${S}/_dist"
+
+src_prepare() {
+   export GOPATH="${S}/_dist"
+
+   default
+
+   sed -i \
+   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
+   -e "s:make:make ${MAKEOPTS}:g" \
+   Makefile || die
+
+   # Fix hardcoded ovmf file path, see bug 763180
+   sed -i \
+   -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+   -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
+

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

2022-05-22 Thread Jakov Smolić

commit: f4d0122e067726a6657d45cb0e3d8c63da51518f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 22 08:12:47 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 22 08:12:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d0122e

app-containers/lxd: Keyword 4.0.9-r3 arm64, #846779

Signed-off-by: Jakov Smolić  gentoo.org>

 app-containers/lxd/lxd-4.0.9-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-4.0.9-r3.ebuild 
b/app-containers/lxd/lxd-4.0.9-r3.ebuild
index aee451bed561..094ce154dee2 100644
--- a/app-containers/lxd/lxd-4.0.9-r3.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd

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

2022-04-16 Thread Joonas Niilola

commit: 4ec6a7ea315f172b67cf05233dce61b1fac86606
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Apr 16 15:10:56 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 16 18:47:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec6a7ea

app-containers/lxd: remove unused files

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

 app-containers/lxd/files/lxd-4.0.0.initd  | 47 ---
 app-containers/lxd/files/lxd-4.0.7-r1.service | 20 
 2 files changed, 67 deletions(-)

diff --git a/app-containers/lxd/files/lxd-4.0.0.initd 
b/app-containers/lxd/files/lxd-4.0.0.initd
deleted file mode 100644
index e6ae971e879f..
--- a/app-containers/lxd/files/lxd-4.0.0.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-depend() {
-   need net
-   need lxcfs
-}
-
-start() {
-   ebegin "Starting lxd service"
-
-   modprobe -f loop > /dev/null 2>&1
-
-   # fix permissions on /var/lib/lxd and make sure it exists
-   install -d /var/lib/lxd --group lxd --owner root --mode 0775
-   start-stop-daemon --start \
-   --pidfile ${PIDFILE} \
-   --exec ${DAEMON} \
-   --background \
-   --make-pidfile \
-   -- \
-   ${LXD_OPTIONS}
-   eend ${?}
-}
-
-stop() {
-   if [ "${RC_CMD}" = restart ]; then
-   ebegin "Stopping lxd service (but not containers)"
-   # start-stop-daemon sends SIGTERM with a timeout of 5s by 
default.
-   # SIGTERM indicates to LXD that it will be stopped temporarily.
-   # Instances will keep running.
-   start-stop-daemon --stop --quiet -p "${PIDFILE}"
-   eend ${?}
-   else
-   ebegin "Stopping lxd service and containers, waiting 40s"
-   # SIGPWR indicates to LXD that the host is going down.
-   # LXD will do a clean shutdown of all instances.
-   # After 30s all remaining instances will be killed.
-   # We wait up to 40s for LXD.
-   start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
-   eend ${?}
-   fi
-}

diff --git a/app-containers/lxd/files/lxd-4.0.7-r1.service 
b/app-containers/lxd/files/lxd-4.0.7-r1.service
deleted file mode 100644
index f1e644b95df8..
--- a/app-containers/lxd/files/lxd-4.0.7-r1.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=LXD - main daemon
-After=network-online.target lxcfs.service lxd.socket
-Requires=network-online.target lxcfs.service lxd.socket
-Documentation=man:lxd(1)
-
-[Service]
-EnvironmentFile=-/etc/environment
-ExecStart=/usr/sbin/lxd --group lxd --syslog
-ExecStartPost=/usr/sbin/lxd waitready --timeout=600
-KillMode=process
-TimeoutStartSec=600s
-TimeoutStopSec=30s
-Restart=on-failure
-LimitNOFILE=1048576
-LimitNPROC=infinity
-TasksMax=infinity
-
-[Install]
-Also=lxd-containers.service lxd.socket

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

2022-04-14 Thread Joonas Niilola

commit: 3e890ba449027d1b9d2dbe2db33432ce0672d4a2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Apr 14 11:49:21 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Apr 14 11:51:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e890ba4

app-containers/lxd: drop 4.0.8-r3

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

 app-containers/lxd/Manifest|   2 -
 app-containers/lxd/files/lxd-4.0.7-no-werror.patch | 108 
 ...d-4.0.8-btrfs-progs-5.14-safety-check-fix.patch |  75 
 app-containers/lxd/lxd-4.0.8-r3.ebuild | 190 -
 4 files changed, 375 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 97017785ab20..0a5674f099fa 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B 
c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e
 SHA512 
9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6
-DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 
2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b
 SHA512 
9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9
 DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2
 SHA512 
657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886

diff --git a/app-containers/lxd/files/lxd-4.0.7-no-werror.patch 
b/app-containers/lxd/files/lxd-4.0.7-no-werror.patch
deleted file mode 100644
index 50a916356019..
--- a/app-containers/lxd/files/lxd-4.0.7-no-werror.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -Naur lxd-4.0.7/lxd/cgo.go lxd-4.0.7-no-werror/lxd/cgo.go
 lxd-4.0.7/lxd/cgo.go   2021-07-16 23:33:23.0 +0300
-+++ lxd-4.0.7-no-werror/lxd/cgo.go 2021-11-16 15:16:23.575299112 +0200
-@@ -3,7 +3,7 @@
- 
- package main
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels 
-fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/lxd/seccomp/cgo.go lxd-4.0.7-no-werror/lxd/seccomp/cgo.go
 lxd-4.0.7/lxd/seccomp/cgo.go   2021-07-16 23:33:23.0 +0300
-+++ lxd-4.0.7-no-werror/lxd/seccomp/cgo.go 2021-11-16 15:16:34.928629720 
+0200
-@@ -3,7 +3,7 @@
- 
- package seccomp
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels 
-fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/lxd/storage/cgo.go lxd-4.0.7-no-werror/lxd/storage/cgo.go
 lxd-4.0.7/lxd/storage/cgo.go   2021-07-16 23:33:23.0 +0300
-+++ lxd-4.0.7-no-werror/lxd/storage/cgo.go 2021-11-16 15:16:44.585294068 
+0200
-@@ -3,7 +3,7 @@
- 
- package storage
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels 
-fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/lxd/storage/quota/cgo.go 
lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go
 lxd-4.0.7/lxd/storage/quota/cgo.go 2021-07-16 23:33:23.0 +0300
-+++ lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go   2021-11-16 
15:16:54.231958418 +0200
-@@ -3,7 +3,7 @@
- 
- package quota
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels 
-fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/lxd-p2c/cgo.go lxd-4.0.7-no-werror/lxd-p2c/cgo.go
 lxd-4.0.7/lxd-p2c/cgo.go   2021-07-16 23:33:23.0

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

2022-03-21 Thread Joonas Niilola

commit: 88557686e5382ac1e164f61c72bb63a7a076a240
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Mar 21 09:26:12 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Mar 21 09:31:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88557686

app-containers/lxd: fix finding virtfs-proxy-helper, again

 - the code has been divided amongst different files.

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

 app-containers/lxd/{lxd-4.0.9-r2.ebuild => lxd-4.0.9-r3.ebuild} | 5 +
 1 file changed, 5 insertions(+)

diff --git a/app-containers/lxd/lxd-4.0.9-r2.ebuild 
b/app-containers/lxd/lxd-4.0.9-r3.ebuild
similarity index 95%
rename from app-containers/lxd/lxd-4.0.9-r2.ebuild
rename to app-containers/lxd/lxd-4.0.9-r3.ebuild
index 07794400df85..aee451bed561 100644
--- a/app-containers/lxd/lxd-4.0.9-r2.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r3.ebuild
@@ -99,6 +99,11 @@ src_prepare() {
lxd/apparmor/instance_qemu.go \
lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
 
+   # Fix hardcoded virtfs-proxy-helper file path, see bug 798924
+   sed -i \
+   -e 
"s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
+   lxd/device/device_utils_disk.go || die "Failed to fix 
virtfs-proxy-helper path."
+
cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
if use apparmor; then
sed -i \

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

2022-03-20 Thread Joonas Niilola

commit: e11ea51fb564a5fc34769e491e887008a9bdc0df
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Mar 20 06:18:36 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 20 06:18:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11ea51f

app-containers/lxd: stabilize 4.0.9-r2 for amd64

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

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

diff --git a/app-containers/lxd/lxd-4.0.9-r2.ebuild 
b/app-containers/lxd/lxd-4.0.9-r2.ebuild
index 83a03cabf801..07794400df85 100644
--- a/app-containers/lxd/lxd-4.0.9-r2.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd

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

2022-02-19 Thread Joonas Niilola

commit: 5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Feb 20 06:34:46 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Feb 20 06:34:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a48ee50

app-containers/lxd: fix systemd service file for 4.0.9

 - the previous settings caused some runtime issues, with apparently
   mixed process ownerships.

Reported-by: telans
Thanks-to: telans
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/files/{lxd-4.0.9.service => lxd-4.0.9-r1.service} | 2 --
 app-containers/lxd/{lxd-4.0.9-r1.ebuild => lxd-4.0.9-r2.ebuild}  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app-containers/lxd/files/lxd-4.0.9.service 
b/app-containers/lxd/files/lxd-4.0.9-r1.service
similarity index 96%
rename from app-containers/lxd/files/lxd-4.0.9.service
rename to app-containers/lxd/files/lxd-4.0.9-r1.service
index 6a218d2c43a7..480940dab7a3 100644
--- a/app-containers/lxd/files/lxd-4.0.9.service
+++ b/app-containers/lxd/files/lxd-4.0.9-r1.service
@@ -5,8 +5,6 @@ Requires=network-online.target lxcfs.service lxd.socket
 Documentation=man:lxd(1)
 
 [Service]
-Group=lxd
-User=root
 EnvironmentFile=-/etc/environment
 ExecStart=/usr/sbin/lxd --group lxd --syslog
 ExecStartPost=/usr/sbin/lxd waitready --timeout=600

diff --git a/app-containers/lxd/lxd-4.0.9-r1.ebuild 
b/app-containers/lxd/lxd-4.0.9-r2.ebuild
similarity index 98%
rename from app-containers/lxd/lxd-4.0.9-r1.ebuild
rename to app-containers/lxd/lxd-4.0.9-r2.ebuild
index 999b833af717..83a03cabf801 100644
--- a/app-containers/lxd/lxd-4.0.9-r1.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r2.ebuild
@@ -99,7 +99,7 @@ src_prepare() {
lxd/apparmor/instance_qemu.go \
lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
 
-   cp "${FILESDIR}"/lxd-4.0.9.service "${T}"/lxd.service || die
+   cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
if use apparmor; then
sed -i \
'/^EnvironmentFile=.*/a 
ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \

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

2022-02-02 Thread Joonas Niilola

commit: 5bd04ef5dc1514fe99e65550f7e72bcf7ab993eb
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Feb  2 08:45:41 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb  2 08:53:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd04ef5

app-containers/lxd: add 4.0.9

 - inherit go-module.eclass; upstream uses go.mod now,
 - new documentation offered by upstream, e.g. a handy cheatsheet,
 - openrc init file and systemd service file now manages the log
   directory (#817287),
 - virtfs-proxy-helper bin path isn't hardcoded anymore (#798924),
 - -Werror patch turned into sed for easier maintainability.

Bug: https://bugs.gentoo.org/798924
Closes: https://bugs.gentoo.org/817287
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/lxd/Manifest|   2 +
 app-containers/lxd/files/lxd-4.0.9.initd   |  49 
 app-containers/lxd/files/lxd-4.0.9.service |  25 +
 app-containers/lxd/lxd-4.0.9.ebuild| 174 +
 4 files changed, 250 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 5aa9fa7a435c..97017785ab20 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B 
c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e
 SHA512 
9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6
 DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 
2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b
 SHA512 
9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9
+DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B 
aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2
 SHA512 
657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
+DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 
7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3
 SHA512 
79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886

diff --git a/app-containers/lxd/files/lxd-4.0.9.initd 
b/app-containers/lxd/files/lxd-4.0.9.initd
new file mode 100644
index ..7b3d464ea367
--- /dev/null
+++ b/app-containers/lxd/files/lxd-4.0.9.initd
@@ -0,0 +1,49 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+   need net
+   need lxcfs
+}
+
+start() {
+   ebegin "Starting lxd service"
+
+   modprobe -f loop > /dev/null 2>&1
+
+   # Fix permissions on /var/lib/lxd and make sure it exists.
+   # Create a log directory for lxd with correct permissions.
+   install -d /var/lib/lxd --group lxd --owner root --mode 0775
+   install -d /var/log/lxd --group lxd --owner root 
+   start-stop-daemon --start \
+   --pidfile ${PIDFILE} \
+   --exec ${DAEMON} \
+   --background \
+   --make-pidfile \
+   -- \
+   ${LXD_OPTIONS}
+   eend ${?}
+}
+
+stop() {
+   if [ "${RC_CMD}" = restart ]; then
+   ebegin "Stopping lxd service (but not containers)"
+   # start-stop-daemon sends SIGTERM with a timeout of 5s by 
default.
+   # SIGTERM indicates to LXD that it will be stopped temporarily.
+   # Instances will keep running.
+   start-stop-daemon --stop --quiet -p "${PIDFILE}"
+   eend ${?}
+   else
+   ebegin "Stopping lxd service and containers, waiting 40s"
+   # SIGPWR indicates to LXD that the host is going down.
+   # LXD will do a clean shutdown of all instances.
+   # After 30s all remaining instances will be killed.
+   # We wait up to 40s for LXD.
+   start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
+   eend ${?}
+   fi
+}

diff --git a/app-containers/lxd/files/lxd-4.0.9.service 
b/app-containers/lxd/files/lxd-4.0.9.service
new file mode 100644
index ..6a218d2c43a7
--- /dev/null
+++ b/app-containers/lxd/files/lxd-4.0.9.service
@@ -0,0 +1,25 @@
+[Unit]
+Description=LXD - main daemon
+After=network-online.target lxcfs.service lxd.socket
+Requires=network-online.target lxcfs.service lxd.socket
+Documentation=man:lxd(1)
+
+[Service]
+Group=lxd
+User=root
+EnvironmentFile=-/etc/environment
+ExecStart=/usr/sbin/lxd --group lxd --syslog
+ExecStartPost=/usr/sbin/lxd

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

2022-01-07 Thread Joonas Niilola

commit: 862a2b98b7b8abf9062a0f562a2e7b9670e82752
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jan  7 13:36:01 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jan  7 13:38:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862a2b98

app-containers/lxd: fix the sed for OVMF path, add notes about vm's

 - lxd supports virtual machines through qemu which wasn't advertised
   in the ebuild.

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

 .../lxd/{lxd-4.0.8-r1.ebuild => lxd-4.0.8-r2.ebuild}   | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-4.0.8-r1.ebuild 
b/app-containers/lxd/lxd-4.0.8-r2.ebuild
similarity index 89%
rename from app-containers/lxd/lxd-4.0.8-r1.ebuild
rename to app-containers/lxd/lxd-4.0.8-r2.ebuild
index 11314dde35da..f33144850c9d 100644
--- a/app-containers/lxd/lxd-4.0.8-r1.ebuild
+++ b/app-containers/lxd/lxd-4.0.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,10 @@ CONFIG_CHECK="
~SECCOMP
~USER_NS
~UTS_NS
+
+   ~KVM
+   ~MACVTAP
+   ~VHOST_VSOCK
 "
 
 ERROR_IPC_NS="CONFIG_IPC_NS is required."
@@ -55,6 +59,10 @@ ERROR_PID_NS="CONFIG_PID_NS is required."
 ERROR_SECCOMP="CONFIG_SECCOMP is required."
 ERROR_UTS_NS="CONFIG_UTS_NS is required."
 
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual 
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
 # Go magic.
 QA_PREBUILT="/usr/bin/fuidshift
/usr/bin/lxc
@@ -91,6 +99,7 @@ src_prepare() {
-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
doc/environment.md \
+   lxd/apparmor/instance.go \
lxd/apparmor/instance_qemu.go \
lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
 
@@ -167,9 +176,12 @@ pkg_postinst() {
elog
elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
elog "including a Quick Start."
+   elog "For virtual machine support, see:"
+   elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines;
elog
elog "Please run 'lxc-checkconfig' to see all optional kernel features."
elog
+   optfeature "virtual machine support" 
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs

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

2021-12-21 Thread Joonas Niilola

commit: a05b3092dc61c390e599b33e29d508dd81827a9f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Dec 22 06:10:25 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Dec 22 06:22:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05b3092

app-containers/lxd: drop 4.0.7-r2

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

 app-containers/lxd/Manifest|   2 -
 ...appers-don-t-conflict-with-glibc-provided.patch |  58 ---
 app-containers/lxd/lxd-4.0.7-r2.ebuild | 175 -
 3 files changed, 235 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 2295b2e0b2c5..5aa9fa7a435c 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 
6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13
 SHA512 
dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1
-DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B 
a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f
 SHA512 
561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82
 DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B 
c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e
 SHA512 
9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6
 DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 
2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b
 SHA512 
9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9

diff --git 
a/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
 
b/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
deleted file mode 100644
index 0b471688cc0d..
--- 
a/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9a128f32fc277dd0c07bc85c71dc25d123f8a831 Mon Sep 17 00:00:00 2001
-From: Christian Brauner 
-Date: Wed, 4 Aug 2021 21:34:11 +0200
-Subject: [PATCH] syscall_wrappers: don't conflict with glibc provided
- close_range()
-
-Newer glibc version's provide a wrapper for close_range().
-
-Fixes: #9084
-Signed-off-by: Christian Brauner 

- lxd/include/syscall_wrappers.h | 2 +-
- lxd/main_checkfeature.go   | 2 +-
- lxd/main_forkexec.go   | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lxd/include/syscall_wrappers.h b/lxd/include/syscall_wrappers.h
-index 4405a622b801..25e56a5cefac 100644
 a/lxd/include/syscall_wrappers.h
-+++ b/lxd/include/syscall_wrappers.h
-@@ -16,7 +16,7 @@
- #define CLOSE_RANGE_UNSHARE (1U << 1)
- #endif
- 
--static inline int close_range(unsigned int fd, unsigned int max_fd, unsigned 
int flags)
-+static inline int lxd_close_range(unsigned int fd, unsigned int max_fd, 
unsigned int flags)
- {
-   return syscall(__NR_close_range, fd, max_fd, flags);
- }
-diff --git a/lxd/main_checkfeature.go b/lxd/main_checkfeature.go
-index 9511b684fa5d..0cc89207158d 100644
 a/lxd/main_checkfeature.go
-+++ b/lxd/main_checkfeature.go
-@@ -496,7 +496,7 @@ static void is_close_range_aware(void)
-   if (fd < 0)
-   return;
- 
--  if (close_range(fd, fd, CLOSE_RANGE_UNSHARE))
-+  if (lxd_close_range(fd, fd, CLOSE_RANGE_UNSHARE))
-   return;
- 
-   close_range_aware = true;
-diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go
-index 574f25eeb988..cfa4cd6bcda8 100644
 a/lxd/main_forkexec.go
-+++ b/lxd/main_forkexec.go
-@@ -290,7 +290,7 @@ __attribute__ ((noinline)) static int __forkexec(void)
-   if (!argvp || !*argvp)
-   return log_error(EXIT_FAILURE, "No command specified");
- 
--  ret = close_range(EXEC_PIPE_FD + 1, UINT_MAX, CLOSE_RANGE_UNSHARE);
-+  ret = lxd_close_range(EXEC_PIPE_FD + 1, UINT_MAX, CLOSE_RANGE_UNSHARE);
-   if (ret) {
-   // Fallback to close_inherited() when the syscall is not
-   // available or when CLOSE_RANGE_UNSHARE isn't supported.
--- 
-2.32.0
-

diff --git a/app-containers/lxd/lxd-4.0.7-r2.ebuild 
b/app-containers/lxd/lxd-4.0.7-r2.ebuild
deleted file mode 100644
index 0d725dd9c643..
--- a/app-containers/lxd/lxd-4.0.7-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd verify-sig
-

[gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/, profiles/updates/, profiles/arch/amd64/, app-emulation/lxd/, ...

2021-12-20 Thread Georgy Yakovlev

commit: 8eaf21ba7dc4502fcf5aec02e46c9c2152db9365
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Dec 20 09:05:44 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Dec 21 02:24:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eaf21ba

Move {app-emulation -> app-containers}/lxd

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

 acct-group/lxd/lxd-0-r1.ebuild  | 2 +-
 {app-emulation => app-containers}/lxd/Manifest  | 0
 {app-emulation => app-containers}/lxd/files/lxd-4.0.0.confd | 0
 {app-emulation => app-containers}/lxd/files/lxd-4.0.0.initd | 0
 {app-emulation => app-containers}/lxd/files/lxd-4.0.0.socket| 0
 {app-emulation => app-containers}/lxd/files/lxd-4.0.7-no-werror.patch   | 0
 {app-emulation => app-containers}/lxd/files/lxd-4.0.7-r1.service| 0
 .../lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch | 0
 .../lxd/files/lxd-containers-4.0.0.service  | 0
 .../files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch | 0
 {app-emulation => app-containers}/lxd/lxd-4.0.7-r2.ebuild   | 0
 {app-emulation => app-containers}/lxd/lxd-4.0.8-r1.ebuild   | 0
 {app-emulation => app-containers}/lxd/metadata.xml  | 0
 profiles/arch/amd64/package.use.stable.mask | 2 +-
 profiles/arch/x86/package.use.mask  | 2 +-
 profiles/updates/4Q-2021| 1 +
 16 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/acct-group/lxd/lxd-0-r1.ebuild b/acct-group/lxd/lxd-0-r1.ebuild
index b6ce29937d17..4277214c445a 100644
--- a/acct-group/lxd/lxd-0-r1.ebuild
+++ b/acct-group/lxd/lxd-0-r1.ebuild
@@ -6,4 +6,4 @@ EAPI=7
 inherit acct-group
 
 ACCT_GROUP_ID=402
-DESCRIPTION="Group for app-emulation/lxd"
+DESCRIPTION="Group for app-containers/lxd"

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

diff --git a/app-emulation/lxd/files/lxd-4.0.0.confd 
b/app-containers/lxd/files/lxd-4.0.0.confd
similarity index 100%
rename from app-emulation/lxd/files/lxd-4.0.0.confd
rename to app-containers/lxd/files/lxd-4.0.0.confd

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-containers/lxd/files/lxd-4.0.0.initd
similarity index 100%
rename from app-emulation/lxd/files/lxd-4.0.0.initd
rename to app-containers/lxd/files/lxd-4.0.0.initd

diff --git a/app-emulation/lxd/files/lxd-4.0.0.socket 
b/app-containers/lxd/files/lxd-4.0.0.socket
similarity index 100%
rename from app-emulation/lxd/files/lxd-4.0.0.socket
rename to app-containers/lxd/files/lxd-4.0.0.socket

diff --git a/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch 
b/app-containers/lxd/files/lxd-4.0.7-no-werror.patch
similarity index 100%
rename from app-emulation/lxd/files/lxd-4.0.7-no-werror.patch
rename to app-containers/lxd/files/lxd-4.0.7-no-werror.patch

diff --git a/app-emulation/lxd/files/lxd-4.0.7-r1.service 
b/app-containers/lxd/files/lxd-4.0.7-r1.service
similarity index 100%
rename from app-emulation/lxd/files/lxd-4.0.7-r1.service
rename to app-containers/lxd/files/lxd-4.0.7-r1.service

diff --git 
a/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch 
b/app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch
similarity index 100%
rename from 
app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch
rename to 
app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch

diff --git a/app-emulation/lxd/files/lxd-containers-4.0.0.service 
b/app-containers/lxd/files/lxd-containers-4.0.0.service
similarity index 100%
rename from app-emulation/lxd/files/lxd-containers-4.0.0.service
rename to app-containers/lxd/files/lxd-containers-4.0.0.service

diff --git 
a/app-emulation/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
 
b/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
similarity index 100%
rename from 
app-emulation/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
rename to 
app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch

diff --git a/app-emulation/lxd/lxd-4.0.7-r2.ebuild 
b/app-containers/lxd/lxd-4.0.7-r2.ebuild
similarity index 100%
rename from app-emulation/lxd/lxd-4.0.7-r2.ebuild
rename to app-containers/lxd/lxd-4.0.7-r2.ebuild

diff --git a/app-emulation/lxd/lxd-4.0.8-r1.ebuild 
b/app-containers/lxd/lxd-4.0.8-r1.ebuild
similarity index 100%
rename from app-emulation/lxd/lxd-4.0.8-r1.ebuild
rename to app-containers/lxd/lxd-4.0.8-r1.ebuild

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

64 matches

Mail list logo