Accepting request 766444 from Virtualization:containers

- Update to LXD 3.19. The full upstream changelog is available from:
  https://discuss.linuxcontainers.org/t/lxd-3-19-has-been-released/6529
  boo#1161615

OBS-URL: https://build.opensuse.org/request/show/766444
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxd?expand=0&rev=8

lxd-3.18.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b09434e089776fb0c48d384a6e04707ba1d99d60b7b59e8ba573d8c7d7130fdd
-size 23590879

lxd-3.18.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAl2U0kMACgkQxjiXTWR5
-LWc8NRAAqT+2Vn6F1tenvD4En2HOhG3sVA3GVttjElMs9tpK7gafoXVMKBRH2Gem
-GlqDYEKQz0IfzGZIBpwvHX0un7xt5A84NLcB0UDCE5Po23T577kbH7qsgrGup4Dk
-kOmZ2LxUknb9IqCW66LbpaIJ31CY7f11lnVyOiGMI0nGTpgXvDGsbJyBt0B0jk96
-YzHchDCg+EctbrRzgRlLiKnW4HU3Idesud9MMOXKSTu1d8Y4IThoAR0ZXMDfX3f2
-hu+pU9idL5AFV5+gKfJF0lAbQsfjztZcvReK/L27EI5B7dYPOSe9GCnsY6xvBDKV
-Z1MAZdiFY/hvP5zPVLcVSJ4M8sX6xF9HIy++JFF+T11Re3knTpmq0kes8WEZezRN
-TYX7MNmEX3glRqvQhNr2nyDkXWA9Z+6Lks3Wrl3peC0/6Qm9g8yhSWMkqGG8o/1S
-nU1qdZdMrs7IoKFkb/wulHSkeXzQsy6qp7FlBPWeSRH9AgFFhy16GibPcgz8Tru7
-wu5mYn292CSaidxijwseIjobpfy5hyCxb+X8VQYjXi4gVBNfsnVPJjlQIVbcv+iO
-+Rxd3cdkl2zc+j8dtskQ7hgXrKDJG+QWszArxO+r9ipwiI4af57jRfKNtmmovHnQ
-7uIyLauEhIPVdyllYh+DlmMeEx/xMebsPEhCSFT/CKIRfUjv5/E=
-=3zIp
------END PGP SIGNATURE-----

lxd-3.19.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:afc0b0912e5fa977007cfd97805849a3a47564eaaaa1638948081665ad7224c8
+size 24468419

lxd-3.19.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAl4fh4MACgkQxjiXTWR5
+LWddlQ/+PD9UFJYmDCWuEIvLb5tGoKdrwOxTFItLvoL1+MpHtphRWFS8UArm6sS/
+ev7r8QTM9HMUCd+PbEEVYJ+tLbiEC4SJzG1en4Cfprl27BeSra9SQGzt/WdzGtZ7
+S2h3CvJrjHxOg0aBqBIIRPuvpETnpWFAXyALicf4KtuPimqPdFsDcOYAxtOQN2s/
+fVaZ8ibMNFcCGFn6PmXa0f3qiJfzKC1FsOEmVc4WpfU42g4tMZWJnFWsF5zRw+WC
+gIA3CD5xHwrLfN0gg6tMbM/Aa1FWjBXcDHxP4uf2V6i8OxcIPzdfqf8auXbOkOwC
+dtO3KZKFo1tJ2kwlhT7WaIOeHifFfRa3dybtyFGzpw50ZFjyGCjDK6T+i+FCZsOX
+N9ergkzUqDw5GeYuxnjsSWT8bREZYw9RMpUfbM3d+UWQ2NFbNevCRMRcXDTlstO+
+4Jst6Yice7ohmfzOaeGgB+RTMnrBUZLp/5qpNiEKjOH+qDh8fE/IbcW+vNdco481
+jv0GJPJKg0XdWr0NkzMsuI6cjGkntWDwKQbtAOvRWJI3Q3Xg7PFZBu9Q7Q/oz6Q7
+G6WQvmQY4urFARLvjQgb3ZpsFwlJNMgeChzI2CQkfC8/Bl8Zvr/wVtaMx98yrVni
+kjvJkp/G9eOOlEkB1IvCdJpwpz5vPdJhndJUcn/bv7ggTJlqlu4=
+=XqkK
+-----END PGP SIGNATURE-----

lxd.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Jan 17 05:17:53 UTC 2020 - Aleksa Sarai <asarai@suse.com>
+
+- Update to LXD 3.19. The full upstream changelog is available from:
+  https://discuss.linuxcontainers.org/t/lxd-3-19-has-been-released/6529
+  boo#1161615
+  + Virtual machine support
+  + Reworked storage layer
+  + Routed networking mode
+  + Custom mount options for disk devices
+  + Interception of the mount system call
+  + Multi-architecture clustering
+  + ...
+- Rework package handling to fake Go module builds.
+
 -------------------------------------------------------------------
 Wed Dec 11 23:55:40 UTC 2019 - Aleksa Sarai <asarai@suse.com>
 

lxd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lxd
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 %define import_path github.com/lxc/lxd
 
 Name:           lxd
-Version:        3.18
+Version:        3.19
 Release:        0
 Summary:        Container hypervisor based on LXC
 License:        Apache-2.0
@@ -44,6 +44,7 @@ BuildRequires:  libacl-devel
 BuildRequires:  libcap-devel
 BuildRequires:  patchelf
 BuildRequires:  pkg-config
+BuildRequires:  rsync
 BuildRequires:  golang(API) >= 1.10
 BuildRequires:  pkgconfig(lxc) >= 3.0.0
 # Needed to build the sqlite fork and dqlite.
@@ -96,6 +97,20 @@ fi
 # Move _dist/src (which is LXD's variant of vendoring) to vendor/.
 mv -v _dist/src vendor
 
+# For some reason, some vendored packages have stored their vendored sources
+# within their source tree inside the vendor tree (?!). So we need to
+# workaround this, even though it's probably a bug in LXD packaging.
+for vendor in $(find vendor/* -type d -name vendor)
+do
+	rsync -a "$vendor/" vendor/
+	rm -rf "$vendor/"
+done
+
+# 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
+# "go mod" support in OBS...
+ln -s . vendor/github.com/cpuguy83/go-md2man/v2
+
 %build
 # Make sure any leftover go build caches are gone.
 go clean -cache
@@ -179,12 +194,11 @@ for mainpkg in "${mainpkgs[@]}"
 do
 	binary="$(basename "$mainpkg")"
 	(
-		# We need to link against our dylib deps when dealing with lxd proper.
+		# We need to link against our particular dylib deps.
-		[ "$binary" == "lxd" ] && export \
+		export \
-			BUILDTAGS="libsqlite3" \
 			CGO_CFLAGS="-I $INSTALL_INCLUDEDIR" \
 			CGO_LDFLAGS="-L $INSTALL_LIBDIR" ||:
-		go build -buildmode=pie -tags "$BUILDTAGS" -o "bin/$binary" "$mainpkg"
+		go build -buildmode=pie -tags "libsqlite3" -o "bin/$binary" "$mainpkg"
 	)
 done
 
@@ -234,7 +248,7 @@ done
 # Switch to absolute DT_NEEDED for all dylibs we have as well as the main LXD
 # binary. We do this for all dylibs to make sure we don't end up with weird
 # chain-loading problems.
-for target in bin/lxd "$INSTALL_LIBDIR"/lib*.so
+for target in bin/* "$INSTALL_LIBDIR"/lib*.so
 do
 	# Drop RPATH in case it got included during builds.
 	patchelf --remove-rpath "$target"
@@ -256,6 +270,8 @@ for bin in *
 do
 	# Ensure that all our binaries are dynamic. boo#1138769
 	file "$bin" | grep 'dynamically linked'
+	# Check what they are linked against.
+	ldd "$bin"
 done
 popd