Accepting request 835558 from home:cyphar:lxc

- Update to LXD 4.6. The full upstream changelog is available from:
  https://discuss.linuxcontainers.org/t/lxd-4-6-has-been-released/8981
  boo#1176737

  + Networks in projects
  + AppArmor profiles for qemu
  - Removal of custom sqlite fork.

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

lxd-4.5.tar.gz

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

lxd-4.5.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAl9JGSAACgkQxjiXTWR5
-LWe4ew/9GhiKfm7vL5h4wh/9qJyZt8Nm+uTy9jBRM4TqeubRAkW/KiwPeJpLmIdi
-fed0d70kIAG+TCzWTIXaxAdQ2s/c0P6qgmekbP2BmTsb8uxzQCnaez6ENrx2r/nV
-lbv6e8WfgHN6m2APGKibCm60VSVP5SKCPP7CJVLk5f+oRRCR4tnK8p2s+obj3yaP
-lNmGWpsJuMdbDjhAA8WoDLe5ZF87fuohKIZEwbKn70si3fxA6+vfaQmOSwT8OyEu
-Xlwft4FoNAzz3rRW3cR05TfPCuOihvE9wOgZxGdch5Iwo0+3MVM7bjklSF+/BiEi
-i9XObmDIADgK9bCLomSvhoDUiV1mvxl1gjCXVxNkSaLoNEdXp6Ffj3kk+eas6umX
-4oPUrjqTkqp3SpYXd3/1S2mghWhZx6cnGqXIydxNCmp5uz6SKd7u1SanngMKRmCY
-sLTkZ8u38Pui8IGXL7qyw57+lNgJSxd6kjTOVl3G6e6/dK4Jv/ZH89H3UE0zcMnx
-qSELNis+E22InU1B1Ca5jCLfYQMoQfuKHQdE0T5dI542XpCjl2p2kBRIFFNHKi6h
-MCf+A43l3VZeuhxxTGZZ/0A1GO/QWbiVI6aspsmBlqPOD9XjCtsn5DYa5aILpjhN
-AIjXFPWg1SqC2PCoh813spNuDOtia+mDEUUNPRZHudOxyQQhboQ=
-=NHJO
------END PGP SIGNATURE-----

lxd-4.6.tar.gz

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

lxd-4.6.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAl9k1skACgkQxjiXTWR5
+LWfVGhAAh3HlPyyNlCAyFmyFnqaFJxwV36s1yFnwwueL2rwbyjj29/5PUegRL3d0
+pNNaX0d6Ef7kWUicsgkf4AyeCfdbI4tYMyxUX32D/24O7Ngor1Di/nOjxWJjuhsD
+Qzst7aX+OLQ47iMV4xYnDoDEXeR/DrsFs3e3IHogub+7qvz0wjOo3hGaB3Lnx04a
+kGkGszVOlPr7Qu6b3D+2t+nt0QaSlrgJkASb9UTFCSuC8yBVfEax6OqpUcUQGog4
+/MI2jERbIg9E9Ncrc/EBIGMsgLYEI5VCrFW7vPU+dfRBUmA6XNtdwqJXlfgJadzZ
+B3d/GkLEbCRjuArsKbelbZlZNY3s7l5PQh8lkP5AcUQ+3VwdEPb5ZUK7OkAc0lqc
+EZpZVt1qLvWNDX72gW/0kTM9Usvx+FJ7fq2xPqvYECc4r0v3EUWAm7ma9GELMxrS
+NAeaeVvnySJeELfxvy/m2AASe1/EnkS3hf1Rvm+sYlJ5QMUFXryII8MqkLXbJYyn
+CGgVCba7KqNzHif8qcxLxDDyCGxd3Hn+mYuukCNaouZ3671hNOfTFfNJ1HlS4/LP
+YCcq4+8SYMwRGmZYNVKwcccZ70cXAndre/vIRveHOekPa9k5ktTXOXADI1fyxC1B
+8SZiksF7qzWubgwNwuGNdXBChcm4aWo7vch/Iayz/flDffk1Vvk=
+=oT48
+-----END PGP SIGNATURE-----

lxd.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Sep 19 04:50:10 UTC 2020 - Aleksa Sarai <asarai@suse.com>
+
+- Update to LXD 4.6. The full upstream changelog is available from:
+  https://discuss.linuxcontainers.org/t/lxd-4-6-has-been-released/8981
+  boo#1176737
+
+  + Networks in projects
+  + AppArmor profiles for qemu
+  - Removal of custom sqlite fork.
+
 -------------------------------------------------------------------
 Sat Aug 29 02:59:26 UTC 2020 - Aleksa Sarai <asarai@suse.com>
 

lxd.spec

@@ -23,7 +23,7 @@
 %define import_path github.com/lxc/lxd
 
 Name:           lxd
-Version:        4.5
+Version:        4.6
 Release:        0
 Summary:        Container hypervisor based on LXC
 License:        Apache-2.0
@@ -47,14 +47,14 @@ BuildRequires:  pkg-config
 BuildRequires:  rsync
 # Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
 # for 'golang(API) >= 1.14' here, so just require 1.14 exactly. bsc#1172608
+BuildRequires:  sqlite3-devel >= 3.25
 BuildRequires:  golang(API) = 1.14
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(lxc) >= 3.0.0
-# Needed to build the sqlite fork and dqlite.
+# Needed to build dqlite and raft.
 BuildRequires:  autoconf
 BuildRequires:  libtool
 BuildRequires:  pkgconfig(libuv) >= 1.8.0
-BuildRequires:  pkgconfig(tcl)
 # Bits required for images and other things at runtime.
 Requires:       acl
 Requires:       ebtables
@@ -120,30 +120,6 @@ export CFLAGS="%{optflags} -fPIC -DPIC"
 export PKG_CONFIG_SYSROOT_DIR="$INSTALL_ROOT"
 export PKG_CONFIG_PATH="$INSTALL_LIBDIR/pkgconfig"
 
-# SQLite
-pushd "$PKGDIR/_dist/deps/sqlite"
-autoreconf -fiv
-%configure \
-	--libdir="%{_libdir}/%{name}" \
-	--disable-static \
-	--enable-replication \
-	--disable-tcl
-make clean
-make %{?_smp_mflags}
-make DESTDIR="$INSTALL_ROOT" install
-popd
-
-# libco
-pushd "$PKGDIR/_dist/deps/libco"
-make \
-	CFLAGS="$CFLAGS" \
-	PREFIX="" \
-	INCLUDEDIR="%{_includedir}" \
-	LIBDIR="%{_libdir}/%{name}" \
-	DESTDIR="$INSTALL_ROOT" \
-	all install
-popd
-
 # raft
 pushd "$PKGDIR/_dist/deps/raft"
 autoreconf -fiv