gentoo resync : 22.12.2021

7 files changed, 301 insertions, 0 deletions

diff --git a/app-containers/lxd/files/lxd-4.0.0.confd b/app-containers/lxd/files/lxd-4.0.0.confd
new file mode 100644
index 000000000000..68cf344995be
--- /dev/null
+++ b/app-containers/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-containers/lxd/files/lxd-4.0.0.initd b/app-containers/lxd/files/lxd-4.0.0.initd
new file mode 100644
index 000000000000..e6ae971e879f
--- /dev/null
+++ b/app-containers/lxd/files/lxd-4.0.0.initd
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+	need net
+	need lxcfs
+}
+
+start() {
+	ebegin "Starting lxd service"
+
+	modprobe -f loop > /dev/null 2>&1
+
+	# fix permissions on /var/lib/lxd and make sure it exists
+	install -d /var/lib/lxd --group lxd --owner root --mode 0775
+	start-stop-daemon --start \
+		--pidfile ${PIDFILE} \
+		--exec ${DAEMON} \
+		--background \
+		--make-pidfile \
+		-- \
+		${LXD_OPTIONS}
+	eend ${?}
+}
+
+stop() {
+	if [ "${RC_CMD}" = restart ]; then
+		ebegin "Stopping lxd service (but not containers)"
+		# start-stop-daemon sends SIGTERM with a timeout of 5s by default.
+		# SIGTERM indicates to LXD that it will be stopped temporarily.
+		# Instances will keep running.
+		start-stop-daemon --stop --quiet -p "${PIDFILE}"
+		eend ${?}
+	else
+		ebegin "Stopping lxd service and containers, waiting 40s"
+		# SIGPWR indicates to LXD that the host is going down.
+		# LXD will do a clean shutdown of all instances.
+		# After 30s all remaining instances will be killed.
+		# We wait up to 40s for LXD.
+		start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
+		eend ${?}
+	fi
+}
diff --git a/app-containers/lxd/files/lxd-4.0.0.socket b/app-containers/lxd/files/lxd-4.0.0.socket
new file mode 100644
index 000000000000..3207c9453d11
--- /dev/null
+++ b/app-containers/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-containers/lxd/files/lxd-4.0.7-no-werror.patch b/app-containers/lxd/files/lxd-4.0.7-no-werror.patch
new file mode 100644
index 000000000000..50a916356019
--- /dev/null
+++ b/app-containers/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.000000000 +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.000000000 +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.000000000 +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.000000000 +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.000000000 +0300
++++ lxd-4.0.7-no-werror/lxd-p2c/cgo.go	2021-11-16 15:17:06.185288881 +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.go	2021-07-16 23:33:23.000000000 +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.000000000 +0300
++++ lxd-4.0.7-no-werror/shared/idmap/cgo.go	2021-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 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/netutils/cgo.go lxd-4.0.7-no-werror/shared/netutils/cgo.go
+--- lxd-4.0.7/shared/netutils/cgo.go	2021-07-16 23:33:23.000000000 +0300
++++ lxd-4.0.7-no-werror/shared/netutils/cgo.go	2021-11-16 15:17:34.598615393 +0200
+@@ -3,7 +3,7 @@
+ 
+ package netutils
+ 
+-// #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/termios/cgo.go lxd-4.0.7-no-werror/shared/termios/cgo.go
+--- lxd-4.0.7/shared/termios/cgo.go	2021-07-16 23:33:23.000000000 +0300
++++ lxd-4.0.7-no-werror/shared/termios/cgo.go	2021-11-16 15:17:43.568613239 +0200
+@@ -3,7 +3,7 @@
+ 
+ package termios
+ 
+-// #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 --git a/app-containers/lxd/files/lxd-4.0.7-r1.service b/app-containers/lxd/files/lxd-4.0.7-r1.service
new file mode 100644
index 000000000000..f1e644b95df8
--- /dev/null
+++ b/app-containers/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-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch b/app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch
new file mode 100644
index 000000000000..f32debff5e3b
--- /dev/null
+++ b/app-containers/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?= <stgraber@ubuntu.com>
+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 <stgraber@ubuntu.com>
+---
+ 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-containers/lxd/files/lxd-containers-4.0.0.service b/app-containers/lxd/files/lxd-containers-4.0.0.service
new file mode 100644
index 000000000000..894760c3506b
--- /dev/null
+++ b/app-containers/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