[pve-devel] [PATCH kvm 3/3] bump version to 2.5

[Wolfgang Bumiller]

--disable-smartcard-nss is now --disable-smartcard

--enable-vnc-tls is gone
--enable-gnutls was added instead
---
 Makefile         | 6 +++---
 debian/changelog | 8 ++++++++
 debian/rules     | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 106728b..afebb16 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=4.1
 
 # also update debian/changelog
-KVMVER=2.4
-KVMPKGREL=20
+KVMVER=2.5
+KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -24,7 +24,7 @@ download:
 	#git clone git://git.qemu-project.org/qemu.git -b stable-2.4 ${KVMDIR} 
 	git clone git://git.qemu-project.org/qemu.git ${KVMDIR}
 	# see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all
-	cd ${KVMDIR}; git checkout v2.4.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
+	cd ${KVMDIR}; git checkout v2.5.0; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${DEBS} kvm: ${KVMSRC}
diff --git a/debian/changelog b/debian/changelog
index fdbfa08..fe01dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pve-qemu-kvm (2.5-1) unstable; urgency=medium
+
+  * update qemu to 2.5.0
+
+  * removed upstream CVE fixes
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 08 Jan 2016 12:43:24 +0100
+
 pve-qemu-kvm (2.4-20) unstable; urgency=medium
 
   * Removing wrong CVE-2015-8619
diff --git a/debian/rules b/debian/rules
index 9e1e820..4431d18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --with-confsuffix="/kvm" --target-list=x86_64-softmmu --prefix=/usr --datadir=/usr/share --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --localstatedir=/var --disable-xen --enable-vnc-tls --enable-sdl --enable-uuid --enable-linux-aio --enable-rbd --enable-libiscsi --disable-smartcard-nss --audio-drv-list="alsa" --enable-spice --enable-usb-redir --enable-glusterfs --enable-libusb --disable-gtk --enable-xfsctl --enable-numa --disable-strip --enable-jemalloc
+	./configure --with-confsuffix="/kvm" --target-list=x86_64-softmmu --prefix=/usr --datadir=/usr/share --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --localstatedir=/var --disable-xen --enable-gnutls --enable-sdl --enable-uuid --enable-linux-aio --enable-rbd --enable-libiscsi --disable-smartcard --audio-drv-list="alsa" --enable-spice --enable-usb-redir --enable-glusterfs --enable-libusb --disable-gtk --enable-xfsctl --enable-numa --disable-strip --enable-jemalloc
 
 build: patch build-stamp
 
-- 
2.1.4