[PR PATCH] incus: enable installing client without the daemon

[PR PATCH] incus: enable installing client without the daemon

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]

There is a new pull request by duskmoss against master on the void-packages repository

https://github.com/duskmoss/void-packages incus-updates
https://github.com/void-linux/void-packages/pull/52384

incus: enable installing client without the daemon
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/52384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-updates-52384.patch --]
[-- Type: text/x-diff, Size: 3124 bytes --]

From 081a942ceadb5775bc042240d192dcb8fdded176 Mon Sep 17 00:00:00 2001
From: Moss Hope <duskmoss@proton.me>
Date: Fri, 27 Sep 2024 15:56:48 -0700
Subject: [PATCH] incus: enable installing client without the daemon

    incus-client is intended to be installed without the daemon to use to
    control remove incus servers. incus the daemon can't me used without
    the client, at least to authorize another client's to access the API.

    I moved incus-user to the daemon package because it's a daemon and
    not part of the client.

    readme: I also removed the information about subuid and subgid because void sets
    these up out of the box.

    readme: I changed "and" to "or" because the two groups grant you access to the
    daemons in different privelege levels.
---
 srcpkgs/incus/files/README.voidlinux | 8 +-------
 srcpkgs/incus/template               | 7 +++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 2d1757447dda8e..a995919a09d8cf 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -1,12 +1,6 @@
 Users wishing to interact with incus system daemons should belong to
-the `_incus-admin` and `_incus` groups. The root user should also be
-assigned a range of subordinate user and group IDs to be mapped in
-containers. For example, the command
+either the `_incus-admin` or `_incus` groups.
 
-	usermod --add-subuids 1000000-1065535 \
-		--add-subgids 1000000-1065535 root
-
-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`.
 
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c9857c58e33b..85adda1479a467 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.5.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -11,7 +11,7 @@ make_check_args="-skip TestConvertNetworkConfig"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs ${pkgname}-client-${version}_${revision}"
 short_desc="Powerful system container and virtual machine manager"
 maintainer="dkwo <npiazza@disroot.org>"
 license="Apache-2.0"
@@ -38,6 +38,7 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+	vsv incus-user
 
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -57,10 +58,8 @@ post_install() {
 
 incus-client_package() {
 	short_desc+=" - client"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/incus
-		vsv incus-user
 		for shell in bash fish zsh; do
 			vcompletion scripts/${shell}-completion ${shell} incus
 		done

Re: incus: enable installing client without the daemon

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

New comment by duskmoss on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2380278556

Comment:
@dkwo 

If you could take a look at let me know what you think I'd appreciate it, willing to make changes, especially to content of readme.  I also have opened a PR for handbook docs https://github.com/void-linux/void-docs/pull/815 and we can discuss what information should exist in readme vs handbook. 

Re: incus: enable installing client without the daemon

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 434 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2380652500

Comment:
Hey, the changes to incus make sense to me, thanks!
About the readme, could you leave the subuid/subgid part?

I was also thinking it'd be useful to have man pages, something like
```
vtargetrun incus manpage --all --format=man /target/path
vman /target/path
```
Can you try adding this?

Re: incus: enable installing client without the daemon

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

New comment by duskmoss on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2380871689

Comment:
Sure! I'll work on getting the manpages added this weekend. 

For the subuid/subguid, I can leave it in.  Maybe I should add something about checking current /etc/subuid /etc/subguid? 

Might not be necessary since if people do run it it'll hopefully be a no op, since [base-files](https://github.com/void-linux/void-packages/blob/master/srcpkgs/base-files/files/subuid) matches the range the read me suggests.

Re: [PR PATCH] [Updated] incus: enable installing client without the daemon

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]

There is an updated pull request by duskmoss against master on the void-packages repository

https://github.com/duskmoss/void-packages incus-updates
https://github.com/void-linux/void-packages/pull/52384

incus: enable installing client without the daemon
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/52384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-updates-52384.patch --]
[-- Type: text/x-diff, Size: 3898 bytes --]

From 9c2f674dc5d4bc34155d11951cf9e93c3e15cc3b Mon Sep 17 00:00:00 2001
From: Moss Hope <duskmoss@proton.me>
Date: Fri, 27 Sep 2024 15:56:48 -0700
Subject: [PATCH] incus: enable installing client without the daemon

    incus-client is intended to be installed without the daemon to use to
    control remove incus servers. incus the daemon can't me used without
    the client, at least to authorize another client's to access the API.

    I moved incus-user to the daemon package because it's a daemon and
    not part of the client.

    I added incus's generated manpages to the incus-client package.

    readme: I changed "and" to "or" because the two groups grant you access to the
    daemons in different privelege levels.
---
 srcpkgs/incus/files/README.voidlinux |  4 ++--
 srcpkgs/incus/template               | 30 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 2d1757447dda8e..31a55a3415ece8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -1,6 +1,6 @@
 Users wishing to interact with incus system daemons should belong to
-the `_incus-admin` and `_incus` groups. The root user should also be
-assigned a range of subordinate user and group IDs to be mapped in
+either the `_incus-admin` or `_incus` group. The root user should also
+be assigned a range of subordinate user and group IDs to be mapped in
 containers. For example, the command
 
 	usermod --add-subuids 1000000-1065535 \
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c9857c58e33b..f3518b52100792 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.5.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -11,7 +11,7 @@ make_check_args="-skip TestConvertNetworkConfig"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs ${pkgname}-client-${version}_${revision}"
 short_desc="Powerful system container and virtual machine manager"
 maintainer="dkwo <npiazza@disroot.org>"
 license="Apache-2.0"
@@ -38,6 +38,7 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+	vsv incus-user
 
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -46,24 +47,43 @@ post_install() {
 		chmod 700 ${DESTDIR}/usr/bin/${_tool}
 	done
 
-	# generate shell completions
+	#path to run incus commands in build
 	local _incus=${DESTDIR}/usr/bin/incus
+
+	# generate shell completions
 	for _shell in bash fish zsh; do
 		vtargetrun ${_incus} completion ${_shell} > scripts/${_shell}-completion
 	done
 
+	#generate manpages and rename files to match the manpage's internal references
+	mkdir ${wrksrc}/man
+	vtargetrun ${_incus} manpage --all --format=man "${wrksrc}/man/"
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD.SUBCMD<SUBSUBCMD.1 -> CMD-SUBCMD-SUBSUBCMD-1
+		rename -a '.' '-' "$_manpage"
+	done
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD-SUBCMD-SUBSUBCMD-1 -> CMD-SUBCMD-SUBSUBCMD.1
+		rename -l '-' '.' "$_manpage"
+	done
+
 	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 incus-client_package() {
 	short_desc+=" - client"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/incus
-		vsv incus-user
+
+		#install shell completions
 		for shell in bash fish zsh; do
 			vcompletion scripts/${shell}-completion ${shell} incus
 		done
+
+		#install manpages
+		for _manpage in ${wrksrc}/man/*; do
+			vman "$_manpage"
+		done
 	}
 }
 

Re: [PR PATCH] [Updated] incus: enable installing client without the daemon

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]

There is an updated pull request by duskmoss against master on the void-packages repository

https://github.com/duskmoss/void-packages incus-updates
https://github.com/void-linux/void-packages/pull/52384

incus: enable installing client without the daemon
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/52384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-updates-52384.patch --]
[-- Type: text/x-diff, Size: 3898 bytes --]

From ad2d1f63f335e9f80de33fa501d78f46aea07a44 Mon Sep 17 00:00:00 2001
From: Moss Hope <duskmoss@proton.me>
Date: Fri, 27 Sep 2024 15:56:48 -0700
Subject: [PATCH] incus: enable installing client without the daemon

    incus-client is intended to be installed without the daemon to use to
    control remove incus servers. incus the daemon can't me used without
    the client, at least to authorize another client's to access the API.

    I moved incus-user to the daemon package because it's a daemon and
    not part of the client.

    I added incus's generated manpages to the incus-client package.

    readme: I changed "and" to "or" because the two groups grant you access to the
    daemons in different privelege levels.
---
 srcpkgs/incus/files/README.voidlinux |  4 ++--
 srcpkgs/incus/template               | 30 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 2d1757447dda8e..31a55a3415ece8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -1,6 +1,6 @@
 Users wishing to interact with incus system daemons should belong to
-the `_incus-admin` and `_incus` groups. The root user should also be
-assigned a range of subordinate user and group IDs to be mapped in
+either the `_incus-admin` or `_incus` group. The root user should also
+be assigned a range of subordinate user and group IDs to be mapped in
 containers. For example, the command
 
 	usermod --add-subuids 1000000-1065535 \
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c9857c58e33b..adb3f7c9cad376 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.5.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -11,7 +11,7 @@ make_check_args="-skip TestConvertNetworkConfig"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs ${pkgname}-client-${version}_${revision}"
 short_desc="Powerful system container and virtual machine manager"
 maintainer="dkwo <npiazza@disroot.org>"
 license="Apache-2.0"
@@ -38,6 +38,7 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+	vsv incus-user
 
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -46,24 +47,43 @@ post_install() {
 		chmod 700 ${DESTDIR}/usr/bin/${_tool}
 	done
 
-	# generate shell completions
+	#path to run incus commands in build
 	local _incus=${DESTDIR}/usr/bin/incus
+
+	# generate shell completions
 	for _shell in bash fish zsh; do
 		vtargetrun ${_incus} completion ${_shell} > scripts/${_shell}-completion
 	done
 
+	#generate manpages and rename files to match the manpage's internal references
+	mkdir ${wrksrc}/man
+	vtargetrun ${_incus} manpage --all --format=man "${wrksrc}/man/"
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD.SUBCMD.SUBSUBCMD.1 -> CMD-SUBCMD-SUBSUBCMD-1
+		rename -a '.' '-' "$_manpage"
+	done
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD-SUBCMD-SUBSUBCMD-1 -> CMD-SUBCMD-SUBSUBCMD.1
+		rename -l '-' '.' "$_manpage"
+	done
+
 	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 incus-client_package() {
 	short_desc+=" - client"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/incus
-		vsv incus-user
+
+		#install shell completions
 		for shell in bash fish zsh; do
 			vcompletion scripts/${shell}-completion ${shell} incus
 		done
+
+		#install manpages
+		for _manpage in ${wrksrc}/man/*; do
+			vman "$_manpage"
+		done
 	}
 }
 

Re: incus: enable installing client without the daemon

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 438 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2381359214

Comment:
Hey, this looks good to me.
I think it's better to move a discussion about readme into the docs pr, so i'd leave the readme as is here.

Should some man pages go into the tools subpkg?
Can you post the output of `xls incus`, xls incus-client etc,
to make sure they are going to the right place?

Re: incus: enable installing client without the daemon

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1045 bytes --]

New comment by duskmoss on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2381413794

Comment:
There are no man pages for "fuidshift-incus lxc-to-incus lxd-to-incus incus-benchmark incus-migrate incus-simplestreams" So it looks like they all go in the incus-client to me.


incus-tools
```
/usr/bin/fuidshift-incus
/usr/bin/incus-benchmark
/usr/bin/incus-migrate
/usr/bin/incus-simplestreams
/usr/bin/lxc-to-incus
/usr/bin/lxd-to-incus
```
incus
```
/etc/sv/incus/check
/etc/sv/incus/log/run
/etc/sv/incus/run
/etc/sv/incus-user/log/run
/etc/sv/incus-user/run
/usr/bin/incus-agent
/usr/libexec/incus/incus-user
/usr/libexec/incus/incusd
/usr/share/doc/incus/README.voidlinux
/etc/sv/incus/log/supervise -> /run/runit/supervise.incus-log
/etc/sv/incus/supervise -> /run/runit/supervise.incus
/etc/sv/incus-user/log/supervise -> /run/runit/supervise.incus-user-log
/etc/sv/incus-user/supervise -> /run/runit/supervise.incus-user
```
incus-client 
https://0x0.st/Xguv.txt

Re: incus: enable installing client without the daemon

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2383264417

Comment:
You're right, and this looks good to me. Thanks!

Re: incus: enable installing client without the daemon

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by duskmoss on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2383720898

Comment:
yw, thanks for the feedback!

Re: [PR PATCH] [Updated] incus: enable installing client without the daemon

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]

There is an updated pull request by duskmoss against master on the void-packages repository

https://github.com/duskmoss/void-packages incus-updates
https://github.com/void-linux/void-packages/pull/52384

incus: enable installing client without the daemon
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/52384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-updates-52384.patch --]
[-- Type: text/x-diff, Size: 3896 bytes --]

From 773c54d55991f6fe52776c1956a0b55a23dc2b88 Mon Sep 17 00:00:00 2001
From: Moss Hope <duskmoss@proton.me>
Date: Fri, 27 Sep 2024 15:56:48 -0700
Subject: [PATCH] incus: enable installing client without the daemon

    incus-client is intended to be installed without the daemon to use to
    control remote incus servers. incus the daemon can't me used without
    the client, at least to authorize another client to access the API.

    I moved incus-user to the daemon package because it's a daemon and
    not part of the client.

    I added incus's generated manpages to the incus-client package.

    readme: I changed "and" to "or" because the two groups grant you
    access to the daemons in different privelege levels.
---
 srcpkgs/incus/files/README.voidlinux |  4 ++--
 srcpkgs/incus/template               | 30 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 2d1757447dda8e..31a55a3415ece8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -1,6 +1,6 @@
 Users wishing to interact with incus system daemons should belong to
-the `_incus-admin` and `_incus` groups. The root user should also be
-assigned a range of subordinate user and group IDs to be mapped in
+either the `_incus-admin` or `_incus` group. The root user should also
+be assigned a range of subordinate user and group IDs to be mapped in
 containers. For example, the command
 
 	usermod --add-subuids 1000000-1065535 \
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c9857c58e33b..adb3f7c9cad376 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.5.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -11,7 +11,7 @@ make_check_args="-skip TestConvertNetworkConfig"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs ${pkgname}-client-${version}_${revision}"
 short_desc="Powerful system container and virtual machine manager"
 maintainer="dkwo <npiazza@disroot.org>"
 license="Apache-2.0"
@@ -38,6 +38,7 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+	vsv incus-user
 
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -46,24 +47,43 @@ post_install() {
 		chmod 700 ${DESTDIR}/usr/bin/${_tool}
 	done
 
-	# generate shell completions
+	#path to run incus commands in build
 	local _incus=${DESTDIR}/usr/bin/incus
+
+	# generate shell completions
 	for _shell in bash fish zsh; do
 		vtargetrun ${_incus} completion ${_shell} > scripts/${_shell}-completion
 	done
 
+	#generate manpages and rename files to match the manpage's internal references
+	mkdir ${wrksrc}/man
+	vtargetrun ${_incus} manpage --all --format=man "${wrksrc}/man/"
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD.SUBCMD.SUBSUBCMD.1 -> CMD-SUBCMD-SUBSUBCMD-1
+		rename -a '.' '-' "$_manpage"
+	done
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD-SUBCMD-SUBSUBCMD-1 -> CMD-SUBCMD-SUBSUBCMD.1
+		rename -l '-' '.' "$_manpage"
+	done
+
 	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 incus-client_package() {
 	short_desc+=" - client"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/incus
-		vsv incus-user
+
+		#install shell completions
 		for shell in bash fish zsh; do
 			vcompletion scripts/${shell}-completion ${shell} incus
 		done
+
+		#install manpages
+		for _manpage in ${wrksrc}/man/*; do
+			vman "$_manpage"
+		done
 	}
 }
 

Re: incus: enable installing client without the daemon

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2386647015

Comment:
The commit message would more aptly be something along the lines of

    incus: move incus-user service to main package, install man pages

Re: [PR PATCH] [Updated] incus: enable installing client without the daemon

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]

There is an updated pull request by duskmoss against master on the void-packages repository

https://github.com/duskmoss/void-packages incus-updates
https://github.com/void-linux/void-packages/pull/52384

incus: enable installing client without the daemon
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/52384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-updates-52384.patch --]
[-- Type: text/x-diff, Size: 3886 bytes --]

From 902953b0a50156affd9b04c11806aba6fffcbd53 Mon Sep 17 00:00:00 2001
From: Moss Hope <duskmoss@proton.me>
Date: Fri, 27 Sep 2024 15:56:48 -0700
Subject: [PATCH] incus: reverse dependency; add man pages

    incus-client is intended to be installed without the daemon to use to
    control remote incus servers. incus the daemon can't me used without
    the client, at least to authorize another client to access the API.

    I moved incus-user to the daemon package because it's a daemon and
    not part of the client.

    I added incus's generated manpages to the incus-client package.

    readme: I changed "and" to "or" because the two groups grant you
    access to the daemons in different privelege levels.
---
 srcpkgs/incus/files/README.voidlinux |  4 ++--
 srcpkgs/incus/template               | 30 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 2d1757447dda8e..31a55a3415ece8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -1,6 +1,6 @@
 Users wishing to interact with incus system daemons should belong to
-the `_incus-admin` and `_incus` groups. The root user should also be
-assigned a range of subordinate user and group IDs to be mapped in
+either the `_incus-admin` or `_incus` group. The root user should also
+be assigned a range of subordinate user and group IDs to be mapped in
 containers. For example, the command
 
 	usermod --add-subuids 1000000-1065535 \
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c9857c58e33b..adb3f7c9cad376 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.5.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -11,7 +11,7 @@ make_check_args="-skip TestConvertNetworkConfig"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs ${pkgname}-client-${version}_${revision}"
 short_desc="Powerful system container and virtual machine manager"
 maintainer="dkwo <npiazza@disroot.org>"
 license="Apache-2.0"
@@ -38,6 +38,7 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+	vsv incus-user
 
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -46,24 +47,43 @@ post_install() {
 		chmod 700 ${DESTDIR}/usr/bin/${_tool}
 	done
 
-	# generate shell completions
+	#path to run incus commands in build
 	local _incus=${DESTDIR}/usr/bin/incus
+
+	# generate shell completions
 	for _shell in bash fish zsh; do
 		vtargetrun ${_incus} completion ${_shell} > scripts/${_shell}-completion
 	done
 
+	#generate manpages and rename files to match the manpage's internal references
+	mkdir ${wrksrc}/man
+	vtargetrun ${_incus} manpage --all --format=man "${wrksrc}/man/"
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD.SUBCMD.SUBSUBCMD.1 -> CMD-SUBCMD-SUBSUBCMD-1
+		rename -a '.' '-' "$_manpage"
+	done
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD-SUBCMD-SUBSUBCMD-1 -> CMD-SUBCMD-SUBSUBCMD.1
+		rename -l '-' '.' "$_manpage"
+	done
+
 	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 incus-client_package() {
 	short_desc+=" - client"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/incus
-		vsv incus-user
+
+		#install shell completions
 		for shell in bash fish zsh; do
 			vcompletion scripts/${shell}-completion ${shell} incus
 		done
+
+		#install manpages
+		for _manpage in ${wrksrc}/man/*; do
+			vman "$_manpage"
+		done
 	}
 }
 

Re: [PR PATCH] [Updated] incus: reverse dependency; add man pages

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

There is an updated pull request by duskmoss against master on the void-packages repository

https://github.com/duskmoss/void-packages incus-updates
https://github.com/void-linux/void-packages/pull/52384

incus: reverse dependency; add man pages 
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/52384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-updates-52384.patch --]
[-- Type: text/x-diff, Size: 3886 bytes --]

From b95535bb86e4ae200e09560b11c82c1d8566ffbf Mon Sep 17 00:00:00 2001
From: Moss Hope <duskmoss@proton.me>
Date: Fri, 27 Sep 2024 15:56:48 -0700
Subject: [PATCH] incus: reverse dependency; add man pages

    incus-client is intended to be installed without the daemon to use to
    control remote incus servers. incus the daemon can't be used without
    the client, at least to authorize another client to access the API.

    I moved incus-user to the daemon package because it's a daemon and
    not part of the client.

    I added incus's generated manpages to the incus-client package.

    readme: I changed "and" to "or" because the two groups grant you
    access to the daemons in different privelege levels.
---
 srcpkgs/incus/files/README.voidlinux |  4 ++--
 srcpkgs/incus/template               | 30 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 2d1757447dda8e..31a55a3415ece8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -1,6 +1,6 @@
 Users wishing to interact with incus system daemons should belong to
-the `_incus-admin` and `_incus` groups. The root user should also be
-assigned a range of subordinate user and group IDs to be mapped in
+either the `_incus-admin` or `_incus` group. The root user should also
+be assigned a range of subordinate user and group IDs to be mapped in
 containers. For example, the command
 
 	usermod --add-subuids 1000000-1065535 \
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c9857c58e33b..adb3f7c9cad376 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.5.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -11,7 +11,7 @@ make_check_args="-skip TestConvertNetworkConfig"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs ${pkgname}-client-${version}_${revision}"
 short_desc="Powerful system container and virtual machine manager"
 maintainer="dkwo <npiazza@disroot.org>"
 license="Apache-2.0"
@@ -38,6 +38,7 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+	vsv incus-user
 
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -46,24 +47,43 @@ post_install() {
 		chmod 700 ${DESTDIR}/usr/bin/${_tool}
 	done
 
-	# generate shell completions
+	#path to run incus commands in build
 	local _incus=${DESTDIR}/usr/bin/incus
+
+	# generate shell completions
 	for _shell in bash fish zsh; do
 		vtargetrun ${_incus} completion ${_shell} > scripts/${_shell}-completion
 	done
 
+	#generate manpages and rename files to match the manpage's internal references
+	mkdir ${wrksrc}/man
+	vtargetrun ${_incus} manpage --all --format=man "${wrksrc}/man/"
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD.SUBCMD.SUBSUBCMD.1 -> CMD-SUBCMD-SUBSUBCMD-1
+		rename -a '.' '-' "$_manpage"
+	done
+	for _manpage in ${wrksrc}/man/*; do
+		#CMD-SUBCMD-SUBSUBCMD-1 -> CMD-SUBCMD-SUBSUBCMD.1
+		rename -l '-' '.' "$_manpage"
+	done
+
 	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 incus-client_package() {
 	short_desc+=" - client"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/incus
-		vsv incus-user
+
+		#install shell completions
 		for shell in bash fish zsh; do
 			vcompletion scripts/${shell}-completion ${shell} incus
 		done
+
+		#install manpages
+		for _manpage in ${wrksrc}/man/*; do
+			vman "$_manpage"
+		done
 	}
 }
 

Re: [PR REVIEW] incus: reverse dependency; add man pages

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#discussion_r1783297980

Comment:
Break lines at 80 columns.

Re: [PR REVIEW] incus: reverse dependency; add man pages

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#discussion_r1783311432

Comment:
```suggestion
		for _manpage in man/*; do
```

Re: [PR REVIEW] incus: reverse dependency; add man pages

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#discussion_r1783310840

Comment:
```suggestion
	#generate man pages
	mkdir man
	vtargetrun ${_incus} manpage --all --format=man man
	
	local _manpage _prefix _suffix
	for _manpage in man/*; do
		_prefix="${_manpage%.*}"
		_suffix="${_manpage##*.}"
		[ "${_suffix}" != "${_manpage}" ]
		mv "${_manpage}" "${_prefix//./-}.{_suffix}"
	done
```

Re: [PR REVIEW] incus: reverse dependency; add man pages

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#discussion_r1783351350

Comment:
Try this:

```bash
# rename pages with multiple dots
for _manpage in man/*.*.*; do
    [ -f "${_manpage}" ] || continue
    _prefix="${_manpage%.*}"
    _suffix="${_manpage##*.}"
    mv "${_manpage}" "${_prefix//./-}.${_suffix}"
done
```

Re: [PR PATCH] [Updated] incus: reverse dependency; add man pages

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

There is an updated pull request by duskmoss against master on the void-packages repository

https://github.com/duskmoss/void-packages incus-updates
https://github.com/void-linux/void-packages/pull/52384

incus: reverse dependency; add man pages 
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/52384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-updates-52384.patch --]
[-- Type: text/x-diff, Size: 3789 bytes --]

From 88d4aa6725b6b3b0642ef552d42c9f69bcd25a23 Mon Sep 17 00:00:00 2001
From: Moss Hope <duskmoss@proton.me>
Date: Fri, 27 Sep 2024 15:56:48 -0700
Subject: [PATCH] incus: reverse dependency; add man pages

    incus-client is intended to be installed without the daemon to use to
    control remote incus servers. incus the daemon can't be used without
    the client, at least to authorize another client to access the API.

    I moved incus-user to the daemon package because it's a daemon and
    not part of the client.

    I added incus's generated manpages to the incus-client package.

    readme: I changed "and" to "or" because the two groups grant you
    access to the daemons in different privelege levels.
---
 srcpkgs/incus/files/README.voidlinux |  4 ++--
 srcpkgs/incus/template               | 32 +++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 2d1757447dda8e..31a55a3415ece8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -1,6 +1,6 @@
 Users wishing to interact with incus system daemons should belong to
-the `_incus-admin` and `_incus` groups. The root user should also be
-assigned a range of subordinate user and group IDs to be mapped in
+either the `_incus-admin` or `_incus` group. The root user should also
+be assigned a range of subordinate user and group IDs to be mapped in
 containers. For example, the command
 
 	usermod --add-subuids 1000000-1065535 \
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c9857c58e33b..781c638db738cb 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.5.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -11,7 +11,8 @@ make_check_args="-skip TestConvertNetworkConfig"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs
+ ${pkgname}-client-${version}_${revision}"
 short_desc="Powerful system container and virtual machine manager"
 maintainer="dkwo <npiazza@disroot.org>"
 license="Apache-2.0"
@@ -38,6 +39,7 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+	vsv incus-user
 
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -46,24 +48,44 @@ post_install() {
 		chmod 700 ${DESTDIR}/usr/bin/${_tool}
 	done
 
-	# generate shell completions
+	# path to run incus commands in build
 	local _incus=${DESTDIR}/usr/bin/incus
+
+	# generate shell completions
 	for _shell in bash fish zsh; do
 		vtargetrun ${_incus} completion ${_shell} > scripts/${_shell}-completion
 	done
 
+	# generate man pages
+	mkdir man
+	vtargetrun ${_incus} manpage --all --format=man man
+
+	local _manpage _prefix _suffix
+	# rename pages with multiple dots
+	for _manpage in man/*.*.*; do
+	[ -f "${_manpage}" ] || continue
+		_prefix="${_manpage%.*}"
+		_suffix="${_manpage##*.}"
+		mv "${_manpage}" "${_prefix//./-}.${_suffix}"
+	done
+
 	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 incus-client_package() {
 	short_desc+=" - client"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/incus
-		vsv incus-user
+
+		# install shell completions
 		for shell in bash fish zsh; do
 			vcompletion scripts/${shell}-completion ${shell} incus
 		done
+
+		# install manpages
+		for _manpage in man/*; do
+			vman "$_manpage"
+		done
 	}
 }
 

Re: incus: reverse dependency; add man pages

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]

New comment by duskmoss on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2387115497

Comment:
Summarizing a quick conversation on IRC:

-> maybe man page naming should be changed up stream
-> the man pages have the same information as --help  so maybe it's not worth it. (per https://linuxcontainers.org/incus/docs/main/packaging/#manual-pages )

There seem to be a few ways to move forward. 

1) Merge  with the man pages change
   a) I get them fixed upstream we can remove the renaming logic when we version bump
   b) We decide the renaming we're doing is fine for now 
2) Merge the original changes but leave the man pages out
   a) Decide not to care about including the man pages 
   b) I work on getting the files renamed upstream, and we add them after that.
   
I don't mind whichever direction we want to take, but If there's a lot of debate I'd rather merge the original changes and decide what to do about man pages separately. 

@ericonr @classabbyamp  @dkwo 

Re: incus: reverse dependency; add man pages

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2387138512

Comment:
300+ manpages just for regurgitated `--help` seems like a bit much

Re: [PR PATCH] [Updated] incus: reverse dependency; add man pages

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

There is an updated pull request by duskmoss against master on the void-packages repository

https://github.com/duskmoss/void-packages incus-updates
https://github.com/void-linux/void-packages/pull/52384

incus: reverse dependency; add man pages 
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/52384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-updates-52384.patch --]
[-- Type: text/x-diff, Size: 2884 bytes --]

From a1819a2720f40edd1d7c4f1e17b8cb188e585b3a Mon Sep 17 00:00:00 2001
From: Moss Hope <duskmoss@proton.me>
Date: Fri, 27 Sep 2024 15:56:48 -0700
Subject: [PATCH] incus: reverse dependency; keep daemons together

    incus-client is intended to be installed without the daemon to use to
    control remote incus servers. incus the daemon can't be used without
    the client, at least to authorize another client to access the API.

    I moved incus-user to the daemon package because it's a daemon and
    not part of the client.

    readme: I changed "and" to "or" because the two groups grant you
    access to the daemons in different privelege levels.
---
 srcpkgs/incus/files/README.voidlinux | 4 ++--
 srcpkgs/incus/template               | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 2d1757447dda8e..31a55a3415ece8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -1,6 +1,6 @@
 Users wishing to interact with incus system daemons should belong to
-the `_incus-admin` and `_incus` groups. The root user should also be
-assigned a range of subordinate user and group IDs to be mapped in
+either the `_incus-admin` or `_incus` group. The root user should also
+be assigned a range of subordinate user and group IDs to be mapped in
 containers. For example, the command
 
 	usermod --add-subuids 1000000-1065535 \
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c9857c58e33b..c9150bff0aef5b 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.5.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -11,7 +11,8 @@ make_check_args="-skip TestConvertNetworkConfig"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs
+ ${pkgname}-client-${version}_${revision}"
 short_desc="Powerful system container and virtual machine manager"
 maintainer="dkwo <npiazza@disroot.org>"
 license="Apache-2.0"
@@ -38,6 +39,7 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+	vsv incus-user
 
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -57,10 +59,8 @@ post_install() {
 
 incus-client_package() {
 	short_desc+=" - client"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/incus
-		vsv incus-user
 		for shell in bash fish zsh; do
 			vcompletion scripts/${shell}-completion ${shell} incus
 		done

Re: incus: reverse dependency; add man pages

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New comment by duskmoss on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2387150000

Comment:
I saved the other commit on a local branch, so can bring the man page changes back if we need it, but here's the PR without adding man pages

Re: incus: reverse dependency; add man pages

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2388757997

Comment:
I'm fine either way about man pages.

Re: incus: reverse dependency; move incus-user service to daemon package

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

New comment by duskmoss on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2392251314

Comment:
@dkwo  I'm running the 6.6 update now to test,  and have added it to this PR, unless you'd rather have it in a separate one.

Re: [PR PATCH] [Updated] incus: reverse dependency; move incus-user service to daemon package

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]

There is an updated pull request by duskmoss against master on the void-packages repository

https://github.com/duskmoss/void-packages incus-updates
https://github.com/void-linux/void-packages/pull/52384

incus: reverse dependency; move incus-user service to daemon package
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/52384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-updates-52384.patch --]
[-- Type: text/x-diff, Size: 3203 bytes --]

From e3f4da00f8757924107c9885d06ccb2e51a33fca Mon Sep 17 00:00:00 2001
From: Moss Hope <duskmoss@proton.me>
Date: Fri, 27 Sep 2024 15:56:48 -0700
Subject: [PATCH] incus: update to 6.6; reverse dependency.

    incus-client is intended to be installed without the daemon to use to
    control remote incus servers. incus the daemon can't be used without
    the client, at least to authorize another client to access the API.

    I moved incus-user to the daemon package because it's a daemon and
    not part of the client.

    readme: I changed "and" to "or" because the two groups grant you
    access to the daemons in different privelege levels.
---
 srcpkgs/incus/files/README.voidlinux |  4 ++--
 srcpkgs/incus/template               | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 2d1757447dda8e..31a55a3415ece8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -1,6 +1,6 @@
 Users wishing to interact with incus system daemons should belong to
-the `_incus-admin` and `_incus` groups. The root user should also be
-assigned a range of subordinate user and group IDs to be mapped in
+either the `_incus-admin` or `_incus` group. The root user should also
+be assigned a range of subordinate user and group IDs to be mapped in
 containers. For example, the command
 
 	usermod --add-subuids 1000000-1065535 \
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c9857c58e33b..af37776caf8343 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,6 +1,6 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.5.0
+version=6.6.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,13 +11,14 @@ make_check_args="-skip TestConvertNetworkConfig"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs
+ ${pkgname}-client-${version}_${revision}"
 short_desc="Powerful system container and virtual machine manager"
 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=aabc762bdcfe210b777e6b78e40150c9ffbc798aa39c8b4ba55812dac3ada0ec
+checksum=0274f6258591a3189737812228722d5c7b0cc57deb5edd0f65750d3323210394
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root
@@ -38,6 +39,7 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+	vsv incus-user
 
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -57,10 +59,8 @@ post_install() {
 
 incus-client_package() {
 	short_desc+=" - client"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/incus
-		vsv incus-user
 		for shell in bash fish zsh; do
 			vcompletion scripts/${shell}-completion ${shell} incus
 		done

Re: incus: update to 6.6; reverse dependency.

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2395140713

Comment:
v6.6 works fine for me.

Re: incus: update to 6.6; reverse dependency.

[duskmoss]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by duskmoss on void-packages repository

https://github.com/void-linux/void-packages/pull/52384#issuecomment-2395256865

Comment:
It's also been solid for me. Tested some vm stuff too just in case.

Re: [PR PATCH] [Closed]: incus: update to 6.6; reverse dependency.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]

There's a closed pull request on the void-packages repository

incus: update to 6.6; reverse dependency.
https://github.com/void-linux/void-packages/pull/52384

Description:
incus-client is intended to be installed without the daemon to use to control remove incus servers. incus the daemon can't me used without the client, at least to authorize another client's to access the API.

I moved incus-user to the daemon package because it's a daemon and not part of the client.

readme: I also removed the information about subuid and subgid because void sets these up out of the box.

readme: I changed "and" to "or" because the two groups grant you access to the daemons in different privelege levels.


#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture:
x86_64-glibc
- I built this PR locally for these architectures:
x86_64-musl
(cross) aarch64-musl 
(cross) armv7l
(cross) armv6l-musl