Accepting request 768954 from home:cyphar:lxc

- Update to LXD 3.20. The full upstream changelog is available from:
  https://discuss.linuxcontainers.org/t/lxd-3-20-has-been-released/6673
  boo#1162299
  + Server side support of API collections
  + New unix-hotplug device type
  + Support for standby cluster members
- Update packaging to use GOPATH="_dist" rather than trying to move everything
  to vendor/. This is the recommended approach by upstream (and makes our
  specfile marginally less horrific).

OBS-URL: https://build.opensuse.org/request/show/768954
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/lxd?expand=0&rev=37

lxd-3.19.tar.gz

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

lxd-3.19.tar.gz.asc

@@ -1,16 +0,0 @@
------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-3.20.tar.gz

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

lxd-3.20.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAl4zMqEACgkQxjiXTWR5
+LWf3XhAA2MgOeb5f7oF3/mHaIow0HvOtBUEQpZW9/j18zsfO0vhrxuXtQf5iOcnO
+oS/o5HH0erghn0sdPmn5r+MyDoqEP2sTpNlCIiyVjx7BgtMkE/pwyhRpdXS9Si+w
+dC9zotL7qXDYEXOGfpqlZGbOk0DXEmRPmWQ7NMSINOIBkjA/fYCPy4iFoKwdqjRV
+ODSM35WMIdY1noi//d2PYOZyuK38yN3b5uyDrWi2DUc1xXH+MHzaFCkr7tWalDcf
+9plMlzFgOpXRU13VvxBDgCeAT4CimDvP2zf7gaAPWFsBr7E4AOXazuvDfvIclZvA
+DdZdQy0F8RRh3ULY+qCfkK01IsxO32mjh7/oj2mrBx6l+HVyXKE6hzT/xEkqxd5k
+j0dqkilIbVFeuWIGBCdh5JfvbbHLKvzYt75BSdBrC1t8EasfbN2w5hmVBkYMZV6+
+9MSTjfyl+4WgiynmG0Ihidd5ouAtJ+ijEqEfCk0nHgZjslEZ720giRFbwCqh3wNc
+D8QpmDaN7qc4r64aHwP4J4ii6P312363lWom3/SzQj795az5MYHRBHTeLSBM7hQO
+Y6nn+k99tc2z7/bmHT1RA7vJYEsXb36AtWPLzsrB6GJR8vMhSz6C5n9H3bR+fQd1
+fWLVadXl9ULEiiYaWU/ypvjYv9YEp8sRbbSvMCuHKyVw/5Zl/Ko=
+=se38
+-----END PGP SIGNATURE-----

lxd.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jan 31 00:33:47 UTC 2020 - Aleksa Sarai <asarai@suse.com>
+
+- Update to LXD 3.20. The full upstream changelog is available from:
+  https://discuss.linuxcontainers.org/t/lxd-3-20-has-been-released/6673
+  boo#1162299
+  + Server side support of API collections
+  + New unix-hotplug device type
+  + Support for standby cluster members
+- Update packaging to use GOPATH="_dist" rather than trying to move everything
+  to vendor/. This is the recommended approach by upstream (and makes our
+  specfile marginally less horrific).
+
 -------------------------------------------------------------------
 Fri Jan 17 05:17:53 UTC 2020 - Aleksa Sarai <asarai@suse.com>
 

lxd.spec

@@ -23,7 +23,7 @@
 %define import_path github.com/lxc/lxd
 
 Name:           lxd
-Version:        3.19
+Version:        3.20
 Release:        0
 Summary:        Container hypervisor based on LXC
 License:        Apache-2.0
@@ -42,6 +42,7 @@ BuildRequires:  fdupes
 BuildRequires:  golang-packaging
 BuildRequires:  libacl-devel
 BuildRequires:  libcap-devel
+BuildRequires:  libudev-devel
 BuildRequires:  patchelf
 BuildRequires:  pkg-config
 BuildRequires:  rsync
@@ -88,28 +89,10 @@ Bash command line completion support for %{name}.
 %prep
 %setup -q
 
-# If there is a vendor/ move it to _dist/src/.
-if [ -d vendor ]
-then
-	cp -at _dist/src vendor/*
-	rm -rf vendor/
-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
+ln -s . _dist/src/github.com/cpuguy83/go-md2man/v2
 
 %build
 # Make sure any leftover go build caches are gone.
@@ -188,6 +171,9 @@ readarray -t mainpkgs \
 	      awk -F: '$1 == "main" { print $2 }' | \
 	      grep -Ev '^github.com/lxc/lxd/(test|shared)')"
 
+# We don't use
+export GOPATH="$GOPATH:$PKGDIR/_dist"
+
 # And now we can finally build LXD and all of the related binaries.
 mkdir bin
 for mainpkg in "${mainpkgs[@]}"