[pve-devel] [PATCH kvm 4/4] bump version to 2.6.1

[Wolfgang Bumiller]

---
 Makefile            |   6 +++---
 debian/changelog    |  22 ++++++++++++++++++++++
 qemu-kvm-src.tar.gz | Bin 12073187 -> 12075164 bytes
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9452c09..4b423a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=4.2
 
 # also update debian/changelog
-KVMVER=2.6
+KVMVER=2.6.1
 KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm
@@ -9,7 +9,7 @@ KVMDIR=qemu-kvm
 KVMSRC=${KVMDIR}-src.tar.gz
 
 ARCH=amd64
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse master)
 
 DEBS=							\
 ${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb	\
@@ -21,7 +21,7 @@ all: ${DEBS}
 .PHONY: download
 download:
 	rm -rf ${KVMDIR} ${KVMSRC}
-	git clone --depth=1 git://git.qemu-project.org/qemu.git -b v2.6.0 ${KVMDIR}
+	git clone --depth=1 git://git.qemu-project.org/qemu.git -b v${KVMVER} ${KVMDIR}
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 .PHONY: deb
diff --git a/debian/changelog b/debian/changelog
index add3bc9..93d9e05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+pve-qemu-kvm (2.6.1-1) unstable; urgency=medium
+
+  * update to qemu 2.6.1
+
+  * Fix CVE-2016-6490: virtio: check vring descriptor buffer length
+
+  * Fix CVE-2016-6833: net: vmxnet3: check for device_active before write
+
+  * Fix CVE-2016-6834: net: check fragment length during fragmentation
+
+  * Fix CVE-2016-6835: net: vmxnet: check IP header length
+
+  * Fix CVE-2016-6836: net: vmxnet: initialise local tx descriptor
+
+  * Fix CVE-2016-6888: net: vmxnet: use g_new for pkt initialisation
+
+  * enable cache=unsafe for vma extract_content and qmp_savevm_start
+
+  * rbd : disable cache_writethtrough_until_flush with cache=unsafe
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 22 Aug 2016 11:55:38 +0200
+
 pve-qemu-kvm (2.6-1) unstable; urgency=medium
 
   * update to qemu 2.6.0
diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
index ca1ab4c..772c666 100644
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ
-- 
2.1.4