* Re: [PR PATCH] [Updated] lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
@ 2019-06-24 5:25 ` voidlinux-github
2019-06-24 5:25 ` voidlinux-github
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-24 5:25 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
2019-06-24 5:25 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-24 5:25 ` voidlinux-github
2019-06-24 20:05 ` voidlinux-github
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-24 5:25 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
2019-06-24 5:25 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-24 5:25 ` voidlinux-github
@ 2019-06-24 20:05 ` voidlinux-github
2019-06-25 6:43 ` voidlinux-github
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-24 20:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/12645#issuecomment-505158874
Comment:
Why did you only take one of the three related patches?
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
` (2 preceding siblings ...)
2019-06-24 20:05 ` voidlinux-github
@ 2019-06-25 6:43 ` voidlinux-github
2019-06-25 7:25 ` voidlinux-github
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-25 6:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/12645#issuecomment-505309172
Comment:
I don't understand, what related patch?
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
` (3 preceding siblings ...)
2019-06-25 6:43 ` voidlinux-github
@ 2019-06-25 7:25 ` voidlinux-github
2019-06-25 8:02 ` [PR PATCH] [Updated] " voidlinux-github
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-25 7:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/12645#issuecomment-505309172
Comment:
I don't understand, what related patch?
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
` (4 preceding siblings ...)
2019-06-25 7:25 ` voidlinux-github
@ 2019-06-25 8:02 ` voidlinux-github
2019-06-25 8:02 ` voidlinux-github
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-25 8:02 UTC (permalink / raw)
To: ml
[-- 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: 2524 bytes --]
From 0e35bc51707dfa69bc82bd920d8ebac5625ff44f 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 | 41 +++++++++++++++++++++++++++++++
srcpkgs/lxd/template | 4 +--
2 files changed, 43 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..e7b52a31931
--- /dev/null
+++ b/srcpkgs/lxd/patches/seccomp.patch
@@ -0,0 +1,41 @@
+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 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() {
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
` (5 preceding siblings ...)
2019-06-25 8:02 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-25 8:02 ` voidlinux-github
2019-06-25 8:07 ` voidlinux-github
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-25 8:02 UTC (permalink / raw)
To: ml
[-- 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: 2524 bytes --]
From 0e35bc51707dfa69bc82bd920d8ebac5625ff44f 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 | 41 +++++++++++++++++++++++++++++++
srcpkgs/lxd/template | 4 +--
2 files changed, 43 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..e7b52a31931
--- /dev/null
+++ b/srcpkgs/lxd/patches/seccomp.patch
@@ -0,0 +1,41 @@
+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 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() {
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
` (6 preceding siblings ...)
2019-06-25 8:02 ` voidlinux-github
@ 2019-06-25 8:07 ` voidlinux-github
2019-06-25 8:07 ` voidlinux-github
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-25 8:07 UTC (permalink / raw)
To: ml
[-- 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: 2524 bytes --]
From de749425a112e0ddb602cd51c19bc759a121eeca 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 | 41 +++++++++++++++++++++++++++++++
srcpkgs/lxd/template | 4 +--
2 files changed, 43 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..e7b52a31931
--- /dev/null
+++ b/srcpkgs/lxd/patches/seccomp.patch
@@ -0,0 +1,41 @@
+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 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() {
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
` (7 preceding siblings ...)
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
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-25 8:07 UTC (permalink / raw)
To: ml
[-- 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: 2524 bytes --]
From de749425a112e0ddb602cd51c19bc759a121eeca 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 | 41 +++++++++++++++++++++++++++++++
srcpkgs/lxd/template | 4 +--
2 files changed, 43 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..e7b52a31931
--- /dev/null
+++ b/srcpkgs/lxd/patches/seccomp.patch
@@ -0,0 +1,41 @@
+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 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() {
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
` (8 preceding siblings ...)
2019-06-25 8:07 ` voidlinux-github
@ 2019-06-25 8:09 ` voidlinux-github
2019-06-26 11:46 ` [PR PATCH] [Merged]: " voidlinux-github
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-25 8:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/12645#issuecomment-505336186
Comment:
@CameronNemo The first patch was already merged and the two last patches I combined into one patch in the latest commit
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Merged]: lxd: update to 3.14
2019-06-24 4:55 [PR PATCH] lxd: update to 3.14 voidlinux-github
` (9 preceding siblings ...)
2019-06-25 8:09 ` voidlinux-github
@ 2019-06-26 11:46 ` voidlinux-github
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-06-26 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
There's a merged pull request on the void-packages repository
lxd: update to 3.14
https://github.com/void-linux/void-packages/pull/12645
Description: first merge #12526
^ permalink raw reply [flat|nested] 12+ messages in thread