snapd: update to 2.31.1, add python-docutils to makedepends, drop snap-seccomp patches

New upstream release 2.31.1.

Add python-docutils to makedepends, so that man pages for snap-confine and
snap-discard-ns are generated.

Drop snap-seccomp patches. The upstream has dropped setting LDFLAGS for cgo
directly in cgo comment sections.

Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>

3 files changed, 10 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 483a115c2739..52618e0b88f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = snapd
 	pkgdesc = Service and tools for management of snap packages.
-	pkgver = 2.31
-	pkgrel = 3
+	pkgver = 2.31.1
+	pkgrel = 1
 	url = https://github.com/snapcore/snapd
 	install = snapd.install
 	arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = snapd
 	makedepends = libcap
 	makedepends = systemd
 	makedepends = xfsprogs
+	makedepends = python-docutils
 	depends = squashfs-tools
 	depends = libseccomp
 	depends = libsystemd
@@ -20,10 +21,8 @@ pkgbase = snapd
 	conflicts = snap-confine
 	options = !strip
 	options = emptydirs
-	source = snapd-2.31::https://github.com/snapcore/snapd/archive/2.31.tar.gz
-	source = 0001-cmd-snap-seccomp-drop-link-flags-that-will-be-reject.patch
-	sha256sums = 973e7e8098f5780d71a0633a0fa7c3371ef7fb7ae120d464b2e25af9588c1f89
-	sha256sums = ba4591f70b032b5e6f63d251cf6463ef93f3b963b8f19aac098b4c7dbed0309d
+	source = snapd-2.31.1::https://github.com/snapcore/snapd/archive/2.31.1.tar.gz
+	sha256sums = 15b630811b8b017276767f1e0e8713c5fbf223d7dd90f75a740535652c066d85
 
 pkgname = snapd
 
diff --git a/0001-cmd-snap-seccomp-drop-link-flags-that-will-be-reject.patch b/0001-cmd-snap-seccomp-drop-link-flags-that-will-be-reject.patch
deleted file mode 100644
index 4a58cd226bee..000000000000
--- a/0001-cmd-snap-seccomp-drop-link-flags-that-will-be-reject.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3286baf646fa7974c165efd9b63c690d08dff6b7 Mon Sep 17 00:00:00 2001
-Message-Id: <3286baf646fa7974c165efd9b63c690d08dff6b7.1518102033.git.maciej.zenon.borzecki@canonical.com>
-From: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
-Date: Thu, 8 Feb 2018 15:57:13 +0100
-Subject: [PATCH] cmd/snap-seccomp: drop link flags that will be rejected by
- go1.9.4
-
-Due to CVE-2018-6574 Go rejects a number of previously allowed flags cgo flags.
-Drop any flags passed to pkg-config. Drop static link flags for libseccomp as
-those are not supported on Arch anyway.
-
-Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
----
- cmd/snap-seccomp/main.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmd/snap-seccomp/main.go b/cmd/snap-seccomp/main.go
-index 935b3098b434053808c87efe9cefe682124a09a4..ffb9bb3bcc55c9c327b4f1937bd8a86b498e74ec 100644
---- a/cmd/snap-seccomp/main.go
-+++ b/cmd/snap-seccomp/main.go
-@@ -20,8 +20,8 @@
- package main
- 
- //#cgo CFLAGS: -D_FILE_OFFSET_BITS=64
--//#cgo pkg-config: --static --cflags libseccomp
--//#cgo LDFLAGS: -Wl,-Bstatic -lseccomp -Wl,-Bdynamic
-+//#cgo pkg-config: libseccomp
-+//#cgo LDFLAGS: -lseccomp
- //
- //#include <asm/ioctls.h>
- //#include <ctype.h>
--- 
-2.16.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 32bc87ca8cba..80eea5729e9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,19 +7,17 @@ pkgname=snapd
 pkgdesc="Service and tools for management of snap packages."
 depends=('squashfs-tools' 'libseccomp' 'libsystemd')
 optdepends=('bash-completion: bash completion support')
-pkgver=2.31
-pkgrel=3
+pkgver=2.31.1
+pkgrel=1
 arch=('x86_64')
 url="https://github.com/snapcore/snapd"
 license=('GPL3')
-makedepends=('git' 'go-pie' 'go-tools' 'libseccomp' 'libcap' 'systemd' 'xfsprogs')
+makedepends=('git' 'go-pie' 'go-tools' 'libseccomp' 'libcap' 'systemd' 'xfsprogs' 'python-docutils')
 conflicts=('snap-confine')
 options=('!strip' 'emptydirs')
 install=snapd.install
-source=("$pkgname-$pkgver::https://github.com/snapcore/${pkgname}/archive/$pkgver.tar.gz"
-        "0001-cmd-snap-seccomp-drop-link-flags-that-will-be-reject.patch")
-sha256sums=('973e7e8098f5780d71a0633a0fa7c3371ef7fb7ae120d464b2e25af9588c1f89'
-           'ba4591f70b032b5e6f63d251cf6463ef93f3b963b8f19aac098b4c7dbed0309d')
+source=("$pkgname-$pkgver::https://github.com/snapcore/${pkgname}/archive/$pkgver.tar.gz")
+sha256sums=('15b630811b8b017276767f1e0e8713c5fbf223d7dd90f75a740535652c066d85')
 
 _gourl=github.com/snapcore/snapd
 
@@ -34,8 +32,6 @@ prepare() {
   # above describes.
   mkdir -p "$(dirname "$GOPATH/src/${_gourl}")"
   ln --no-target-directory -fs "$srcdir/$pkgname-$pkgver" "$GOPATH/src/${_gourl}"
-
-  patch -Np1 -i "${srcdir}/0001-cmd-snap-seccomp-drop-link-flags-that-will-be-reject.patch"
 }
 
 build() {