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

2021-12-10 Thread Joonas Niilola
commit: 11be8649cdcd70df4b516a3fecbe5d240e57a0b1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Dec 11 07:16:22 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Dec 11 07:17:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11be8649

app-emulation/lxd: stabilize 4.0.8-r1 for amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.8-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.8-r1.ebuild
index e76b0eeabfea..7aca4e4a92d4 100644
--- a/app-emulation/lxd/lxd-4.0.8-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.8-r1.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-emulation/lxd/

2021-11-16 Thread Joonas Niilola
commit: cc4a9cd6ac42aa66f6bd0401c07cf8458d1c9b04
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Nov 17 06:28:35 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov 17 06:28:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc4a9cd6

app-emulation/lxd: disable -werror on 4.0.8 too

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

 app-emulation/lxd/lxd-4.0.8-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lxd/lxd-4.0.8-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.8-r1.ebuild
index feceaec92267..e76b0eeabfea 100644
--- a/app-emulation/lxd/lxd-4.0.8-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.8-r1.ebuild
@@ -73,7 +73,8 @@ 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
 # make: *** [Makefile:156: check] Error 1
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch )
+PATCHES=( "${FILESDIR}"/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch
+   "${FILESDIR}"/lxd-4.0.7-no-werror.patch )
 
 src_prepare() {
default



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

2021-11-16 Thread Joonas Niilola
commit: 235e431dfb356758c3975b622961b2042dcd933d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Nov 16 13:23:23 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov 16 13:24:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235e431d

app-emulation/lxd: disable -Werror on 4.0.7

 - apparently only triggered with clang (after glibc update).

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

 app-emulation/lxd/files/lxd-4.0.7-no-werror.patch | 108 ++
 app-emulation/lxd/lxd-4.0.7-r2.ebuild |   1 +
 2 files changed, 109 insertions(+)

diff --git a/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch 
b/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch
new file mode 100644
index ..50a916356019
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch
@@ -0,0 +1,108 @@
+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 +0300
 lxd-4.0.7-no-werror/lxd-p2c/cgo.go 2021-11-16 15:17:06.18521 +0200
+@@ -2,7 +2,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/shared/cgo.go lxd-4.0.7-no-werror/shared/cgo.go
+--- lxd-4.0.7/shared/cgo.go2021-07-16 23:33:23.0 +0300
 lxd-4.0.7-no-werror/shared/cgo.go  2021-11-16 15:17:15.238620041 +0200
+@@ -3,7 +3,7 @@
+ 
+ package shared
+ 
+-// #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/shared/idmap/cgo.go 
lxd-4.0.7-no-werror/shared/idmap/cgo.go
+--- lxd-4.0.7/shared/idmap/cgo.go  2021-07-16 23:33:23.0 +0300
 lxd-4.0.7-no-werror/shared/idmap/cgo.go2021-11-16 15:17:25.768617513 
+0200
+@@ -3,7 +3,7 @@
+ 
+ package idmap
+ 
+-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
+ // #cgo 

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

2021-11-15 Thread Conrad Kostecki
commit: ddd91d013c3a1a2001957b91ded9c9a7fa46d8e6
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Nov 13 17:00:33 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Nov 15 21:55:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd91d01

app-emulation/lxd: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/22932
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-emulation/lxd/files/lxd-4.0.0.service  | 20 
 app-emulation/lxd/files/lxd-4.0.0_apparmor.service | 21 -
 2 files changed, 41 deletions(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.service 
b/app-emulation/lxd/files/lxd-4.0.0.service
deleted file mode 100644
index c2e9db8aa8ae..
--- a/app-emulation/lxd/files/lxd-4.0.0.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 --logfile=/var/log/lxd/lxd.log
-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

diff --git a/app-emulation/lxd/files/lxd-4.0.0_apparmor.service 
b/app-emulation/lxd/files/lxd-4.0.0_apparmor.service
deleted file mode 100644
index 5e688d9c098c..
--- a/app-emulation/lxd/files/lxd-4.0.0_apparmor.service
+++ /dev/null
@@ -1,21 +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
-ExecStartPre=/usr/libexec/lxc/lxc-apparmor-load
-ExecStart=/usr/sbin/lxd --group lxd --logfile=/var/log/lxd/lxd.log
-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-emulation/lxd/

2021-11-09 Thread Joonas Niilola
commit: bc25e3bff62f717de3f029a9c7e106b89700f5f3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Nov 10 07:00:55 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov 10 07:01:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc25e3bf

app-emulation/lxd: drop 4.0.7

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

 app-emulation/lxd/lxd-4.0.7.ebuild | 163 -
 1 file changed, 163 deletions(-)

diff --git a/app-emulation/lxd/lxd-4.0.7.ebuild 
b/app-emulation/lxd/lxd-4.0.7.ebuild
deleted file mode 100644
index 6171e0fbf21..000
--- a/app-emulation/lxd/lxd-4.0.7.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info 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"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-libs/dqlite
-   dev-libs/lzo
-   dev-libs/raft[lz4]
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-   acct-group/lxd
-   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? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-"
-
-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."
-
-# 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"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-   default
-
-   export GOPATH="${S}/_dist"
-
-   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_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/disk.go || die "Failed to fix virtfs-proxy-helper 
path."
-}
-
-src_configure() { :; }
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-   export GO111MODULE=auto
-   export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-   cd "${S}" || die
-
-   for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-   go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
-   done
-
-   go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build 
the daemon"
-
-   # Needs to be built statically
-   CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
-   CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
-
-   use nls && emake build-mo
-}
-
-src_test() {
-   export GOPATH="${S}/_dist"
-   export GO111MODULE=off
-   go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
-   local bindir="_dist/bin"
-   export GOPATH="${S}/_dist"
-
-   dosbin ${bindir}/lxd
-
-   for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-   dobin ${bindir}/${l}
-   done
-
-   cd "${S}" || die
-
-   newbashcomp scripts/bash/lxd-client lxc
-
-   newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-   newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
-   if use apparmor; then
-   systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service 
lxd.service
-   else
-   systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
-   fi
-
-   

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

2021-11-09 Thread Joonas Niilola
commit: 6103cc970b19611e307538225330693b8a61e537
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Nov 10 07:00:41 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov 10 07:01:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6103cc97

app-emulation/lxd: stabilize 4.0.7-r2 for amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.7-r2.ebuild 
b/app-emulation/lxd/lxd-4.0.7-r2.ebuild
index 70a7841f123..b83c5ea4825 100644
--- a/app-emulation/lxd/lxd-4.0.7-r2.ebuild
+++ b/app-emulation/lxd/lxd-4.0.7-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-emulation/lxd/, app-emulation/lxd/files/

2021-11-09 Thread Joonas Niilola
commit: 37d0f50bdb1e7779632a7fe4c6df16158fd2f114
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Nov  9 11:41:58 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov  9 11:41:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37d0f50b

app-emulation/lxd: add fix for >btrfs-progs-5.14 safety check

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

 ...d-4.0.8-btrfs-progs-5.14-safety-check-fix.patch | 75 ++
 .../lxd/{lxd-4.0.8.ebuild => lxd-4.0.8-r1.ebuild}  |  2 +
 2 files changed, 77 insertions(+)

diff --git 
a/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch 
b/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch
new file mode 100644
index 000..f32debff5e3
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch
@@ -0,0 +1,75 @@
+From 5efac9cfed92a890dc1a073fe60b1c814c305267 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= 
+Date: Thu, 4 Nov 2021 14:05:27 -0400
+Subject: [PATCH] lxd/storage/btrfs: Support 5.14.2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes #9418
+
+Signed-off-by: Stéphane Graber 
+---
+ lxd/storage/drivers/driver_btrfs.go   | 18 ++
+ lxd/storage/drivers/driver_btrfs_utils.go |  8 +++-
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/lxd/storage/drivers/driver_btrfs.go 
b/lxd/storage/drivers/driver_btrfs.go
+index e6a64bf8136..a47be766f8f 100644
+--- a/lxd/storage/drivers/driver_btrfs.go
 b/lxd/storage/drivers/driver_btrfs.go
+@@ -17,10 +17,12 @@ import (
+   "github.com/lxc/lxd/shared/api"
+   "github.com/lxc/lxd/shared/units"
+   "github.com/lxc/lxd/shared/validate"
++  "github.com/lxc/lxd/shared/version"
+ )
+ 
+ var btrfsVersion string
+ var btrfsLoaded bool
++var btrfsPropertyForce bool
+ 
+ type btrfs struct {
+   common
+@@ -64,6 +66,22 @@ func (d *btrfs) load() error {
+   }
+   }
+ 
++  // Check if we need --force to set properties.
++  ver5142, err := version.Parse("5.14.2")
++  if err != nil {
++  return err
++  }
++
++  ourVer, err := version.Parse(btrfsVersion)
++  if err != nil {
++  return err
++  }
++
++  // If running 5.14.2 or older, we need --force.
++  if ourVer.Compare(ver5142) > 0 {
++  btrfsPropertyForce = true
++  }
++
+   btrfsLoaded = true
+   return nil
+ }
+diff --git a/lxd/storage/drivers/driver_btrfs_utils.go 
b/lxd/storage/drivers/driver_btrfs_utils.go
+index e1a359e8490..0618e29e6f2 100644
+--- a/lxd/storage/drivers/driver_btrfs_utils.go
 b/lxd/storage/drivers/driver_btrfs_utils.go
+@@ -308,7 +308,13 @@ func (d *btrfs) setSubvolumeReadonlyProperty(path string, 
readonly bool) error {
+   return nil
+   }
+ 
+-  _, err := shared.RunCommand("btrfs", "property", "set", "-ts", path, 
"ro", fmt.Sprintf("%t", readonly))
++  args := []string{"property", "set"}
++  if btrfsPropertyForce {
++  args = append(args, "-f")
++  }
++  args = append(args, "-ts", path, "ro", fmt.Sprintf("%t", readonly))
++
++  _, err := shared.RunCommand("btrfs", args...)
+   return err
+ }
+ 

diff --git a/app-emulation/lxd/lxd-4.0.8.ebuild 
b/app-emulation/lxd/lxd-4.0.8-r1.ebuild
similarity index 98%
rename from app-emulation/lxd/lxd-4.0.8.ebuild
rename to app-emulation/lxd/lxd-4.0.8-r1.ebuild
index df0bb65646f..feceaec9226 100644
--- a/app-emulation/lxd/lxd-4.0.8.ebuild
+++ b/app-emulation/lxd/lxd-4.0.8-r1.ebuild
@@ -73,6 +73,8 @@ 
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
 # make: *** [Makefile:156: check] Error 1
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}"/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch )
+
 src_prepare() {
default
 



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

2021-10-22 Thread Joonas Niilola
commit: 06b1520c48e2f5c7d1d2ac1a1f23d3b9ec6ac559
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Oct 22 17:20:19 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 22 17:21:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b1520c

app-emulation/lxd: add 4.0.8

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

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

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 9f5501c4228..2295b2e0b2c 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,4 @@
 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-emulation/lxd/lxd-4.0.8.ebuild 
b/app-emulation/lxd/lxd-4.0.8.ebuild
new file mode 100644
index 000..df0bb65646f
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.8.ebuild
@@ -0,0 +1,175 @@
+# 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
+
+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 ~x86"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
+   >=app-emulation/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? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+"
+
+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."
+
+# 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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+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"
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   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_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 \
+ 

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

2021-10-10 Thread Joonas Niilola
commit: 1aa6efcee944c0751b1c58a23ce79022d466124b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Oct 10 06:25:13 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Oct 10 06:28:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa6efce

app-emulation/lxd: add fowners for the keepdir

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

 app-emulation/lxd/{lxd-4.0.7-r1.ebuild => lxd-4.0.7-r2.ebuild} | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxd/lxd-4.0.7-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.7-r2.ebuild
similarity index 97%
rename from app-emulation/lxd/lxd-4.0.7-r1.ebuild
rename to app-emulation/lxd/lxd-4.0.7-r2.ebuild
index 6741e169d8f..70a7841f123 100644
--- a/app-emulation/lxd/lxd-4.0.7-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.7-r2.ebuild
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
-DEPEND="app-arch/xz-utils
+DEPEND="acct-group/lxd
+   app-arch/xz-utils
>=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
dev-libs/dqlite
dev-libs/lzo
@@ -23,7 +24,6 @@ DEPEND="app-arch/xz-utils
>=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp,ipv6?]"
 RDEPEND="${DEPEND}
-   acct-group/lxd
net-firewall/ebtables
net-firewall/iptables[ipv6?]
sys-apps/iproute2[ipv6?]
@@ -151,7 +151,9 @@ src_install() {
systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service 
lxd-containers.service
systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
 
+   # Temporary fix for #817287
keepdir /var/log/lxd
+   fowners root:lxd /var/log/lxd
 
dodoc AUTHORS doc/*
use nls && domo po/*.mo



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

2021-10-10 Thread Joonas Niilola
commit: 27b61b8cd8a74129fa0c6dc0addbb02e12732735
Author: Uzi Erdenebileg  gmail  com>
AuthorDate: Sun Oct 10 06:22:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Oct 10 06:28:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b61b8c

app-emulation/lxd: Add keepdir

Bug: https://bugs.gentoo.org/817287
Signed-off-by: Uzi Erdenebileg  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22535
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxd/lxd-4.0.7-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-emulation/lxd/lxd-4.0.7-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.7-r1.ebuild
index cdfd0052cb6..6741e169d8f 100644
--- a/app-emulation/lxd/lxd-4.0.7-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.7-r1.ebuild
@@ -151,6 +151,8 @@ src_install() {
systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service 
lxd-containers.service
systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
 
+   keepdir /var/log/lxd
+
dodoc AUTHORS doc/*
use nls && domo po/*.mo
 }



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

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

app-emulation/lxd: keyword 4.0.7-r1 for ~x86

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

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

diff --git a/app-emulation/lxd/lxd-4.0.7-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.7-r1.ebuild
index f7a259aeafe..cdfd0052cb6 100644
--- a/app-emulation/lxd/lxd-4.0.7-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils



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

2021-09-24 Thread Florian Schmaus
commit: 4d7295038ed9e84cc131b3003b1d103f35fcea50
Author: Florian Schmaus  gentoo  org>
AuthorDate: Fri Sep 24 07:49:57 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Fri Sep 24 08:06:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d729503

app-emulation/lxd: backport syscall_wrappers patch, use --syslog

This backports the lxd patch to avoid conflicts with glibc's
close_range(). Also use --syslog instead of
--logfile=/var/log/lxd/lxd.log in lxd's systemd service, so that lxd's
log messages are not logged to a file, but instead to the service's
journal.

The ebuild also no longer uses a dedicated apparmor service
file (files/lxd-4.0.0_apparmor.service), but instead patches the
existing service file if apparmor is used. This avoids maintaining two
systemd service files.

Also drop the unused autotools eclass.

Closes: https://bugs.gentoo.org/807268
Closes: https://github.com/gentoo/gentoo/pull/22383
Signed-off-by: Florian Schmaus  gentoo.org>

 app-emulation/lxd/files/lxd-4.0.7-r1.service   |  20 +++
 ...appers-don-t-conflict-with-glibc-provided.patch |  58 +++
 app-emulation/lxd/lxd-4.0.7-r1.ebuild  | 170 +
 3 files changed, 248 insertions(+)

diff --git a/app-emulation/lxd/files/lxd-4.0.7-r1.service 
b/app-emulation/lxd/files/lxd-4.0.7-r1.service
new file mode 100644
index 000..f1e644b95df
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.7-r1.service
@@ -0,0 +1,20 @@
+[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

diff --git 
a/app-emulation/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
 
b/app-emulation/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
new file mode 100644
index 000..0b471688cc0
--- /dev/null
+++ 
b/app-emulation/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
@@ -0,0 +1,58 @@
+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-emulation/lxd/lxd-4.0.7-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.7-r1.ebuild
new file mode 100644
index 000..f7a259aeafe
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.7-r1.ebuild
@@ -0,0 +1,170 @@
+# 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
+
+DESCRIPTION="Fast, dense and secure 

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

2021-08-25 Thread Joonas Niilola
commit: 71c9ed27960f772a00cc542cdce1475daa461536
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug 25 07:08:41 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 25 07:09:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c9ed27

app-emulation/lxd: drop 4.0.6-r1

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

 app-emulation/lxd/Manifest|   2 -
 app-emulation/lxd/lxd-4.0.6-r1.ebuild | 162 --
 2 files changed, 164 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 6252615f397..9f5501c4228 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-4.0.6.tar.gz 15353779 BLAKE2B 
f699e91c53b407e5a0e47fe40b133d6216754b1e5c5829ee68993468565f2080c12cbcbf8373d6da16ca94a3648ec51b874e66ff589be09dc95f2382d18f3e12
 SHA512 
58efaac50dbcbb3cf0e7aa1b3b43085beae4546dfcd081720b049c2b88bf120b9a74e7db1238bbdd8cc2449e039b076ece3734e8f46f3ddbdc70aaae8b326963
-DIST lxd-4.0.6.tar.gz.asc 833 BLAKE2B 
6d1756b130a944a98e62d809c45129178bfc39158c71e09319cdaff7461b14bda467e44a781bb5c15d40afdae4d3ec86f98919738a8c169d3fff910d8e9fe58a
 SHA512 
6c59bd8ec9bf0d9bd90c8ab2970cf6928c0bef3736631ea2a56ebc464f33940366d35925ddfc4104c13fa0fd4e1bea42796e0a2eb82a8bf395957829f938c7db
 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

diff --git a/app-emulation/lxd/lxd-4.0.6-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.6-r1.ebuild
deleted file mode 100644
index 1a59fbf708c..000
--- a/app-emulation/lxd/lxd-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info 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"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-libs/dqlite
-   dev-libs/lzo
-   dev-libs/raft
-   >=dev-util/xdelta-3.0[lzma(+)]
-   net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-   acct-group/lxd
-   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? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-"
-
-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."
-
-# 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"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-   default
-
-   export GOPATH="${S}/_dist"
-
-   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_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/disk.go || die "Failed to fix 

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

2021-08-19 Thread Joonas Niilola
commit: a3b13c5a8a93be11164784aad56c9f6966d372db
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Aug 19 06:22:45 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug 19 06:22:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b13c5a

app-emulation/lxd: stabilize 4.0.7 for amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.7.ebuild 
b/app-emulation/lxd/lxd-4.0.7.ebuild
index 75f17a0dac7..6171e0fbf21 100644
--- a/app-emulation/lxd/lxd-4.0.7.ebuild
+++ b/app-emulation/lxd/lxd-4.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils



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

2021-07-19 Thread Joonas Niilola
commit: b8a138ec44b19c3a045cf3bbc2c708ce38ce69d7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 19 11:08:09 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 19 11:15:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a138ec

app-emulation/lxd: bump to 4.0.7

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

 app-emulation/lxd/Manifest |   2 +
 app-emulation/lxd/lxd-4.0.7.ebuild | 163 +
 2 files changed, 165 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index c92c906912e..0036224299e 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -2,3 +2,5 @@ DIST lxd-4.0.5.tar.gz 14659330 BLAKE2B 
4d61885a94946d3a6018324512ea318716cb9c1bc
 DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B 
f5b2ead748973831ec7ba7be00c34d26b16a6b168fb88a25f07126eeab5c812cab72609acc443e9bb541ff64849952bf66f8ee207083836a2aab905f1373c1e0
 SHA512 
b59edaf88cd8ab34271eb0ebb52270ede1509351596449b1b955eaba70a50f6f18fdc95fcc933deca3fe545b9aa45bfda3b7aa6553a8b4f2cedc8d1a6b3a5946
 DIST lxd-4.0.6.tar.gz 15353779 BLAKE2B 
f699e91c53b407e5a0e47fe40b133d6216754b1e5c5829ee68993468565f2080c12cbcbf8373d6da16ca94a3648ec51b874e66ff589be09dc95f2382d18f3e12
 SHA512 
58efaac50dbcbb3cf0e7aa1b3b43085beae4546dfcd081720b049c2b88bf120b9a74e7db1238bbdd8cc2449e039b076ece3734e8f46f3ddbdc70aaae8b326963
 DIST lxd-4.0.6.tar.gz.asc 833 BLAKE2B 
6d1756b130a944a98e62d809c45129178bfc39158c71e09319cdaff7461b14bda467e44a781bb5c15d40afdae4d3ec86f98919738a8c169d3fff910d8e9fe58a
 SHA512 
6c59bd8ec9bf0d9bd90c8ab2970cf6928c0bef3736631ea2a56ebc464f33940366d35925ddfc4104c13fa0fd4e1bea42796e0a2eb82a8bf395957829f938c7db
+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

diff --git a/app-emulation/lxd/lxd-4.0.7.ebuild 
b/app-emulation/lxd/lxd-4.0.7.ebuild
new file mode 100644
index 000..75f17a0dac7
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.7.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info 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"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft[lz4]
+   >=dev-util/xdelta-3.0[lzma(+)]
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   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? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+"
+
+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."
+
+# 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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   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 \
+  

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

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

app-emulation/lxd: drop 4.0.5

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

 app-emulation/lxd/Manifest |   2 -
 app-emulation/lxd/lxd-4.0.5.ebuild | 152 -
 2 files changed, 154 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 0036224299e..6252615f397 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,5 +1,3 @@
-DIST lxd-4.0.5.tar.gz 14659330 BLAKE2B 
4d61885a94946d3a6018324512ea318716cb9c1bc5f40be4eb62f71ad6a0eb993cda0ef917fbefb3949c0d47a6217245cc62e0ced3abfbcf47f6d8375a7d85d0
 SHA512 
8b9e6742dc3383fb31dce33d9f8ffe7a0ea661d274f6c3ac710f58d4d5b90b596881386571564ec0cd8f027da43eaa3948dd675d6fa07f1095405f4cc05f1211
-DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B 
f5b2ead748973831ec7ba7be00c34d26b16a6b168fb88a25f07126eeab5c812cab72609acc443e9bb541ff64849952bf66f8ee207083836a2aab905f1373c1e0
 SHA512 
b59edaf88cd8ab34271eb0ebb52270ede1509351596449b1b955eaba70a50f6f18fdc95fcc933deca3fe545b9aa45bfda3b7aa6553a8b4f2cedc8d1a6b3a5946
 DIST lxd-4.0.6.tar.gz 15353779 BLAKE2B 
f699e91c53b407e5a0e47fe40b133d6216754b1e5c5829ee68993468565f2080c12cbcbf8373d6da16ca94a3648ec51b874e66ff589be09dc95f2382d18f3e12
 SHA512 
58efaac50dbcbb3cf0e7aa1b3b43085beae4546dfcd081720b049c2b88bf120b9a74e7db1238bbdd8cc2449e039b076ece3734e8f46f3ddbdc70aaae8b326963
 DIST lxd-4.0.6.tar.gz.asc 833 BLAKE2B 
6d1756b130a944a98e62d809c45129178bfc39158c71e09319cdaff7461b14bda467e44a781bb5c15d40afdae4d3ec86f98919738a8c169d3fff910d8e9fe58a
 SHA512 
6c59bd8ec9bf0d9bd90c8ab2970cf6928c0bef3736631ea2a56ebc464f33940366d35925ddfc4104c13fa0fd4e1bea42796e0a2eb82a8bf395957829f938c7db
 DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 
6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13
 SHA512 
dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1

diff --git a/app-emulation/lxd/lxd-4.0.5.ebuild 
b/app-emulation/lxd/lxd-4.0.5.ebuild
deleted file mode 100644
index 0fc73099a8d..000
--- a/app-emulation/lxd/lxd-4.0.5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info 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"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-libs/dqlite
-   dev-libs/lzo
-   dev-libs/raft
-   net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-   acct-group/lxd
-   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? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-"
-
-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."
-
-# 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"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-   default
-
-   export GOPATH="${S}/_dist"
-
-   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_qemu.go \
-   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded 

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

2021-07-14 Thread Joonas Niilola
commit: e6291b63df3c98ce328fa4bd198b0fc5e4d5eebd
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Jul 14 13:04:04 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jul 14 13:04:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6291b63

app-emulation/lxd: add a dep for xdelta[lzma]

 - looks like increasing amount of containers need this to uncompress
   the container image. Might affect lxc too.

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

 app-emulation/lxd/{lxd-4.0.6.ebuild => lxd-4.0.6-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/lxd/lxd-4.0.6.ebuild 
b/app-emulation/lxd/lxd-4.0.6-r1.ebuild
similarity index 99%
rename from app-emulation/lxd/lxd-4.0.6.ebuild
rename to app-emulation/lxd/lxd-4.0.6-r1.ebuild
index 92c4ad7891d..1a59fbf708c 100644
--- a/app-emulation/lxd/lxd-4.0.6.ebuild
+++ b/app-emulation/lxd/lxd-4.0.6-r1.ebuild
@@ -20,6 +20,7 @@ DEPEND="app-arch/xz-utils
dev-libs/dqlite
dev-libs/lzo
dev-libs/raft
+   >=dev-util/xdelta-3.0[lzma(+)]
net-dns/dnsmasq[dhcp,ipv6?]"
 RDEPEND="${DEPEND}
acct-group/lxd



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

2021-06-29 Thread Joonas Niilola
commit: 41765dab645acb31174d787d8d7c4288ae8bce18
Author: Benedikt Neuffer  itfriend  de>
AuthorDate: Sun Jun 27 14:55:09 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jun 30 04:39:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41765dab

app-emulation/lxd: fix virtfs-proxy-helper path

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

 app-emulation/lxd/lxd-4.0.6.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/app-emulation/lxd/lxd-4.0.6.ebuild 
b/app-emulation/lxd/lxd-4.0.6.ebuild
index e701c89b199..92c4ad7891d 100644
--- a/app-emulation/lxd/lxd-4.0.6.ebuild
+++ b/app-emulation/lxd/lxd-4.0.6.ebuild
@@ -82,6 +82,11 @@ src_prepare() {
doc/environment.md \
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/disk.go || die "Failed to fix virtfs-proxy-helper 
path."
 }
 
 src_configure() { :; }



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

2021-06-01 Thread Joonas Niilola
commit: aa34b8108ca47d9f88c810ef9f4fb495bbc9d664
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun  1 08:40:25 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun  1 08:43:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa34b810

app-emulation/lxd: stabilize 4.0.6 on amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.6.ebuild 
b/app-emulation/lxd/lxd-4.0.6.ebuild
index bfa426ef05e..e701c89b199 100644
--- a/app-emulation/lxd/lxd-4.0.6.ebuild
+++ b/app-emulation/lxd/lxd-4.0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils



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

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

app-emulation/lxd: bump to 4.0.6

 - build lxd-agent statically, #752480

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

 app-emulation/lxd/Manifest |   2 +
 app-emulation/lxd/lxd-4.0.6.ebuild | 156 +
 2 files changed, 158 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 45ccce6f37d..c92c906912e 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-4.0.5.tar.gz 14659330 BLAKE2B 
4d61885a94946d3a6018324512ea318716cb9c1bc5f40be4eb62f71ad6a0eb993cda0ef917fbefb3949c0d47a6217245cc62e0ced3abfbcf47f6d8375a7d85d0
 SHA512 
8b9e6742dc3383fb31dce33d9f8ffe7a0ea661d274f6c3ac710f58d4d5b90b596881386571564ec0cd8f027da43eaa3948dd675d6fa07f1095405f4cc05f1211
 DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B 
f5b2ead748973831ec7ba7be00c34d26b16a6b168fb88a25f07126eeab5c812cab72609acc443e9bb541ff64849952bf66f8ee207083836a2aab905f1373c1e0
 SHA512 
b59edaf88cd8ab34271eb0ebb52270ede1509351596449b1b955eaba70a50f6f18fdc95fcc933deca3fe545b9aa45bfda3b7aa6553a8b4f2cedc8d1a6b3a5946
+DIST lxd-4.0.6.tar.gz 15353779 BLAKE2B 
f699e91c53b407e5a0e47fe40b133d6216754b1e5c5829ee68993468565f2080c12cbcbf8373d6da16ca94a3648ec51b874e66ff589be09dc95f2382d18f3e12
 SHA512 
58efaac50dbcbb3cf0e7aa1b3b43085beae4546dfcd081720b049c2b88bf120b9a74e7db1238bbdd8cc2449e039b076ece3734e8f46f3ddbdc70aaae8b326963
+DIST lxd-4.0.6.tar.gz.asc 833 BLAKE2B 
6d1756b130a944a98e62d809c45129178bfc39158c71e09319cdaff7461b14bda467e44a781bb5c15d40afdae4d3ec86f98919738a8c169d3fff910d8e9fe58a
 SHA512 
6c59bd8ec9bf0d9bd90c8ab2970cf6928c0bef3736631ea2a56ebc464f33940366d35925ddfc4104c13fa0fd4e1bea42796e0a2eb82a8bf395957829f938c7db

diff --git a/app-emulation/lxd/lxd-4.0.6.ebuild 
b/app-emulation/lxd/lxd-4.0.6.ebuild
new file mode 100644
index 000..bfa426ef05e
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.6.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info 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"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   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? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+"
+
+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."
+
+# 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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   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_qemu.go \
+   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
+}
+
+src_configure() { :; }
+
+src_compile() {
+   export GOPATH="${S}/_dist"
+   export GO111MODULE=auto
+
+   cd "${S}" || die
+
+   for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
+   

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

2021-04-27 Thread Joonas Niilola
commit: 890b456f998279ee88c7112ef3cc322d0200623e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Apr 28 05:55:35 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 28 05:55:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=890b456f

app-emulation/lxd: drop 4.0.4-r7

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

 app-emulation/lxd/Manifest|   2 -
 app-emulation/lxd/lxd-4.0.4-r7.ebuild | 153 --
 2 files changed, 155 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 3a7e504a79d..45ccce6f37d 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 
5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea
 SHA512 
800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f
-DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B 
bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b
 SHA512 
7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15
 DIST lxd-4.0.5.tar.gz 14659330 BLAKE2B 
4d61885a94946d3a6018324512ea318716cb9c1bc5f40be4eb62f71ad6a0eb993cda0ef917fbefb3949c0d47a6217245cc62e0ced3abfbcf47f6d8375a7d85d0
 SHA512 
8b9e6742dc3383fb31dce33d9f8ffe7a0ea661d274f6c3ac710f58d4d5b90b596881386571564ec0cd8f027da43eaa3948dd675d6fa07f1095405f4cc05f1211
 DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B 
f5b2ead748973831ec7ba7be00c34d26b16a6b168fb88a25f07126eeab5c812cab72609acc443e9bb541ff64849952bf66f8ee207083836a2aab905f1373c1e0
 SHA512 
b59edaf88cd8ab34271eb0ebb52270ede1509351596449b1b955eaba70a50f6f18fdc95fcc933deca3fe545b9aa45bfda3b7aa6553a8b4f2cedc8d1a6b3a5946

diff --git a/app-emulation/lxd/lxd-4.0.4-r7.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r7.ebuild
deleted file mode 100644
index 8893eee210e..000
--- a/app-emulation/lxd/lxd-4.0.4-r7.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info 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 
)"
-
-# Needs to include licenses for all bundled programs and libraries.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-libs/dqlite
-   dev-libs/lzo
-   dev-libs/raft
-   net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-   acct-group/lxd
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse:0=
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-"
-
-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."
-
-# 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"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-   default
-
-   export GOPATH="${S}/_dist"
-
-   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_qemu.go \
-   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
-}
-
-src_configure() { :; }
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-   export GO111MODULE=auto
-
-   cd "${S}" || die
-
-   for k in fuidshift lxd-agent 

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

2021-04-26 Thread Joonas Niilola
commit: 102aa8261721b81fc40c5b8541e878ff76ff8f77
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Apr 26 10:08:22 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 26 10:08:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=102aa826

app-emulation/lxd: stabilize 4.0.5 on amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.5.ebuild 
b/app-emulation/lxd/lxd-4.0.5.ebuild
index 753f89358e9..0fc73099a8d 100644
--- a/app-emulation/lxd/lxd-4.0.5.ebuild
+++ b/app-emulation/lxd/lxd-4.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils



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

2021-03-09 Thread Joonas Niilola
commit: 330914d1f82f7d6079c5922741b5e742b1636e4e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Mar  9 09:03:54 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar  9 09:03:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330914d1

app-emulation/lxd: drop 4.0.4

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

 app-emulation/lxd/lxd-4.0.4-r6.ebuild | 152 --
 1 file changed, 152 deletions(-)

diff --git a/app-emulation/lxd/lxd-4.0.4-r6.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r6.ebuild
deleted file mode 100644
index 6419fd08403..000
--- a/app-emulation/lxd/lxd-4.0.4-r6.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info 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 
)"
-
-# Needs to include licenses for all bundled programs and libraries.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-libs/dqlite
-   dev-libs/lzo
-   dev-libs/raft
-   net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-   acct-group/lxd
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse:0=
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools[lzma]
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-"
-
-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."
-
-# 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"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-   default
-
-   export GOPATH="${S}/_dist"
-
-   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_qemu.go \
-   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
-}
-
-src_configure() { :; }
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-
-   cd "${S}" || die
-
-   for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-   go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
-   done
-
-   go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build 
the daemon"
-
-   use nls && emake build-mo
-}
-
-src_test() {
-   export GOPATH="${S}/_dist"
-   go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
-   local bindir="_dist/bin"
-   export GOPATH="${S}/_dist"
-
-   dosbin ${bindir}/lxd
-
-   for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-   dobin ${bindir}/${l}
-   done
-
-   cd "${S}" || die
-
-   newbashcomp scripts/bash/lxd-client lxc
-
-   newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-   newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
-   if use apparmor; then
-   systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service 
lxd.service
-   else
-   systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
-   fi
-
-   systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service 
lxd-containers.service
-   systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-   dodoc AUTHORS doc/*
-   use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-   elog
-   elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-   elog "including a Quick Start."
-   elog
-   elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-   elog
-   elog 

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

2021-03-08 Thread Sam James
commit: 54fc1bac4030781558d5dcc15eaa96b11216a03a
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  8 10:25:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  8 10:25:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fc1bac

app-emulation/lxd: Stabilize 4.0.4-r7 amd64, #774645

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

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

diff --git a/app-emulation/lxd/lxd-4.0.4-r7.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r7.ebuild
index b5c87f1d9fd..301aad791c9 100644
--- a/app-emulation/lxd/lxd-4.0.4-r7.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-r7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 # Needs to include licenses for all bundled programs and libraries.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils



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

2021-03-07 Thread Joonas Niilola
commit: 3baa3d89b3a3a06b0bf2a3d086c1b8d95710cc08
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Mar  7 08:44:08 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar  7 09:03:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3baa3d89

app-emulation/lxd: bump to 4.0.5

 - allow sys-fs/fuse:*, both slots seems to work,
 - update LICENSES, we don't bundle any libraries anymore.

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

 app-emulation/lxd/Manifest |   2 +
 app-emulation/lxd/lxd-4.0.5.ebuild | 153 +
 2 files changed, 155 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index bc9fe001cc8..3a7e504a79d 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 
5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea
 SHA512 
800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f
 DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B 
bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b
 SHA512 
7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15
+DIST lxd-4.0.5.tar.gz 14659330 BLAKE2B 
4d61885a94946d3a6018324512ea318716cb9c1bc5f40be4eb62f71ad6a0eb993cda0ef917fbefb3949c0d47a6217245cc62e0ced3abfbcf47f6d8375a7d85d0
 SHA512 
8b9e6742dc3383fb31dce33d9f8ffe7a0ea661d274f6c3ac710f58d4d5b90b596881386571564ec0cd8f027da43eaa3948dd675d6fa07f1095405f4cc05f1211
+DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B 
f5b2ead748973831ec7ba7be00c34d26b16a6b168fb88a25f07126eeab5c812cab72609acc443e9bb541ff64849952bf66f8ee207083836a2aab905f1373c1e0
 SHA512 
b59edaf88cd8ab34271eb0ebb52270ede1509351596449b1b955eaba70a50f6f18fdc95fcc933deca3fe545b9aa45bfda3b7aa6553a8b4f2cedc8d1a6b3a5946

diff --git a/app-emulation/lxd/lxd-4.0.5.ebuild 
b/app-emulation/lxd/lxd-4.0.5.ebuild
new file mode 100644
index 000..6463918b080
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.5.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info 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"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   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? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+"
+
+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."
+
+# 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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   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_qemu.go \
+   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
+}
+
+src_configure() { :; }
+
+src_compile() {
+   export GOPATH="${S}/_dist"
+   export GO111MODULE=auto
+
+   cd "${S}" || die
+
+   for k in fuidshift lxd-agent 

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

2021-03-06 Thread Joonas Niilola
commit: 9c60e52a45eb8cc099cd735c7dfa00516435a7a3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Mar  7 06:29:27 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar  7 06:32:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c60e52a

app-emulation/lxd: more POSIX-compliant init.d file, #609070

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

 app-emulation/lxd/files/lxd-4.0.0.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
index c55b2da6a84..e6ae971e879 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -28,7 +28,7 @@ start() {
 }
 
 stop() {
-   if [[ "${RC_CMD}" = restart ]]; then
+   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.



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

2021-02-18 Thread Joonas Niilola
commit: 7ea3bb4bc957942439dca1c506dff2fabc3a506e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Feb 19 07:37:17 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb 19 07:37:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea3bb4b

app-emulation/lxd: fix building with go-1.16

 - by exporting GO111MODULE=auto,
 - reset KEYWORDS on -r7 to match go versioning and to be sure new go version
   won't surprise stable users with runtime issues.

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

 app-emulation/lxd/lxd-4.0.4-r7.ebuild | 154 ++
 1 file changed, 154 insertions(+)

diff --git a/app-emulation/lxd/lxd-4.0.4-r7.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r7.ebuild
new file mode 100644
index 000..b5c87f1d9fd
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.4-r7.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info 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 
)"
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse:0=
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+"
+
+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."
+
+# 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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   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_qemu.go \
+   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
+}
+
+src_configure() { :; }
+
+src_compile() {
+   export GOPATH="${S}/_dist"
+   export GO111MODULE=auto
+
+   cd "${S}" || die
+
+   for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+   go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
+   done
+
+   go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build 
the daemon"
+
+   use nls && emake build-mo
+}
+
+src_test() {
+   export GO111MODULE=auto
+   export GOPATH="${S}/_dist"
+   go test -v ${EGO_PN}/lxd || die
+}
+
+src_install() {
+   local bindir="_dist/bin"
+   export GOPATH="${S}/_dist"
+
+   dosbin ${bindir}/lxd
+
+   for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+   dobin ${bindir}/${l}
+   done
+
+   cd "${S}" || die
+
+   newbashcomp scripts/bash/lxd-client lxc
+
+   newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
+   newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
+
+   if use apparmor; then
+   systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service 
lxd.service
+   else
+   systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
+   fi
+
+   systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service 
lxd-containers.service
+   systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
+
+   dodoc AUTHORS doc/*
+   use nls && domo 

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

2021-02-18 Thread Joonas Niilola
commit: 6ea96b2080d0903324e22a39400d23f1c7e1f71c
Author: Benedikt Neuffer  itfriend  de>
AuthorDate: Wed Feb 17 09:54:29 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 18 17:35:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea96b20

app-emulation/lxd: use signals in openrc script

Rework on openrc script to use signals to communicate with the LXD daemon.

Bug: https://bugs.gentoo.org/770511
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Benedikt Neuffer  itfriend.de>
Closes: https://bugs.gentoo.org/770511
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxd/files/lxd-4.0.0.initd | 18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
index 266e84fcef6..c55b2da6a84 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -28,12 +28,20 @@ start() {
 }
 
 stop() {
-   if [[ ${RC_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
-   "${DAEMON}" shutdown
-   rm -f ${PIDFILE}
+   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 (but not containers)."
-   start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+   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
 }



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

2021-02-16 Thread Joonas Niilola
commit: ae2b0f58b84aa443a09d6fc7e03ba5d52b778436
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Feb 16 12:16:19 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb 16 12:16:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2b0f58

app-emulation/lxd: remove unused variable from init.d file

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

 app-emulation/lxd/files/lxd-4.0.0.initd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
index baec86805c6..266e84fcef6 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -4,7 +4,6 @@
 
 DAEMON=/usr/sbin/lxd
 PIDFILE=/run/lxd.pid
-TIMEOUT=10
 
 depend() {
need net



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

2021-02-16 Thread Joonas Niilola
commit: 43b0f09708ca0ee5fb22bec6f3c5320b26c8b535
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Feb 16 11:34:40 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb 16 12:16:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b0f097

app-emulation/lxd: rework init.d file shutdown logic

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

 app-emulation/lxd/files/lxd-4.0.0.initd | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
index 1cd4da1840b..baec86805c6 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -29,8 +29,12 @@ start() {
 }
 
 stop() {
-   ebegin "Stopping lxd service (but not containers)."
-   start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-   rm -f ${PIDFILE}
-   eend ${?}
+   if [[ ${RC_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
+   "${DAEMON}" shutdown
+   rm -f ${PIDFILE}
+   else
+   ebegin "Stopping lxd service (but not containers)."
+   start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+   eend ${?}
+   fi
 }



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

2021-02-16 Thread Joonas Niilola
commit: 1f7a406c30e7c3d28528e70222120ef353f41f5a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Feb 16 08:33:00 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb 16 08:33:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7a406c

app-emulation/lxd: remove pidfile on shutdown

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

 app-emulation/lxd/files/lxd-4.0.0.initd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
index 51284f6e2ae..1cd4da1840b 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -31,5 +31,6 @@ start() {
 stop() {
ebegin "Stopping lxd service (but not containers)."
start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+   rm -f ${PIDFILE}
eend ${?}
 }



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

2021-02-16 Thread Joonas Niilola
commit: 9f88706ccb6f6582b42ff558d679ebe39bc6fb93
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Feb 16 08:27:59 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb 16 08:29:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f88706c

app-emulation/lxd: don't shutdown all cluster instances with service

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

 app-emulation/lxd/files/lxd-4.0.0.initd| 25 +++---
 .../{lxd-4.0.4-r5.ebuild => lxd-4.0.4-r6.ebuild}   |  0
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
index 03ec12e44f5..51284f6e2ae 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -1,13 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 DAEMON=/usr/sbin/lxd
 PIDFILE=/run/lxd.pid
 TIMEOUT=10
 
-extra_commands="stopall"
-
 depend() {
need net
need lxcfs
@@ -31,24 +29,7 @@ start() {
 }
 
 stop() {
-   if [[ ${RC_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
-   stopall
-   else
-   ebegin "Stopping lxd service (but not containers)."
-   start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-   eend ${?}
-   fi
-}
-
-stopall() {
-   ebegin "Stopping lxd service and containers."
-   lxc stop --all --timeout $TIMEOUT >/dev/null 2>&1
-   if [[ ${?} -ne 0 ]]; then
-   lxc stop --all --force || eerror "Could not stop all 
containers."
-   fi
-   if "${DAEMON}" shutdown; then
-   rm -f ${PIDFILE}
-   eend 0
-   fi
+   ebegin "Stopping lxd service (but not containers)."
+   start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
eend ${?}
 }

diff --git a/app-emulation/lxd/lxd-4.0.4-r5.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r6.ebuild
similarity index 100%
rename from app-emulation/lxd/lxd-4.0.4-r5.ebuild
rename to app-emulation/lxd/lxd-4.0.4-r6.ebuild



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

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

app-emulation/lxd: clean old

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

 app-emulation/lxd/lxd-4.0.4-r3.ebuild | 144 
 app-emulation/lxd/lxd-4.0.4-r4.ebuild | 152 --
 2 files changed, 296 deletions(-)

diff --git a/app-emulation/lxd/lxd-4.0.4-r3.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r3.ebuild
deleted file mode 100644
index 2a2aee90dd4..000
--- a/app-emulation/lxd/lxd-4.0.4-r3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info 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 
)"
-
-# Needs to include licenses for all bundled programs and libraries.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-   dev-libs/dqlite
-   dev-libs/lzo
-   dev-libs/raft
-   net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-   acct-group/lxd
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse:0=
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~CGROUPS
-   ~IPC_NS
-   ~NET_NS
-   ~PID_NS
-
-   ~SECCOMP
-   ~USER_NS
-   ~UTS_NS
-"
-
-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."
-
-# 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"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-   default
-
-   export GOPATH="${S}/_dist"
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-
-   cd "${S}" || die
-
-   for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-   go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
-   done
-
-   go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build 
the daemon"
-
-   use nls && emake build-mo
-}
-
-src_test() {
-   export GOPATH="${S}/_dist"
-   go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
-   local bindir="_dist/bin"
-   export GOPATH="${S}/_dist"
-
-   dosbin ${bindir}/lxd
-
-   for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-   dobin ${bindir}/${l}
-   done
-
-   cd "${S}" || die
-
-   newbashcomp scripts/bash/lxd-client lxc
-
-   newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-   newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
-   if use apparmor; then
-   systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service 
lxd.service
-   else
-   systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
-   fi
-
-   systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service 
lxd-containers.service
-   systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-   dodoc AUTHORS doc/*
-   use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-   elog
-   elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-   elog "including a Quick Start."
-   elog
-   elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-   elog
-   elog "Optional features:"
-   optfeature "btrfs storage backend" sys-fs/btrfs-progs
-   optfeature "lvm2 storage backend" sys-fs/lvm2
-   optfeature "zfs storage backend" sys-fs/zfs
-   elog
-   elog "Be sure to add your local user to the lxd group."
-}

diff --git 

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

2021-01-29 Thread Joonas Niilola
commit: a6252421c7075e7a947919f0915356695327d5ef
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Jan 29 17:18:10 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan 30 06:09:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6252421

app-emulation/lxd: add lzma dep on squashfs

images from the default remote image host
are compressed as xz and need this

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/19258
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/lxd/lxd-4.0.4-r5.ebuild | 152 ++
 1 file changed, 152 insertions(+)

diff --git a/app-emulation/lxd/lxd-4.0.4-r5.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r5.ebuild
new file mode 100644
index 000..2a6ab5a0058
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.4-r5.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info 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 
)"
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse:0=
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools[lzma]
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+"
+
+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."
+
+# 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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   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_qemu.go \
+   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
+}
+
+src_configure() { :; }
+
+src_compile() {
+   export GOPATH="${S}/_dist"
+
+   cd "${S}" || die
+
+   for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+   go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
+   done
+
+   go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build 
the daemon"
+
+   use nls && emake build-mo
+}
+
+src_test() {
+   export GOPATH="${S}/_dist"
+   go test -v ${EGO_PN}/lxd || die
+}
+
+src_install() {
+   local bindir="_dist/bin"
+   export GOPATH="${S}/_dist"
+
+   dosbin ${bindir}/lxd
+
+   for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+   dobin ${bindir}/${l}
+   done
+
+   cd "${S}" || die
+
+   newbashcomp scripts/bash/lxd-client lxc
+
+   newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
+   newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
+
+   if use apparmor; then
+   systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service 
lxd.service
+   else
+   systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
+   fi
+
+   systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service 
lxd-containers.service
+   systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
+
+   dodoc AUTHORS doc/*
+   use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+   elog
+   elog 

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

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

app-emulation/lxd: stabilize 4.0.4-r5 on amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.4-r5.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r5.ebuild
index 2a6ab5a0058..6419fd08403 100644
--- a/app-emulation/lxd/lxd-4.0.4-r5.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 # Needs to include licenses for all bundled programs and libraries.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils



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

2021-01-13 Thread Joonas Niilola
commit: 1c58af215a63d542b6baf3054d06facf9bde95a1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jan 14 04:19:12 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 14 04:19:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c58af21

app-emulation/lxd: revbump to match new lxc[seccomp] default

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

 app-emulation/lxd/{lxd-4.0.4-r1.ebuild => lxd-4.0.4-r3.ebuild} | 4 ++--
 app-emulation/lxd/{lxd-4.0.4-r2.ebuild => lxd-4.0.4-r4.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/lxd/lxd-4.0.4-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r3.ebuild
similarity index 97%
rename from app-emulation/lxd/lxd-4.0.4-r1.ebuild
rename to app-emulation/lxd/lxd-4.0.4-r3.ebuild
index 81f45b82b6a..2a2aee90dd4 100644
--- a/app-emulation/lxd/lxd-4.0.4-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ KEYWORDS="amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
dev-libs/dqlite
dev-libs/lzo
dev-libs/raft

diff --git a/app-emulation/lxd/lxd-4.0.4-r2.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r4.ebuild
similarity index 98%
rename from app-emulation/lxd/lxd-4.0.4-r2.ebuild
rename to app-emulation/lxd/lxd-4.0.4-r4.ebuild
index 060fd2fab5e..361d00b56fa 100644
--- a/app-emulation/lxd/lxd-4.0.4-r2.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-r4.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
dev-libs/dqlite
dev-libs/lzo
dev-libs/raft



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

2021-01-03 Thread Joonas Niilola
commit: fa6511e34b163edcde77e9d7b9a49178eb3e3e39
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jan  4 05:16:17 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jan  4 05:18:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6511e3

app-emulation/lxd: fix hardcoded ovmf file path

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

 app-emulation/lxd/lxd-4.0.4-r2.ebuild | 152 ++
 1 file changed, 152 insertions(+)

diff --git a/app-emulation/lxd/lxd-4.0.4-r2.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r2.ebuild
new file mode 100644
index 000..060fd2fab5e
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.4-r2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info 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 
)"
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse:0=
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+"
+
+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."
+
+# 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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   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_qemu.go \
+   lxd/instance/drivers/driver_qemu.go || die "Failed to fix 
hardcoded ovmf paths."
+}
+
+src_configure() { :; }
+
+src_compile() {
+   export GOPATH="${S}/_dist"
+
+   cd "${S}" || die
+
+   for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+   go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
+   done
+
+   go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build 
the daemon"
+
+   use nls && emake build-mo
+}
+
+src_test() {
+   export GOPATH="${S}/_dist"
+   go test -v ${EGO_PN}/lxd || die
+}
+
+src_install() {
+   local bindir="_dist/bin"
+   export GOPATH="${S}/_dist"
+
+   dosbin ${bindir}/lxd
+
+   for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+   dobin ${bindir}/${l}
+   done
+
+   cd "${S}" || die
+
+   newbashcomp scripts/bash/lxd-client lxc
+
+   newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
+   newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
+
+   if use apparmor; then
+   systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service 
lxd.service
+   else
+   systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
+   fi
+
+   systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service 
lxd-containers.service
+   systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
+
+   dodoc AUTHORS doc/*
+   use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+   elog
+   elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+   elog "including a Quick Start."
+   elog
+   elog "Please run 'lxc-checkconfig' to see all optional 

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

2020-12-14 Thread Joonas Niilola
commit: 9e045296069aeaa62de31b85cca24b0fc721ccf1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Dec 15 07:16:58 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec 15 07:18:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e045296

app-emulation/lxd: remove old 4.0.3

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

 app-emulation/lxd/Manifest|   2 -
 app-emulation/lxd/lxd-4.0.3-r2.ebuild | 212 --
 2 files changed, 214 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index b7b2ca464c0..bc9fe001cc8 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-4.0.3.tar.gz 25468067 BLAKE2B 
5c3d8a2841d3222d070be39fb6cb63c99450a7edea86915a808230012f1a3b7a66c2c4a3c56be378f586c8ca033c4f547ed6eeb14bb09a091b3ae28c62fda7ae
 SHA512 
aaf7fe7473e04765263ff99f02041748f0e57abdd0311d734fbf1cbc461516bf6adad1bc42c9cfa58b4e87c28efb5186d9436fb0a1d309b23eb37fe95299ad6f
-DIST lxd-4.0.3.tar.gz.asc 833 BLAKE2B 
b889b7c3a85f325a4c47319b45c4828c4fc0cac2bae77341734827e737243802852c20a766ab72ce1a12e643502d108fec41b715d8eb820ec273c651b7745fb2
 SHA512 
993ad833832a551e0804f9e565542b5779352cad2bb32989a440a0be11b1ae6539e46fa3332d35e8be365026dacc21d847db544b62b3e11493100d3c9cb313e1
 DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 
5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea
 SHA512 
800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f
 DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B 
bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b
 SHA512 
7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15

diff --git a/app-emulation/lxd/lxd-4.0.3-r2.ebuild 
b/app-emulation/lxd/lxd-4.0.3-r2.ebuild
deleted file mode 100644
index fa42646855b..000
--- a/app-emulation/lxd/lxd-4.0.3-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info 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 
)"
-
-# Needs to include licenses for all bundled programs and libraries.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor +ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
-   dev-lang/tcl
-   dev-libs/libuv
-   dev-libs/lzo
-   net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-   acct-group/lxd
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse:0=
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools
-   virtual/acl"
-BDEPEND=">=dev-lang/go-1.13
-   nls? ( sys-devel/gettext )
-   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-   ~BRIDGE
-   ~DUMMY
-   ~IP6_NF_NAT
-   ~IP6_NF_TARGET_MASQUERADE
-   ~IPV6
-   ~IP_NF_NAT
-   ~IP_NF_TARGET_MASQUERADE
-   ~MACVLAN
-   ~NETFILTER_XT_MATCH_COMMENT
-   ~NET_IPGRE
-   ~NET_IPGRE_DEMUX
-   ~NET_IPIP
-   ~NF_NAT_MASQUERADE
-   ~VSOCKETS
-   ~VXLAN
-"
-
-# 4.0.3: Network fetching fixed, but tests don't work when ran inside 
container.
-RESTRICT="test"
-
-# Go magic.
-QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
-   /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"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-common_op() {
-   local i
-   for i in dqlite raft; do
-   cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
-   "${@}"
-   cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-   done
-}
-
-src_prepare() {
-   default
-
-   export GOPATH="${S}/_dist"
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
-   sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | 

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

2020-12-09 Thread Joonas Niilola
commit: 0e08da87c557bb9458081e3ff363da5666951df0
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Dec  9 07:55:42 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Dec  9 07:55:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e08da87

app-emulation/lxd: stabilize 4.0.4-r1 on amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.4-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r1.ebuild
index e287cc4458a..81f45b82b6a 100644
--- a/app-emulation/lxd/lxd-4.0.4-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 # Needs to include licenses for all bundled programs and libraries.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils



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

2020-10-26 Thread Joonas Niilola
commit: 1e6334d771a7f7b7b38c8221a5649f2e81c5ce8a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Oct 26 06:25:22 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Oct 26 06:29:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6334d7

app-emulation/lxd: revert openrc -> systemd-cgroups fix

 - it now breaks openrc -> openrc-cgroups instead. A better solution needs to
   be found. Please see
   
https://wiki.gentoo.org/wiki/LXD#Running_systemd_based_containers_on_OpenRC_hosts
   for a workaround, that you can add to your own init.d file if needed.

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

 app-emulation/lxd/files/lxd-4.0.0.initd| 3 ---
 app-emulation/lxd/{lxd-4.0.3-r1.ebuild => lxd-4.0.3-r2.ebuild} | 0
 app-emulation/lxd/{lxd-4.0.4.ebuild => lxd-4.0.4-r1.ebuild}| 0
 3 files changed, 3 deletions(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
index f4206344355..03ec12e44f5 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -18,9 +18,6 @@ start() {
 
modprobe -f loop > /dev/null 2>&1
 
-   # Allow systemd containers to be used on openrc host, #750410
-   [ -d /sys/fs/cgroup/systemd ] || ( mkdir -p /sys/fs/cgroup/systemd ; 
mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd )
-
# 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 \

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

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



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

2020-10-23 Thread Joonas Niilola
commit: d63e8ebe8e24e37ba29415d4e7d11e49ac9b6d64
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Oct 23 07:35:25 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 23 07:36:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63e8ebe

app-emulation/lxd: bump to 4.0.4

 - dropped bundled libco,
 - dropped dependencies that were required to build bundled libs,
 - dropped multiple kernel requirements that were not documented upstream,
   please run 'lxc-checkconfig' to enable some optional kernel features,
 - fixed 'builds with -Werror' bug #744106,
 - test phase works now,
 - use system dqlite instead of bundled one,
 - use system raft instead of bundled one,
 - use system sqlite instead of bundled one.

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

 app-emulation/lxd/Manifest |   2 +
 app-emulation/lxd/lxd-4.0.4.ebuild | 144 +
 2 files changed, 146 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 84866a252c0..b7b2ca464c0 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-4.0.3.tar.gz 25468067 BLAKE2B 
5c3d8a2841d3222d070be39fb6cb63c99450a7edea86915a808230012f1a3b7a66c2c4a3c56be378f586c8ca033c4f547ed6eeb14bb09a091b3ae28c62fda7ae
 SHA512 
aaf7fe7473e04765263ff99f02041748f0e57abdd0311d734fbf1cbc461516bf6adad1bc42c9cfa58b4e87c28efb5186d9436fb0a1d309b23eb37fe95299ad6f
 DIST lxd-4.0.3.tar.gz.asc 833 BLAKE2B 
b889b7c3a85f325a4c47319b45c4828c4fc0cac2bae77341734827e737243802852c20a766ab72ce1a12e643502d108fec41b715d8eb820ec273c651b7745fb2
 SHA512 
993ad833832a551e0804f9e565542b5779352cad2bb32989a440a0be11b1ae6539e46fa3332d35e8be365026dacc21d847db544b62b3e11493100d3c9cb313e1
+DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 
5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea
 SHA512 
800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f
+DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B 
bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b
 SHA512 
7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15

diff --git a/app-emulation/lxd/lxd-4.0.4.ebuild 
b/app-emulation/lxd/lxd-4.0.4.ebuild
new file mode 100644
index 000..e287cc4458a
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info 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 
)"
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+   dev-libs/dqlite
+   dev-libs/lzo
+   dev-libs/raft
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse:0=
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+   ~CGROUPS
+   ~IPC_NS
+   ~NET_NS
+   ~PID_NS
+
+   ~SECCOMP
+   ~USER_NS
+   ~UTS_NS
+"
+
+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."
+
+# 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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   sed -i \
+   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
+   -e "s:make:make ${MAKEOPTS}:g" \
+   Makefile || die
+}
+
+src_configure() { :; }
+
+src_compile() {
+   export GOPATH="${S}/_dist"
+
+   cd "${S}" || die
+
+ 

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

2020-10-21 Thread Joonas Niilola
commit: 4b4cbd6f7c78abe9d831c8425b2a4ebdbba298ca
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Oct 21 06:03:53 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Oct 21 06:03:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b4cbd6f

app-emulation/lxd: fix init.d to allow systemd cont on openrc host

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

 app-emulation/lxd/files/lxd-4.0.0.initd | 3 +++
 app-emulation/lxd/{lxd-4.0.3.ebuild => lxd-4.0.3-r1.ebuild} | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
index 03ec12e44f5..f4206344355 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -18,6 +18,9 @@ start() {
 
modprobe -f loop > /dev/null 2>&1
 
+   # Allow systemd containers to be used on openrc host, #750410
+   [ -d /sys/fs/cgroup/systemd ] || ( mkdir -p /sys/fs/cgroup/systemd ; 
mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd )
+
# 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 \

diff --git a/app-emulation/lxd/lxd-4.0.3.ebuild 
b/app-emulation/lxd/lxd-4.0.3-r1.ebuild
similarity index 98%
rename from app-emulation/lxd/lxd-4.0.3.ebuild
rename to app-emulation/lxd/lxd-4.0.3-r1.ebuild
index cecda7cf1eb..fa42646855b 100644
--- a/app-emulation/lxd/lxd-4.0.3.ebuild
+++ b/app-emulation/lxd/lxd-4.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools bash-completion-r1 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/${PN}/${P}.tar.gz
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
 
 # Needs to include licenses for all bundled programs and libraries.



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

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

app-emulation/lxd: use verify-sig

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

 app-emulation/lxd/Manifest |  1 +
 app-emulation/lxd/lxd-4.0.3.ebuild | 12 
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index afffed8ce51..84866a252c0 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1 +1,2 @@
 DIST lxd-4.0.3.tar.gz 25468067 BLAKE2B 
5c3d8a2841d3222d070be39fb6cb63c99450a7edea86915a808230012f1a3b7a66c2c4a3c56be378f586c8ca033c4f547ed6eeb14bb09a091b3ae28c62fda7ae
 SHA512 
aaf7fe7473e04765263ff99f02041748f0e57abdd0311d734fbf1cbc461516bf6adad1bc42c9cfa58b4e87c28efb5186d9436fb0a1d309b23eb37fe95299ad6f
+DIST lxd-4.0.3.tar.gz.asc 833 BLAKE2B 
b889b7c3a85f325a4c47319b45c4828c4fc0cac2bae77341734827e737243802852c20a766ab72ce1a12e643502d108fec41b715d8eb820ec273c651b7745fb2
 SHA512 
993ad833832a551e0804f9e565542b5779352cad2bb32989a440a0be11b1ae6539e46fa3332d35e8be365026dacc21d847db544b62b3e11493100d3c9cb313e1

diff --git a/app-emulation/lxd/lxd-4.0.3.ebuild 
b/app-emulation/lxd/lxd-4.0.3.ebuild
index abda07f1be0..cecda7cf1eb 100644
--- a/app-emulation/lxd/lxd-4.0.3.ebuild
+++ b/app-emulation/lxd/lxd-4.0.3.ebuild
@@ -3,17 +3,18 @@
 
 EAPI=7
 
-inherit autotools bash-completion-r1 linux-info optfeature systemd
+inherit autotools bash-completion-r1 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/${PN}/${P}.tar.gz;
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz
+   verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc 
)"
 
 # Needs to include licenses for all bundled programs and libraries.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="apparmor +ipv6 nls"
+IUSE="apparmor +ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils
>=app-emulation/lxc-3.0.0[apparmor?,seccomp]
@@ -31,7 +32,8 @@ RDEPEND="${DEPEND}
sys-fs/squashfs-tools
virtual/acl"
 BDEPEND=">=dev-lang/go-1.13
-   nls? ( sys-devel/gettext )"
+   nls? ( sys-devel/gettext )
+   verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
 
 CONFIG_CHECK="
~BRIDGE
@@ -67,6 +69,8 @@ QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
 EGO_PN="github.com/lxc/lxd"
 GOPATH="${S}/_dist" # this seems to reset every now and then, though
 
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
 common_op() {
local i
for i in dqlite raft; do



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

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

app-emulation/lxd: become primary maintainer, drop stasibear

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

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

diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 8a3feb50493..db7a11f18d7 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -2,8 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
   
-stasib...@gentoo.org
-Erik Mackdanz
+juip...@gentoo.org
+Joonas Niilola
   
   
 virtualizat...@gentoo.org



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

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

app-emulation/lxd: stabilize 4.0.3 on amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.3.ebuild 
b/app-emulation/lxd/lxd-4.0.3.ebuild
index 9da34e59114..abda07f1be0 100644
--- a/app-emulation/lxd/lxd-4.0.3.ebuild
+++ b/app-emulation/lxd/lxd-4.0.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
 # Needs to include licenses for all bundled programs and libraries.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor +ipv6 nls"
 
 DEPEND="app-arch/xz-utils



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

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

app-emulation/lxd: remove old 4.0.2

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

 app-emulation/lxd/Manifest|   1 -
 app-emulation/lxd/lxd-4.0.2-r1.ebuild | 210 --
 2 files changed, 211 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index ec555c4d4d4..afffed8ce51 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1 @@
-DIST lxd-4.0.2.tar.gz 25350601 BLAKE2B 
2abecb61759a1a717960671516157dc7b7a36865ecdbcec1f211e5b653b2b4afc41932a4a289430de0dd4ac1e2c777de471ab26e31dbf2b8d1855f67d03886ad
 SHA512 
6c1c668055e9677850f24e142e6741cb6b5aa8d4d9cce29af566e8090c28e04b4baf973f486aef28b7f6b34be5b9ab9bb45e77956879ff7feff6bec8e4db3077
 DIST lxd-4.0.3.tar.gz 25468067 BLAKE2B 
5c3d8a2841d3222d070be39fb6cb63c99450a7edea86915a808230012f1a3b7a66c2c4a3c56be378f586c8ca033c4f547ed6eeb14bb09a091b3ae28c62fda7ae
 SHA512 
aaf7fe7473e04765263ff99f02041748f0e57abdd0311d734fbf1cbc461516bf6adad1bc42c9cfa58b4e87c28efb5186d9436fb0a1d309b23eb37fe95299ad6f

diff --git a/app-emulation/lxd/lxd-4.0.2-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.2-r1.ebuild
deleted file mode 100644
index cf2276c610b..000
--- a/app-emulation/lxd/lxd-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info optfeature systemd
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
-
-# Needs to include licenses for all bundled programs and libraries.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor +ipv6 nls"
-
-DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
-   dev-lang/tcl
-   dev-libs/libuv
-   dev-libs/lzo
-   net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-   acct-group/lxd
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse:0=
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="
-   ~BRIDGE
-   ~DUMMY
-   ~IP6_NF_NAT
-   ~IP6_NF_TARGET_MASQUERADE
-   ~IPV6
-   ~IP_NF_NAT
-   ~IP_NF_TARGET_MASQUERADE
-   ~MACVLAN
-   ~NETFILTER_XT_MATCH_COMMENT
-   ~NET_IPGRE
-   ~NET_IPGRE_DEMUX
-   ~NET_IPIP
-   ~NF_NAT_MASQUERADE
-   ~VSOCKETS
-   ~VXLAN
-"
-
-# Uses internet connection.
-RESTRICT="test"
-
-# Go magic.
-QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
-   /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"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-common_op() {
-   local i
-   for i in dqlite raft; do
-   cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
-   "${@}"
-   cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-   done
-}
-
-src_prepare() {
-   default
-
-   export GOPATH="${S}/_dist"
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
-   sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< 
/sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
-
-   common_op eautoreconf
-}
-
-src_configure() {
-   export GOPATH="${S}/_dist"
-
-   export CO_CFLAGS="-I${GOPATH}/deps/libco/"
-   export CO_LIBS="${GOPATH}/deps/libco/"
-
-   export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
-   export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
-
-   export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
-   export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
-
-   export 
PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
-
-   cd "${GOPATH}/deps/sqlite" || die
-   econf --enable-replication --disable-amalgamation --disable-tcl 
--libdir="${EPREFIX}/usr/lib/lxd"
-
-   common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
-}
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-
-   export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ 
-I${GOPATH}/deps/dqlite/include/ 

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

2020-08-15 Thread Joonas Niilola
commit: 6dc1a76c6c1221364f661988c15b5961da8b14f9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Aug 15 06:19:25 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Aug 15 06:19:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc1a76c

app-emulation/lxd: bump to 4.0.3

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

 app-emulation/lxd/Manifest |   1 +
 app-emulation/lxd/lxd-4.0.3.ebuild | 208 +
 2 files changed, 209 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index e491542f828..ec555c4d4d4 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1 +1,2 @@
 DIST lxd-4.0.2.tar.gz 25350601 BLAKE2B 
2abecb61759a1a717960671516157dc7b7a36865ecdbcec1f211e5b653b2b4afc41932a4a289430de0dd4ac1e2c777de471ab26e31dbf2b8d1855f67d03886ad
 SHA512 
6c1c668055e9677850f24e142e6741cb6b5aa8d4d9cce29af566e8090c28e04b4baf973f486aef28b7f6b34be5b9ab9bb45e77956879ff7feff6bec8e4db3077
+DIST lxd-4.0.3.tar.gz 25468067 BLAKE2B 
5c3d8a2841d3222d070be39fb6cb63c99450a7edea86915a808230012f1a3b7a66c2c4a3c56be378f586c8ca033c4f547ed6eeb14bb09a091b3ae28c62fda7ae
 SHA512 
aaf7fe7473e04765263ff99f02041748f0e57abdd0311d734fbf1cbc461516bf6adad1bc42c9cfa58b4e87c28efb5186d9436fb0a1d309b23eb37fe95299ad6f

diff --git a/app-emulation/lxd/lxd-4.0.3.ebuild 
b/app-emulation/lxd/lxd-4.0.3.ebuild
new file mode 100644
index 000..6916707a2f4
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.3.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 eutils linux-info systemd
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor +ipv6 nls"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+   dev-lang/tcl
+   dev-libs/libuv
+   dev-libs/lzo
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse:0=
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl"
+BDEPEND=">=dev-lang/go-1.13
+   nls? ( sys-devel/gettext )"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE
+   ~VSOCKETS
+   ~VXLAN
+"
+
+# 4.0.3: Network fetching fixed, but tests don't work when ran inside 
container.
+RESTRICT="test"
+
+# Go magic.
+QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
+   /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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+common_op() {
+   local i
+   for i in dqlite raft; do
+   cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
+   "${@}"
+   cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+   done
+}
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   sed -i \
+   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
+   -e "s:make:make ${MAKEOPTS}:g" \
+   Makefile || die
+
+   sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
+   sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< 
/sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
+
+   common_op eautoreconf
+}
+
+src_configure() {
+   export GOPATH="${S}/_dist"
+
+   export CO_CFLAGS="-I${GOPATH}/deps/libco/"
+   export CO_LIBS="${GOPATH}/deps/libco/"
+
+   export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
+   export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
+
+   export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
+   export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
+
+   export 
PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
+
+   cd "${GOPATH}/deps/sqlite" || die
+   econf --enable-replication --disable-amalgamation --disable-tcl 
--libdir="${EPREFIX}/usr/lib/lxd"
+
+   common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
+}
+
+src_compile() {
+   export GOPATH="${S}/_dist"
+
+   export CGO_CFLAGS="${CGO_CFLAGS} 

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

2020-08-12 Thread Joonas Niilola
commit: 7b2c75542cd329950cdb3d2ca6185bd1a34222cd
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug 12 12:53:22 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 12 13:03:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2c7554

app-emulation/lxd: stabilize 4.0.2-r1 on amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.2-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.2-r1.ebuild
index 3c8ffca9ef1..0eed136d3d5 100644
--- a/app-emulation/lxd/lxd-4.0.2-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.2-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
 # Needs to include licenses for all bundled programs and libraries.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor +ipv6 nls"
 
 DEPEND="app-arch/xz-utils



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

2020-08-12 Thread Joonas Niilola
commit: a6d431a990c249ae48c8cde1b7246d30f50a9acb
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug 12 12:55:38 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 12 13:03:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d431a9

app-emulation/lxd: remove old 4.0.1

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

 app-emulation/lxd/Manifest|   1 -
 app-emulation/lxd/files/lxd-4.0.1-clang.patch |  76 --
 app-emulation/lxd/files/lxd.service   |  10 --
 app-emulation/lxd/lxd-4.0.1.ebuild| 206 --
 4 files changed, 293 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 621644c18ae..e491542f828 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1 @@
-DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 
1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920
 SHA512 
1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f
 DIST lxd-4.0.2.tar.gz 25350601 BLAKE2B 
2abecb61759a1a717960671516157dc7b7a36865ecdbcec1f211e5b653b2b4afc41932a4a289430de0dd4ac1e2c777de471ab26e31dbf2b8d1855f67d03886ad
 SHA512 
6c1c668055e9677850f24e142e6741cb6b5aa8d4d9cce29af566e8090c28e04b4baf973f486aef28b7f6b34be5b9ab9bb45e77956879ff7feff6bec8e4db3077

diff --git a/app-emulation/lxd/files/lxd-4.0.1-clang.patch 
b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
deleted file mode 100644
index 765f2f38be5..000
--- a/app-emulation/lxd/files/lxd-4.0.1-clang.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c7ce94825871ea5d0946e92762e981354628b8ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?= 
-Date: Mon, 22 Jun 2020 22:17:02 -0400
-Subject: [PATCH] lxd: Fix building with clang
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Closes #7573
-
-Signed-off-by: Stéphane Graber 

- lxd/main_forksyscall.go |  8 
- lxd/seccomp/seccomp.go  | 16 
- 2 files changed, 8 insertions(+), 16 deletions(-)
-
-diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
-index a304405c2e..14895b6ce0 100644
 a/lxd/main_forksyscall.go
-+++ b/lxd/main_forksyscall.go
-@@ -34,12 +34,6 @@ extern void attach_userns_fd(int ns_fd);
- extern int pidfd_nsfd(int pidfd, pid_t pid);
- extern bool setnsat(int ns_fd, const char *ns);
- 
--static inline bool same_fsinfo(struct stat *s1, struct stat *s2,
-- struct statfs *sfs1, struct statfs *sfs2)
--{
--  return ((sfs1->f_type == sfs2->f_type) && (s1->st_dev == s2->st_dev));
--}
--
- static bool chdirchroot_in_mntns(int cwd_fd, int root_fd)
- {
-   ssize_t len;
-@@ -209,8 +203,6 @@ const char *ns_names[] = { "user", "pid", "uts", "ipc", 
"net", "cgroup", NULL };
- 
- static bool change_creds(int ns_fd, cap_t caps, uid_t nsuid, gid_t nsgid, 
uid_t nsfsuid, gid_t nsfsgid)
- {
--  __do_close int fd = -EBADF;
--
-   if (prctl(PR_SET_KEEPCAPS, 1))
-   return false;
- 
-diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
-index 8945fd9197..025efb3141 100644
 a/lxd/seccomp/seccomp.go
-+++ b/lxd/seccomp/seccomp.go
-@@ -91,21 +91,21 @@ static int device_allowed(dev_t dev, mode_t mode)
- {
-   switch (mode & S_IFMT) {
-   case S_IFCHR:
--  if ((dev == makedev(0, 0))) // whiteout
-+  if (dev == makedev(0, 0)) // whiteout
-   return 0;
--  else if ((dev == makedev(5, 1))) // /dev/console
-+  else if (dev == makedev(5, 1)) // /dev/console
-   return 0;
--  else if ((dev == makedev(1, 7))) // /dev/full
-+  else if (dev == makedev(1, 7)) // /dev/full
-   return 0;
--  else if ((dev == makedev(1, 3))) // /dev/null
-+  else if (dev == makedev(1, 3)) // /dev/null
-   return 0;
--  else if ((dev == makedev(1, 8))) // /dev/random
-+  else if (dev == makedev(1, 8)) // /dev/random
-   return 0;
--  else if ((dev == makedev(5, 0))) // /dev/tty
-+  else if (dev == makedev(5, 0)) // /dev/tty
-   return 0;
--  else if ((dev == makedev(1, 9))) // /dev/urandom
-+  else if (dev == makedev(1, 9)) // /dev/urandom
-   return 0;
--  else if ((dev == makedev(1, 5))) // /dev/zero
-+  else if (dev == makedev(1, 5)) // /dev/zero
-   return 0;
-   }
- 

diff --git a/app-emulation/lxd/files/lxd.service 
b/app-emulation/lxd/files/lxd.service
deleted file mode 100644
index d00635fbcdd..000
--- a/app-emulation/lxd/files/lxd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Container hypervisor based on 

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

2020-07-17 Thread Joonas Niilola
commit: 5543b7fae9355f431df2f18696b790499efab0b8
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jul 17 06:47:26 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jul 17 08:14:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5543b7fa

app-emulation/lxd: remove old 4.0.2

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

 app-emulation/lxd/lxd-4.0.2.ebuild | 204 -
 1 file changed, 204 deletions(-)

diff --git a/app-emulation/lxd/lxd-4.0.2.ebuild 
b/app-emulation/lxd/lxd-4.0.2.ebuild
deleted file mode 100644
index 8317a5bc6fb..000
--- a/app-emulation/lxd/lxd-4.0.2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 eutils linux-info systemd
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
-
-# Needs to include licenses for all bundled programs and libraries.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ipv6 nls"
-
-DEPEND="app-arch/xz-utils
-   >=app-emulation/lxc-3.0.0[seccomp]
-   dev-lang/tcl
-   dev-libs/libuv
-   dev-libs/lzo
-   net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-   acct-group/lxd
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse:0=
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools
-   virtual/acl"
-BDEPEND="dev-lang/go
-   nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="
-   ~BRIDGE
-   ~DUMMY
-   ~IP6_NF_NAT
-   ~IP6_NF_TARGET_MASQUERADE
-   ~IPV6
-   ~IP_NF_NAT
-   ~IP_NF_TARGET_MASQUERADE
-   ~MACVLAN
-   ~NETFILTER_XT_MATCH_COMMENT
-   ~NET_IPGRE
-   ~NET_IPGRE_DEMUX
-   ~NET_IPIP
-   ~NF_NAT_MASQUERADE_IPV4
-   ~VSOCKETS
-   ~VXLAN
-"
-
-# Uses internet connection.
-RESTRICT="test"
-
-# Go magic.
-QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
-   /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"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-common_op() {
-   local i
-   for i in dqlite raft; do
-   cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
-   "${@}"
-   cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-   done
-}
-
-src_prepare() {
-   default
-
-   export GOPATH="${S}/_dist"
-
-   sed -i \
-   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-   -e "s:make:make ${MAKEOPTS}:g" \
-   Makefile || die
-
-   sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
-   sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< 
/sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
-
-   common_op eautoreconf
-}
-
-src_configure() {
-   export GOPATH="${S}/_dist"
-
-   export CO_CFLAGS="-I${GOPATH}/deps/libco/"
-   export CO_LIBS="${GOPATH}/deps/libco/"
-
-   export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
-   export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
-
-   export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
-   export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
-
-   export 
PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
-
-   cd "${GOPATH}/deps/sqlite" || die
-   econf --enable-replication --disable-amalgamation --disable-tcl 
--libdir="${EPREFIX}/usr/lib/lxd"
-
-   common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
-}
-
-src_compile() {
-   export GOPATH="${S}/_dist"
-
-   export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ 
-I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ 
-I${GOPATH}/deps/libco/"
-   export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ 
-L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs 
-L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
-   export 
LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
-
-   local j
-   for j in sqlite raft libco; do
-   cd "${GOPATH}"/deps/${j} || die
-   emake
-   done
-
-   ln -s libco.so.0.1.0 libco.so || die
-
-   cd "${GOPATH}/deps/dqlite" || die
-   emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" 
LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
-
-   cd "${S}" || die
-
-   for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; 

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

2020-07-13 Thread Joonas Niilola
commit: bd06487a605c08a2400b9b0df7f8e591d60884e7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 13 07:19:22 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 13 07:19:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd06487a

app-emulation/lxd: remove redundant optfeature

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

 app-emulation/lxd/lxd-4.0.2-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/lxd/lxd-4.0.2-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.2-r1.ebuild
index 899ac595ada..3c8ffca9ef1 100644
--- a/app-emulation/lxd/lxd-4.0.2-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.2-r1.ebuild
@@ -202,7 +202,6 @@ pkg_postinst() {
elog "including a Quick Start."
elog
elog "Optional features:"
-   optfeature "apparmor support" app-emulation/lxc[apparmor]
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-emulation/lxd/

2020-07-13 Thread Joonas Niilola
commit: 3d074f04398d4ed6c64f74aea0687d7b4f27462e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 13 06:59:01 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 13 07:16:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d074f04

app-emulation/lxd: describe apparmor IUSE

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

 app-emulation/lxd/metadata.xml | 37 -
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 6711afb51f1..8a3feb50493 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -1,21 +1,24 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   stasib...@gentoo.org
-   Erik Mackdanz
-   
-   
-   virtualizat...@gentoo.org
-   Gentoo Virtualization Project
-   
-   
-   By combining the speed and density of containers with
-   the security of traditional virtual machines, LXD is
-   the next-generation of container hypervisor for Linux
-   from Canonical.
-   
-   
-   lxc/lxd
-   
+  
+stasib...@gentoo.org
+Erik Mackdanz
+  
+  
+virtualizat...@gentoo.org
+Gentoo Virtualization Project
+  
+  
+Enable AppArmor support
+  
+  
+By combining the speed and density of containers with
+the security of traditional virtual machines, LXD is
+the next-generation of container hypervisor for Linux
+from Canonical.
+  
+  
+lxc/lxd
+  
 



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

2020-07-13 Thread Joonas Niilola
commit: ebe0bdd0661553ba0b8657de0d51db56c1241f67
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 13 06:56:21 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 13 07:16:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe0bdd0

app-emulation/lxd: systemd related fixes #729930

 - systemd service files provided by upstream,
 - update kernel check CONFIG_NF_NAT_MASQUERADE_IPV4 to NF_NAT_MASQUERADE.

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

 app-emulation/lxd/files/lxd-4.0.0.service  |  20 ++
 app-emulation/lxd/files/lxd-4.0.0.socket   |  12 ++
 app-emulation/lxd/files/lxd-4.0.0_apparmor.service |  21 ++
 .../lxd/files/lxd-containers-4.0.0.service |  16 ++
 app-emulation/lxd/lxd-4.0.2-r1.ebuild  | 211 +
 5 files changed, 280 insertions(+)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.service 
b/app-emulation/lxd/files/lxd-4.0.0.service
new file mode 100644
index 000..c2e9db8aa8a
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.0.service
@@ -0,0 +1,20 @@
+[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 --logfile=/var/log/lxd/lxd.log
+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

diff --git a/app-emulation/lxd/files/lxd-4.0.0.socket 
b/app-emulation/lxd/files/lxd-4.0.0.socket
new file mode 100644
index 000..3207c9453d1
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.0.socket
@@ -0,0 +1,12 @@
+[Unit]
+Description=LXD - unix socket
+Documentation=man:lxd(1)
+
+[Socket]
+ListenStream=/var/lib/lxd/unix.socket
+SocketGroup=lxd
+SocketMode=0660
+Service=lxd.service
+
+[Install]
+WantedBy=sockets.target

diff --git a/app-emulation/lxd/files/lxd-4.0.0_apparmor.service 
b/app-emulation/lxd/files/lxd-4.0.0_apparmor.service
new file mode 100644
index 000..5e688d9c098
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.0_apparmor.service
@@ -0,0 +1,21 @@
+[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
+ExecStartPre=/usr/libexec/lxc/lxc-apparmor-load
+ExecStart=/usr/sbin/lxd --group lxd --logfile=/var/log/lxd/lxd.log
+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

diff --git a/app-emulation/lxd/files/lxd-containers-4.0.0.service 
b/app-emulation/lxd/files/lxd-containers-4.0.0.service
new file mode 100644
index 000..894760c3506
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-containers-4.0.0.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=LXD - container startup/shutdown
+Documentation=man:lxd(1)
+After=lxd.socket lxd.service
+Requires=lxd.socket
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/lxd activateifneeded
+ExecStop=/usr/sbin/lxd shutdown
+TimeoutStartSec=600s
+TimeoutStopSec=600s
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

diff --git a/app-emulation/lxd/lxd-4.0.2-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.2-r1.ebuild
new file mode 100644
index 000..899ac595ada
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.2-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 eutils linux-info systemd
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor +ipv6 nls"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+   dev-lang/tcl
+   dev-libs/libuv
+   dev-libs/lzo
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse:0=
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   

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

2020-06-26 Thread Joonas Niilola
commit: 38736cb4eba180269edac353c4120c4e645db242
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jun 26 08:11:46 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun 26 08:13:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38736cb4

app-emulation/lxd: 4.0.2 bump

 - update kernel config checks, #703874

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

 app-emulation/lxd/Manifest |   2 +-
 app-emulation/lxd/lxd-4.0.2.ebuild | 204 +
 2 files changed, 205 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index f5bd47450bf..621644c18ae 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,2 @@
-DIST lxd-3.14.tar.gz 26141949 BLAKE2B 
69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe
 SHA512 
3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
 DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 
1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920
 SHA512 
1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f
+DIST lxd-4.0.2.tar.gz 25350601 BLAKE2B 
2abecb61759a1a717960671516157dc7b7a36865ecdbcec1f211e5b653b2b4afc41932a4a289430de0dd4ac1e2c777de471ab26e31dbf2b8d1855f67d03886ad
 SHA512 
6c1c668055e9677850f24e142e6741cb6b5aa8d4d9cce29af566e8090c28e04b4baf973f486aef28b7f6b34be5b9ab9bb45e77956879ff7feff6bec8e4db3077

diff --git a/app-emulation/lxd/lxd-4.0.2.ebuild 
b/app-emulation/lxd/lxd-4.0.2.ebuild
new file mode 100644
index 000..8317a5bc6fb
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 eutils linux-info systemd
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ipv6 nls"
+
+DEPEND="app-arch/xz-utils
+   >=app-emulation/lxc-3.0.0[seccomp]
+   dev-lang/tcl
+   dev-libs/libuv
+   dev-libs/lzo
+   net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+   acct-group/lxd
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse:0=
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl"
+BDEPEND="dev-lang/go
+   nls? ( sys-devel/gettext )"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~VSOCKETS
+   ~VXLAN
+"
+
+# Uses internet connection.
+RESTRICT="test"
+
+# Go magic.
+QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
+   /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"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+common_op() {
+   local i
+   for i in dqlite raft; do
+   cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
+   "${@}"
+   cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+   done
+}
+
+src_prepare() {
+   default
+
+   export GOPATH="${S}/_dist"
+
+   sed -i \
+   -e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
+   -e "s:make:make ${MAKEOPTS}:g" \
+   Makefile || die
+
+   sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
+   sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< 
/sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
+
+   common_op eautoreconf
+}
+
+src_configure() {
+   export GOPATH="${S}/_dist"
+
+   export CO_CFLAGS="-I${GOPATH}/deps/libco/"
+   export CO_LIBS="${GOPATH}/deps/libco/"
+
+   export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
+   export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
+
+   export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
+   export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
+
+   export 
PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
+
+  

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

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

app-emulation/lxd: remove old 3.14

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

 .../lxd/files/de-translation-newline-1.patch   |  11 -
 app-emulation/lxd/files/lxd.confd  |  24 --
 app-emulation/lxd/files/lxd.initd  |  46 
 app-emulation/lxd/lxd-3.14.ebuild  | 241 -
 app-emulation/lxd/metadata.xml |  11 -
 5 files changed, 333 deletions(-)

diff --git a/app-emulation/lxd/files/de-translation-newline-1.patch 
b/app-emulation/lxd/files/de-translation-newline-1.patch
deleted file mode 100644
index 4c731e9023d..000
--- a/app-emulation/lxd/files/de-translation-newline-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 /po/de.po  2018-06-27 19:57:56.759130047 -0500
-+++ /po/de.po  2018-06-27 20:01:09.694634346 -0500
-@@ -167,7 +167,7 @@
- "###\n"
- "### Each property is represented by a single line:\n"
- "### An example would be:\n"
--"###  description: My custom image"
-+"###  description: My custom image\n"
- msgstr ""
- "### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
- "### Jede Zeile die mit '# beginnt wird ignoriert.\n"

diff --git a/app-emulation/lxd/files/lxd.confd 
b/app-emulation/lxd/files/lxd.confd
deleted file mode 100644
index 8e342cc62d1..000
--- a/app-emulation/lxd/files/lxd.confd
+++ /dev/null
@@ -1,24 +0,0 @@
-# Group which owns the shared socket
-LXD_OPTIONS+=" --group lxd"
-
-
-
-# Enable cpu profiling into the specified file
-#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
-
-# Enable memory profiling into the specified file
-#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" --verbose"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"

diff --git a/app-emulation/lxd/files/lxd.initd 
b/app-emulation/lxd/files/lxd.initd
deleted file mode 100644
index b1fa7caac54..000
--- a/app-emulation/lxd/files/lxd.initd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
-need net
-use lxcfs
-}
-
-start() {
-ebegin "Starting lxd service"
-
-start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
-eend $?
-}
-
-stop() {
-if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
-   stopall
-else
-   ebegin "Stopping lxd service (but not containers)"
-   start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-   eend $?
-fi
-}
-
-stopall() {
-ebegin "Stopping lxd service and containers"
-if "${DAEMON}" shutdown; then
-   /etc/init.d/lxd zap
-   rm -f ${PIDFILE}
-fi
-eend $?
-}

diff --git a/app-emulation/lxd/lxd-3.14.ebuild 
b/app-emulation/lxd/lxd-3.14.ebuild
deleted file mode 100644
index 3639d12ad02..000
--- a/app-emulation/lxd/lxd-3.14.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-RESTRICT="!test? ( test )"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
-
-DEPEND="
-   dev-lang/tcl
-   >=dev-lang/go-1.9.4
-   dev-libs/libuv
-   dev-libs/protobuf
-   nls? ( sys-devel/gettext )
-   test? (
-   app-misc/jq
-   net-misc/curl
-   sys-devel/gettext
-   )
-"
-
-RDEPEND="
-   daemon? (
-   app-arch/xz-utils
-   >=app-emulation/lxc-2.0.7[seccomp]
-   dev-libs/libuv
-   dev-libs/lzo
-   dev-util/xdelta:3
-   dnsmasq? (
-   net-dns/dnsmasq[dhcp,ipv6?]
-   )
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   net-libs/libnfnetlink
-   net-libs/libnsl:0=
-   net-misc/rsync[xattr]
-   

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

2020-06-23 Thread Joonas Niilola
commit: eb824502f28aa17d4ebaa4581491b48e156edab2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun 23 07:24:55 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun 23 07:25:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb824502

app-emulation/lxd: fix 4.0.1 compilation with clang

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

 app-emulation/lxd/files/lxd-4.0.1-clang.patch | 76 +++
 app-emulation/lxd/lxd-4.0.1.ebuild|  2 +
 2 files changed, 78 insertions(+)

diff --git a/app-emulation/lxd/files/lxd-4.0.1-clang.patch 
b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
new file mode 100644
index 000..765f2f38be5
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
@@ -0,0 +1,76 @@
+From c7ce94825871ea5d0946e92762e981354628b8ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= 
+Date: Mon, 22 Jun 2020 22:17:02 -0400
+Subject: [PATCH] lxd: Fix building with clang
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes #7573
+
+Signed-off-by: Stéphane Graber 
+---
+ lxd/main_forksyscall.go |  8 
+ lxd/seccomp/seccomp.go  | 16 
+ 2 files changed, 8 insertions(+), 16 deletions(-)
+
+diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
+index a304405c2e..14895b6ce0 100644
+--- a/lxd/main_forksyscall.go
 b/lxd/main_forksyscall.go
+@@ -34,12 +34,6 @@ extern void attach_userns_fd(int ns_fd);
+ extern int pidfd_nsfd(int pidfd, pid_t pid);
+ extern bool setnsat(int ns_fd, const char *ns);
+ 
+-static inline bool same_fsinfo(struct stat *s1, struct stat *s2,
+- struct statfs *sfs1, struct statfs *sfs2)
+-{
+-  return ((sfs1->f_type == sfs2->f_type) && (s1->st_dev == s2->st_dev));
+-}
+-
+ static bool chdirchroot_in_mntns(int cwd_fd, int root_fd)
+ {
+   ssize_t len;
+@@ -209,8 +203,6 @@ const char *ns_names[] = { "user", "pid", "uts", "ipc", 
"net", "cgroup", NULL };
+ 
+ static bool change_creds(int ns_fd, cap_t caps, uid_t nsuid, gid_t nsgid, 
uid_t nsfsuid, gid_t nsfsgid)
+ {
+-  __do_close int fd = -EBADF;
+-
+   if (prctl(PR_SET_KEEPCAPS, 1))
+   return false;
+ 
+diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
+index 8945fd9197..025efb3141 100644
+--- a/lxd/seccomp/seccomp.go
 b/lxd/seccomp/seccomp.go
+@@ -91,21 +91,21 @@ static int device_allowed(dev_t dev, mode_t mode)
+ {
+   switch (mode & S_IFMT) {
+   case S_IFCHR:
+-  if ((dev == makedev(0, 0))) // whiteout
++  if (dev == makedev(0, 0)) // whiteout
+   return 0;
+-  else if ((dev == makedev(5, 1))) // /dev/console
++  else if (dev == makedev(5, 1)) // /dev/console
+   return 0;
+-  else if ((dev == makedev(1, 7))) // /dev/full
++  else if (dev == makedev(1, 7)) // /dev/full
+   return 0;
+-  else if ((dev == makedev(1, 3))) // /dev/null
++  else if (dev == makedev(1, 3)) // /dev/null
+   return 0;
+-  else if ((dev == makedev(1, 8))) // /dev/random
++  else if (dev == makedev(1, 8)) // /dev/random
+   return 0;
+-  else if ((dev == makedev(5, 0))) // /dev/tty
++  else if (dev == makedev(5, 0)) // /dev/tty
+   return 0;
+-  else if ((dev == makedev(1, 9))) // /dev/urandom
++  else if (dev == makedev(1, 9)) // /dev/urandom
+   return 0;
+-  else if ((dev == makedev(1, 5))) // /dev/zero
++  else if (dev == makedev(1, 5)) // /dev/zero
+   return 0;
+   }
+ 

diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild 
b/app-emulation/lxd/lxd-4.0.1.ebuild
index 33decc443dd..578a64630a1 100644
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -67,6 +67,8 @@ QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
 EGO_PN="github.com/lxc/lxd"
 GOPATH="${S}/_dist" # this seems to reset every now and then, though
 
+PATCHES=( "${FILESDIR}"/lxd-4.0.1-clang.patch )
+
 common_op() {
local i
for i in dqlite raft; do



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

2020-06-21 Thread Joonas Niilola
commit: f8615a09cefc3b76a882f3e5a1e109ddf138d941
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jun 21 16:58:36 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun 21 17:02:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8615a09

app-emulation/lxd: stabilize 4.0.1 on amd64

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

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

diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild 
b/app-emulation/lxd/lxd-4.0.1.ebuild
index 21a6fcee066..33decc443dd 100644
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
 # Needs to include licenses for all bundled programs.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+ipv6 nls"
 
 DEPEND="app-arch/xz-utils



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

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

app-emulation/lxd: clean old 3.16

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

 app-emulation/lxd/Manifest   |   1 -
 app-emulation/lxd/lxd-3.16-r1.ebuild | 266 ---
 2 files changed, 267 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 5c5d670606b..f5bd47450bf 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,2 @@
 DIST lxd-3.14.tar.gz 26141949 BLAKE2B 
69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe
 SHA512 
3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
-DIST lxd-3.16.tar.gz 24863601 BLAKE2B 
0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9
 SHA512 
11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9
 DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 
1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920
 SHA512 
1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f

diff --git a/app-emulation/lxd/lxd-3.16-r1.ebuild 
b/app-emulation/lxd/lxd-3.16-r1.ebuild
deleted file mode 100644
index 6f15ebbce92..000
--- a/app-emulation/lxd/lxd-3.16-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-RESTRICT="!test? ( test )"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
-
-DEPEND="
-   dev-lang/tcl
-   >=dev-lang/go-1.9.4
-   dev-libs/libuv
-   dev-libs/protobuf
-   nls? ( sys-devel/gettext )
-   test? (
-   app-misc/jq
-   net-misc/curl
-   sys-devel/gettext
-   )
-"
-
-RDEPEND="
-   daemon? (
-   app-arch/xz-utils
-   >=app-emulation/lxc-2.0.7[seccomp]
-   dev-libs/libuv
-   dev-libs/lzo
-   dev-util/xdelta:3
-   dnsmasq? (
-   net-dns/dnsmasq[dhcp,ipv6?]
-   )
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   net-libs/libnfnetlink
-   net-libs/libnsl:0=
-   net-misc/rsync[xattr]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse:0=
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools
-   virtual/acl
-   )
-"
-
-CONFIG_CHECK="
-   ~BRIDGE
-   ~DUMMY
-   ~IP6_NF_NAT
-   ~IP6_NF_TARGET_MASQUERADE
-   ~IPV6
-   ~IP_NF_NAT
-   ~IP_NF_TARGET_MASQUERADE
-   ~MACVLAN
-   ~NETFILTER_XT_MATCH_COMMENT
-   ~NET_IPGRE
-   ~NET_IPGRE_DEMUX
-   ~NET_IPIP
-   ~NF_NAT_MASQUERADE_IPV4
-   ~NF_NAT_MASQUERADE_IPV6
-   ~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-src_prepare() {
-   eapply_user
-   eapply "${FILESDIR}/de-translation-newline-1.patch"
-
-   cd "${S}/_dist/deps/raft" || die "Can't cd to raft dir"
-   # Workaround for " * ACCESS DENIED:  open_wr:  /dev/zfs"
-   sed -i 's#zfs 

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

2020-05-15 Thread Joonas Niilola
commit: bd9a21c94f79536ee7feb436db238b234b197ff7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri May 15 08:57:06 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 15 08:57:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9a21c9

app-emulation/lxd: update zfs fix line per feedback on bug 723208

 - straight copypaste from the bug (I don't have zfs to test on).

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

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

diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild 
b/app-emulation/lxd/lxd-4.0.1.ebuild
index 020974b79e2..21a6fcee066 100644
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -87,7 +87,7 @@ src_prepare() {
Makefile || die
 
sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
-   sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' 
"${GOPATH}"/deps/raft/configure.ac || die
+   sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< 
/sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
 
common_op eautoreconf
 }



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

2020-05-15 Thread Joonas Niilola
commit: 5d2b71f562ab76e38974cb928567b3acd12d795c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri May 15 08:30:19 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 15 08:30:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2b71f5

app-emulation/lxd: copy zfs fix from 3.16 ebuild to 4 LTS

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

 app-emulation/lxd/lxd-4.0.1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild 
b/app-emulation/lxd/lxd-4.0.1.ebuild
index 876dcde968a..020974b79e2 100644
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -79,13 +79,15 @@ common_op() {
 src_prepare() {
default
 
+   export GOPATH="${S}/_dist"
+
sed -i \
-e "s:\./configure:./configure --prefix=/usr 
--libdir=${EPREFIX}/usr/lib/lxd:g" \
-e "s:make:make ${MAKEOPTS}:g" \
Makefile || die
 
-   cd "${GOPATH}"/deps/libco || die
-   sed -i 's#lib$#lib/lxd#' Makefile || die
+   sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
+   sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' 
"${GOPATH}"/deps/raft/configure.ac || die
 
common_op eautoreconf
 }



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

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

app-emulation/lxd: bump to 4.0.1, LTS channel

 - always install daemon and tools,
 - port to GLEP-81 acct.

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

 app-emulation/lxd/Manifest  |   1 +
 app-emulation/lxd/files/lxd-4.0.0.confd |  23 
 app-emulation/lxd/files/lxd-4.0.0.initd |  54 +
 app-emulation/lxd/lxd-4.0.1.ebuild  | 202 
 4 files changed, 280 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index f0a03569d10..5c5d670606b 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
 DIST lxd-3.14.tar.gz 26141949 BLAKE2B 
69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe
 SHA512 
3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
 DIST lxd-3.16.tar.gz 24863601 BLAKE2B 
0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9
 SHA512 
11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9
+DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 
1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920
 SHA512 
1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f

diff --git a/app-emulation/lxd/files/lxd-4.0.0.confd 
b/app-emulation/lxd/files/lxd-4.0.0.confd
new file mode 100644
index 000..68cf344995b
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.0.confd
@@ -0,0 +1,23 @@
+# Group which owns the shared socket
+LXD_OPTIONS+=" --group lxd"
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
+
+# Enable debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enable verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enable syslog logging
+#LXD_OPTIONS+=" --syslog"

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
new file mode 100644
index 000..03ec12e44f5
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+TIMEOUT=10
+
+extra_commands="stopall"
+
+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_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
+   stopall
+   else
+   ebegin "Stopping lxd service (but not containers)."
+   start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+   eend ${?}
+   fi
+}
+
+stopall() {
+   ebegin "Stopping lxd service and containers."
+   lxc stop --all --timeout $TIMEOUT >/dev/null 2>&1
+   if [[ ${?} -ne 0 ]]; then
+   lxc stop --all --force || eerror "Could not stop all 
containers."
+   fi
+   if "${DAEMON}" shutdown; then
+   rm -f ${PIDFILE}
+   eend 0
+   fi
+   eend ${?}
+}

diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild 
b/app-emulation/lxd/lxd-4.0.1.ebuild
new file mode 100644
index 000..876dcde968a
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 eutils linux-info systemd
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ 
https://github.com/lxc/lxd;

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

2019-11-18 Thread Tim Harder
commit: e9dce33c196e3af25686e0a829aa17a0bfe4d303
Author: David Heidelberg  ixit  cz>
AuthorDate: Tue Oct  8 19:19:44 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Nov 18 20:53:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9dce33c

app-emulation/lxd: revbump, fix sys-fs/fuse SLOT

Closes: https://github.com/gentoo/gentoo/pull/13216
Closes: https://bugs.gentoo.org/697010

Signed-off-by: David Heidelberg  ixit.cz>
Signed-off-by: Tim Harder  gentoo.org>

 app-emulation/lxd/{lxd-3.16.ebuild => lxd-3.16-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lxd/lxd-3.16.ebuild 
b/app-emulation/lxd/lxd-3.16-r1.ebuild
similarity index 99%
rename from app-emulation/lxd/lxd-3.16.ebuild
rename to app-emulation/lxd/lxd-3.16-r1.ebuild
index 8c7e5f94a4d..28b5695b2e9 100644
--- a/app-emulation/lxd/lxd-3.16.ebuild
+++ b/app-emulation/lxd/lxd-3.16-r1.ebuild
@@ -11,6 +11,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+RESTRICT="!test? ( test )"
 
 inherit autotools bash-completion-r1 linux-info systemd user
 
@@ -45,7 +46,7 @@ RDEPEND="
net-libs/libnsl:0=
net-misc/rsync[xattr]
sys-apps/iproute2[ipv6?]
-   sys-fs/fuse
+   sys-fs/fuse:0=
sys-fs/lxcfs
sys-fs/squashfs-tools
virtual/acl



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

2019-09-08 Thread Erik Mackdanz
commit: 2758f7b24ebd2d60d2a552c0fd3b2c01dea6cdf0
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Sep  8 22:50:32 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon Sep  9 02:57:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2758f7b2

app-emulation/lxd: Remove old

Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.73, Repoman-2.3.17

 app-emulation/lxd/Manifest |   1 -
 .../lxd/files/ptbr-translation-newline.patch   |  19 --
 app-emulation/lxd/lxd-3.12.ebuild  | 241 -
 3 files changed, 261 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 94f485cced0..6a388ba 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1 @@
-DIST lxd-3.12.tar.gz 27365315 BLAKE2B 
2b371ef4e9703a7a0494ca009b3c04a3051d76ba0bc87566b90871059cce04f80c5d941d639a53762b219f658379bbffb8ed844cee4271bb756aecb2742ce1d0
 SHA512 
fd56ee2a2114b338cfb8b575775530b34c7dcc978c95f9bc3b0dced91cf7f01558012c357eb3f8220bc6fa6aa5ecaca67d47b300b67c0d193f11c5088ce6330e
 DIST lxd-3.14.tar.gz 26141949 BLAKE2B 
69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe
 SHA512 
3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff

diff --git a/app-emulation/lxd/files/ptbr-translation-newline.patch 
b/app-emulation/lxd/files/ptbr-translation-newline.patch
deleted file mode 100644
index 92d78ca1427..000
--- a/app-emulation/lxd/files/ptbr-translation-newline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 /po/pt_BR.po.orig  2018-10-13 23:27:01.523645894 -0500
-+++ /po/pt_BR.po   2018-10-13 23:28:04.730644762 -0500
-@@ -95,7 +95,6 @@
- "###\n"
- "### Note that the name is shown but cannot be changed"
- msgstr ""
--"\n"
- "### Esta é uma representação em yaml da configuração.\n"
- "### Qualquer linha começando com '#' será ignorada.\n"
- "###\n"
-@@ -112,7 +111,7 @@
- "### type: disk\n"
- "### ephemeral: false\n"
- "###\n"
--"### Observe que o nome é exibido mas não pode ser modificado\n"
-+"### Observe que o nome é exibido mas não pode ser modificado"
- 
- #: lxc/config_metadata.go:63
- msgid ""

diff --git a/app-emulation/lxd/lxd-3.12.ebuild 
b/app-emulation/lxd/lxd-3.12.ebuild
deleted file mode 100644
index a330cfbac4e..000
--- a/app-emulation/lxd/lxd-3.12.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
-
-DEPEND="
-   dev-lang/tcl
-   >=dev-lang/go-1.9.4
-   dev-libs/libuv
-   dev-libs/protobuf
-   nls? ( sys-devel/gettext )
-   test? (
-   app-misc/jq
-   net-misc/curl
-   sys-devel/gettext
-   )
-"
-
-RDEPEND="
-   daemon? (
-   app-arch/xz-utils
-   >=app-emulation/lxc-2.0.7[seccomp]
-   dev-libs/libuv
-   dev-libs/lzo
-   dev-util/xdelta:3
-   dnsmasq? (
-   net-dns/dnsmasq[dhcp,ipv6?]
-   )
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   net-libs/libnfnetlink
-   net-libs/libnsl:0=
-   net-misc/rsync[xattr]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools
-   virtual/acl
-   )
-"
-
-CONFIG_CHECK="
-   ~BRIDGE
-   ~DUMMY
-   ~IP6_NF_NAT
-   ~IP6_NF_TARGET_MASQUERADE
-   ~IPV6
-   ~IP_NF_NAT
-   ~IP_NF_TARGET_MASQUERADE
-   ~MACVLAN
-   ~NETFILTER_XT_MATCH_COMMENT
-   ~NET_IPGRE
-   ~NET_IPGRE_DEMUX
-   ~NET_IPIP
-   ~NF_NAT_MASQUERADE_IPV4
-   ~NF_NAT_MASQUERADE_IPV6
-   ~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for 

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

2019-09-08 Thread Erik Mackdanz
commit: c3ec35f78f6aae4d02478aeee3f0a7893dc7bd7f
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Mon Sep  9 02:56:59 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon Sep  9 02:57:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ec35f7

app-emulation/lxd: Upgrade to 3.16

Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.73, Repoman-2.3.17

 app-emulation/lxd/Manifest|   1 +
 app-emulation/lxd/lxd-3.16.ebuild | 265 ++
 2 files changed, 266 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 6a388ba..f0a03569d10 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1 +1,2 @@
 DIST lxd-3.14.tar.gz 26141949 BLAKE2B 
69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe
 SHA512 
3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
+DIST lxd-3.16.tar.gz 24863601 BLAKE2B 
0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9
 SHA512 
11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9

diff --git a/app-emulation/lxd/lxd-3.16.ebuild 
b/app-emulation/lxd/lxd-3.16.ebuild
new file mode 100644
index 000..8c7e5f94a4d
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.16.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-libs/libnsl:0=
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+   eapply_user
+   eapply "${FILESDIR}/de-translation-newline-1.patch"
+
+   cd "${S}/_dist/deps/raft" || die "Can't cd to raft dir"
+   # Workaround for " * ACCESS DENIED:  open_wr:  /dev/zfs"
+   sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' 
configure.ac || die "Can't sed configure.ac for raft"
+   eautoreconf
+
+   cd "${S}/_dist/deps/dqlite" || die "Can't cd to dqlite dir"
+   eautoreconf
+
+}
+
+src_configure() {
+   export GOPATH="${S}/_dist"
+   cd 

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

2019-09-08 Thread Erik Mackdanz
commit: 80d4bc74776a572ed5a0309ef52cc35db240961c
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Sep  8 22:46:16 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Sep  8 22:47:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d4bc74

app-emulation/lxd: stabilize 3.14

Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.73, Repoman-2.3.17

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

diff --git a/app-emulation/lxd/lxd-3.14.ebuild 
b/app-emulation/lxd/lxd-3.14.ebuild
index 80bccb3ac76..4d7ff49b9d1 100644
--- a/app-emulation/lxd/lxd-3.14.ebuild
+++ b/app-emulation/lxd/lxd-3.14.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 



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

2019-07-05 Thread Virgil Dupras
commit: fd2ab6c77edf67581d3c14a7af69851558bd20f2
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Jul  5 18:56:37 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Jul  5 18:56:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2ab6c7

app-emulation/lxd: remove myself as maintainer

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

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

diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 3896143698f..bc72b24a726 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -5,10 +5,6 @@
stasib...@gentoo.org
Erik Mackdanz

-   
-   vdup...@gentoo.org
-   Virgil Dupras
-   

virtualizat...@gentoo.org
Gentoo Virtualization Project



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

2019-07-01 Thread Erik Mackdanz
commit: d86f8a1382457790853be504333d7172a0139d3b
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Mon Jul  1 14:24:55 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon Jul  1 14:24:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d86f8a13

app-emulation/lxd: Bump to 3.14

Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.16

 app-emulation/lxd/Manifest|   1 +
 app-emulation/lxd/lxd-3.14.ebuild | 240 ++
 2 files changed, 241 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 03b05f78456..94f485cced0 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1 +1,2 @@
 DIST lxd-3.12.tar.gz 27365315 BLAKE2B 
2b371ef4e9703a7a0494ca009b3c04a3051d76ba0bc87566b90871059cce04f80c5d941d639a53762b219f658379bbffb8ed844cee4271bb756aecb2742ce1d0
 SHA512 
fd56ee2a2114b338cfb8b575775530b34c7dcc978c95f9bc3b0dced91cf7f01558012c357eb3f8220bc6fa6aa5ecaca67d47b300b67c0d193f11c5088ce6330e
+DIST lxd-3.14.tar.gz 26141949 BLAKE2B 
69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe
 SHA512 
3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff

diff --git a/app-emulation/lxd/lxd-3.14.ebuild 
b/app-emulation/lxd/lxd-3.14.ebuild
new file mode 100644
index 000..80bccb3ac76
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.14.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-libs/libnsl:0=
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+   eapply_user
+   eapply "${FILESDIR}/de-translation-newline-1.patch"
+
+   cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+   eautoreconf
+}
+
+src_configure() {
+   export GOPATH="${S}/dist"
+   cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+   econf --enable-replication --disable-amalgamation --disable-tcl 
--libdir="${EPREFIX}/usr/lib/lxd"
+
+   cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+   PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf 
--libdir=${EPREFIX}/usr/lib/lxd
+}
+

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

2019-07-01 Thread Erik Mackdanz
commit: 6b52a723c10346855d8c8e9209b1aeea870dbcb2
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Mon Jul  1 14:06:51 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon Jul  1 14:23:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b52a723

app-emulation/lxd: Remove old

Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.16

 app-emulation/lxd/Manifest|   2 -
 app-emulation/lxd/lxd-3.10.ebuild | 241 --
 app-emulation/lxd/lxd-3.11.ebuild | 241 --
 3 files changed, 484 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 5c445c18e2c..03b05f78456 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1 @@
-DIST lxd-3.10.tar.gz 27057432 BLAKE2B 
b5a5c3cd4f1045419c806510aab21c3bcde8c8687ede808b1b832e2a0caba0ff3af5d79367141b29e84c0bd3bcf6958d917bc813700220e238cd21933963009b
 SHA512 
25ed7675af7b6861d754607b19485e329ae344befac06fe33f326e34030755359bea6f574c414849b85f034533fd5dccb95a326ae0ad9e44b8ea366f7ee44d04
-DIST lxd-3.11.tar.gz 27281796 BLAKE2B 
640944cd929b69b7c6f935b7e3587e05b77ec71da8f20b988b831b837f86706b3cb3a81676f4ae456bf06594ea74e9ab44b87d22ddaa78209d4a0f6cbbba3483
 SHA512 
182a2fd6b69c8228760c26498d77f46c6bdda899018e1ab4470f2382202250582c66fc11f4c2d8d86598f19e3a62a1027dfe190342611c4a819a27ce6e39e78e
 DIST lxd-3.12.tar.gz 27365315 BLAKE2B 
2b371ef4e9703a7a0494ca009b3c04a3051d76ba0bc87566b90871059cce04f80c5d941d639a53762b219f658379bbffb8ed844cee4271bb756aecb2742ce1d0
 SHA512 
fd56ee2a2114b338cfb8b575775530b34c7dcc978c95f9bc3b0dced91cf7f01558012c357eb3f8220bc6fa6aa5ecaca67d47b300b67c0d193f11c5088ce6330e

diff --git a/app-emulation/lxd/lxd-3.10.ebuild 
b/app-emulation/lxd/lxd-3.10.ebuild
deleted file mode 100644
index a330cfbac4e..000
--- a/app-emulation/lxd/lxd-3.10.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
-
-DEPEND="
-   dev-lang/tcl
-   >=dev-lang/go-1.9.4
-   dev-libs/libuv
-   dev-libs/protobuf
-   nls? ( sys-devel/gettext )
-   test? (
-   app-misc/jq
-   net-misc/curl
-   sys-devel/gettext
-   )
-"
-
-RDEPEND="
-   daemon? (
-   app-arch/xz-utils
-   >=app-emulation/lxc-2.0.7[seccomp]
-   dev-libs/libuv
-   dev-libs/lzo
-   dev-util/xdelta:3
-   dnsmasq? (
-   net-dns/dnsmasq[dhcp,ipv6?]
-   )
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   net-libs/libnfnetlink
-   net-libs/libnsl:0=
-   net-misc/rsync[xattr]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools
-   virtual/acl
-   )
-"
-
-CONFIG_CHECK="
-   ~BRIDGE
-   ~DUMMY
-   ~IP6_NF_NAT
-   ~IP6_NF_TARGET_MASQUERADE
-   ~IPV6
-   ~IP_NF_NAT
-   ~IP_NF_TARGET_MASQUERADE
-   ~MACVLAN
-   ~NETFILTER_XT_MATCH_COMMENT
-   ~NET_IPGRE
-   ~NET_IPGRE_DEMUX
-   ~NET_IPIP
-   ~NF_NAT_MASQUERADE_IPV4
-   ~NF_NAT_MASQUERADE_IPV6
-   ~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-src_prepare() {
-   eapply_user
-   eapply "${FILESDIR}/de-translation-newline-1.patch"
-   eapply "${FILESDIR}/ptbr-translation-newline.patch"
-
-   cd 

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

2019-07-01 Thread Erik Mackdanz
commit: 63fd67276b966cd8d24ed63817afc2fae69a8214
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Mon Jul  1 13:51:49 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon Jul  1 13:51:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63fd6727

app-emulation/lxd: Stabilize through 3.12

Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.16

 app-emulation/lxd/lxd-3.11.ebuild | 2 +-
 app-emulation/lxd/lxd-3.12.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxd/lxd-3.11.ebuild 
b/app-emulation/lxd/lxd-3.11.ebuild
index 988a505aa24..a330cfbac4e 100644
--- a/app-emulation/lxd/lxd-3.11.ebuild
+++ b/app-emulation/lxd/lxd-3.11.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 

diff --git a/app-emulation/lxd/lxd-3.12.ebuild 
b/app-emulation/lxd/lxd-3.12.ebuild
index 988a505aa24..a330cfbac4e 100644
--- a/app-emulation/lxd/lxd-3.12.ebuild
+++ b/app-emulation/lxd/lxd-3.12.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 



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

2019-04-06 Thread Erik Mackdanz
commit: 9f332cec5f85e5048c478e9586dcb669032a186c
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Apr  7 03:58:19 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Apr  7 03:59:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f332cec

app-emulation/lxd: bump to 3.12

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Erik Mackdanz  gentoo.org>

 app-emulation/lxd/Manifest|   1 +
 app-emulation/lxd/lxd-3.12.ebuild | 241 ++
 2 files changed, 242 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index d48b9ba3565..5c445c18e2c 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
 DIST lxd-3.10.tar.gz 27057432 BLAKE2B 
b5a5c3cd4f1045419c806510aab21c3bcde8c8687ede808b1b832e2a0caba0ff3af5d79367141b29e84c0bd3bcf6958d917bc813700220e238cd21933963009b
 SHA512 
25ed7675af7b6861d754607b19485e329ae344befac06fe33f326e34030755359bea6f574c414849b85f034533fd5dccb95a326ae0ad9e44b8ea366f7ee44d04
 DIST lxd-3.11.tar.gz 27281796 BLAKE2B 
640944cd929b69b7c6f935b7e3587e05b77ec71da8f20b988b831b837f86706b3cb3a81676f4ae456bf06594ea74e9ab44b87d22ddaa78209d4a0f6cbbba3483
 SHA512 
182a2fd6b69c8228760c26498d77f46c6bdda899018e1ab4470f2382202250582c66fc11f4c2d8d86598f19e3a62a1027dfe190342611c4a819a27ce6e39e78e
+DIST lxd-3.12.tar.gz 27365315 BLAKE2B 
2b371ef4e9703a7a0494ca009b3c04a3051d76ba0bc87566b90871059cce04f80c5d941d639a53762b219f658379bbffb8ed844cee4271bb756aecb2742ce1d0
 SHA512 
fd56ee2a2114b338cfb8b575775530b34c7dcc978c95f9bc3b0dced91cf7f01558012c357eb3f8220bc6fa6aa5ecaca67d47b300b67c0d193f11c5088ce6330e

diff --git a/app-emulation/lxd/lxd-3.12.ebuild 
b/app-emulation/lxd/lxd-3.12.ebuild
new file mode 100644
index 000..988a505aa24
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.12.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-libs/libnsl:0=
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+   eapply_user
+   eapply "${FILESDIR}/de-translation-newline-1.patch"
+   eapply "${FILESDIR}/ptbr-translation-newline.patch"
+
+   cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+   eautoreconf
+}
+
+src_configure() 

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

2019-04-01 Thread Erik Mackdanz
commit: ce76e4d27be1c2f95fdd90e1701da16ff6fd841b
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Tue Apr  2 04:14:51 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Tue Apr  2 04:14:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce76e4d2

app-emulation/lxd: Bump to 3.11

Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12

 app-emulation/lxd/Manifest|   1 +
 app-emulation/lxd/lxd-3.11.ebuild | 241 ++
 2 files changed, 242 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index f2ee48a0546..d48b9ba3565 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1 +1,2 @@
 DIST lxd-3.10.tar.gz 27057432 BLAKE2B 
b5a5c3cd4f1045419c806510aab21c3bcde8c8687ede808b1b832e2a0caba0ff3af5d79367141b29e84c0bd3bcf6958d917bc813700220e238cd21933963009b
 SHA512 
25ed7675af7b6861d754607b19485e329ae344befac06fe33f326e34030755359bea6f574c414849b85f034533fd5dccb95a326ae0ad9e44b8ea366f7ee44d04
+DIST lxd-3.11.tar.gz 27281796 BLAKE2B 
640944cd929b69b7c6f935b7e3587e05b77ec71da8f20b988b831b837f86706b3cb3a81676f4ae456bf06594ea74e9ab44b87d22ddaa78209d4a0f6cbbba3483
 SHA512 
182a2fd6b69c8228760c26498d77f46c6bdda899018e1ab4470f2382202250582c66fc11f4c2d8d86598f19e3a62a1027dfe190342611c4a819a27ce6e39e78e

diff --git a/app-emulation/lxd/lxd-3.11.ebuild 
b/app-emulation/lxd/lxd-3.11.ebuild
new file mode 100644
index 000..988a505aa24
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.11.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-libs/libnsl:0=
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+   eapply_user
+   eapply "${FILESDIR}/de-translation-newline-1.patch"
+   eapply "${FILESDIR}/ptbr-translation-newline.patch"
+
+   cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+   eautoreconf
+}
+
+src_configure() {
+   export GOPATH="${S}/dist"
+   cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+   econf --enable-replication --disable-amalgamation --disable-tcl 
--libdir="${EPREFIX}/usr/lib/lxd"
+
+   cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+   

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

2019-04-01 Thread Erik Mackdanz
commit: 0b96e191ff8364e293d3bb7207843c45a7f868d4
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Tue Apr  2 04:00:06 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Tue Apr  2 04:00:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b96e191

app-emulation/lxd: Remove old

Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12

 app-emulation/lxd/Manifest   |   3 -
 app-emulation/lxd/lxd-3.7.ebuild | 238 --
 app-emulation/lxd/lxd-3.8.ebuild | 241 ---
 app-emulation/lxd/lxd-3.9.ebuild | 241 ---
 4 files changed, 723 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 65e12c849b0..f2ee48a0546 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,4 +1 @@
 DIST lxd-3.10.tar.gz 27057432 BLAKE2B 
b5a5c3cd4f1045419c806510aab21c3bcde8c8687ede808b1b832e2a0caba0ff3af5d79367141b29e84c0bd3bcf6958d917bc813700220e238cd21933963009b
 SHA512 
25ed7675af7b6861d754607b19485e329ae344befac06fe33f326e34030755359bea6f574c414849b85f034533fd5dccb95a326ae0ad9e44b8ea366f7ee44d04
-DIST lxd-3.7.tar.gz 26321652 BLAKE2B 
ce7faab689ffe3950aa6f57a0fd2601f231ad26fc7fb09f02300f9c2226deda0876183fe2a4a14cc982c3c2a829acc1785e5e6e030f4dbeaf03a8fbba83e4cfc
 SHA512 
a485c26ea04e6686a9fdac2219535e866f1906ff9a8e25fcd954d061a4cfc1585c4fa81b00247c34f571dbfb7f382be3e7208e3da72a4e281b714715a4f145fb
-DIST lxd-3.8.tar.gz 26914475 BLAKE2B 
9cf7ee1b5d57a3588d3ccecd47b22ef28da0faa684de03c7273949be1902f77ff7c49f4e7e5c942f7266e4e462ee009b1e70d25362610050cc41d81029d42d7b
 SHA512 
20085f05c59287fc8f350d8ef314c19fd7361f8394812e4a0466f76d9df6957348fc954d952f70e50e7227d593a9db9af994e15f69fd76e6ca4812174bfa907c
-DIST lxd-3.9.tar.gz 27031818 BLAKE2B 
7956aa9d0cf773fbdae64e8770ebee474d0b1e20aa1399d96eb317efb8a8e1cc1673bf345cea7a7cf99746905b9e16c6b2b507e571931a0cab37ff7ff5df67fd
 SHA512 
8d61912adeb33d06e4065aab7eaf80ab7b6e9cbc2b20dcca1cc5c74b999838aec32e805af3a6ae1262948514a619f4332ec44912ca720fa1b0e8b962165c117a

diff --git a/app-emulation/lxd/lxd-3.7.ebuild b/app-emulation/lxd/lxd-3.7.ebuild
deleted file mode 100644
index 7f3ceabdddf..000
--- a/app-emulation/lxd/lxd-3.7.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
-
-DEPEND="
-   dev-lang/tcl
-   >=dev-lang/go-1.9.4
-   dev-libs/libuv
-   dev-libs/protobuf
-   nls? ( sys-devel/gettext )
-   test? (
-   app-misc/jq
-   net-misc/curl
-   sys-devel/gettext
-   )
-"
-
-RDEPEND="
-   daemon? (
-   app-arch/xz-utils
-   >=app-emulation/lxc-2.0.7[seccomp]
-   dev-libs/libuv
-   dev-libs/lzo
-   dev-util/xdelta:3
-   dnsmasq? (
-   net-dns/dnsmasq[dhcp,ipv6?]
-   )
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   net-libs/libnfnetlink
-   net-misc/rsync[xattr]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools
-   virtual/acl
-   )
-"
-
-CONFIG_CHECK="
-   ~BRIDGE
-   ~DUMMY
-   ~IP6_NF_NAT
-   ~IP6_NF_TARGET_MASQUERADE
-   ~IPV6
-   ~IP_NF_NAT
-   ~IP_NF_TARGET_MASQUERADE
-   ~MACVLAN
-   ~NETFILTER_XT_MATCH_COMMENT
-   ~NET_IPGRE
-   ~NET_IPGRE_DEMUX
-   ~NET_IPIP
-   ~NF_NAT_MASQUERADE_IPV4
-   ~NF_NAT_MASQUERADE_IPV6
-   ~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"

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

2019-04-01 Thread Erik Mackdanz
commit: 93a62a2f798d10dd5f4101836bc9e7b689867270
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Tue Apr  2 03:55:44 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Tue Apr  2 03:57:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a62a2f

app-emulation/lxd: Stabilize through 3.10

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Erik Mackdanz  gentoo.org>

 app-emulation/lxd/lxd-3.10.ebuild | 2 +-
 app-emulation/lxd/lxd-3.9.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxd/lxd-3.10.ebuild 
b/app-emulation/lxd/lxd-3.10.ebuild
index 988a505aa24..a330cfbac4e 100644
--- a/app-emulation/lxd/lxd-3.10.ebuild
+++ b/app-emulation/lxd/lxd-3.10.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 

diff --git a/app-emulation/lxd/lxd-3.9.ebuild b/app-emulation/lxd/lxd-3.9.ebuild
index 418cd000141..886ba7e161b 100644
--- a/app-emulation/lxd/lxd-3.9.ebuild
+++ b/app-emulation/lxd/lxd-3.9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 



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

2019-02-07 Thread Erik Mackdanz
commit: 9e7c32a270cea29f7534592f1358c2dc225b4e70
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Fri Feb  8 03:54:01 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Fri Feb  8 03:54:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7c32a2

app-emulation/lxd: Bump to 3.10

and EAPI=7

Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.59, Repoman-2.3.12

 app-emulation/lxd/Manifest|   1 +
 app-emulation/lxd/lxd-3.10.ebuild | 241 ++
 2 files changed, 242 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 0af5059a436..65e12c849b0 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
+DIST lxd-3.10.tar.gz 27057432 BLAKE2B 
b5a5c3cd4f1045419c806510aab21c3bcde8c8687ede808b1b832e2a0caba0ff3af5d79367141b29e84c0bd3bcf6958d917bc813700220e238cd21933963009b
 SHA512 
25ed7675af7b6861d754607b19485e329ae344befac06fe33f326e34030755359bea6f574c414849b85f034533fd5dccb95a326ae0ad9e44b8ea366f7ee44d04
 DIST lxd-3.7.tar.gz 26321652 BLAKE2B 
ce7faab689ffe3950aa6f57a0fd2601f231ad26fc7fb09f02300f9c2226deda0876183fe2a4a14cc982c3c2a829acc1785e5e6e030f4dbeaf03a8fbba83e4cfc
 SHA512 
a485c26ea04e6686a9fdac2219535e866f1906ff9a8e25fcd954d061a4cfc1585c4fa81b00247c34f571dbfb7f382be3e7208e3da72a4e281b714715a4f145fb
 DIST lxd-3.8.tar.gz 26914475 BLAKE2B 
9cf7ee1b5d57a3588d3ccecd47b22ef28da0faa684de03c7273949be1902f77ff7c49f4e7e5c942f7266e4e462ee009b1e70d25362610050cc41d81029d42d7b
 SHA512 
20085f05c59287fc8f350d8ef314c19fd7361f8394812e4a0466f76d9df6957348fc954d952f70e50e7227d593a9db9af994e15f69fd76e6ca4812174bfa907c
 DIST lxd-3.9.tar.gz 27031818 BLAKE2B 
7956aa9d0cf773fbdae64e8770ebee474d0b1e20aa1399d96eb317efb8a8e1cc1673bf345cea7a7cf99746905b9e16c6b2b507e571931a0cab37ff7ff5df67fd
 SHA512 
8d61912adeb33d06e4065aab7eaf80ab7b6e9cbc2b20dcca1cc5c74b999838aec32e805af3a6ae1262948514a619f4332ec44912ca720fa1b0e8b962165c117a

diff --git a/app-emulation/lxd/lxd-3.10.ebuild 
b/app-emulation/lxd/lxd-3.10.ebuild
new file mode 100644
index 000..988a505aa24
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.10.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-libs/libnsl:0=
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed 

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

2019-01-19 Thread Erik Mackdanz
commit: b562420bd721ef39e7fd090c07b11cda4ab3d423
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sat Jan 19 17:25:03 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sat Jan 19 17:25:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b562420b

app-emulation/lxd: Bump to 3.9

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Erik Mackdanz  gentoo.org>

 app-emulation/lxd/Manifest   |   1 +
 app-emulation/lxd/lxd-3.9.ebuild | 241 +++
 2 files changed, 242 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index a803c090494..0af5059a436 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
 DIST lxd-3.7.tar.gz 26321652 BLAKE2B 
ce7faab689ffe3950aa6f57a0fd2601f231ad26fc7fb09f02300f9c2226deda0876183fe2a4a14cc982c3c2a829acc1785e5e6e030f4dbeaf03a8fbba83e4cfc
 SHA512 
a485c26ea04e6686a9fdac2219535e866f1906ff9a8e25fcd954d061a4cfc1585c4fa81b00247c34f571dbfb7f382be3e7208e3da72a4e281b714715a4f145fb
 DIST lxd-3.8.tar.gz 26914475 BLAKE2B 
9cf7ee1b5d57a3588d3ccecd47b22ef28da0faa684de03c7273949be1902f77ff7c49f4e7e5c942f7266e4e462ee009b1e70d25362610050cc41d81029d42d7b
 SHA512 
20085f05c59287fc8f350d8ef314c19fd7361f8394812e4a0466f76d9df6957348fc954d952f70e50e7227d593a9db9af994e15f69fd76e6ca4812174bfa907c
+DIST lxd-3.9.tar.gz 27031818 BLAKE2B 
7956aa9d0cf773fbdae64e8770ebee474d0b1e20aa1399d96eb317efb8a8e1cc1673bf345cea7a7cf99746905b9e16c6b2b507e571931a0cab37ff7ff5df67fd
 SHA512 
8d61912adeb33d06e4065aab7eaf80ab7b6e9cbc2b20dcca1cc5c74b999838aec32e805af3a6ae1262948514a619f4332ec44912ca720fa1b0e8b962165c117a

diff --git a/app-emulation/lxd/lxd-3.9.ebuild b/app-emulation/lxd/lxd-3.9.ebuild
new file mode 100644
index 000..418cd000141
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.9.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-libs/libnsl:0=
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+   eapply_user
+   eapply "${FILESDIR}/de-translation-newline-1.patch"
+   eapply "${FILESDIR}/ptbr-translation-newline.patch"
+
+   cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+   eautoreconf
+}
+
+src_configure() {
+   

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

2019-01-19 Thread Erik Mackdanz
commit: 5706b8d767c1fe31b5edc394f5f39fb247e00944
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sat Jan 19 17:10:00 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sat Jan 19 17:12:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5706b8d7

app-emulation/lxd: Stabilize 3.8

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Erik Mackdanz  gentoo.org>

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

diff --git a/app-emulation/lxd/lxd-3.8.ebuild b/app-emulation/lxd/lxd-3.8.ebuild
index 202a7f81579..886ba7e161b 100644
--- a/app-emulation/lxd/lxd-3.8.ebuild
+++ b/app-emulation/lxd/lxd-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 



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

2018-12-15 Thread Erik Mackdanz
commit: 728da7cdc72a5b7c8b74125fb8e4126587282fb0
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sat Dec 15 22:22:46 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sat Dec 15 22:22:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=728da7cd

app-emulation/lxd: Bump to 3.8

Closes: https://bugs.gentoo.org/670568
Closes: https://bugs.gentoo.org/673058
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Erik Mackdanz  gentoo.org>

 app-emulation/lxd/Manifest   |   1 +
 app-emulation/lxd/lxd-3.8.ebuild | 241 +++
 2 files changed, 242 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 387e0b87bd6..a803c090494 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1 +1,2 @@
 DIST lxd-3.7.tar.gz 26321652 BLAKE2B 
ce7faab689ffe3950aa6f57a0fd2601f231ad26fc7fb09f02300f9c2226deda0876183fe2a4a14cc982c3c2a829acc1785e5e6e030f4dbeaf03a8fbba83e4cfc
 SHA512 
a485c26ea04e6686a9fdac2219535e866f1906ff9a8e25fcd954d061a4cfc1585c4fa81b00247c34f571dbfb7f382be3e7208e3da72a4e281b714715a4f145fb
+DIST lxd-3.8.tar.gz 26914475 BLAKE2B 
9cf7ee1b5d57a3588d3ccecd47b22ef28da0faa684de03c7273949be1902f77ff7c49f4e7e5c942f7266e4e462ee009b1e70d25362610050cc41d81029d42d7b
 SHA512 
20085f05c59287fc8f350d8ef314c19fd7361f8394812e4a0466f76d9df6957348fc954d952f70e50e7227d593a9db9af994e15f69fd76e6ca4812174bfa907c

diff --git a/app-emulation/lxd/lxd-3.8.ebuild b/app-emulation/lxd/lxd-3.8.ebuild
new file mode 100644
index 000..202a7f81579
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.8.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-libs/libnsl:0=
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+   eapply_user
+   eapply "${FILESDIR}/de-translation-newline-1.patch"
+   eapply "${FILESDIR}/ptbr-translation-newline.patch"
+
+   cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+   eautoreconf
+}
+
+src_configure() {
+   export GOPATH="${S}/dist"
+   cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+   econf --enable-replication --disable-amalgamation --disable-tcl 
--libdir="${EPREFIX}/usr/lib/lxd"
+
+   cd "${GOPATH}/dqlite" || 

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

2018-12-15 Thread Erik Mackdanz
commit: f33e18a60611bf10f5972ac5f2cc51322f1964a0
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sat Dec 15 21:40:44 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sat Dec 15 21:40:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33e18a6

app-emulation/lxd: Remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Erik Mackdanz  gentoo.org>

 app-emulation/lxd/Manifest  |   2 -
 app-emulation/lxd/lxd-3.5-r1.ebuild | 237 ---
 app-emulation/lxd/lxd-3.5.ebuild| 237 ---
 app-emulation/lxd/lxd-3.6-r1.ebuild | 238 
 app-emulation/lxd/lxd-3.6.ebuild| 238 
 5 files changed, 952 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index bd91ec8c2a4..387e0b87bd6 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1 @@
-DIST lxd-3.5.tar.gz 28356957 BLAKE2B 
44334026ed720cc9d8a16a0752abb102f07b186e9a5946ffce9872734d166a6d477e0dd324002f74c2cca36bc500f7def9ff7f358c7d07792124392ab815e07c
 SHA512 
56f10a75ee2cfb6ed653e2d69dee979b0a661f267bc66ab642e5fc1835d1879e7df600671325973d9772ddc653334531f2420f129c06cdb5a93950083263f366
-DIST lxd-3.6.tar.gz 25777268 BLAKE2B 
f2c3f20108f5990b1e086d1f5db53cbd476d0613f97f60a29dd66d3779486aef10f9eebf514853960d5606a108aea2e7c89365207130e8345ede70ed5b22806e
 SHA512 
7b1982b81cfee56185bc0929b7bd9f1eb705c1ae83f11fa6f9aa2c9f8fc9aa5c705112121b41e5ed3791aa2ab41be26d7f8fb0a78951bab382b77ae9ae95a793
 DIST lxd-3.7.tar.gz 26321652 BLAKE2B 
ce7faab689ffe3950aa6f57a0fd2601f231ad26fc7fb09f02300f9c2226deda0876183fe2a4a14cc982c3c2a829acc1785e5e6e030f4dbeaf03a8fbba83e4cfc
 SHA512 
a485c26ea04e6686a9fdac2219535e866f1906ff9a8e25fcd954d061a4cfc1585c4fa81b00247c34f571dbfb7f382be3e7208e3da72a4e281b714715a4f145fb

diff --git a/app-emulation/lxd/lxd-3.5-r1.ebuild 
b/app-emulation/lxd/lxd-3.5-r1.ebuild
deleted file mode 100644
index ee1fd2d1183..000
--- a/app-emulation/lxd/lxd-3.5-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
-
-DEPEND="
-   dev-lang/tcl
-   >=dev-lang/go-1.9.4
-   dev-libs/libuv
-   dev-libs/protobuf
-   nls? ( sys-devel/gettext )
-   test? (
-   app-misc/jq
-   net-misc/curl
-   sys-devel/gettext
-   )
-"
-
-RDEPEND="
-   daemon? (
-   app-arch/xz-utils
-   >=app-emulation/lxc-2.0.7[seccomp]
-   dev-libs/libuv
-   dev-libs/lzo
-   dev-util/xdelta:3
-   dnsmasq? (
-   net-dns/dnsmasq[dhcp,ipv6?]
-   )
-   net-firewall/ebtables
-   net-firewall/iptables[ipv6?]
-   net-libs/libnfnetlink
-   net-misc/rsync[xattr]
-   sys-apps/iproute2[ipv6?]
-   sys-fs/fuse
-   sys-fs/lxcfs
-   sys-fs/squashfs-tools
-   virtual/acl
-   )
-"
-
-CONFIG_CHECK="
-   ~BRIDGE
-   ~DUMMY
-   ~IP6_NF_NAT
-   ~IP6_NF_TARGET_MASQUERADE
-   ~IPV6
-   ~IP_NF_NAT
-   ~IP_NF_TARGET_MASQUERADE
-   ~MACVLAN
-   ~NETFILTER_XT_MATCH_COMMENT
-   ~NET_IPGRE
-   ~NET_IPGRE_DEMUX
-   ~NET_IPIP
-   ~NF_NAT_MASQUERADE_IPV4
-   ~NF_NAT_MASQUERADE_IPV6
-   ~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-src_prepare() {
-   eapply_user
-   eapply 

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

2018-12-15 Thread Erik Mackdanz
commit: 5e2f8617ca8f543647b91bea059c6b18b5d15a31
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sat Dec 15 21:38:06 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sat Dec 15 21:38:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2f8617

app-emulation/lxd: stabilize 3.7

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Erik Mackdanz  gentoo.org>

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

diff --git a/app-emulation/lxd/lxd-3.7.ebuild b/app-emulation/lxd/lxd-3.7.ebuild
index 250ea1346d7..7f3ceabdddf 100644
--- a/app-emulation/lxd/lxd-3.7.ebuild
+++ b/app-emulation/lxd/lxd-3.7.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 



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

2018-11-11 Thread Erik Mackdanz
commit: 8bc829a169e60d1785e91fa0cc882e9889d16dcd
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Nov 11 21:23:40 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Nov 11 21:23:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc829a1

app-emulation/lxd: Bump to 3.7

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

 app-emulation/lxd/Manifest   |   1 +
 app-emulation/lxd/lxd-3.7.ebuild | 238 +++
 2 files changed, 239 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 92740d8c352..bd91ec8c2a4 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
 DIST lxd-3.5.tar.gz 28356957 BLAKE2B 
44334026ed720cc9d8a16a0752abb102f07b186e9a5946ffce9872734d166a6d477e0dd324002f74c2cca36bc500f7def9ff7f358c7d07792124392ab815e07c
 SHA512 
56f10a75ee2cfb6ed653e2d69dee979b0a661f267bc66ab642e5fc1835d1879e7df600671325973d9772ddc653334531f2420f129c06cdb5a93950083263f366
 DIST lxd-3.6.tar.gz 25777268 BLAKE2B 
f2c3f20108f5990b1e086d1f5db53cbd476d0613f97f60a29dd66d3779486aef10f9eebf514853960d5606a108aea2e7c89365207130e8345ede70ed5b22806e
 SHA512 
7b1982b81cfee56185bc0929b7bd9f1eb705c1ae83f11fa6f9aa2c9f8fc9aa5c705112121b41e5ed3791aa2ab41be26d7f8fb0a78951bab382b77ae9ae95a793
+DIST lxd-3.7.tar.gz 26321652 BLAKE2B 
ce7faab689ffe3950aa6f57a0fd2601f231ad26fc7fb09f02300f9c2226deda0876183fe2a4a14cc982c3c2a829acc1785e5e6e030f4dbeaf03a8fbba83e4cfc
 SHA512 
a485c26ea04e6686a9fdac2219535e866f1906ff9a8e25fcd954d061a4cfc1585c4fa81b00247c34f571dbfb7f382be3e7208e3da72a4e281b714715a4f145fb

diff --git a/app-emulation/lxd/lxd-3.7.ebuild b/app-emulation/lxd/lxd-3.7.ebuild
new file mode 100644
index 000..250ea1346d7
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.7.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+   eapply_user
+   eapply "${FILESDIR}/de-translation-newline-1.patch"
+   eapply "${FILESDIR}/ptbr-translation-newline.patch"
+
+   cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+   eautoreconf
+}
+
+src_configure() {
+   export GOPATH="${S}/dist"
+   

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

2018-11-11 Thread Erik Mackdanz
commit: a6a45d3b026b8e91235147cf17234a08155ed8e5
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Nov 11 21:13:55 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Nov 11 21:15:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a45d3b

app-emulation/lxd: Stabilize 3.6-r1

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

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

diff --git a/app-emulation/lxd/lxd-3.6-r1.ebuild 
b/app-emulation/lxd/lxd-3.6-r1.ebuild
index 250ea1346d7..7f3ceabdddf 100644
--- a/app-emulation/lxd/lxd-3.6-r1.ebuild
+++ b/app-emulation/lxd/lxd-3.6-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 



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

2018-11-03 Thread Erik Mackdanz
commit: 6e2717927c6d96cb45e8097fa7d93e416dcb6c22
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Nov  4 04:03:26 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Nov  4 04:03:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e271792

app-emulation/lxd: Fix linking wrong sqlite

Closes: https://bugs.gentoo.org/669008
Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-emulation/lxd/lxd-3.5-r1.ebuild | 237 +++
 app-emulation/lxd/lxd-3.6-r1.ebuild | 238 
 2 files changed, 475 insertions(+)

diff --git a/app-emulation/lxd/lxd-3.5-r1.ebuild 
b/app-emulation/lxd/lxd-3.5-r1.ebuild
new file mode 100644
index 000..ee1fd2d1183
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.5-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+   eapply_user
+   eapply "${FILESDIR}/de-translation-newline-1.patch"
+
+   cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+   eautoreconf
+}
+
+src_configure() {
+   export GOPATH="${S}/dist"
+   cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+   econf --enable-replication --disable-amalgamation --disable-tcl 
--libdir="${EPREFIX}/usr/lib/lxd"
+
+   cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+   PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf 
--libdir=${EPREFIX}/usr/lib/lxd
+}
+
+src_compile() {
+   export GOPATH="${S}/dist"
+
+   cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+   emake
+
+   cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+   emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite"
+
+   # We don't use the Makefile here because it builds targets with the
+   # assumption that `pwd` is in a deep gopath namespace, which we're not.
+   # It's simpler to manually call "go install" than patching the Makefile.
+   cd "${S}"
+   go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
+
+   if use daemon; then
+
+   # LXD depends on a patched, bundled sqlite with replication
+   # capabilities.
+   

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

2018-10-13 Thread Erik Mackdanz
commit: 72bf039f5ed8c88ec658e19516bab07f77828c8a
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Oct 14 04:36:01 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Oct 14 04:36:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72bf039f

app-emulation/lxd: Bump to 3.6

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

 app-emulation/lxd/Manifest |   1 +
 .../lxd/files/ptbr-translation-newline.patch   |  19 ++
 app-emulation/lxd/lxd-3.6.ebuild   | 238 +
 3 files changed, 258 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 57a31c22485..92740d8c352 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1 +1,2 @@
 DIST lxd-3.5.tar.gz 28356957 BLAKE2B 
44334026ed720cc9d8a16a0752abb102f07b186e9a5946ffce9872734d166a6d477e0dd324002f74c2cca36bc500f7def9ff7f358c7d07792124392ab815e07c
 SHA512 
56f10a75ee2cfb6ed653e2d69dee979b0a661f267bc66ab642e5fc1835d1879e7df600671325973d9772ddc653334531f2420f129c06cdb5a93950083263f366
+DIST lxd-3.6.tar.gz 25777268 BLAKE2B 
f2c3f20108f5990b1e086d1f5db53cbd476d0613f97f60a29dd66d3779486aef10f9eebf514853960d5606a108aea2e7c89365207130e8345ede70ed5b22806e
 SHA512 
7b1982b81cfee56185bc0929b7bd9f1eb705c1ae83f11fa6f9aa2c9f8fc9aa5c705112121b41e5ed3791aa2ab41be26d7f8fb0a78951bab382b77ae9ae95a793

diff --git a/app-emulation/lxd/files/ptbr-translation-newline.patch 
b/app-emulation/lxd/files/ptbr-translation-newline.patch
new file mode 100644
index 000..92d78ca1427
--- /dev/null
+++ b/app-emulation/lxd/files/ptbr-translation-newline.patch
@@ -0,0 +1,19 @@
+--- /po/pt_BR.po.orig  2018-10-13 23:27:01.523645894 -0500
 /po/pt_BR.po   2018-10-13 23:28:04.730644762 -0500
+@@ -95,7 +95,6 @@
+ "###\n"
+ "### Note that the name is shown but cannot be changed"
+ msgstr ""
+-"\n"
+ "### Esta é uma representação em yaml da configuração.\n"
+ "### Qualquer linha começando com '#' será ignorada.\n"
+ "###\n"
+@@ -112,7 +111,7 @@
+ "### type: disk\n"
+ "### ephemeral: false\n"
+ "###\n"
+-"### Observe que o nome é exibido mas não pode ser modificado\n"
++"### Observe que o nome é exibido mas não pode ser modificado"
+ 
+ #: lxc/config_metadata.go:63
+ msgid ""

diff --git a/app-emulation/lxd/lxd-3.6.ebuild b/app-emulation/lxd/lxd-3.6.ebuild
new file mode 100644
index 000..52e97dfade6
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.6.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"

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

2018-10-13 Thread Erik Mackdanz
commit: 6aaccc67a3c6fc22b12ef573a2626b8d9d32e19d
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sat Oct 13 22:47:26 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sat Oct 13 22:47:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aaccc67

app-emulation/lxd: Remove old versions

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

 app-emulation/lxd/Manifest |   2 -
 .../lxd/files/de-translation-newline.patch |  20 --
 .../lxd/files/ja-translation-newline.patch |  11 -
 app-emulation/lxd/files/lxd.initd.1|  47 -
 app-emulation/lxd/lxd-3.3.ebuild   | 183 
 app-emulation/lxd/lxd-3.4-r1.ebuild| 233 -
 app-emulation/lxd/lxd-3.4.ebuild   | 232 
 7 files changed, 728 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index e2d85aa69e4..57a31c22485 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1 @@
-DIST lxd-3.3.tar.gz 28414680 BLAKE2B 
7f3eecf400761548935e6e3c81d894379cd667ffbe6d8ef67a7dd3ad4f1c13846f524fcefc4cdc306674fb990706bda0b2c4ef390f320c41561fa86cf610586c
 SHA512 
ed5d792c1080f2be7f48f34051fbfa28d138b4ccb5405edb13cd630776ec34312da491a1881f77dddbe1a121e589b44952e73ce1e61f2cba72243f3b8f4c0177
-DIST lxd-3.4.tar.gz 24313641 BLAKE2B 
6f2db8a690474d020a0d43366e940760c0886c8af60e17ecc6bf1f9747d8454d09d619b723b1794bec503dda82028f7d81edc2d0c33216cbad9c810f2657198d
 SHA512 
f041878fcfd2b45f594d97e748272d44c517f28e181861a604bef23f858c4bd59cc93ac56c24cce6d353743428b66940f11df268ff9f66e83a5c8f1fb95dc3aa
 DIST lxd-3.5.tar.gz 28356957 BLAKE2B 
44334026ed720cc9d8a16a0752abb102f07b186e9a5946ffce9872734d166a6d477e0dd324002f74c2cca36bc500f7def9ff7f358c7d07792124392ab815e07c
 SHA512 
56f10a75ee2cfb6ed653e2d69dee979b0a661f267bc66ab642e5fc1835d1879e7df600671325973d9772ddc653334531f2420f129c06cdb5a93950083263f366

diff --git a/app-emulation/lxd/files/de-translation-newline.patch 
b/app-emulation/lxd/files/de-translation-newline.patch
deleted file mode 100644
index 9ef55ab2f0e..000
--- a/app-emulation/lxd/files/de-translation-newline.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 /po/de.po  2018-06-27 19:57:56.759130047 -0500
-+++ /po/de.po  2018-06-27 20:01:09.694634346 -0500
-@@ -65,7 +65,7 @@
- "### type: custom\n"
- "### used_by: []\n"
- "### config:\n"
--"###   size: \"61203283968\""
-+"###   size: \"61203283968\"\n"
- msgstr ""
- "### Dies ist eine Darstellung der Eigenschaften eines Abbildes in yaml.\n"
- "### Jede Zeile die mit '# beginnt wird ignoriert.\n"
-@@ -167,7 +167,7 @@
- "###\n"
- "### Each property is represented by a single line:\n"
- "### An example would be:\n"
--"###  description: My custom image"
-+"###  description: My custom image\n"
- msgstr ""
- "### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
- "### Jede Zeile die mit '# beginnt wird ignoriert.\n"

diff --git a/app-emulation/lxd/files/ja-translation-newline.patch 
b/app-emulation/lxd/files/ja-translation-newline.patch
deleted file mode 100644
index bbda24c6f37..000
--- a/app-emulation/lxd/files/ja-translation-newline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 /po/ja.po  2018-05-20 19:42:38.932990198 -0500
-+++ /po/ja.po  2018-05-20 19:42:55.839944861 -0500
-@@ -1380,7 +1380,7 @@
- "イメージのエイリアスを一覧表示します\n"
- "\n"
- "指定するフィルタはイメージのハッシュ値の一部でもイメージのエイリアスの一部で"
--"も構いません。"
-+"も構いません。\n"
- 
- #: lxc/image.go:888
- msgid "List images"

diff --git a/app-emulation/lxd/files/lxd.initd.1 
b/app-emulation/lxd/files/lxd.initd.1
deleted file mode 100644
index b6d3cd4eb26..000
--- a/app-emulation/lxd/files/lxd.initd.1
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
-need net
-use lxcfs
-}
-
-start() {
-ebegin "Starting lxd service"
-
-start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- --env LD_LIBRARY_PATH="/usr/lib/lxd" \
- -- \
- ${LXD_OPTIONS}
-
-eend $?
-}
-
-stop() {
-if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
-   stopall
-else
-   ebegin "Stopping lxd service (but not containers)"
-   start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-   eend $?
-fi
-}
-
-stopall() {
-ebegin "Stopping lxd service and containers"
-if "${DAEMON}" shutdown; then
-   /etc/init.d/lxd zap
-   rm -f ${PIDFILE}
-fi
-eend $?
-}

diff --git a/app-emulation/lxd/lxd-3.3.ebuild b/app-emulation/lxd/lxd-3.3.ebuild
deleted file mode 100644

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

2018-10-13 Thread Erik Mackdanz
commit: 74866c4712318a1cd546826bbefbd991b6781270
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sat Oct 13 22:43:30 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sat Oct 13 22:43:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74866c47

app-emulation/lxd: Stabilize 3.5

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

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

diff --git a/app-emulation/lxd/lxd-3.5.ebuild b/app-emulation/lxd/lxd-3.5.ebuild
index daa47a63706..8fca096264a 100644
--- a/app-emulation/lxd/lxd-3.5.ebuild
+++ b/app-emulation/lxd/lxd-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 



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

2018-09-15 Thread Erik Mackdanz
commit: f100f06ec45c4b7c199e027945150266875d8b8e
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sat Sep 15 13:09:07 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sat Sep 15 13:09:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f100f06e

app-emulation/lxd: Bump to 3.5

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 app-emulation/lxd/Manifest |   1 +
 .../lxd/files/de-translation-newline-1.patch   |  11 +
 app-emulation/lxd/lxd-3.5.ebuild   | 237 +
 3 files changed, 249 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index d88e6965e98..e2d85aa69e4 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
 DIST lxd-3.3.tar.gz 28414680 BLAKE2B 
7f3eecf400761548935e6e3c81d894379cd667ffbe6d8ef67a7dd3ad4f1c13846f524fcefc4cdc306674fb990706bda0b2c4ef390f320c41561fa86cf610586c
 SHA512 
ed5d792c1080f2be7f48f34051fbfa28d138b4ccb5405edb13cd630776ec34312da491a1881f77dddbe1a121e589b44952e73ce1e61f2cba72243f3b8f4c0177
 DIST lxd-3.4.tar.gz 24313641 BLAKE2B 
6f2db8a690474d020a0d43366e940760c0886c8af60e17ecc6bf1f9747d8454d09d619b723b1794bec503dda82028f7d81edc2d0c33216cbad9c810f2657198d
 SHA512 
f041878fcfd2b45f594d97e748272d44c517f28e181861a604bef23f858c4bd59cc93ac56c24cce6d353743428b66940f11df268ff9f66e83a5c8f1fb95dc3aa
+DIST lxd-3.5.tar.gz 28356957 BLAKE2B 
44334026ed720cc9d8a16a0752abb102f07b186e9a5946ffce9872734d166a6d477e0dd324002f74c2cca36bc500f7def9ff7f358c7d07792124392ab815e07c
 SHA512 
56f10a75ee2cfb6ed653e2d69dee979b0a661f267bc66ab642e5fc1835d1879e7df600671325973d9772ddc653334531f2420f129c06cdb5a93950083263f366

diff --git a/app-emulation/lxd/files/de-translation-newline-1.patch 
b/app-emulation/lxd/files/de-translation-newline-1.patch
new file mode 100644
index 000..4c731e9023d
--- /dev/null
+++ b/app-emulation/lxd/files/de-translation-newline-1.patch
@@ -0,0 +1,11 @@
+--- /po/de.po  2018-06-27 19:57:56.759130047 -0500
 /po/de.po  2018-06-27 20:01:09.694634346 -0500
+@@ -167,7 +167,7 @@
+ "###\n"
+ "### Each property is represented by a single line:\n"
+ "### An example would be:\n"
+-"###  description: My custom image"
++"###  description: My custom image\n"
+ msgstr ""
+ "### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
+ "### Jede Zeile die mit '# beginnt wird ignoriert.\n"

diff --git a/app-emulation/lxd/lxd-3.5.ebuild b/app-emulation/lxd/lxd-3.5.ebuild
new file mode 100644
index 000..daa47a63706
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.5.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/libuv
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network 

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

2018-09-09 Thread Erik Mackdanz
commit: 466f357db24e56349ca2f09e05a4b406087d62c0
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Sep  9 22:49:53 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Sep  9 22:50:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466f357d

app-emulation/lxd: Fix missing dep, fix bad linking

Closes: https://bugs.gentoo.org/664394
Closes: https://bugs.gentoo.org/664990
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 app-emulation/lxd/lxd-3.4-r1.ebuild | 233 
 1 file changed, 233 insertions(+)

diff --git a/app-emulation/lxd/lxd-3.4-r1.ebuild 
b/app-emulation/lxd/lxd-3.4-r1.ebuild
new file mode 100644
index 000..0988eae3ecc
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.4-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/libuv
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/fuse
+   sys-fs/lxcfs
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+   eapply_user
+   eapply "${FILESDIR}/de-translation-newline.patch"
+
+   cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+   eautoreconf
+}
+
+src_configure() {
+   export GOPATH="${S}/dist"
+   cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+   econf --enable-replication --disable-amalgamation --disable-tcl 
--libdir="${EPREFIX}/usr/lib/lxd"
+
+   cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+   PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf 
--libdir=${EPREFIX}/usr/lib/lxd
+}
+
+src_compile() {
+   export GOPATH="${S}/dist"
+
+   cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+   emake
+
+   cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+   emake CFLAGS="-I${GOPATH}/sqlite"
+
+   # We don't use the Makefile here because it builds targets with the
+   # assumption that `pwd` is in a deep gopath namespace, which we're not.
+   # It's simpler to manually call "go install" than patching the Makefile.
+   cd "${S}"
+   go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
+
+   if use daemon; then
+
+   # LXD depends on a patched, bundled sqlite with replication
+   # capabilities.
+   export CGO_CFLAGS="-I${GOPATH}/sqlite/ 
-I${GOPATH}/dqlite/include/"
+   export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ 

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

2018-08-19 Thread Erik Mackdanz
commit: 8658775519ab229cbf6e156066283d64cc4bed8a
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Aug 19 22:27:40 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Aug 19 22:27:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86587755

app-emulation/lxd: Remove old versions

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 app-emulation/lxd/Manifest|  46 --
 app-emulation/lxd/files/lxd-dont-go-get.patch |  16 --
 app-emulation/lxd/files/lxd.confd |   7 +-
 app-emulation/lxd/files/lxd.confd.1   |  24 ---
 app-emulation/lxd/lxd-2.21.ebuild | 224 --
 app-emulation/lxd/lxd-3.1.ebuild  | 180 -
 app-emulation/lxd/lxd-3.2.ebuild  | 181 -
 app-emulation/lxd/lxd-3.3.ebuild  |   2 +-
 app-emulation/lxd/lxd-3.4.ebuild  |   2 +-
 9 files changed, 4 insertions(+), 678 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 12ef79ec012..d88e6965e98 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,48 +1,2 @@
-DIST 
github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz
 15127 BLAKE2B 
06338b4364d9554a1334c04bd9ea81df7539641ef5ce41d681670b7b65c06160ef67e4bd3ad2529dc7864537d5be6a91be53c5e96335f5dfcab198a8bcae9a9b
 SHA512 
0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d
-DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 
59915 BLAKE2B 
763403cec3bcb27acd6654e7d2d57d198862b0d16c242ec975b46a7cca95560505b3373e8c4b7a53e7fc025523845bee16b90311f8bd341c0d2bfc28987ae0d4
 SHA512 
c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee
-DIST github.com-go-errgo-errgo-442357a80af5c6bf9b6d51ae791a39c3421004f3.tar.gz 
7453 BLAKE2B 
9f231836718860c023a487d0971e152656e0ff39dcd5efdfda8c62577dbf4ae82335bada308d44a4d0af5ec951e5608f40bb9e0a7567c1edce35664c98596744
 SHA512 
f54cdf5089b7e46f08f75f7f1b0bfb893b1cd0a36d08b925d5ba04d2fa6021e85fe0625235a9e712b09099e2f5cce46aa1700d12c12b0c54ab59c8d13030e820
-DIST 
github.com-go-httprequest-httprequest-fdaf1bffa25560ba0920e3e29aae85d3677ab32e.tar.gz
 52964 BLAKE2B 
f0dddcd38b9f8ac75a3e45473e22cfab1db88bef19f90431b16d1a3699ab56ef7f0d038ce837c0305600d69bc5ba64dffd344143cd0bc4a10aa5093ca32b0771
 SHA512 
60688f2e320afaeaeb824226bd586b9e9d7ccde00d9585401ac328d83195a23dc3e4e26b1848bc9998023b732a559963920860f21056416161c31304388aad4d
-DIST 
github.com-go-macaroon-bakery-macaroon-bakery-ec9d2ad6796100720c154f614b6dea8798ec1181.tar.gz
 124110 BLAKE2B 
c05d59504f7cd2d0cdb913b1d06898375fce112e71a1db0c1752628bc9939003a92ad608463cd0e1fa8d75945b9b5a76c0710ebb3ea126cfd67ea01b46229bff
 SHA512 
2965b6441df2790e0378b962fb66672e2316902620223e4ca3a8ddf1ef38e2a76b9cda2a5013e664ef49073aed8f424e1713538626f6ce1929e81e3bacbef45f
-DIST 
github.com-go-macaroon-macaroon-bed2a428da6e56d950bed5b41fcbae3141e5b0d0.tar.gz 
22383 BLAKE2B 
b2d89ccdf4ad0a8c29f44895697a9921d40b9316879f477f608fc5f59683f825a66357e5587d654a55ea80f0c79d6680f5dbb45590b2fea051fca4a7f23a9eb8
 SHA512 
7ec072cec42266cf8cdd44819c653b8d09b58622fdfa42fb12422c9727e6eb7326519fbeb247fa4840d8c87a5357ae0acd028a8d5757acedc3582810a5cc467b
-DIST github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz 
376880 BLAKE2B 
800038e0870d8b943604bc5edf9ba566d20fed75f445834801955a19da6add891f96cbf5e19a93d520d90ccc4e9da911ab02cccb710fee67b3fe60e4409a717f
 SHA512 
f0e7948d4672d29d3d0a741961ff8a75d30c556e157698118a32de10e2af8eb2ae6a61feea1c93aff313596d285a048a70dae7339c66760ebb91a1aecfb05845
-DIST github.com-go-retry-retry-01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz 
9318 BLAKE2B 
d5eb408e4c4acf0c2304d951705a1f39f2b2663357f04402f5ee47bfc79182511e3a29568846bb902887aa5efb149ac6a4cf32ecae07a183f845ad8886fe0377
 SHA512 
71956a468472754313830a7f1afc844020e5ffc8bac4464e369562bde8c1cf5e11814fc110dcb00d243cbc6c13fe7a0423d29b73f0f420df8313666e645a7a24
-DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 
5515 BLAKE2B 
9ae2c00b43da5958392e0817f448d01374712ce7552c07be0de8204a7f16a7442b195695d51782a375da7aaa83019446438d52a8768317216a7812380be8c1b1
 SHA512 
03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
-DIST github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz 
64826 BLAKE2B 
47e9182124037317bdfc31137a2715db979146688e637a586f5a7c4a12250d0fcffdbbaa8793e189421d189b1071f48d8588cfda9ac1f3e297bfc244f30bcae7
 SHA512 
429256bb847defb53dee5c960edc726455397045e7dc2e4833e0e9088f9ec11452e2198961080dc00b8eff9d165df5e0377f4039932df0e46cd960827b8f800d
-DIST github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz 
1443268 BLAKE2B 

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

2018-08-19 Thread Erik Mackdanz
commit: 0e4bdbd2a88d1df705fed846cbe1b1dfa69e87b3
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Aug 19 22:23:21 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Aug 19 22:23:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4bdbd2

app-emulation/lxd: Stabilize 3.3

Package-Manager: Portage-2.3.46, Repoman-2.3.10

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

diff --git a/app-emulation/lxd/lxd-3.3.ebuild b/app-emulation/lxd/lxd-3.3.ebuild
index 16a412be6a9..07e1bf968bb 100644
--- a/app-emulation/lxd/lxd-3.3.ebuild
+++ b/app-emulation/lxd/lxd-3.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test"
 



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

2018-08-19 Thread Erik Mackdanz
commit: 7f091e8001253dfcd84e81d263d7db319b63aabf
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Aug 19 22:20:07 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Aug 19 22:20:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f091e80

app-emulation/lxd: Bump to version 3.4

Add some dependencies used by upstream, fully build custom sqlite,
move tools to IUSE.

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

 app-emulation/lxd/Manifest  |   1 +
 app-emulation/lxd/files/lxd.initd.1 |  47 
 app-emulation/lxd/lxd-3.4.ebuild| 232 
 app-emulation/lxd/metadata.xml  |   5 +-
 4 files changed, 284 insertions(+), 1 deletion(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index a59667370be..12ef79ec012 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -45,3 +45,4 @@ DIST lxd-2.21.tar.gz 882352 BLAKE2B 
80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178a
 DIST lxd-3.1.tar.gz 27979442 BLAKE2B 
0b74e3f76a7ab835b042b52b469a6fe11e7077d567e0658d13fab2192fd25d99518d65ba319c981a2e4677319e280cccae26f70ef99e9911264dc028ca5628fd
 SHA512 
61f64d08dd80f7f676f386912f4dfc0d0af38cce0287de7865123b9da667b54ab91d22b76ffe03480e04ae0fbd8dc837d7d519d0e34409377c3d7e6624bf636c
 DIST lxd-3.2.tar.gz 28183660 BLAKE2B 
9aabc9fd0bd66d3b4e0178448a65ca39c69e4e7a14d01309e0e023501de1c17b2b7887a9da5b84fcfde27db3f521cce3451beace9955232da9bd5e5136bc0043
 SHA512 
82c37e87d75e328a29b1f2876a24fedec43a253bb72f3ea55fa9cdb928d11947eda723a01e758f90ef77ed4492f86ec6dd5f1f88240d05e771d926dfdc9888fb
 DIST lxd-3.3.tar.gz 28414680 BLAKE2B 
7f3eecf400761548935e6e3c81d894379cd667ffbe6d8ef67a7dd3ad4f1c13846f524fcefc4cdc306674fb990706bda0b2c4ef390f320c41561fa86cf610586c
 SHA512 
ed5d792c1080f2be7f48f34051fbfa28d138b4ccb5405edb13cd630776ec34312da491a1881f77dddbe1a121e589b44952e73ce1e61f2cba72243f3b8f4c0177
+DIST lxd-3.4.tar.gz 24313641 BLAKE2B 
6f2db8a690474d020a0d43366e940760c0886c8af60e17ecc6bf1f9747d8454d09d619b723b1794bec503dda82028f7d81edc2d0c33216cbad9c810f2657198d
 SHA512 
f041878fcfd2b45f594d97e748272d44c517f28e181861a604bef23f858c4bd59cc93ac56c24cce6d353743428b66940f11df268ff9f66e83a5c8f1fb95dc3aa

diff --git a/app-emulation/lxd/files/lxd.initd.1 
b/app-emulation/lxd/files/lxd.initd.1
new file mode 100644
index 000..b6d3cd4eb26
--- /dev/null
+++ b/app-emulation/lxd/files/lxd.initd.1
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+need net
+use lxcfs
+}
+
+start() {
+ebegin "Starting lxd service"
+
+start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ --env LD_LIBRARY_PATH="/usr/lib/lxd" \
+ -- \
+ ${LXD_OPTIONS}
+
+eend $?
+}
+
+stop() {
+if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
+   stopall
+else
+   ebegin "Stopping lxd service (but not containers)"
+   start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+   eend $?
+fi
+}
+
+stopall() {
+ebegin "Stopping lxd service and containers"
+if "${DAEMON}" shutdown; then
+   /etc/init.d/lxd zap
+   rm -f ${PIDFILE}
+fi
+eend $?
+}

diff --git a/app-emulation/lxd/lxd-3.4.ebuild b/app-emulation/lxd/lxd-3.4.ebuild
new file mode 100644
index 000..32dc9abda4a
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.4.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   dev-lang/tcl
+   >=dev-lang/go-1.9.4
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dev-libs/lzo
+   dev-util/xdelta:3
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-firewall/ebtables
+   net-firewall/iptables[ipv6?]
+   net-libs/libnfnetlink
+   net-misc/rsync[xattr]
+   

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

2018-07-26 Thread Erik Mackdanz
commit: 57bee163877d8acafed493cc57cd05a656e915f1
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Fri Jul 27 03:56:47 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Fri Jul 27 03:56:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57bee163

app-emulation/lxd: Stabilize 3.2

Package-Manager: Portage-2.3.43, Repoman-2.3.10

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

diff --git a/app-emulation/lxd/lxd-3.2.ebuild b/app-emulation/lxd/lxd-3.2.ebuild
index 1f0f3db33a2..473f52df537 100644
--- a/app-emulation/lxd/lxd-3.2.ebuild
+++ b/app-emulation/lxd/lxd-3.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test"
 



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

2018-07-26 Thread Erik Mackdanz
commit: 28d082d1f7a366675651059f7b878afd78f1c67c
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Thu Jul 26 22:22:53 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Thu Jul 26 22:22:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d082d1

app-emulation/lxd: Bump to 3.3

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 app-emulation/lxd/Manifest   |   1 +
 app-emulation/lxd/lxd-3.3.ebuild | 183 +++
 2 files changed, 184 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index e4d4728dc2a..a59667370be 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -44,3 +44,4 @@ DIST 
github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar
 DIST lxd-2.21.tar.gz 882352 BLAKE2B 
80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178aec06ad62fe3521ed012ed9b82c68c0254e0299e8e1dfd274a0622f32bde730480a950ab6ba15ddae5f4b
 SHA512 
9a8ec3a97e4c861a80311dbdecbf5a485c0af85d6ba6b20680ca17e6ac877de3f27cfdcf0a111ba0db2b7c562dfe2f41336b562b7c13350c4543505b3c17357e
 DIST lxd-3.1.tar.gz 27979442 BLAKE2B 
0b74e3f76a7ab835b042b52b469a6fe11e7077d567e0658d13fab2192fd25d99518d65ba319c981a2e4677319e280cccae26f70ef99e9911264dc028ca5628fd
 SHA512 
61f64d08dd80f7f676f386912f4dfc0d0af38cce0287de7865123b9da667b54ab91d22b76ffe03480e04ae0fbd8dc837d7d519d0e34409377c3d7e6624bf636c
 DIST lxd-3.2.tar.gz 28183660 BLAKE2B 
9aabc9fd0bd66d3b4e0178448a65ca39c69e4e7a14d01309e0e023501de1c17b2b7887a9da5b84fcfde27db3f521cce3451beace9955232da9bd5e5136bc0043
 SHA512 
82c37e87d75e328a29b1f2876a24fedec43a253bb72f3ea55fa9cdb928d11947eda723a01e758f90ef77ed4492f86ec6dd5f1f88240d05e771d926dfdc9888fb
+DIST lxd-3.3.tar.gz 28414680 BLAKE2B 
7f3eecf400761548935e6e3c81d894379cd667ffbe6d8ef67a7dd3ad4f1c13846f524fcefc4cdc306674fb990706bda0b2c4ef390f320c41561fa86cf610586c
 SHA512 
ed5d792c1080f2be7f48f34051fbfa28d138b4ccb5405edb13cd630776ec34312da491a1881f77dddbe1a121e589b44952e73ce1e61f2cba72243f3b8f4c0177

diff --git a/app-emulation/lxd/lxd-3.3.ebuild b/app-emulation/lxd/lxd-3.3.ebuild
new file mode 100644
index 000..16a412be6a9
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.3.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test"
+
+inherit bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   >=dev-lang/go-1.9.4
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for 
network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network 
commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network 
commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+PATCHES=(
+   "${FILESDIR}/ja-translation-newline.patch"  # 
https://github.com/lxc/lxd/pull/4572
+   "${FILESDIR}/de-translation-newline.patch"
+)
+
+# LXD tarball is packaged with a nice "dist" folder containing all dependencies
+# that were vendored by upstream at release 

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

2018-07-03 Thread Virgil Dupras
commit: d3eb22b92b1a63934cabf8b17066e58413c1c4b9
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Jul  3 12:19:58 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Jul  3 12:23:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3eb22b9

app-emulation/lxd: revert removal of v2.21

It was a mistake to remove it because it was the only stable version
left

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/lxd/Manifest|  44 +
 app-emulation/lxd/files/lxd-dont-go-get.patch |  16 ++
 app-emulation/lxd/files/lxd.confd |  27 
 app-emulation/lxd/lxd-2.21.ebuild | 224 ++
 4 files changed, 311 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 1389d1729bb..e4d4728dc2a 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,46 @@
+DIST 
github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz
 15127 BLAKE2B 
06338b4364d9554a1334c04bd9ea81df7539641ef5ce41d681670b7b65c06160ef67e4bd3ad2529dc7864537d5be6a91be53c5e96335f5dfcab198a8bcae9a9b
 SHA512 
0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d
+DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 
59915 BLAKE2B 
763403cec3bcb27acd6654e7d2d57d198862b0d16c242ec975b46a7cca95560505b3373e8c4b7a53e7fc025523845bee16b90311f8bd341c0d2bfc28987ae0d4
 SHA512 
c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee
+DIST github.com-go-errgo-errgo-442357a80af5c6bf9b6d51ae791a39c3421004f3.tar.gz 
7453 BLAKE2B 
9f231836718860c023a487d0971e152656e0ff39dcd5efdfda8c62577dbf4ae82335bada308d44a4d0af5ec951e5608f40bb9e0a7567c1edce35664c98596744
 SHA512 
f54cdf5089b7e46f08f75f7f1b0bfb893b1cd0a36d08b925d5ba04d2fa6021e85fe0625235a9e712b09099e2f5cce46aa1700d12c12b0c54ab59c8d13030e820
+DIST 
github.com-go-httprequest-httprequest-fdaf1bffa25560ba0920e3e29aae85d3677ab32e.tar.gz
 52964 BLAKE2B 
f0dddcd38b9f8ac75a3e45473e22cfab1db88bef19f90431b16d1a3699ab56ef7f0d038ce837c0305600d69bc5ba64dffd344143cd0bc4a10aa5093ca32b0771
 SHA512 
60688f2e320afaeaeb824226bd586b9e9d7ccde00d9585401ac328d83195a23dc3e4e26b1848bc9998023b732a559963920860f21056416161c31304388aad4d
+DIST 
github.com-go-macaroon-bakery-macaroon-bakery-ec9d2ad6796100720c154f614b6dea8798ec1181.tar.gz
 124110 BLAKE2B 
c05d59504f7cd2d0cdb913b1d06898375fce112e71a1db0c1752628bc9939003a92ad608463cd0e1fa8d75945b9b5a76c0710ebb3ea126cfd67ea01b46229bff
 SHA512 
2965b6441df2790e0378b962fb66672e2316902620223e4ca3a8ddf1ef38e2a76b9cda2a5013e664ef49073aed8f424e1713538626f6ce1929e81e3bacbef45f
+DIST 
github.com-go-macaroon-macaroon-bed2a428da6e56d950bed5b41fcbae3141e5b0d0.tar.gz 
22383 BLAKE2B 
b2d89ccdf4ad0a8c29f44895697a9921d40b9316879f477f608fc5f59683f825a66357e5587d654a55ea80f0c79d6680f5dbb45590b2fea051fca4a7f23a9eb8
 SHA512 
7ec072cec42266cf8cdd44819c653b8d09b58622fdfa42fb12422c9727e6eb7326519fbeb247fa4840d8c87a5357ae0acd028a8d5757acedc3582810a5cc467b
+DIST github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz 
376880 BLAKE2B 
800038e0870d8b943604bc5edf9ba566d20fed75f445834801955a19da6add891f96cbf5e19a93d520d90ccc4e9da911ab02cccb710fee67b3fe60e4409a717f
 SHA512 
f0e7948d4672d29d3d0a741961ff8a75d30c556e157698118a32de10e2af8eb2ae6a61feea1c93aff313596d285a048a70dae7339c66760ebb91a1aecfb05845
+DIST github.com-go-retry-retry-01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz 
9318 BLAKE2B 
d5eb408e4c4acf0c2304d951705a1f39f2b2663357f04402f5ee47bfc79182511e3a29568846bb902887aa5efb149ac6a4cf32ecae07a183f845ad8886fe0377
 SHA512 
71956a468472754313830a7f1afc844020e5ffc8bac4464e369562bde8c1cf5e11814fc110dcb00d243cbc6c13fe7a0423d29b73f0f420df8313666e645a7a24
+DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 
5515 BLAKE2B 
9ae2c00b43da5958392e0817f448d01374712ce7552c07be0de8204a7f16a7442b195695d51782a375da7aaa83019446438d52a8768317216a7812380be8c1b1
 SHA512 
03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
+DIST github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz 
64826 BLAKE2B 
47e9182124037317bdfc31137a2715db979146688e637a586f5a7c4a12250d0fcffdbbaa8793e189421d189b1071f48d8588cfda9ac1f3e297bfc244f30bcae7
 SHA512 
429256bb847defb53dee5c960edc726455397045e7dc2e4833e0e9088f9ec11452e2198961080dc00b8eff9d165df5e0377f4039932df0e46cd960827b8f800d
+DIST github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz 
1443268 BLAKE2B 
19bb8d2861225a14ba3f19b2ae96c6640833fea7da52228480634e715b7690afc94e605a5be1b70b263bb3045a0fbcf9f78211c431836d077cca7d076fec1686
 SHA512 
e82f87394d2a8d96779cc69c8803555b5d23eb02f3d38101ccb9142a892280c32b8123d61a309a041cf5034282b5269ea38b5d29e03c85ca3c62c4fc0802502e
+DIST 

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

2018-07-03 Thread Virgil Dupras
commit: 01da9655ffeb9d2fb177f09cf458882759e8e7ad
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Jul  3 12:21:39 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Jul  3 12:23:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01da9655

app-emulation/lxd: update metadata

Replace my proxy-maint email with my gentoo one.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index a0dd29a5f4e..de08da5ec7d 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -6,7 +6,7 @@
Erik Mackdanz


-   hs...@hardcoded.net
+   vdup...@gentoo.org
Virgil Dupras





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

2018-07-01 Thread Erik Mackdanz
commit: 5bfc7e65f3c0523daccd23e9cbd19183563f30e8
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Jul  1 17:15:22 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Jul  1 17:15:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bfc7e65

app-emulation/lxd: Remove old versions

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/lxd/Manifest|  98 --
 app-emulation/lxd/files/lxd-dont-go-get.patch |  16 --
 app-emulation/lxd/files/lxd.confd |  27 ---
 app-emulation/lxd/lxd-2.21.ebuild | 224 ---
 app-emulation/lxd/lxd-3.0.0-r1.ebuild | 251 --
 app-emulation/lxd/lxd-3.0.0.ebuild| 251 --
 6 files changed, 867 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 4e3d4b1ae5d..1389d1729bb 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,100 +1,2 @@
-DIST 
github.com-CanonicalLtd-dqlite-9334841532709c77fc79e13a08408694e4bb3616.tar.gz 
67246 BLAKE2B 
05efc336d8ee21073261286f268bd071cf11f334c3544e0d267e44cbee5dbb642d20b62f2b293984fdd82e5351ada5330b412267b21e384376f9be12e7ea6346
 SHA512 
0bc787d886f275e8b228bbfda7c96e743bd514db59ed22c8e10ceae2d91c793d4675bf88d6de5bc197983dc43b627d3044e4cb586cf259f2de7e62f738991692
-DIST 
github.com-CanonicalLtd-go-grpc-sql-534b56d0c689ed437e6cff44868964d45d3ec85c.tar.gz
 26922 BLAKE2B 
9f330e00138535b5aa8cf5a98f0feb080e925f0068b5d499b73784a282321a975cf07df4d5b68aec39d3bae08cb9c762059d325b8677cc837f6e461efc565a6e
 SHA512 
474bf9e04cc6f8a19ee3586478ee0887e29427092736295473c51535750c66e3d04bb96f75537edb5ee41bfb07f32cd070fbf3ea04fec8849d3d75a07577cd3d
-DIST 
github.com-CanonicalLtd-go-sqlite3-730012cee3364e7717c28f7e9b05ee6dd8684bae.tar.gz
 2112277 BLAKE2B 
7c6bd67e013f66d5889cb34170cf6f462b14799bc9ccab32037a19d6401677df211d9f9d90790b6a3d46e0673f18e16fce6dd53582f23d589ac4b2fb5570dbaf
 SHA512 
5026475a1b673c3271434c458aa684f774019905d7d8f6d5aa8611b8c8798eff3f97b9d47cd17d5a8bbb03316f54e0bd2bd06f51120c9e860a45efbfc574
-DIST 
github.com-CanonicalLtd-raft-http-e4290d0af830073ec140538e8974aa4393495ea1.tar.gz
 14140 BLAKE2B 
320ac66f57aea98553a6812a4b855ad8631d5ca1110985d7de4975bc7caa7a2b06aaa78b9d54d799d147854182f802d836a2c41a8c03ebe748fe7fd274dbcda0
 SHA512 
82ce95df9a1c492542d474f83abd46c19eb33b6ec8d7bfba7f8683101f66bea34341d031f2701b4128b42d7d8243ade0ee93242f64b69019028c84d5bea70344
-DIST 
github.com-CanonicalLtd-raft-membership-26ef52960f54c472f52fb3701f19f25319e1032e.tar.gz
 8029 BLAKE2B 
a66d3e4c6e63135b681e0a31edb6dcdfccf849206ba95dbcdbc49ee33510d5261a240b647e753f1941e6d846c60c15e6e97cc3727ffd02a2bf65b9fea5f82521
 SHA512 
6ceb2c8e651e4841c242105c8293eff5859bd50d0ee462853b04f759202e615e17c44ec29800e25298a394505a52021b6a6e69e9398e4ab2561c5cb26cb6
-DIST 
github.com-CanonicalLtd-raft-test-22441a088d5630ddd2e971eae68074d2b645f1b7.tar.gz
 23472 BLAKE2B 
790943f53cbbc4d8b2c19aefe8cfcab4b4a3d36bf0927e0e8cf9b7dbc97ce194084c6846991c34402bb1b342123d17b47da6a192196573240c34654d0cb62eb2
 SHA512 
e44cf16d2190c9680e3698d188a065b151458546855c88e343c08022a455312aa4f8191ce8b125f71aeb6b8b9054967b6374750ee3187192528399be2b5b29e7
-DIST 
github.com-armon-go-metrics-783273d703149aaeb9897cf58613d5af48861c25.tar.gz 
22373 BLAKE2B 
dd4daca721ac0643f6ba4300966217ec57cb5d21c495029fb356badacfb4032a275807d7498a8fd1bd97315e70ee0c2d3501ae7e3bb072feea94787c5ca8f608
 SHA512 
a1a245cd9ccc07af7fc30bff358819389a18d1be21179626a2e79f0ccb82d71f7a4ad009d8919bbdfb547176346716c3f0b1f764f0e75171381a56aeb066685e
-DIST github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz 
83950 BLAKE2B 
04b9aa5632ccf231f319e8d25309f024a2a60c84e8eafac8b4bc16152fb7581d1a563903034e47668d7e9c61fdd6828294342c5b84d843e70367e578864ba4dd
 SHA512 
5effccc7dadb214ef5ce53092db48c04ae25a388962c58732190c34f4537b579ef645ae579df5d0de30645574ff753486a6f743bf4fd58ec1d2aff76ba537694
-DIST 
github.com-cpuguy83-go-md2man-48d8747a2ca13185e7cc8efe6e9fc196a83f71a5.tar.gz 
87543 BLAKE2B 
6305e0097e9b1d9a237d91a7cf1bc2c969f56a2efecb2dc1775d5a8773099672685085829f4b3b721f302ca0495396b4c08417f12d44247f4b143ff3677575ac
 SHA512 
38b93ce7c4320287dad7fe307a9da55c474d57abd15ec58718d455e8721ae66ecb03823c13011ef93d9319d38d1c587039d288209efb6b806baa37e880b37ec9
-DIST 
github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz
 15127 BLAKE2B 
06338b4364d9554a1334c04bd9ea81df7539641ef5ce41d681670b7b65c06160ef67e4bd3ad2529dc7864537d5be6a91be53c5e96335f5dfcab198a8bcae9a9b
 SHA512 
0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d
-DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 
59915 BLAKE2B 
763403cec3bcb27acd6654e7d2d57d198862b0d16c242ec975b46a7cca95560505b3373e8c4b7a53e7fc025523845bee16b90311f8bd341c0d2bfc28987ae0d4
 SHA512 

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

2018-07-01 Thread Erik Mackdanz
commit: 7161056c6d309856b19fc23ede5e9995ec8ea910
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Fri Jun 29 23:11:10 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Jul  1 17:10:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7161056c

app-emulation/lxd: Bump to version 3.2

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/lxd/Manifest |   1 +
 .../lxd/files/de-translation-newline.patch |  20 +++
 app-emulation/lxd/lxd-3.2.ebuild   | 181 +
 3 files changed, 202 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 653ac15bf85..4e3d4b1ae5d 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -97,3 +97,4 @@ DIST 
github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar
 DIST lxd-2.21.tar.gz 882352 BLAKE2B 
80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178aec06ad62fe3521ed012ed9b82c68c0254e0299e8e1dfd274a0622f32bde730480a950ab6ba15ddae5f4b
 SHA512 
9a8ec3a97e4c861a80311dbdecbf5a485c0af85d6ba6b20680ca17e6ac877de3f27cfdcf0a111ba0db2b7c562dfe2f41336b562b7c13350c4543505b3c17357e
 DIST lxd-3.0.0.tar.gz 1152282 BLAKE2B 
e84808c626064ba6985c08119905510c2a9659edca09887a55bfe006eaba4a624215d48978e18ab642f34e54e58fc1d2e04303c9db73c332df8c5d29568fb779
 SHA512 
b4de839d26080f2b14b1f6f04a92b000e1abaa0712377528b87ca79e01b9c46b7b6c7f7ce5365f37f7a0ae8a2459bcdc6010fcb2a238d78e34d090750ae070f3
 DIST lxd-3.1.tar.gz 27979442 BLAKE2B 
0b74e3f76a7ab835b042b52b469a6fe11e7077d567e0658d13fab2192fd25d99518d65ba319c981a2e4677319e280cccae26f70ef99e9911264dc028ca5628fd
 SHA512 
61f64d08dd80f7f676f386912f4dfc0d0af38cce0287de7865123b9da667b54ab91d22b76ffe03480e04ae0fbd8dc837d7d519d0e34409377c3d7e6624bf636c
+DIST lxd-3.2.tar.gz 28183660 BLAKE2B 
9aabc9fd0bd66d3b4e0178448a65ca39c69e4e7a14d01309e0e023501de1c17b2b7887a9da5b84fcfde27db3f521cce3451beace9955232da9bd5e5136bc0043
 SHA512 
82c37e87d75e328a29b1f2876a24fedec43a253bb72f3ea55fa9cdb928d11947eda723a01e758f90ef77ed4492f86ec6dd5f1f88240d05e771d926dfdc9888fb

diff --git a/app-emulation/lxd/files/de-translation-newline.patch 
b/app-emulation/lxd/files/de-translation-newline.patch
new file mode 100644
index 000..9ef55ab2f0e
--- /dev/null
+++ b/app-emulation/lxd/files/de-translation-newline.patch
@@ -0,0 +1,20 @@
+--- /po/de.po  2018-06-27 19:57:56.759130047 -0500
 /po/de.po  2018-06-27 20:01:09.694634346 -0500
+@@ -65,7 +65,7 @@
+ "### type: custom\n"
+ "### used_by: []\n"
+ "### config:\n"
+-"###   size: \"61203283968\""
++"###   size: \"61203283968\"\n"
+ msgstr ""
+ "### Dies ist eine Darstellung der Eigenschaften eines Abbildes in yaml.\n"
+ "### Jede Zeile die mit '# beginnt wird ignoriert.\n"
+@@ -167,7 +167,7 @@
+ "###\n"
+ "### Each property is represented by a single line:\n"
+ "### An example would be:\n"
+-"###  description: My custom image"
++"###  description: My custom image\n"
+ msgstr ""
+ "### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
+ "### Jede Zeile die mit '# beginnt wird ignoriert.\n"

diff --git a/app-emulation/lxd/lxd-3.2.ebuild b/app-emulation/lxd/lxd-3.2.ebuild
new file mode 100644
index 000..1f0f3db33a2
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test"
+
+inherit bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   >=dev-lang/go-1.9.4
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: 

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

2018-05-20 Thread Erik Mackdanz
commit: d6be94961308bcbc954135412868267b9216f78e
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Mon May 21 01:26:29 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon May 21 01:26:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6be9496

app-emulation/lxd: bump to 3.1

Closes: https://bugs.gentoo.org/652846
Closes: https://bugs.gentoo.org/639020
Package-Manager: Portage-2.3.38, Repoman-2.3.9

 app-emulation/lxd/Manifest |   1 +
 .../lxd/files/ja-translation-newline.patch |  11 ++
 app-emulation/lxd/lxd-3.1.ebuild   | 180 +
 3 files changed, 192 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 09518bce21b..653ac15bf85 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -96,3 +96,4 @@ DIST 
github.com-syndtr-gocapability-33e07d32887e1e06b7c025f27ce52f62c7990bc0.tar
 DIST 
github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 
9899 BLAKE2B 
584e75a9c47d28498aedb5c85b3409c79c84ec9fc47a5a9dc77aa117b4e48f681f72a12a03fafa566a405def40b4961bb7343cad0c6ecb3cd9da883a51ed20d6
 SHA512 
fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae
 DIST lxd-2.21.tar.gz 882352 BLAKE2B 
80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178aec06ad62fe3521ed012ed9b82c68c0254e0299e8e1dfd274a0622f32bde730480a950ab6ba15ddae5f4b
 SHA512 
9a8ec3a97e4c861a80311dbdecbf5a485c0af85d6ba6b20680ca17e6ac877de3f27cfdcf0a111ba0db2b7c562dfe2f41336b562b7c13350c4543505b3c17357e
 DIST lxd-3.0.0.tar.gz 1152282 BLAKE2B 
e84808c626064ba6985c08119905510c2a9659edca09887a55bfe006eaba4a624215d48978e18ab642f34e54e58fc1d2e04303c9db73c332df8c5d29568fb779
 SHA512 
b4de839d26080f2b14b1f6f04a92b000e1abaa0712377528b87ca79e01b9c46b7b6c7f7ce5365f37f7a0ae8a2459bcdc6010fcb2a238d78e34d090750ae070f3
+DIST lxd-3.1.tar.gz 27979442 BLAKE2B 
0b74e3f76a7ab835b042b52b469a6fe11e7077d567e0658d13fab2192fd25d99518d65ba319c981a2e4677319e280cccae26f70ef99e9911264dc028ca5628fd
 SHA512 
61f64d08dd80f7f676f386912f4dfc0d0af38cce0287de7865123b9da667b54ab91d22b76ffe03480e04ae0fbd8dc837d7d519d0e34409377c3d7e6624bf636c

diff --git a/app-emulation/lxd/files/ja-translation-newline.patch 
b/app-emulation/lxd/files/ja-translation-newline.patch
new file mode 100644
index 000..bbda24c6f37
--- /dev/null
+++ b/app-emulation/lxd/files/ja-translation-newline.patch
@@ -0,0 +1,11 @@
+--- /po/ja.po  2018-05-20 19:42:38.932990198 -0500
 /po/ja.po  2018-05-20 19:42:55.839944861 -0500
+@@ -1380,7 +1380,7 @@
+ "イメージのエイリアスを一覧表示します\n"
+ "\n"
+ "指定するフィルタはイメージのハッシュ値の一部でもイメージのエイリアスの一部で"
+-"も構いません。"
++"も構いません。\n"
+ 
+ #: lxc/image.go:888
+ msgid "List images"

diff --git a/app-emulation/lxd/lxd-3.1.ebuild b/app-emulation/lxd/lxd-3.1.ebuild
new file mode 100644
index 000..7f27f52217f
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test"
+
+inherit bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz;
+
+DEPEND="
+   >=dev-lang/go-1.9.4
+   dev-libs/protobuf
+   nls? ( sys-devel/gettext )
+   test? (
+   app-misc/jq
+   net-misc/curl
+   sys-devel/gettext
+   )
+"
+
+RDEPEND="
+   daemon? (
+   app-arch/xz-utils
+   >=app-emulation/lxc-2.0.7[seccomp]
+   dnsmasq? (
+   net-dns/dnsmasq[dhcp,ipv6?]
+   )
+   net-misc/rsync[xattr]
+   sys-apps/iproute2[ipv6?]
+   sys-fs/squashfs-tools
+   virtual/acl
+   )
+"
+
+CONFIG_CHECK="
+   ~BRIDGE
+   ~DUMMY
+   ~IP6_NF_NAT
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IPV6
+   ~IP_NF_NAT
+   ~IP_NF_TARGET_MASQUERADE
+   ~MACVLAN
+   ~NETFILTER_XT_MATCH_COMMENT
+   ~NET_IPGRE
+   ~NET_IPGRE_DEMUX
+   ~NET_IPIP
+   ~NF_NAT_MASQUERADE_IPV4
+   ~NF_NAT_MASQUERADE_IPV6
+   ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network 
commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"

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

2018-04-08 Thread Erik Mackdanz
commit: aef61f3e7622e190f8833f0738661647c279a4f9
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Apr  8 20:04:56 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Apr  8 20:04:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef61f3e

app-emulation/lxd: Support latest confd options

Closes: https://bugs.gentoo.org/652206
Package-Manager: Portage-2.3.26, Repoman-2.3.7

 app-emulation/lxd/files/lxd.confd.1   |  24 
 app-emulation/lxd/lxd-3.0.0-r1.ebuild | 251 ++
 app-emulation/lxd/metadata.xml|   4 +-
 3 files changed, 277 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxd/files/lxd.confd.1 
b/app-emulation/lxd/files/lxd.confd.1
new file mode 100644
index 000..8e342cc62d1
--- /dev/null
+++ b/app-emulation/lxd/files/lxd.confd.1
@@ -0,0 +1,24 @@
+# Group which owns the shared socket
+LXD_OPTIONS+=" --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" --verbose"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"

diff --git a/app-emulation/lxd/lxd-3.0.0-r1.ebuild 
b/app-emulation/lxd/lxd-3.0.0-r1.ebuild
new file mode 100644
index 000..6330fcb2112
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.0.0-r1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/;
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
+# The "# branch" comments are there for the script, they're important.
+EGO_VENDOR=(
+   "github.com/lxc/lxd e641ae45dc13cc27510c9d2127eece46ed9ac16b"
+   "github.com/CanonicalLtd/go-sqlite3 
730012cee3364e7717c28f7e9b05ee6dd8684bae"
+   "github.com/CanonicalLtd/dqlite 
9334841532709c77fc79e13a08408694e4bb3616"
+   "github.com/CanonicalLtd/go-grpc-sql 
534b56d0c689ed437e6cff44868964d45d3ec85c"
+   "github.com/CanonicalLtd/raft-http 
e4290d0af830073ec140538e8974aa4393495ea1"
+   "github.com/CanonicalLtd/raft-membership 
26ef52960f54c472f52fb3701f19f25319e1032e"
+   "github.com/CanonicalLtd/raft-test 
22441a088d5630ddd2e971eae68074d2b645f1b7"
+   "github.com/dustinkirkland/golang-petname 
d3c2ba80e75eeef10c5cf2fc76d2c809637376b3"
+   "github.com/flosch/pongo2 97eac295f74b5fbb7fd3113e35f4ccf3c816e389"
+   "github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
+   "github.com/juju/idmclient 15392b0e99abe5983297959c737b8d000e43b34c"
+   "github.com/juju/httprequest 77d36ac4b71a6095506c0617d5881846478558cb"
+   "github.com/juju/utils d18e608d01400189bcda3e2669505cbd30e9dda9"
+   "github.com/juju/loggo 7f1609ff1f3fcf3519ed62ccaaa9e609ea287838"
+   "github.com/juju/webbrowser 54b8c57083b4afb7dc75da7f13e2967b2606a507"
+   "github.com/juju/gomaasapi 663f786f595ba1707f56f62f7f4f2284c47c0f1d"
+   "github.com/juju/schema e4f08199aa80d3194008c0bd2e14ef5edc0e6be6"
+   "github.com/juju/version b64dbd566305c836274f0268fa59183a52906b36"
+   "github.com/juju/persistent-cookiejar 
d5e5a8405ef9633c84af42fbcc734ec8dd73c198"
+   "github.com/juju/go4 40d72ab9641a2a8c36a9c46a51e28367115c8e59"
+   "github.com/juju/testing 43f926548f91d55be6bae26ecb7d2386c64e887c"
+   "github.com/juju/retry 1998d01ba1c3eeb4a4728c4a50660025b2fe7c8f"
+   "github.com/golang/protobuf e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"
+   "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+   "github.com/gorilla/mux 4dbd923b0c9e99ff63ad54b0e9705ff92d3cdb06"
+   "github.com/gorilla/websocket eb925808374e5ca90c83401a40d711dc08c0c0f6"
+   "github.com/julienschmidt/httprouter 
d1898390779332322e6b5ca5011da4bf249bb056"
+   "github.com/rogpeppe/fastuuid 6724a57986aff9bff1a1770e9347036def7c89f6"
+   "github.com/pkg/errors 816c9085562cd7ee03e7f8188a1cfd942858cded"
+   "github.com/ryanfaerman/fsm 3dc1bc0980272fd56d81167a48a641dab8356e29"
+   "github.com/hashicorp/raft a3fb4581fb07b16ecf1c3361580d4bdb17de9d98"
+   "github.com/hashicorp/go-immutable-radix 
7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
+   "github.com/hashicorp/golang-lru 
0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
+   "github.com/hashicorp/go-msgpack 
fa3f63826f7c23912c15263591e65d54d080b458"
+   "github.com/hashicorp/raft-boltdb 
6e5ba93211eaf8d9a2ad7e41ffad8c6f160f9fe3"
+   "github.com/armon/go-metrics 783273d703149aaeb9897cf58613d5af48861c25"
+   

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

2018-04-01 Thread Erik Mackdanz
commit: 3fa90b4dd3a6db6b1510ffd3c284e0ae45071fd7
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Mon Apr  2 02:15:05 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon Apr  2 02:15:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fa90b4d

app-emulation/lxd: Remove old versions

Package-Manager: Portage-2.3.26, Repoman-2.3.7

 app-emulation/lxd/Manifest   |  40 ---
 app-emulation/lxd/lxd-2.14-r1.ebuild | 217 ---
 app-emulation/lxd/lxd-2.19.ebuild| 207 -
 3 files changed, 464 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index db58ec5e30b..09518bce21b 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -7,7 +7,6 @@ DIST 
github.com-CanonicalLtd-raft-test-22441a088d5630ddd2e971eae68074d2b645f1b7.
 DIST 
github.com-armon-go-metrics-783273d703149aaeb9897cf58613d5af48861c25.tar.gz 
22373 BLAKE2B 
dd4daca721ac0643f6ba4300966217ec57cb5d21c495029fb356badacfb4032a275807d7498a8fd1bd97315e70ee0c2d3501ae7e3bb072feea94787c5ca8f608
 SHA512 
a1a245cd9ccc07af7fc30bff358819389a18d1be21179626a2e79f0ccb82d71f7a4ad009d8919bbdfb547176346716c3f0b1f764f0e75171381a56aeb066685e
 DIST github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz 
83950 BLAKE2B 
04b9aa5632ccf231f319e8d25309f024a2a60c84e8eafac8b4bc16152fb7581d1a563903034e47668d7e9c61fdd6828294342c5b84d843e70367e578864ba4dd
 SHA512 
5effccc7dadb214ef5ce53092db48c04ae25a388962c58732190c34f4537b579ef645ae579df5d0de30645574ff753486a6f743bf4fd58ec1d2aff76ba537694
 DIST 
github.com-cpuguy83-go-md2man-48d8747a2ca13185e7cc8efe6e9fc196a83f71a5.tar.gz 
87543 BLAKE2B 
6305e0097e9b1d9a237d91a7cf1bc2c969f56a2efecb2dc1775d5a8773099672685085829f4b3b721f302ca0495396b4c08417f12d44247f4b143ff3677575ac
 SHA512 
38b93ce7c4320287dad7fe307a9da55c474d57abd15ec58718d455e8721ae66ecb03823c13011ef93d9319d38d1c587039d288209efb6b806baa37e880b37ec9
-DIST 
github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz
 15087 BLAKE2B 
475488d24d9a859a087367092d5b83e71b858d7dfcd72639e15284fb230b016754fcac64a8a3958380be6007828fa9c09ef86dc0dbfebe67a9d269948986113b
 SHA512 
7f2d849104993e089aac6abc01844a559239110fbe257469ee918de26ef6d77cc29027324204b38613346c6f0579afc66bd721f56c2c2062354ac31f4e7fd7e3
 DIST 
github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz
 15127 BLAKE2B 
06338b4364d9554a1334c04bd9ea81df7539641ef5ce41d681670b7b65c06160ef67e4bd3ad2529dc7864537d5be6a91be53c5e96335f5dfcab198a8bcae9a9b
 SHA512 
0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d
 DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 
59915 BLAKE2B 
763403cec3bcb27acd6654e7d2d57d198862b0d16c242ec975b46a7cca95560505b3373e8c4b7a53e7fc025523845bee16b90311f8bd341c0d2bfc28987ae0d4
 SHA512 
c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee
 DIST github.com-flosch-pongo2-97eac295f74b5fbb7fd3113e35f4ccf3c816e389.tar.gz 
64365 BLAKE2B 
43774ac445810c6f8be5540024662be24e50926037469334f0c832de941b5f2a2f71829eb83f67ee338058f92bd6f8f67e41241686b2066ebd9c7c81dfc6227c
 SHA512 
fdbfb2b35d208ae28946952835230115701691d23c135a2df548fc33b3397ce9a786890b55e73a3cdbe2392aadafcf9667ebd54c8e78144f95050eae19d1918b
@@ -22,43 +21,23 @@ DIST 
github.com-go-macaroon-macaroon-bed2a428da6e56d950bed5b41fcbae3141e5b0d0.ta
 DIST github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz 
376880 BLAKE2B 
800038e0870d8b943604bc5edf9ba566d20fed75f445834801955a19da6add891f96cbf5e19a93d520d90ccc4e9da911ab02cccb710fee67b3fe60e4409a717f
 SHA512 
f0e7948d4672d29d3d0a741961ff8a75d30c556e157698118a32de10e2af8eb2ae6a61feea1c93aff313596d285a048a70dae7339c66760ebb91a1aecfb05845
 DIST github.com-go-retry-retry-01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz 
9318 BLAKE2B 
d5eb408e4c4acf0c2304d951705a1f39f2b2663357f04402f5ee47bfc79182511e3a29568846bb902887aa5efb149ac6a4cf32ecae07a183f845ad8886fe0377
 SHA512 
71956a468472754313830a7f1afc844020e5ffc8bac4464e369562bde8c1cf5e11814fc110dcb00d243cbc6c13fe7a0423d29b73f0f420df8313666e645a7a24
 DIST github.com-go-retry-retry-2d7c7c65cc71d024968d9ff4385d5e7ad3a83fcc.tar.gz 
10395 BLAKE2B 
80b7c027f113caf4d2bc88034c551beaea1555e8e89e4dd8e801cf92eb69a3ce89a05cf3ef17c73496a774e5e53e6e24fd93fffacde6c847feaf1e0a3bcd4fe2
 SHA512 
9d0ede95a8ca09f3fb5572d4df53c163dff0ffc2bfd6d5138f3260fa7e2f7b94bf352d4d3c1137dbcac5cbf6494113a1b0254a7fc8cc1189750e754eeaf79b6b
-DIST github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz 
6476 BLAKE2B 
4d218f2e10d4e03476116012e5dc000b590786808b4679c170622d9d58ad79fa6794c3dcdded6cb878b346b3bacff16772f4778ea061c713595791345e7cbb29
 SHA512 

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

2018-04-01 Thread Erik Mackdanz
commit: f44dbd15c33c4dc285f1f4ea28f638e692567739
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Mon Apr  2 02:12:15 2018 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon Apr  2 02:12:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44dbd15

app-emulation/lxd: bump to 3.0.0

Closes: https://bugs.gentoo.org/647784
Package-Manager: Portage-2.3.26, Repoman-2.3.7

 app-emulation/lxd/Manifest |  53 
 app-emulation/lxd/lxd-3.0.0.ebuild | 251 +
 2 files changed, 304 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index ee629c9d280..db58ec5e30b 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,42 +1,73 @@
+DIST 
github.com-CanonicalLtd-dqlite-9334841532709c77fc79e13a08408694e4bb3616.tar.gz 
67246 BLAKE2B 
05efc336d8ee21073261286f268bd071cf11f334c3544e0d267e44cbee5dbb642d20b62f2b293984fdd82e5351ada5330b412267b21e384376f9be12e7ea6346
 SHA512 
0bc787d886f275e8b228bbfda7c96e743bd514db59ed22c8e10ceae2d91c793d4675bf88d6de5bc197983dc43b627d3044e4cb586cf259f2de7e62f738991692
+DIST 
github.com-CanonicalLtd-go-grpc-sql-534b56d0c689ed437e6cff44868964d45d3ec85c.tar.gz
 26922 BLAKE2B 
9f330e00138535b5aa8cf5a98f0feb080e925f0068b5d499b73784a282321a975cf07df4d5b68aec39d3bae08cb9c762059d325b8677cc837f6e461efc565a6e
 SHA512 
474bf9e04cc6f8a19ee3586478ee0887e29427092736295473c51535750c66e3d04bb96f75537edb5ee41bfb07f32cd070fbf3ea04fec8849d3d75a07577cd3d
+DIST 
github.com-CanonicalLtd-go-sqlite3-730012cee3364e7717c28f7e9b05ee6dd8684bae.tar.gz
 2112277 BLAKE2B 
7c6bd67e013f66d5889cb34170cf6f462b14799bc9ccab32037a19d6401677df211d9f9d90790b6a3d46e0673f18e16fce6dd53582f23d589ac4b2fb5570dbaf
 SHA512 
5026475a1b673c3271434c458aa684f774019905d7d8f6d5aa8611b8c8798eff3f97b9d47cd17d5a8bbb03316f54e0bd2bd06f51120c9e860a45efbfc574
+DIST 
github.com-CanonicalLtd-raft-http-e4290d0af830073ec140538e8974aa4393495ea1.tar.gz
 14140 BLAKE2B 
320ac66f57aea98553a6812a4b855ad8631d5ca1110985d7de4975bc7caa7a2b06aaa78b9d54d799d147854182f802d836a2c41a8c03ebe748fe7fd274dbcda0
 SHA512 
82ce95df9a1c492542d474f83abd46c19eb33b6ec8d7bfba7f8683101f66bea34341d031f2701b4128b42d7d8243ade0ee93242f64b69019028c84d5bea70344
+DIST 
github.com-CanonicalLtd-raft-membership-26ef52960f54c472f52fb3701f19f25319e1032e.tar.gz
 8029 BLAKE2B 
a66d3e4c6e63135b681e0a31edb6dcdfccf849206ba95dbcdbc49ee33510d5261a240b647e753f1941e6d846c60c15e6e97cc3727ffd02a2bf65b9fea5f82521
 SHA512 
6ceb2c8e651e4841c242105c8293eff5859bd50d0ee462853b04f759202e615e17c44ec29800e25298a394505a52021b6a6e69e9398e4ab2561c5cb26cb6
+DIST 
github.com-CanonicalLtd-raft-test-22441a088d5630ddd2e971eae68074d2b645f1b7.tar.gz
 23472 BLAKE2B 
790943f53cbbc4d8b2c19aefe8cfcab4b4a3d36bf0927e0e8cf9b7dbc97ce194084c6846991c34402bb1b342123d17b47da6a192196573240c34654d0cb62eb2
 SHA512 
e44cf16d2190c9680e3698d188a065b151458546855c88e343c08022a455312aa4f8191ce8b125f71aeb6b8b9054967b6374750ee3187192528399be2b5b29e7
+DIST 
github.com-armon-go-metrics-783273d703149aaeb9897cf58613d5af48861c25.tar.gz 
22373 BLAKE2B 
dd4daca721ac0643f6ba4300966217ec57cb5d21c495029fb356badacfb4032a275807d7498a8fd1bd97315e70ee0c2d3501ae7e3bb072feea94787c5ca8f608
 SHA512 
a1a245cd9ccc07af7fc30bff358819389a18d1be21179626a2e79f0ccb82d71f7a4ad009d8919bbdfb547176346716c3f0b1f764f0e75171381a56aeb066685e
+DIST github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz 
83950 BLAKE2B 
04b9aa5632ccf231f319e8d25309f024a2a60c84e8eafac8b4bc16152fb7581d1a563903034e47668d7e9c61fdd6828294342c5b84d843e70367e578864ba4dd
 SHA512 
5effccc7dadb214ef5ce53092db48c04ae25a388962c58732190c34f4537b579ef645ae579df5d0de30645574ff753486a6f743bf4fd58ec1d2aff76ba537694
+DIST 
github.com-cpuguy83-go-md2man-48d8747a2ca13185e7cc8efe6e9fc196a83f71a5.tar.gz 
87543 BLAKE2B 
6305e0097e9b1d9a237d91a7cf1bc2c969f56a2efecb2dc1775d5a8773099672685085829f4b3b721f302ca0495396b4c08417f12d44247f4b143ff3677575ac
 SHA512 
38b93ce7c4320287dad7fe307a9da55c474d57abd15ec58718d455e8721ae66ecb03823c13011ef93d9319d38d1c587039d288209efb6b806baa37e880b37ec9
 DIST 
github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz
 15087 BLAKE2B 
475488d24d9a859a087367092d5b83e71b858d7dfcd72639e15284fb230b016754fcac64a8a3958380be6007828fa9c09ef86dc0dbfebe67a9d269948986113b
 SHA512 
7f2d849104993e089aac6abc01844a559239110fbe257469ee918de26ef6d77cc29027324204b38613346c6f0579afc66bd721f56c2c2062354ac31f4e7fd7e3
 DIST 
github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz
 15127 BLAKE2B 
06338b4364d9554a1334c04bd9ea81df7539641ef5ce41d681670b7b65c06160ef67e4bd3ad2529dc7864537d5be6a91be53c5e96335f5dfcab198a8bcae9a9b
 SHA512 
0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d
 DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 
59915 BLAKE2B 

  1   2   >