added fixes for CVE-2015-7504 and CVE-2015-7512

[pve-qemu-kvm.git] / Makefile

diff --git a/Makefile b/Makefile
index b3c3b903d3b7b3dc5846c493bc9ee27c647882b1..0ab7aa0148a7f258d40f92c8740069648cb91912 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=4.0
 
 # also update debian/changelog
-KVMVER=2.3
-KVMPKGREL=5
+KVMVER=2.4
+KVMPKGREL=15
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -21,9 +21,10 @@ all: ${DEBS}
 .PHONY: download
 download:
        rm -rf ${KVMDIR} ${KVMSRC}
-       #git clone git://git.qemu-project.org/qemu.git -b stable-2.2 ${KVMDIR} 
-       git clone git://git.qemu-project.org/qemu.git ${KVMDIR} 
-       cd ${KVMDIR}; git checkout v2.3.0
+       #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
        tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${DEBS} kvm: ${KVMSRC}
@@ -31,6 +32,8 @@ ${DEBS} kvm: ${KVMSRC}
        tar xf ${KVMSRC} 
        cp -a debian ${KVMDIR}/debian
        echo "git clone git://git.proxmox.com/git/pve-qemu-kvm.git\\ngit checkout ${GITVERSION}" > ${KVMDIR}/debian/SOURCE
+       # set package version
+       sed -i 's/^pkgversion="".*/pkgversion="${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}"/' ${KVMDIR}/configure
        cd ${KVMDIR}; dpkg-buildpackage -b -rfakeroot -us -uc
        lintian ${DEBS} || true