From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] lxd: update to 3.14
Date: Mon, 24 Jun 2019 07:25:54 +0200 [thread overview]
Message-ID: <20190624052554.rU-OffCDKjNP7JKlhzXJLX1lAvsfzoPm5Wuqihp0YTE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12645@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages lxd-update
https://github.com/void-linux/void-packages/pull/12645
lxd: update to 3.14
first merge #12526
A patch file from https://github.com/void-linux/void-packages/pull/12645.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lxd-update-12645.patch --]
[-- Type: application/text/x-diff, Size: 3305 bytes --]
From ead206f83c1ce0125a79b2bf2be98374e2a6d440 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sun, 23 Jun 2019 21:54:55 -0700
Subject: [PATCH] lxd: update to 3.14
---
srcpkgs/lxd/patches/seccomp.patch | 63 +++++++++++++++++++++++++++++++
srcpkgs/lxd/template | 4 +-
2 files changed, 65 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/lxd/patches/seccomp.patch
diff --git a/srcpkgs/lxd/patches/seccomp.patch b/srcpkgs/lxd/patches/seccomp.patch
new file mode 100644
index 00000000000..fff28254ed6
--- /dev/null
+++ b/srcpkgs/lxd/patches/seccomp.patch
@@ -0,0 +1,63 @@
+From a181ed43172755cf9fcd3e1068f914c373e7091b Mon Sep 17 00:00:00 2001
+From: Christian Brauner <christian.brauner@ubuntu.com>
+Date: Fri, 14 Jun 2019 01:05:52 +0200
+Subject: [PATCH] seccomp: define __NR_mknod if missing
+
+Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
+---
+ lxd/seccomp.go | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/lxd/seccomp.go b/lxd/seccomp.go
+index 0afad7cacc..071859d6a2 100644
+--- lxd/seccomp.go
++++ lxd/seccomp.go
+@@ -109,6 +109,48 @@ static int device_allowed(dev_t dev, mode_t mode)
+ return -EPERM;
+ }
+
++#ifndef __NR_mknod
++ #ifdef __x86_64__
++ #define __NR_mknod 133
++ #elif defined __arm__
++ #define __NR_mknod 14
++ #elif defined __aarch64__
++ #define __NR_mknod 14
++ #elif defined __s390__
++ #define __NR_mknod 14
++ #elif defined __s390x__
++ #define __NR_mknod 14
++ #elif __mips__ && _MIPSEB && _MIPS_SIM ==_ABIO32
++ #define __NR_mknod 14
++ #elif __mips__ && _MIPSEL && _MIPS_SIM==_ABIO32
++ #define __NR_mknod 14
++ #elif __mips__ && _MIPSEB && _MIPS_SIM==_ABI64
++ #define __NR_mknod 131
++ #elif __mips__ && _MIPSEL && _MIPS_SIM==_ABI64
++ #define __NR_mknod 131
++ #elif __mips__ && _MIPSEB && _MIPS_SIM==_ABIN32
++ #define __NR_mknod 131
++ #elif __mips__ && _MIPSEL && _MIPS_SIM==_ABIN32
++ #define __NR_mknod 131
++ #elif defined __i386__
++ #define __NR_mknod 14
++ #elif defined __alpha__
++ #define __NR_mknod 14
++ #elif defined __ia64__
++ #define __NR_mknod 13
++ #elif defined __m68k__
++ #define __NR_mknod 14
++ #elif defined __sparc__
++ #define __NR_mknod 14
++ #elif defined __powerpc__
++ #define __NR_mknod 14
++ #elif defined __sh__
++ #define __NR_mknod 14
++ #else
++ #warning "__NR_mknod unknown for your architecture"
++ #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,
diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template
index 1fa0cd0731f..2a9cf44d88d 100644
--- a/srcpkgs/lxd/template
+++ b/srcpkgs/lxd/template
@@ -1,6 +1,6 @@
# Template file for 'lxd'
pkgname=lxd
-version=3.13
+version=3.14
revision=1
build_style=go
go_import_path=github.com/lxc/lxd
@@ -15,7 +15,7 @@ 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=025138d2ac7ade6e34446f90f2d25ded86aedcad726d85ba8f2b7188dab75acd
+checksum=409e4758cbeb43b098d0265c4ce05aeeac5ae73f8914ceb1006e6a6d89fe1fe5
system_groups="lxd"
do_configure() {
next prev parent reply other threads:[~2019-06-24 5:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 4:55 [PR PATCH] " voidlinux-github
2019-06-24 5:25 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-24 5:25 ` voidlinux-github [this message]
2019-06-24 20:05 ` voidlinux-github
2019-06-25 6:43 ` voidlinux-github
2019-06-25 7:25 ` voidlinux-github
2019-06-25 8:02 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-25 8:02 ` voidlinux-github
2019-06-25 8:07 ` voidlinux-github
2019-06-25 8:07 ` voidlinux-github
2019-06-25 8:09 ` voidlinux-github
2019-06-26 11:46 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190624052554.rU-OffCDKjNP7JKlhzXJLX1lAvsfzoPm5Wuqihp0YTE@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).