Control: tags -1 + Am 03.09.24 um 15:19 schrieb Zygmunt Krynicki:
If you have time do NMU, I will unclude the changes in the next upstream release. Apologies for dropping the ball on this.
I'm happy to do so. I've uploaded the attached debdiff to DELAYED/3. They include an (upstream) fix to make it build with GCC-14. Regards, Michael
diff -Nru snapd-2.63/debian/changelog snapd-2.63/debian/changelog
--- snapd-2.63/debian/changelog 2024-07-19 07:15:23.000000000 +0200
+++ snapd-2.63/debian/changelog 2024-09-03 16:43:09.000000000 +0200
@@ -1,3 +1,16 @@
+snapd (2.63-4.1) unstable; urgency=medium
+
+ [ Helmut Grohne ]
+ * Non-maintainer upload.
+ * Move files to /usr for DEP17. (Closes: #1071119)
+
+ [ Michael Biebl ]
+ * cmd/snap-seccomp: define GNU_SOURCE for fallocate.
+ Patch cherry-picked from upstream Git.
+ Fixes FTBFS with GCC-14. (Closes: #1075522)
+
+ -- Michael Biebl <bi...@debian.org> Tue, 03 Sep 2024 16:43:09 +0200
+
snapd (2.63-4) unstable; urgency=medium
* debian: fix lxc/fuse woes
diff -Nru
snapd-2.63/debian/patches/0023-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch
snapd-2.63/debian/patches/0023-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch
---
snapd-2.63/debian/patches/0023-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch
1970-01-01 01:00:00.000000000 +0100
+++
snapd-2.63/debian/patches/0023-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch
2024-09-03 16:36:13.000000000 +0200
@@ -0,0 +1,25 @@
+From: Maciej Borzecki <maciej.borze...@canonical.com>
+Date: Thu, 9 May 2024 17:23:50 +0200
+Subject: cmd/snap-seccomp: define GNU_SOURCE for fallocate
+
+Snap-seccomp stopped building on Arch since glibc got updated which revealed a
+source code problem in our code with a missing _GNU_SOURCE define.
+
+Signed-off-by: Maciej Borzecki <maciej.borze...@canonical.com>
+---
+ cmd/snap-seccomp/main.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/snap-seccomp/main.go b/cmd/snap-seccomp/main.go
+index 49a8171..7c24aab 100644
+--- a/cmd/snap-seccomp/main.go
++++ b/cmd/snap-seccomp/main.go
+@@ -19,7 +19,7 @@
+
+ package main
+
+-//#cgo CFLAGS: -D_FILE_OFFSET_BITS=64
++//#cgo CFLAGS: -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+ //#cgo pkg-config: libseccomp
+ //#cgo LDFLAGS:
+ //
diff -Nru snapd-2.63/debian/patches/series snapd-2.63/debian/patches/series
--- snapd-2.63/debian/patches/series 2024-07-19 07:15:23.000000000 +0200
+++ snapd-2.63/debian/patches/series 2024-09-03 16:38:20.000000000 +0200
@@ -18,3 +18,4 @@
0018-PATCH-17-18-packaging-update-to-compat-level-13.patch
0021-PATCH-tests-create-test-user-for-autopkgtests.patch
0022-tests-enable-the-snapd-socket-in-autopkgtest.patch
+0023-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch
diff -Nru snapd-2.63/debian/rules snapd-2.63/debian/rules
--- snapd-2.63/debian/rules 2024-07-19 07:15:23.000000000 +0200
+++ snapd-2.63/debian/rules 2024-09-03 16:39:13.000000000 +0200
@@ -35,7 +35,7 @@
endif
# this is overridden in the ubuntu/14.04 release branch
-SYSTEMD_UNITS_DESTDIR="lib/systemd/system/"
+SYSTEMD_UNITS_DESTDIR="$(shell pkg-config --variable=systemdsystemunitdir
systemd)"
# The go tool does not fully support vendoring with gccgo, but we can
# work around that by constructing the appropriate -I flag by hand.
diff -Nru snapd-2.63/debian/snapd.links snapd-2.63/debian/snapd.links
--- snapd-2.63/debian/snapd.links 2024-07-19 07:15:23.000000000 +0200
+++ snapd-2.63/debian/snapd.links 2024-09-03 16:39:13.000000000 +0200
@@ -1,4 +1,4 @@
-/usr/lib/snapd/snap-device-helper /lib/udev/snappy-app-dev
+/usr/lib/snapd/snap-device-helper /usr/lib/udev/snappy-app-dev
# This should be removed once we can rely on debhelper >= 11.5:
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764678
/usr/lib/systemd/user/snapd.session-agent.socket
/usr/lib/systemd/user/sockets.target.wants/snapd.session-agent.socket
OpenPGP_signature.asc
Description: OpenPGP digital signature
