[PR PATCH] WIP: lxd: update to 3.18

[voidlinux-github@inbox.vuxu.org]

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

There is a new pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages lxd-3.18
https://github.com/void-linux/void-packages/pull/15935

WIP: lxd: update to 3.18
Works completely for x86_64, extensive runtime testing uncovers no errors.

**cross build still broken**, blocked by strange dqlite error

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

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

From c09e0e9037f38ae8c53c624bba9ae2e2898549d4 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Wed, 30 Oct 2019 17:43:16 +1100
Subject: [PATCH 1/4] add new package: raft-0.9.7

---
 common/shlibs         |  1 +
 srcpkgs/raft/template | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/raft/template

diff --git a/common/shlibs b/common/shlibs
index a79ef996138..37fcbe98a7a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -609,6 +609,7 @@ libcanberra.so.0 libcanberra-0.23_1
 libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
 libgtop-2.0.so.11 libgtop-2.38.0_1
+libraft.so.0 raft-0.9.7_1
 librarian.so.0 rarian-0.8.1_1
 libmusikcore.so musikcube-0.60.1_1
 libgnome-menu-3.so.0 gnome-menus-2.91.6_1
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
new file mode 100644
index 00000000000..a1e0b018c94
--- /dev/null
+++ b/srcpkgs/raft/template
@@ -0,0 +1,16 @@
+# Template file for 'raft'
+pkgname=raft
+version=0.9.7
+revision=1
+build_style=gnu-configure
+short_desc="C implementation of the Raft consensus protocol"
+maintainer="fosslinux <fosslinux@aussies.space>"
+hostmakedepends="autoconf automake libtool pkg-config"
+homepage="https://github.com/canonical/raft"
+license="LGPL-3"
+distfiles="https://github.com/canonical/raft/archive/v${version}.tar.gz"
+checksum=789d39ca2e9272cf7a564e1584de8abb82983b09b7c97a8a5eeaa2ecf0de29b6
+
+pre_configure() {
+	autoreconf -i
+}

From 4d7d75a1542a844b580a08525e01cdeb9ca05ab9 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Wed, 30 Oct 2019 17:44:15 +1100
Subject: [PATCH 2/4] add new package: libco

---
 common/shlibs          |  1 +
 srcpkgs/libco/template | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/libco/template

diff --git a/common/shlibs b/common/shlibs
index 37fcbe98a7a..539d814f3f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -221,6 +221,7 @@ libgirepository-1.0.so.1 libgirepository-1.30_1
 libudev.so.1 eudev-libudev-1.6_1
 libgudev-1.0.so.0 libgudev-230_1
 libext2fs.so.2 e2fsprogs-libs-1.41.5_1
+libco.so.0 libco-19.1_1
 libcom_err.so.2 e2fsprogs-libs-1.41.5_1
 libe2p.so.2 e2fsprogs-libs-1.41.5_1
 libss.so.2 e2fsprogs-libs-1.41.5_1
diff --git a/srcpkgs/libco/template b/srcpkgs/libco/template
new file mode 100644
index 00000000000..30d9d45945a
--- /dev/null
+++ b/srcpkgs/libco/template
@@ -0,0 +1,16 @@
+# Template file for 'libco'
+pkgname=libco
+version=19.1
+revision=1
+build_style=gnu-makefile
+short_desc="Cooperative multithreading library written in C89"
+maintainer="fosslinux <fosslinux@aussies.space>"
+hostmakedepends="autoconf automake libtool"
+license="ISC"
+homepage="https://code.byuu.org/libco"
+distfiles="https://github.com/canonical/libco/archive/v${version}.tar.gz"
+checksum=0cbb3a6ba23c5985683ba0be213bb33bd617490aeb54a4d4421967a4fe9e2b95
+
+post_install() {
+	vlicense LICENSE
+}

From 9cbfc4e3a8f1a0faf25332d6fe58e39ea39573bd Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Wed, 30 Oct 2019 17:49:43 +1100
Subject: [PATCH 3/4] dqlite: update to 1.01

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

diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index b11c2e93bd9..257c3a07762 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,17 +1,17 @@
 # Template file for 'dqlite'
 pkgname=dqlite
-version=0.2.6
+version=1.0.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
-makedepends="libuv-devel sqlite-replication-devel"
+makedepends="raft libco libuv-devel sqlite-replication-devel"
 depends="sqlite-replication"
 short_desc="Distributed SQLite database using the Raft algorithm"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/CanonicalLtd/dqlite"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=47d31550d970a12d25101c331896cfb855128c110d912f5da3371062d9ece52b
+checksum=42d0684523728f169a8024cbd9cd1909b2a6a5ba5c62d8903625bd4c61c79cf8
 
 pre_configure() {
 	autoreconf -i

From 4874bfba6091e8b42966d0e9ce2e7f4e6d2510d7 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 29 Oct 2019 19:47:27 +1100
Subject: [PATCH 4/4] lxd: update to 3.18

---
 srcpkgs/lxd/patches/seccomp.patch | 41 -------------------------------
 srcpkgs/lxd/template              |  8 +++---
 2 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/lxd/patches/seccomp.patch

diff --git a/srcpkgs/lxd/patches/seccomp.patch b/srcpkgs/lxd/patches/seccomp.patch
deleted file mode 100644
index e7b52a31931..00000000000
--- a/srcpkgs/lxd/patches/seccomp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-lxc/lxd@a181ed4 [PATCH] seccomp: define __NR_mknod if missing
-lxc/lxd@c655ed5 [PATCH] seccomp: rework missing syscall number definitions
----
- lxd/seccomp.go | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/lxd/seccomp.go b/lxd/seccomp.go
-index 0afad7cacc..32397b9729 100644
---- lxd/seccomp.go
-+++ lxd/seccomp.go
-@@ -109,6 +109,14 @@
- 	return -EPERM;
- }
-
-+#ifndef __NR_mknodat
-+	#error missing kernel headers
-+#else
-+	#ifdef __NR_mknod
-+		#define LXD_MUST_CHECK_MKNOD
-+ 	#endif
-+#endif
-+
- static int seccomp_notify_mknod_set_response(int fd_mem, struct seccomp_notify_proxy_msg *msg,
- 					     char *buf, size_t size,
- 					     mode_t *mode, dev_t *dev,
-@@ -124,6 +132,7 @@ static int seccomp_notify_mknod_set_response(int fd_mem, struct seccomp_notify_p
-	resp->val = 0;
-
-	switch (req->data.nr) {
-+#ifdef LXD_MUST_CHECK_MKNOD
-	case __NR_mknod:
-		resp->error = device_allowed(req->data.args[2], req->data.args[1]);
-		if (resp->error) {
-@@ -143,6 +149,7 @@ static int seccomp_notify_mknod_set_response(int fd_mem, struct seccomp_notify_p
-		*pid = req->pid;
-
-		break;
-+#endif
-	case __NR_mknodat:
-		if (req->data.args[0] != AT_FDCWD) {
-			errno = EINVAL;
diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template
index 2a9cf44d88d..80a3d58b7eb 100644
--- a/srcpkgs/lxd/template
+++ b/srcpkgs/lxd/template
@@ -1,6 +1,6 @@
 # Template file for 'lxd'
 pkgname=lxd
-version=3.14
+version=3.18
 revision=1
 build_style=go
 go_import_path=github.com/lxc/lxd
@@ -8,19 +8,19 @@ go_build_tags=libsqlite3
 go_package="${go_import_path}/lxd ${go_import_path}/lxc
  ${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
 hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel"
+makedepends="raft lxc-devel acl-devel dqlite-devel"
 depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
 short_desc="Next generation system container manager"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="Apache-2.0"
 homepage="https://linuxcontainers.org/lxd"
 distfiles="https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
-checksum=409e4758cbeb43b098d0265c4ce05aeeac5ae73f8914ceb1006e6a6d89fe1fe5
+checksum=b09434e089776fb0c48d384a6e04707ba1d99d60b7b59e8ba573d8c7d7130fdd
 system_groups="lxd"
 
 do_configure() {
 	# the LXD tarball packages up the required dependencies
-	ln -s "$wrksrc/dist" "$GOPATH"
+	ln -s "$wrksrc/_dist" "$GOPATH"
 }
 
 do_build() {