From 6b3769a6ad3ce2d6c3933eea2a3df8312a357d7a5b7f08916b6840935cbcb2b8 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sat, 31 Jul 2021 06:19:20 +0000 Subject: [PATCH] Accepting request 909502 from home:cyphar:lxc - Update to LXD 4.16. The full upstream changelog is available from: https://discuss.linuxcontainers.org/t/lxd-4-16-has-been-released/11547 boo#1188946 + Cluster certificate update + Copy/move of custom volumes between projects + lxc monitor --pretty now works with all event types + Easier revocation of cluster join tokens + IP filtering on unmanaged bridges + New warnings + New lifecycle events - Remove upstreamed patches: + boo1186786-0001-forkexec-handle-broken-close_range-backport-in-openS.patch OBS-URL: https://build.opensuse.org/request/show/909502 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/lxd?expand=0&rev=99 --- ...broken-close_range-backport-in-openS.patch | 33 ------------------- lxd-4.15.tar.gz | 3 -- lxd-4.15.tar.gz.asc | 16 --------- lxd-4.16.tar.gz | 3 ++ lxd-4.16.tar.gz.asc | 16 +++++++++ lxd.changes | 18 ++++++++++ lxd.spec | 9 +++-- 7 files changed, 41 insertions(+), 57 deletions(-) delete mode 100644 boo1186786-0001-forkexec-handle-broken-close_range-backport-in-openS.patch delete mode 100644 lxd-4.15.tar.gz delete mode 100644 lxd-4.15.tar.gz.asc create mode 100644 lxd-4.16.tar.gz create mode 100644 lxd-4.16.tar.gz.asc diff --git a/boo1186786-0001-forkexec-handle-broken-close_range-backport-in-openS.patch b/boo1186786-0001-forkexec-handle-broken-close_range-backport-in-openS.patch deleted file mode 100644 index 1edc4c5..0000000 --- a/boo1186786-0001-forkexec-handle-broken-close_range-backport-in-openS.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a0c04ef1b99c94edb50084825365c2bab8dadb7c Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Thu, 17 Jun 2021 12:45:25 +0200 -Subject: [PATCH] forkexec: handle broken close_range() backport in openSUSE - Leap 15.3 - -Fixes: https://discuss.linuxcontainers.org/t/lxc-exec-results-in-error-failed-to-retrieve-pid-of-executing-child-process -Signed-off-by: Christian Brauner ---- - lxd/main_forkexec.go | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go -index 7cc5e8d7130c..574f25eeb988 100644 ---- a/lxd/main_forkexec.go -+++ b/lxd/main_forkexec.go -@@ -292,7 +292,12 @@ __attribute__ ((noinline)) static int __forkexec(void) - - ret = close_range(EXEC_PIPE_FD + 1, UINT_MAX, CLOSE_RANGE_UNSHARE); - if (ret) { -- if (errno == ENOSYS) -+ // Fallback to close_inherited() when the syscall is not -+ // available or when CLOSE_RANGE_UNSHARE isn't supported. -+ // On a regular kernel CLOSE_RANGE_UNSHARE should always be -+ // available but openSUSE Leap 15.3 seems to have a partial -+ // backport without CLOSE_RANGE_UNSHARE support. -+ if (errno == ENOSYS || errno == EINVAL) - ret = close_inherited(fds_to_ignore, ARRAY_SIZE(fds_to_ignore)); - } - if (ret) --- -2.32.0 - diff --git a/lxd-4.15.tar.gz b/lxd-4.15.tar.gz deleted file mode 100644 index 672781e..0000000 --- a/lxd-4.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5178a918d59c9412a0af4af4c1abfce469e1a76497913bc316bf602895a2b265 -size 15801069 diff --git a/lxd-4.15.tar.gz.asc b/lxd-4.15.tar.gz.asc deleted file mode 100644 index 7dcb691..0000000 --- a/lxd-4.15.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAmC5dagACgkQxjiXTWR5 -LWeosRAAhxM6/aEIO6OJkZkSIkFpSkS70sZmixlniQr44N4vKv550GGa1YsLLasO -VCiv4sD/PfTEx93oM24IqJkKCGSGzCK6Ohx5ImUKPa7ALIqtxJqPxp3e7W7Fn8F5 -sQgT7KmNjKArvCb0NrHBwE81JyMsHt7MvZyapgzPYvYGmtXJPiHpoISGl71dQX7q -EZb4bfsybdiF/kHOK8LmjciujHBynaQ9PvoIHuaZJKkThf8qjyfxHnI70SF2mGdC -r8CWRE0nqQGEx1q+1JPsoIkzm2irljIomwV/6uDQ13vRly0ns90hhvd2KcCozdH0 -1O6rczZiy3xcq2Xo9BnG8KeVtU2GDdHxeMOX2cxc5ARrgDONmBT6hCzATTemunlB -vxnp3MQCOTL5ZLz53faEmKR/vw39sKUP9GAQhwUcYzi64K3DZzOEOplDRQjmK5jG -rgTmSTiQqm1nzd46n4mEbsOebnSYCFj80UkfWdq8CupKBXz4X5z7WTcrvLc4bPXW -akatfHSeM8PzhONxSuiTn5uC9aE+hqoSc1EW25goAyuZpDqleAjn9Snf7HL8uhsV -G9ADE4XMnfAEXstR8p50yIE6zZ2cTf5+7XeboUWqPf8x9TrpzzNgy8h8v0xKGk9a -/GtqooQSMPiO7vIlOTBhq8xPljnXU25SF1M/QaHNIwt6s+sgzJI= -=bqK2 ------END PGP SIGNATURE----- diff --git a/lxd-4.16.tar.gz b/lxd-4.16.tar.gz new file mode 100644 index 0000000..424f827 --- /dev/null +++ b/lxd-4.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9e0bf2805ac6384b24fc8bd8f0a55b920d385cfaf659b9a485e23ddeb5649b5 +size 15863102 diff --git a/lxd-4.16.tar.gz.asc b/lxd-4.16.tar.gz.asc new file mode 100644 index 0000000..3c26156 --- /dev/null +++ b/lxd-4.16.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAmDn2lcACgkQxjiXTWR5 +LWccXw/+KJ+B/H87eIMxjDwbcCVYBr3g+6QHm6UjEMQezOhO4KV5evdhDChVXw+J +MVmacdDeRYNKOVUMhMEdUjXJ/WgOiDYiJ9eucAuqWa3SWYo4r2nMLUvgUfwIcIzQ +mpYud6DVEVms20DxEl7usxjCh8LSh6H1gJEuDkYleiNtC2Yp8DQhs/yih5XZusE4 +qsuOT4Ym6GxfqqyBi56yT9dKuS6xpXeSWX4lwuLxGI6rqd1jXSNaHCeOsdhexYnW +GAlG69kEd+WDaQZzIyuRkqGB9lwV6QzRgteWWzwwZrPEwADEXlU6wwYURcLOosUB +DJWqKtdkD70Yyk6OCgYc8E80p8kc3gQVMd+g7PCC3Pp6gwCkJoh136jj3iaKxTZX +sh1KHgzGg06yya5k6aH9hL8C5rj1niKAnrcM2CRljL5L+uxXYyVZ5iJz6BOqP2Re +WGTlgs0DuFYssBT7L2QSJtVKiLdki2croO8XFPZDzjurp7ElMILYKT6GNBaoPdpY +vkKiB6S7qT9M2LhmwI4nJ3utApeBZ9LWQqb1ss4wwqXNyfSqkv2TELJ5b7PD8TiZ +zuzwiYpIy3fPXZgC2btR9exOCQN5YuOF0VCnFLT5PKrPHTyuxXnyeIk0kA94B29/ +CzgGvh9osW+kjLIVCrWDc/vb6t6vzqjxs4rwEKUHtenRScUvHbI= +=94Id +-----END PGP SIGNATURE----- diff --git a/lxd.changes b/lxd.changes index 7f1b06c..a626271 100644 --- a/lxd.changes +++ b/lxd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sat Jul 31 04:33:50 UTC 2021 - Aleksa Sarai + +- Update to LXD 4.16. The full upstream changelog is available from: + https://discuss.linuxcontainers.org/t/lxd-4-16-has-been-released/11547 + boo#1188946 + + + Cluster certificate update + + Copy/move of custom volumes between projects + + lxc monitor --pretty now works with all event types + + Easier revocation of cluster join tokens + + IP filtering on unmanaged bridges + + New warnings + + New lifecycle events + +- Remove upstreamed patches: + + boo1186786-0001-forkexec-handle-broken-close_range-backport-in-openS.patch + ------------------------------------------------------------------- Wed Jul 7 16:52:36 UTC 2021 - Bernhard Wiedemann diff --git a/lxd.spec b/lxd.spec index a669143..60f0f4c 100644 --- a/lxd.spec +++ b/lxd.spec @@ -34,7 +34,7 @@ %endif Name: lxd -Version: 4.15 +Version: 4.16 Release: 0 Summary: Container hypervisor based on LXC License: Apache-2.0 @@ -51,8 +51,6 @@ Source101: %{name}-config.yml # Additional runtime configuration. Source200: %{name}.sysctl Source201: %{name}.dnsmasq -# UPSTREAM-FIX: Backport of . boo#1186786 -Patch1: boo1186786-0001-forkexec-handle-broken-close_range-backport-in-openS.patch BuildRequires: fdupes BuildRequires: golang-packaging BuildRequires: libacl-devel @@ -124,8 +122,6 @@ Bash command line completion support for %{name}. %prep %setup -q -# boo#1186786 -%patch1 -p1 # Create fake "go mod"-like import paths. This is going to be really fun to # maintain but it's unfortunately necessary because openSUSE doesn't have nice @@ -190,6 +186,9 @@ readarray -t mainpkgs \ # _dist/src is effectively an old-school "vendor/" tree, so add it to GOPATH. export GOPATH="$GOPATH:$PKGDIR/_dist" +# Needed because lxd and deps use funky #cgo LDFLAGS that Go blocks by default. +export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" + # And now we can finally build LXD and all of the related binaries. mkdir bin for mainpkg in "${mainpkgs[@]}"