diff --git a/f11c0b04f2e90a19e900ca077e21edf02c589db2.patch b/f11c0b04f2e90a19e900ca077e21edf02c589db2.patch deleted file mode 100644 index 8385629..0000000 --- a/f11c0b04f2e90a19e900ca077e21edf02c589db2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f11c0b04f2e90a19e900ca077e21edf02c589db2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Graber?= -Date: Wed, 5 Jun 2024 11:35:50 -0400 -Subject: [PATCH] incusd/seccomp: Fix sysinfo logic on 32bit platforms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Closes #918 - -Signed-off-by: Stéphane Graber ---- - internal/server/seccomp/sysinfo_32.go | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/internal/server/seccomp/sysinfo_32.go b/internal/server/seccomp/sysinfo_32.go -index 56bcd23ace..0445473147 100644 ---- a/internal/server/seccomp/sysinfo_32.go -+++ b/internal/server/seccomp/sysinfo_32.go -@@ -8,13 +8,13 @@ import ( - - // ToNative fills fields from s into native fields. - func (s *Sysinfo) ToNative(n *unix.Sysinfo_t) { -- n.Bufferram = uint32(s.Bufferram / s.Unit) -- n.Freeram = uint32(s.Freeram / s.Unit) -- n.Freeswap = uint32(s.Freeswap / s.Unit) -+ n.Bufferram = uint32(s.Bufferram) / s.Unit -+ n.Freeram = uint32(s.Freeram) / s.Unit -+ n.Freeswap = uint32(s.Freeswap) / s.Unit - n.Procs = s.Procs -- n.Sharedram = uint32(s.Sharedram / s.Unit) -- n.Totalram = uint32(s.Totalram / s.Unit) -- n.Totalswap = uint32(s.Totalswap / s.Unit) -+ n.Sharedram = uint32(s.Sharedram) / s.Unit -+ n.Totalram = uint32(s.Totalram) / s.Unit -+ n.Totalswap = uint32(s.Totalswap) / s.Unit - n.Uptime = int32(s.Uptime) - n.Unit = uint32(s.Unit) - } diff --git a/incus.spec b/incus.spec index c34df95..d8592b2 100644 --- a/incus.spec +++ b/incus.spec @@ -10,7 +10,7 @@ # https://github.com/lxc/incus %global goipath github.com/lxc/incus -Version: 6.2 +Version: 6.4 %gometa @@ -18,7 +18,7 @@ Version: 6.2 %global golicenses COPYING Name: incus -Release: 4%{?dist} +Release: 2%{?dist} Summary: Powerful system container and virtual machine manager License: Apache-2.0 URL: https://linuxcontainers.org/incus @@ -55,8 +55,10 @@ Source202: %{swaggerui_source_baseurl}/swagger-ui-standalone-preset.js#/swa Source203: %{swaggerui_source_baseurl}/swagger-ui.css#/swagger-ui-%{swaggerui_version}.css # Patches upstream or proposed upstream +%if ! 0%{?fedora} && 0%{?rhel} >= 8 ## Fix build for 32-bit arches Patch0001: https://github.com/lxc/incus/commit/f11c0b04f2e90a19e900ca077e21edf02c589db2.patch +%endif # Downstream only patches ## Allow offline builds @@ -459,6 +461,13 @@ export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" %endif %changelog + +* Tue Aug 20 2024 Neil Hanlon - 6.4-2 +- rebuild + +* Tue Aug 20 2024 Neil Hanlon - 6.4-1 +- update to 6.4 + * Sun Aug 11 2024 Brian Ketelsen - 6.2-4 - Update systemd units to new Incus socket path diff --git a/sources b/sources index a4b2400..257e03d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (incus-6.2.tar.xz) = a5a41199b5ec21a6b2abb7ae33d245032db67ec8aedec3eb1cd18236ce39106c25c4a71524d363103c4a6fbe4420368e0fe8763a2eb84afdbf7f069e53312fa7 +SHA512 (incus-6.4.tar.xz) = a9d32526cc7ccf93fe0579f95cbd87f72cecf13c5ebe9d0ee4a61a8f921737f1842ea35d452bdf58ca3d2c5529198e8d80dfee41ce6c92a6213f1994f421c1f6 SHA512 (swagger-ui-5.17.2-bundle.js) = de5bc8c2bbb33c37da2a50fdc4c8d60cab3653e4a15bf7799dcd6ec537b97451c39e254d9746dbde9bdaf858ddb203af89c524f9cfce7034252110274606b511 -SHA512 (swagger-ui-5.17.2-standalone-preset.js) = 1eb3996b1389d825aa7952774d51b98523ced51af17397d4b4103316d925303c803f5556867f26048b19178b28e7ebb51c93cdf16a856cd4ca52f9aab2bd0221 SHA512 (swagger-ui-5.17.2.css) = 32f6113a5286ddc0c13ec90c4203e690d81987ce4b21febccbb499df84c8a696881d0cf533fdd2ff262acc87ee7dd283263cc1f50bb5055eb74998e298990fbf +SHA512 (swagger-ui-5.17.2-standalone-preset.js) = 1eb3996b1389d825aa7952774d51b98523ced51af17397d4b4103316d925303c803f5556867f26048b19178b28e7ebb51c93cdf16a856cd4ca52f9aab2bd0221