main/libvirt: upgrade to 2.0.0

2 files changed, 10 insertions, 86 deletions

diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index eeeb838404..ea7446408d 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libvirt
-pkgver=1.3.5
+pkgver=2.0.0
 _ver="${pkgver/_rc/-rc}"
-pkgrel=2
+pkgrel=0
 pkgdesc="A virtualization API for several hypervisor and container systems"
 url="http://libvirt.org/"
 arch="all"
@@ -23,14 +23,13 @@ makedepends="augeas-dev bridge-utils cyrus-sasl-dev device-mapper
 install="$pkgname.post-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-client $pkgname-daemon
 	$pkgname-lang $pkgname-lxc $pkgname-qemu $pkgname-uml $pkgname-vbox"
-source="http://libvirt.org/sources/$pkgname-$pkgver.tar.gz
+source="http://libvirt.org/sources/$pkgname-$pkgver.tar.xz
 	libvirt.confd
 	libvirt.initd
 	virtlogd.initd
 	virtlockd.initd
 	musl-fix-includes.patch
 	fix-fortify-virnetlink.patch
-	CVE-2016-5008.patch
 	"
 
 if [ "$CARCH" = "x86_64" ]; then
@@ -94,7 +93,7 @@ package() {
 	install -D -m755 $srcdir/virtlockd.initd $pkgdir/etc/init.d/virtlockd
 
 	install -d "$pkgdir"/etc/modules-load.d
-	echo "tun" > "$pkgdir"/etc/modules-load.d/libvirt
+	echo "tun" > "$pkgdir"/etc/modules-load.d/libvirt.conf
 
 	rm -rf "$pkgdir"/usr/lib/charset.alias
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
@@ -178,27 +177,24 @@ _common_drivers() {
 		"$subpkgdir"/etc/libvirt/
 }
 
-md5sums="f9dc1e63d559eca50ae0ee798a4c6c6d  libvirt-1.3.5.tar.gz
+md5sums="31ac94b8c2c14c0c18094802267bfca1  libvirt-2.0.0.tar.xz
 1c84a7baeafe0a7f4e9d7ae5180311b7  libvirt.confd
 bb94cd55d0029de387e6cb41e41f9167  libvirt.initd
 e979ad068888cc824be210bd51c82f82  virtlogd.initd
 4fb24502be354972041b37186ef5406c  virtlockd.initd
 9da7723b114b2d87558e92828366fbcb  musl-fix-includes.patch
-bc6ed2ce739dcc40542bb4e6bc94c0d3  fix-fortify-virnetlink.patch
-989f7e79636e863e3db5203ec8bac39b  CVE-2016-5008.patch"
-sha256sums="93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8  libvirt-1.3.5.tar.gz
+bc6ed2ce739dcc40542bb4e6bc94c0d3  fix-fortify-virnetlink.patch"
+sha256sums="10e90af55e613953c0ddc60b4ac3a10c73c0f3493d7014259e3f012b2ffc9acb  libvirt-2.0.0.tar.xz
 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1  libvirt.confd
 e198935231f34601f1aafccdda132ca6ef22ea1bcc376446e2ceb04e6cd89800  libvirt.initd
 51c030d7ba9a9dad1f927020592d7aef2dc2cd4abf38bd4ca97eee60943c7901  virtlogd.initd
 552ba1f6edf92513a3041cbd3655ce782dc413c6f60995e77e6e3245ad1ef1f2  virtlockd.initd
 8dfa9dbe71ee21dc53e44bd7cc0127adde1bf3371d6b393657b386bb83f8139b  musl-fix-includes.patch
-84132508aeb5a5946e07426337d6fbb0208b1181d51d3c4927ef9601562ce3d3  fix-fortify-virnetlink.patch
-dd3753a52e6ad3b6e46e9460242b7ad076ace6a054b683f96504342ca526b260  CVE-2016-5008.patch"
-sha512sums="6c6a09623d3d4d426311bfa7039f5e39584d5f891b8e761bbdb3022601ea066b8e1c3f8d609326e8ba4081ae40b7b03086fbc8ba5759d218b8616ec98200a89d  libvirt-1.3.5.tar.gz
+84132508aeb5a5946e07426337d6fbb0208b1181d51d3c4927ef9601562ce3d3  fix-fortify-virnetlink.patch"
+sha512sums="1182346e9268ec50cfd191a18172ad8ca80615a111547cc72fbe227cbbe9579263a1236f80cb36542272bdbf092e2184c9060b65c56dc2098076bbd1a89dd66c  libvirt-2.0.0.tar.xz
 9aba6ab73219a635c64a340ee8887356e644445c9128734cbce73f5d54778378da2f10a190365ad88a7db8bc95b1fb17f0c6ca41fc41bb786c09e1afe84d65dc  libvirt.confd
 734afb83b7a4703dd238f1d89dbc853a8c73bcf1994af648c41ab01ae4088e5c7a423f0cb91e5e31f2ae5e60c66d08a6e1583a1e3b88bb5554e0f9fd15ecc15c  libvirt.initd
 36b85f473d292be8df415256d01a562131d8ae61450ba3893658090a12d589ca32215382f56f286a830b4e59ffd98fbe1d92004f2ce14ca0834451b943cd8f2f  virtlogd.initd
 a4c4d26e4111931acbe7594451bf963a36c8db33c64b1bc447ab4758bb92803510bebee0511d6bc16ba80c289ab6f87e74377d47bf560412f9adb9c161a206d9  virtlockd.initd
 b6142256bf2700b9e5335c60fe5628e4095a24689c31d54afcab46f46a06b9c0ae676f87f77a487377eafbec11fb7afa9b994aef48a10a39e82f47c45df008ba  musl-fix-includes.patch
-0ef74be8c8f0e6c6ae6e3dcf6e83dc76c1371e1eaab123589f634c22f221cc26a8f0b0de6a9f5d36510b270d4a06fae42b51b749311f3e57953e65fbfc241911  fix-fortify-virnetlink.patch
-37ebc14aa1616964c89bcac17df14abd7f3fdd95f49eb3c121c89c94fe1321b1f996133763cddbabdccfe8f139edd60a7588bc81b6f14a35c78e8353050b0493  CVE-2016-5008.patch"
+0ef74be8c8f0e6c6ae6e3dcf6e83dc76c1371e1eaab123589f634c22f221cc26a8f0b0de6a9f5d36510b270d4a06fae42b51b749311f3e57953e65fbfc241911  fix-fortify-virnetlink.patch"
diff --git a/main/libvirt/CVE-2016-5008.patch b/main/libvirt/CVE-2016-5008.patch
deleted file mode 100644
index 6fb07ac3ec..0000000000
--- a/main/libvirt/CVE-2016-5008.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From bb848feec0f3f10e92dd8e5231ae7aa89b5598f3 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 28 Jun 2016 14:39:58 +0200
-Subject: [PATCH] qemu: Let empty default VNC password work as documented
-
-CVE-2016-5008
-
-Setting an empty graphics password is documented as a way to disable
-VNC/SPICE access, but QEMU does not always behaves like that. VNC would
-happily accept the empty password. Let's enforce the behavior by setting
-password expiration to "now".
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1180092
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_hotplug.c |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index e0b8230..bf6430d 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -3933,6 +3933,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
-     time_t now = time(NULL);
-     char expire_time [64];
-     const char *connected = NULL;
-+    const char *password;
-     int ret = -1;
-     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
- 
-@@ -3940,16 +3941,14 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
-         ret = 0;
-         goto cleanup;
-     }
-+    password = auth->passwd ? auth->passwd : defaultPasswd;
- 
-     if (auth->connected)
-         connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected);
- 
-     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-         goto cleanup;
--    ret = qemuMonitorSetPassword(priv->mon,
--                                 type,
--                                 auth->passwd ? auth->passwd : defaultPasswd,
--                                 connected);
-+    ret = qemuMonitorSetPassword(priv->mon, type, password, connected);
- 
-     if (ret == -2) {
-         if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
-@@ -3957,14 +3956,15 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
-                            _("Graphics password only supported for VNC"));
-             ret = -1;
-         } else {
--            ret = qemuMonitorSetVNCPassword(priv->mon,
--                                            auth->passwd ? auth->passwd : defaultPasswd);
-+            ret = qemuMonitorSetVNCPassword(priv->mon, password);
-         }
-     }
-     if (ret != 0)
-         goto end_job;
- 
--    if (auth->expires) {
-+    if (password[0] == '\0') {
-+        snprintf(expire_time, sizeof(expire_time), "now");
-+    } else if (auth->expires) {
-         time_t lifetime = auth->validTo - now;
-         if (lifetime <= 0)
-             snprintf(expire_time, sizeof(expire_time), "now");
--- 
-1.7.1
-