Fixed missing path of '--with-system-ovmf' parameter, fixed compilation issue with glibc-2.27, applied XSA-258

4 files changed, 40 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b23b5f0f9cd2..25ce627a11d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xen
 	pkgver = 4.10.0
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.xenproject.org/
 	changelog = ChangeLog
 	arch = x86_64
@@ -52,12 +52,14 @@ pkgbase = xen
 	source = https://xenbits.xen.org/xsa/xsa255-1.patch
 	source = https://xenbits.xen.org/xsa/xsa255-2.patch
 	source = https://xenbits.xen.org/xsa/xsa256.patch
+	source = https://xenbits.xen.org/xsa/xsa258.patch
 	source = grub-mkconfig-helper
 	source = efi-xen.cfg
 	source = grub.conf
 	source = xen.conf
 	source = tmpfiles.conf
 	source = ocaml-unsafe-string.patch
+	source = qemu-xen-memfd.patch::https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch
 	validpgpkeys = 23E3222C145F4475FA8060A783FE14C957E82BD9
 	sha256sums = 0262a7023f8b12bcacfb0b25e69b2a63291f944f7683d54d8f33d4b2ca556844
 	sha256sums = SKIP
@@ -66,12 +68,14 @@ pkgbase = xen
 	sha256sums = 05a5570ecf4354f7aad35bb77a4c2f5f556bcabf3555829a98c94dcfb6dd4696
 	sha256sums = df43a147f1e1a2b7d59588bc91cdaac05d4e45bcfc4e2c8cb5e8de840d44b43d
 	sha256sums = 3e45cc3f2ea516e7470083592041e238c0dfe32324790b2fba0e47c9efe38865
+	sha256sums = 7e8014deae4fa19464fe6570d0719f8f0d7730dd153d58b2fa38b0cd5ed2e459
 	sha256sums = 23c3b0eab4cb06260bd07324d2060356560c9bc52270aaaf6130e1c130fc6e5e
 	sha256sums = ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f
 	sha256sums = 3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568
 	sha256sums = 50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c
 	sha256sums = 40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf
 	sha256sums = 7c76b116ce09a53708306682f04e1460a788fe66f832091b7003a5d8e1fee312
+	sha256sums = 29004b3b9f79bb2cdb0553c5a77c8d748a92e628405b7d9f9ae46693515757bb
 
 pkgname = xen
 	pkgdesc = Virtual Machine Hypervisor & Tools
diff --git a/.gitignore b/.gitignore
index 828cf6724fe0..96113fba530c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,9 @@
 /pkg/
 /src/
 /xsa*
-
 *.tar
 *.gz
 *.xz
 *.tgz
 *.bz2
 *.sig
-000*
diff --git a/ChangeLog b/ChangeLog
index e7e6a0ff2bea..0369162a1337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2018-04-10 Maik Broemme
+	* 4.10.0-5
+	Fix missing path of '--with-system-ovmf' parameter
+	Fix compilation issue with glibc-2.27
+	Apply XSA patches: 258
+
+2018-04-10 Maik Broemme
+	* 4.10.0-4
+	PKGBUILD cleanup
+	Update ipxe to latest version
+	Align dependencies between qemu-xen and qemu-xen-traditional
+	Remove no longer needed '-Werror' fixes
+
+2018-04-10 Maik Broemme
+	* 4.10.0-3
+	Fix '(XEN) parameter "/boot/xen-4.10.0.gz" unknown!' issue
+	Make dependencies independent from build system
+	Apply XSA patches: 253 254 255 256
+
+2018-02-20 Maik Broemme
+	* 4.10.0-1
+	Xen 4.10.0
+
 2017-09-30 Janne Heß
 	* 4.9.0-2
 	Add spice-glib dependency
diff --git a/PKGBUILD b/PKGBUILD
index a3e868afd9cd..885fd147cf46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ _build_stubdom=${build_stubdom:-false}
 
 pkgbase="xen"
 pkgname=("xen" "xen-docs")
-pkgver="4.10.0"
-pkgrel="4"
+pkgver=4.10.0
+pkgrel=5
 arch=("x86_64") # TODO What about ARM?
 url="http://www.xenproject.org/"
 license=("GPL2")
@@ -69,6 +69,7 @@ source=(
   "https://xenbits.xen.org/xsa/xsa255-1.patch"
   "https://xenbits.xen.org/xsa/xsa255-2.patch"
   "https://xenbits.xen.org/xsa/xsa256.patch"
+  "https://xenbits.xen.org/xsa/xsa258.patch"
 
   # Helper and config files.
   "grub-mkconfig-helper"
@@ -79,6 +80,7 @@ source=(
 
   # Compile fixes.
   "ocaml-unsafe-string.patch"
+  "qemu-xen-memfd.patch::https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"
 )
 sha256sums=(
   "0262a7023f8b12bcacfb0b25e69b2a63291f944f7683d54d8f33d4b2ca556844"
@@ -90,6 +92,7 @@ sha256sums=(
   "05a5570ecf4354f7aad35bb77a4c2f5f556bcabf3555829a98c94dcfb6dd4696"
   "df43a147f1e1a2b7d59588bc91cdaac05d4e45bcfc4e2c8cb5e8de840d44b43d"
   "3e45cc3f2ea516e7470083592041e238c0dfe32324790b2fba0e47c9efe38865"
+  "7e8014deae4fa19464fe6570d0719f8f0d7730dd153d58b2fa38b0cd5ed2e459"
 
   # Helper and config files.
   "23c3b0eab4cb06260bd07324d2060356560c9bc52270aaaf6130e1c130fc6e5e"
@@ -100,6 +103,7 @@ sha256sums=(
 
   # Compile fixes.
   "7c76b116ce09a53708306682f04e1460a788fe66f832091b7003a5d8e1fee312"
+  "29004b3b9f79bb2cdb0553c5a77c8d748a92e628405b7d9f9ae46693515757bb"
 )
 noextract=(
   "ipxe-git.tar.gz"
@@ -149,24 +153,26 @@ prepare() {
   msg2 'Copying downloaded files...'
   cp "${srcdir}/ipxe-git.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
 
-  # XSA Patches
+  # XSA patches
   msg2 'Applying XSA Patches...'
   patch -Np1 -i "${srcdir}/xsa253-xsa254-diff-release410-comet1.1.patch"
   patch -Np1 -i "${srcdir}/xsa255-1.patch"
   patch -Np1 -i "${srcdir}/xsa255-2.patch"
   patch -Np1 -i "${srcdir}/xsa256.patch"
+  patch -Np1 -i "${srcdir}/xsa258.patch"
 
   # XSA 253 and XSA 254 fix to keep version number.
   sed 's,1-pre,0,g' -i xen/Makefile
 
-  # Security Patches (qemu-xen-traditional).
+  # Security patches and compile fixes (qemu-xen-traditional).
   msg2 'Applying tools patches (qemu-xen-traditional)...'
   cd tools/qemu-xen-traditional
   cd ../..
 
-  # Security Patches (qemu-xen).
+  # Security patches and compile fixes (qemu-xen).
   msg2 'Applying tools patches (qemu-xen)...'
   cd tools/qemu-xen
+  patch -Np1 -i "${srcdir}/qemu-xen-memfd.patch"
   cd ../..
 
   # Misc compile fixes (removed in future versions if not needed anymore).
@@ -221,7 +227,7 @@ build() {
     --with-rundir=/run \
     --enable-systemd \
     --enable-ovmf \
-    --with-system-ovmf \
+    --with-system-ovmf=/usr/share/ovmf/x64/OVMF_CODE.fd \
     --with-system-seabios=/usr/share/qemu/bios-256k.bin \
     "${_config_stubdom}" \
     --with-extra-qemuu-configure-args=" \