summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--ChangeLog6
-rw-r--r--PKGBUILD29
3 files changed, 49 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3b2ecf4e98a7..a3ae0c26328b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Jan 17 20:21:47 UTC 2017
+# Mon Feb 27 14:22:36 UTC 2017
pkgbase = xen
pkgdesc = Virtual Machine Hypervisor & Tools
pkgver = 4.8.0
- pkgrel = 2
+ pkgrel = 3
url = http://www.xenproject.org/
install = xen.install
changelog = ChangeLog
@@ -74,6 +74,13 @@ pkgbase = xen
source = patch-gcc6-ovmf-build.sh.patch
source = https://xenbits.xen.org/xsa/xsa203-4.8.patch
source = https://xenbits.xen.org/xsa/xsa204-4.8.patch
+ source = https://xenbits.xen.org/xsa/xsa207.patch
+ source = https://xenbits.xen.org/xsa/xsa208-qemut.patch
+ source = https://xenbits.xen.org/xsa/xsa208-qemuu.patch
+ source = https://xenbits.xen.org/xsa/xsa209-qemut.patch
+ source = https://xenbits.xen.org/xsa/xsa209-qemuu/0001-display-cirrus-ignore-source-pitch-value-as-needed-i.patch
+ source = https://xenbits.xen.org/xsa/xsa209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput.patch
+ source = https://xenbits.xen.org/xsa/xsa210.patch
source = grub-mkconfig-helper
source = efi-xen.cfg
source = grub.conf
@@ -88,6 +95,13 @@ pkgbase = xen
sha256sums = 6403a0478e3cfed91dcad53b5f02e71745c98d18ab53930f87aeff1da8d71d55
sha256sums = 4218fcfff11ec4788462a3ea9dddecb25b9d9fb1beaad17ca0f723b07b6675e4
sha256sums = fa2a69682868104b6263655abbfc6b326f76deebdac3273b4b65da6673f5d977
+ sha256sums = e9bcf807b3785ac4d78b621fba4a9395cd713d6e57cdaa66559bccf95ded1cd9
+ sha256sums = afde3e9d4bf5225f92c36dec9ff673b0b1b0bad4452d406f0c12edc85e2fec72
+ sha256sums = e492d528141be5899d46c2ac0bcd0c40ca9d9bfc40906a8e7a565361f17ce38d
+ sha256sums = 167af9ed7163fa7cf4abb52f865290ced3163c7684151bdc1324eb5e534faf13
+ sha256sums = e698b73d8de24af0fe33968a43561e5e1d094f4caf2443caa447b552677d2683
+ sha256sums = 50c60e45151ef2265cce4f92b204e9fd75f8bc8952f097e77ab4fe1c1446bc98
+ sha256sums = 10e26c017c916dcac261c6a3c92656831f0ad037f792940e6faf6905c6e23861
sha256sums = 06c9f6140f7ef4ccfc4b1a7d9732a673313e269733180f53afcd9e43bf6c26bb
sha256sums = ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f
sha256sums = 3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568
diff --git a/ChangeLog b/ChangeLog
index 92bc5c644725..28cedc26e0d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
+2017-02-27 Janne Heß
+ * 4.8.0-3
+ Apply XSA patches: 207 208 209 210
+
2017-01-12 Janne Heß
- * 4.8.0-4
+ * 4.8.0-2
Xen 4.8.0
Update all downloaded packages
Remove all obsolete patches
diff --git a/PKGBUILD b/PKGBUILD
index 1d5579a3415f..97013a78df6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,7 +48,7 @@ fi
pkgname=xen
pkgver="${_xen_version}"
-pkgrel=2
+pkgrel=3
pkgdesc='Virtual Machine Hypervisor & Tools'
url='http://www.xenproject.org/'
license=('GPL2')
@@ -136,6 +136,13 @@ source=(
# XSA patches
'https://xenbits.xen.org/xsa/xsa203-4.8.patch'
'https://xenbits.xen.org/xsa/xsa204-4.8.patch'
+ 'https://xenbits.xen.org/xsa/xsa207.patch'
+ 'https://xenbits.xen.org/xsa/xsa208-qemut.patch'
+ 'https://xenbits.xen.org/xsa/xsa208-qemuu.patch'
+ 'https://xenbits.xen.org/xsa/xsa209-qemut.patch'
+ 'https://xenbits.xen.org/xsa/xsa209-qemuu/0001-display-cirrus-ignore-source-pitch-value-as-needed-i.patch'
+ 'https://xenbits.xen.org/xsa/xsa209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput.patch'
+ 'https://xenbits.xen.org/xsa/xsa210.patch'
# Files
'grub-mkconfig-helper'
@@ -172,6 +179,13 @@ sha256sums=(
# XSA patches
'4218fcfff11ec4788462a3ea9dddecb25b9d9fb1beaad17ca0f723b07b6675e4'
'fa2a69682868104b6263655abbfc6b326f76deebdac3273b4b65da6673f5d977'
+ 'e9bcf807b3785ac4d78b621fba4a9395cd713d6e57cdaa66559bccf95ded1cd9'
+ 'afde3e9d4bf5225f92c36dec9ff673b0b1b0bad4452d406f0c12edc85e2fec72'
+ 'e492d528141be5899d46c2ac0bcd0c40ca9d9bfc40906a8e7a565361f17ce38d'
+ '167af9ed7163fa7cf4abb52f865290ced3163c7684151bdc1324eb5e534faf13'
+ 'e698b73d8de24af0fe33968a43561e5e1d094f4caf2443caa447b552677d2683'
+ '50c60e45151ef2265cce4f92b204e9fd75f8bc8952f097e77ab4fe1c1446bc98'
+ '10e26c017c916dcac261c6a3c92656831f0ad037f792940e6faf6905c6e23861'
# PKGBUILD files
'06c9f6140f7ef4ccfc4b1a7d9732a673313e269733180f53afcd9e43bf6c26bb'
'ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f'
@@ -226,6 +240,19 @@ prepare() {
msg2 'Applying XSA Patches...'
patch -Np1 -i "${srcdir}/xsa203-4.8.patch"
patch -Np1 -i "${srcdir}/xsa204-4.8.patch"
+ patch -Np1 -i "${srcdir}/xsa207.patch"
+ patch -Np1 -i "${srcdir}/xsa210.patch"
+ # qemu-xen-traditional
+ pushd 'tools/qemu-xen-traditional'
+ patch -Np1 -i "${srcdir}/xsa208-qemut.patch"
+ patch -Np1 -i "${srcdir}/xsa209-qemut.patch"
+ popd
+ # qemu-xen upstream
+ pushd 'tools/qemu-xen'
+ patch -Np1 -i "${srcdir}/xsa208-qemuu.patch"
+ patch -Np1 -i "${srcdir}/0001-display-cirrus-ignore-source-pitch-value-as-needed-i.patch"
+ patch -Np1 -i "${srcdir}/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput.patch"
+ popd
# Patch EFI binary build with mingw
if [ "${_binutils_efi}" != true ]; then