diff options
| author | Maciek Borzecki | 2024-05-09 17:46:36 +0200 |
|---|---|---|
| committer | Maciek Borzecki | 2024-05-09 17:46:58 +0200 |
| commit | b1bbaa2ac1e5f2e90bffacba9b7ba27715a84603 (patch) | |
| tree | ac2e7f4121847486e86f9f46eb64e6188305115b | |
| parent | 0a7bc6ace78152d1df0b79eb8121795437c5559c (diff) | |
| download | aur-b1bbaa2ac1e5f2e90bffacba9b7ba27715a84603.tar.gz | |
upgpkg: snapd 2.62-3
Cherry pick upstream patch for snap-seccomp build error
Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch | 30 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
3 files changed, 39 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = snapd pkgdesc = Service and tools for management of snap packages. pkgver = 2.62 - pkgrel = 2 + pkgrel = 3 url = https://github.com/snapcore/snapd install = snapd.install arch = x86_64 @@ -30,6 +30,8 @@ pkgbase = snapd options = emptydirs options = !lto source = snapd-2.62.tar.xz::https://github.com/snapcore/snapd/releases/download/2.62/snapd_2.62.vendor.tar.xz + source = 0001-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch sha256sums = e4bcf0d7677afdcb7256958fd382a5aad71db13474c08e5828e913614ee88ea8 + sha256sums = f96cb34620105ae654f84296b8bbbc938608ff117dc987fbe1274f61681e333f pkgname = snapd diff --git a/0001-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch b/0001-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch new file mode 100644 index 000000000000..4cd5c64b9c1e --- /dev/null +++ b/0001-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch @@ -0,0 +1,30 @@ +From 876eca2d7e8e1741a160c7d837a181ce8fb8b26d Mon Sep 17 00:00:00 2001 +Message-ID: <876eca2d7e8e1741a160c7d837a181ce8fb8b26d.1715268985.git.maciej.borzecki@canonical.com> +From: Maciej Borzecki <maciej.borzecki@canonical.com> +Date: Thu, 9 May 2024 17:23:50 +0200 +Subject: [PATCH] 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.borzecki@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 49a8171817013e7f04047a7b71dfd493679a9463..7c24aaba254171b233e212397ef284a9669c438c 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: + // +-- +2.44.0 + @@ -9,7 +9,7 @@ depends=('squashfs-tools' 'libseccomp' 'libsystemd' 'apparmor') optdepends=('bash-completion: bash completion support' 'xdg-desktop-portal: desktop integration') pkgver=2.62 -pkgrel=2 +pkgrel=3 arch=('x86_64' 'i686' 'armv7h' 'aarch64') url="https://github.com/snapcore/snapd" license=('GPL3') @@ -19,8 +19,12 @@ options=('!strip' 'emptydirs' '!lto') install=snapd.install source=( "$pkgname-$pkgver.tar.xz::https://github.com/snapcore/${pkgname}/releases/download/${pkgver}/${pkgname}_${pkgver}.vendor.tar.xz" + "0001-cmd-snap-seccomp-define-GNU_SOURCE-for-fallocate.patch" +) +sha256sums=( + 'e4bcf0d7677afdcb7256958fd382a5aad71db13474c08e5828e913614ee88ea8' + 'f96cb34620105ae654f84296b8bbbc938608ff117dc987fbe1274f61681e333f' ) -sha256sums=('e4bcf0d7677afdcb7256958fd382a5aad71db13474c08e5828e913614ee88ea8') _gourl=github.com/snapcore/snapd |