From 235bd98c5aced50b98fbd8aed0c7fca809b53df1 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH] incus: update to 6.5, various improvements

	- move check from incus-user to incus
	- expand readme for opt deps
	- do not log to syslog
	- keep certain tools root-only
	- add simplestreams tool
	- build all cmds
---
 srcpkgs/incus/files/README.voidlinux          |  6 +++++
 .../incus/files/{incus-user => incus}/check   |  0
 srcpkgs/incus/files/incus/run                 |  2 +-
 srcpkgs/incus/template                        | 27 ++++++++++---------
 4 files changed, 21 insertions(+), 14 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..2d1757447dda8e 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,9 @@ containers. For example, the command
 will assign a range of 65,536 IDs for users and groups.
 Some container configurations may require that the `CGROUP_MODE`
 variable in `/etc/rc.conf` be set to `unified`.
+
+
+Optional dependencies:
+
+To run virtual machines, install `qemu` and `edk2-ovmf`.
+To run OCI containers, install `spokeo` and `umoci`.
diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check
diff --git a/srcpkgs/incus/files/incus/run b/srcpkgs/incus/files/incus/run
index d189b4395b90ff..a8f6bd3d95a41b 100644
--- a/srcpkgs/incus/files/incus/run
+++ b/srcpkgs/incus/files/incus/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 [ -r conf ] && . ./conf
-exec /usr/libexec/incus/incusd --group _incus-admin --syslog ${OPTS:- --verbose}
+exec /usr/libexec/incus/incusd --group _incus-admin ${OPTS:- --verbose}
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..f3ea185bad0b59 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,17 +1,12 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.5.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
 go_build_tags="libsqlite3"
-go_package="${go_import_path}/cmd/incus
- ${go_import_path}/cmd/incus-benchmark
- ${go_import_path}/cmd/incus-user
- ${go_import_path}/cmd/incusd
- ${go_import_path}/cmd/lxc-to-incus
- ${go_import_path}/cmd/fuidshift"
+go_package="${go_import_path}/cmd/..."
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
@@ -21,7 +16,7 @@ maintainer="dkwo <npiazza@disroot.org>"
 license="Apache-2.0"
 homepage="https://linuxcontainers.org/incus"
 distfiles="https://github.com/lxc/incus/archive/refs/tags/v${version}.tar.gz"
-checksum=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=aabc762bdcfe210b777e6b78e40150c9ffbc798aa39c8b4ba55812dac3ada0ec
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root
@@ -46,13 +41,18 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+	# upstream recommends these should be kept to root only
+	for _tool in fuidshift-incus lxd-to-incus; do
+		chmod 700 ${DESTDIR}/usr/bin/${_tool}
+	done
 
 	# generate shell completions
-	local incus=${DESTDIR}/usr/bin/incus
-	for shell in bash fish zsh; do
-		vtargetrun ${incus} completion ${shell} > scripts/${shell}-completion
+	local _incus=${DESTDIR}/usr/bin/incus
+	for _shell in bash fish zsh; do
+		vtargetrun ${_incus} completion ${_shell} > scripts/${_shell}-completion
 	done
 
 	vdoc "${FILESDIR}/README.voidlinux"
@@ -73,7 +73,8 @@ incus-client_package() {
 incus-tools_package() {
 	short_desc+=" - tools"
 	pkg_install() {
-		for _tool in fuidshift-incus lxc-to-incus lxd-to-incus incus-benchmark incus-migrate; do
+		for _tool in fuidshift-incus lxc-to-incus lxd-to-incus \
+		incus-benchmark incus-migrate incus-simplestreams; do
 			vmove usr/bin/${_tool}
 		done
 	}