From c10ee53a6747b17d2ae266190b8e9124752f3fd31b4cbd2b4ce77350d1ef2833 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Sat, 17 Oct 2020 09:30:56 +0000
Subject: [PATCH] Accepting request 842268 from home:cyphar:lxc

- Update to LXD 4.7. The full upstream changelog is available from:
  https://discuss.linuxcontainers.org/t/lxd-4-7-has-been-released/9213
  boo#1177825

  + Backup (export/import) of custom storage volumes
  + Import of instances with alternative name
  + Virtual machine memory shrinking (and re-grow)
  + USB device passthrough for virtual machines
  + Configurable rsync compression in migration
  + Restrict available uplinks for project networks
  + Add new physical managed network type
  + Support for external routed addresses/subnets on OVN

OBS-URL: https://build.opensuse.org/request/show/842268
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/lxd?expand=0&rev=67
---
 lxd-4.6.tar.gz     |  3 ---
 lxd-4.6.tar.gz.asc | 16 ----------------
 lxd-4.7.tar.gz     |  3 +++
 lxd-4.7.tar.gz.asc | 16 ++++++++++++++++
 lxd.changes        | 16 ++++++++++++++++
 lxd.spec           |  4 +++-
 6 files changed, 38 insertions(+), 20 deletions(-)
 delete mode 100644 lxd-4.6.tar.gz
 delete mode 100644 lxd-4.6.tar.gz.asc
 create mode 100644 lxd-4.7.tar.gz
 create mode 100644 lxd-4.7.tar.gz.asc

diff --git a/lxd-4.6.tar.gz b/lxd-4.6.tar.gz
deleted file mode 100644
index fa357a5..0000000
--- a/lxd-4.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3702f5eafba6dba2ab21c2119bc74e8b55514d697c1fac80343adeea94d72e04
-size 14213669
diff --git a/lxd-4.6.tar.gz.asc b/lxd-4.6.tar.gz.asc
deleted file mode 100644
index 9d886e6..0000000
--- a/lxd-4.6.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------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-----
diff --git a/lxd-4.7.tar.gz b/lxd-4.7.tar.gz
new file mode 100644
index 0000000..c5f4d76
--- /dev/null
+++ b/lxd-4.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:011745a66e971d95ada088dc42a9154028393de86871ea3ef4ff91a2976525ed
+size 14313057
diff --git a/lxd-4.7.tar.gz.asc b/lxd-4.7.tar.gz.asc
new file mode 100644
index 0000000..333fda4
--- /dev/null
+++ b/lxd-4.7.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAl+IxCMACgkQxjiXTWR5
+LWeQNRAAuUxjeHRXO+OaoMW1G2hNwD/7Pi5vlbvBVsaWeY+95PjRLUxXJkf9lQgr
+DRg8PQ4ZduM+4A74phAB/IcFYaxWH+69e4NjKVt1KmT2VSzpHyn1zSlWuUkxi0+5
+bB/CLqVI2t/gxV32M9uaIZ6U6mJizrNTx9xPDmb086vbnYesmOsl97XMZe+GvFYa
+VIHaf7bPRnceVLrIjPq0IS4BeoezZBAgFbjlzDrun4flrk+EYSJpxhKpKMsziUtF
+AU1LuO+25Qvn2EiNs/SDrzuQEC/YsverGmmERNTlzrZYUpJx33pJMMhALInd3S1s
+BoBBjHHV5ykX3H88pu+Tw5uQOEGganuDoMHSalQHp99SHysWRhCmveGLxbjqXAWJ
+uicAbaS4cNB55E2RxkoUVvQFx5DrZE2Aj1bl2iCLz2g2NJZNWbl+IiFN/dL1YCZY
+YZqUcJ0QFQSQX/CnoSibuSFzekYMNxU7y3/yryDCPy91RnaWTu+oUgame3THYeIG
+Qg9f0hIjbVoiHpTfZICUxgOnLf19Wz3vvGtCDxhfy+MBr1u7IFFgkktlI0iLDG1q
+nXdQ/MvlL2/Acs71RXQeBD2clN9Q4JrKCTEbayv/HtgQXhgg/91EoD+dGu0n17Ro
+mH0SgTzXmwdHYiOyI1s3PSSS6+Cml4PglFtqc0sJLGG9hwD1mgQ=
+=K3gq
+-----END PGP SIGNATURE-----
diff --git a/lxd.changes b/lxd.changes
index 59a78dd..05da301 100644
--- a/lxd.changes
+++ b/lxd.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Oct 17 09:03:58 UTC 2020 - Aleksa Sarai <asarai@suse.com>
+
+- Update to LXD 4.7. The full upstream changelog is available from:
+  https://discuss.linuxcontainers.org/t/lxd-4-7-has-been-released/9213
+  boo#1177825
+
+  + Backup (export/import) of custom storage volumes
+  + Import of instances with alternative name
+  + Virtual machine memory shrinking (and re-grow)
+  + USB device passthrough for virtual machines
+  + Configurable rsync compression in migration
+  + Restrict available uplinks for project networks
+  + Add new physical managed network type
+  + Support for external routed addresses/subnets on OVN
+
 -------------------------------------------------------------------
 Sat Sep 19 04:50:10 UTC 2020 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/lxd.spec b/lxd.spec
index 9f86412..9705ff2 100644
--- a/lxd.spec
+++ b/lxd.spec
@@ -23,7 +23,7 @@
 %define import_path github.com/lxc/lxd
 
 Name:           lxd
-Version:        4.6
+Version:        4.7
 Release:        0
 Summary:        Container hypervisor based on LXC
 License:        Apache-2.0
@@ -119,6 +119,8 @@ export CFLAGS="%{optflags} -fPIC -DPIC"
 # We have a temporary-install directory which contains all of the dylib deps.
 export PKG_CONFIG_SYSROOT_DIR="$INSTALL_ROOT"
 export PKG_CONFIG_PATH="$INSTALL_LIBDIR/pkgconfig"
+# For some reason, Leap need us to specify this explicitly now.
+export CPPFLAGS="-I$INSTALL_INCLUDEDIR"
 
 # raft
 pushd "$PKGDIR/_dist/deps/raft"