From 806873a198b911c676973ea3ef7ece948575c5f5 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 23 Sep 2015 11:48:41 +0200 Subject: [PATCH] fix kvm version parser for CVE stable releases, bump version to 4.0-25 --- Makefile | 2 +- PVE/QemuServer.pm | 2 +- changelog.Debian | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d6b818d4..34ff345c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=4.0 VERSION=4.0 PACKAGE=qemu-server -PKGREL=24 +PKGREL=25 CFLAGS= -O2 -Werror -Wall -Wtype-limits -Wl,-z,relro diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index e063c17d..5c34c3ae 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -651,7 +651,7 @@ sub kvm_user_version { my $tmp = `kvm -help 2>/dev/null`; - if ($tmp =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?)[,\s]/) { + if ($tmp =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?)(\.\d+)?[,\s]/) { $kvm_user_version = $2; } diff --git a/changelog.Debian b/changelog.Debian index 65bda636..62e313f8 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,9 @@ +qemu-server (4.0-25) unstable; urgency=medium + + * fix kvm version parser for CVE stable releases + + -- Proxmox Support Team Wed, 23 Sep 2015 11:48:09 +0200 + qemu-server (4.0-24) unstable; urgency=medium * improve VM protection mode -- 2.39.5