Re: [PR PATCH] [Updated] incus: update to 6.7.0

[dkwo <dkwo@users.noreply.github.com>]

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

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

https://github.com/dkwo/void-packages incus
https://github.com/void-linux/void-packages/pull/53135

incus: update to 6.7.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (aarch64-glibc)

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

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

From bf86f50ec7ae020c44dc55b0ea7b3fff8581425c Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Mon, 18 Nov 2024 19:57:37 -0500
Subject: [PATCH 1/2] incus: update to 6.7.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index a7c8e9bfda226a..11ecbc9b34bbd5 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.6.0
-revision=2
+version=6.7.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -18,7 +18,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=0274f6258591a3189737812228722d5c7b0cc57deb5edd0f65750d3323210394
+checksum=bbf12c30fc8eb090779706ddc26b60c2618c2c129ff585d46c949f01d12719dc
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

From 912f409974c2f3cb7b69de3331dd018732bc23d3 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Tue, 19 Nov 2024 12:40:52 -0500
Subject: [PATCH 2/2] incus: apply upstream patch for 32bit

---
 ...1aaa5d0f7c95a69a17428e1974ebbf34ecdf.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/incus/patches/afa91aaa5d0f7c95a69a17428e1974ebbf34ecdf.patch

diff --git a/srcpkgs/incus/patches/afa91aaa5d0f7c95a69a17428e1974ebbf34ecdf.patch b/srcpkgs/incus/patches/afa91aaa5d0f7c95a69a17428e1974ebbf34ecdf.patch
new file mode 100644
index 00000000000000..387ee3f21c8862
--- /dev/null
+++ b/srcpkgs/incus/patches/afa91aaa5d0f7c95a69a17428e1974ebbf34ecdf.patch
@@ -0,0 +1,33 @@
+From afa91aaa5d0f7c95a69a17428e1974ebbf34ecdf Mon Sep 17 00:00:00 2001
+From: Christian Brauner <brauner@kernel.org>
+Date: Tue, 19 Nov 2024 15:42:18 +0100
+Subject: [PATCH] cgo/process_utils: fix 32bit builds
+
+New clang-14 reports errors for directly casting from an integer to a
+pointer. Use uintptr_t to fix that problem and adhere to the casting
+rules.
+
+Fixes: https://github.com/lxc/incus/issues/1395
+Signed-off-by: Christian Brauner <brauner@kernel.org>
+---
+ shared/cgo/process_utils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/shared/cgo/process_utils.h b/shared/cgo/process_utils.h
+index 3e1c400c539..19443e921fa 100644
+--- a/shared/cgo/process_utils.h
++++ b/shared/cgo/process_utils.h
+@@ -219,9 +219,11 @@ static inline int setproctitle(char *title)
+ 	ret = prctl(PR_SET_MM, prctl_arg(PR_SET_MM_MAP), prctl_arg(&prctl_map),
+ 		    prctl_arg(sizeof(prctl_map)), prctl_arg(0));
+ 	if (ret == 0) {
+-		char *dest = (char *)arg_start;
++		char *dest;
++
++		dest = (char *)(uintptr_t)arg_start;
+ 		memcpy(dest, title, len - 1);
+-		dest[len-1] = '\0';
++		dest[len - 1] = '\0';
+ 	}
+ 
+ 	return ret;