From 3a3b52f23f77e29747b7ebccaff75ee79953ec8f Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 5 Mar 2019 19:12:56 +0100
Subject: [PATCH] xen: update to 4.10.3.

---
 .../xen/patches/acpica-utils-20180427.patch   | 21 -------------------
 srcpkgs/xen/patches/qemu-xen-memfd.patch      | 11 ----------
 srcpkgs/xen/template                          | 21 +++++++++----------
 3 files changed, 10 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/xen/patches/acpica-utils-20180427.patch
 delete mode 100644 srcpkgs/xen/patches/qemu-xen-memfd.patch

diff --git a/srcpkgs/xen/patches/acpica-utils-20180427.patch b/srcpkgs/xen/patches/acpica-utils-20180427.patch
deleted file mode 100644
index 421d152c34..0000000000
--- a/srcpkgs/xen/patches/acpica-utils-20180427.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tools/libacpi/Makefile      2018-05-05 13:28:47.168982453 +0200
-+++ tools/libacpi/Makefile2     2018-05-05 13:29:42.122982453 +0200
-@@ -43,7 +43,7 @@
-
- $(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl
- 	iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $<
--	sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex >$@
-+	sed -e 's/AmlCode/$*/g' -e 's/$*_aml_code/$*/g' $(ACPI_BUILD_DIR)/$*.hex >$@
- 	rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
-
- $(MK_DSDT): mk_dsdt.c
-@@ -76,7 +76,7 @@
-
- $(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
- 	iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl
--	sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
-+	sed -e 's/AmlCode/$*/g' -e 's/$*_aml_code/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
- 	echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX)
- 	mv -f $@.$(TMP_SUFFIX) $@
- 	rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
-
diff --git a/srcpkgs/xen/patches/qemu-xen-memfd.patch b/srcpkgs/xen/patches/qemu-xen-memfd.patch
deleted file mode 100644
index 4b8a772624..0000000000
--- a/srcpkgs/xen/patches/qemu-xen-memfd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/qemu-xen/util/memfd.c.orig	2018-09-22 17:42:37.087624225 +0200
-+++ tools/qemu-xen/util/memfd.c	2018-09-22 17:42:51.368623656 +0200
-@@ -37,7 +37,7 @@
- #include <sys/syscall.h>
- #include <asm/unistd.h>
- 
--static int memfd_create(const char *name, unsigned int flags)
-+int memfd_create(const char *name, unsigned int flags)
- {
- #ifdef __NR_memfd_create
-     return syscall(__NR_memfd_create, name, flags);
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index b277471e42..97bba5d7fa 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,11 +1,10 @@
 # Template file for 'xen'
 pkgname=xen
-version=4.10.1
+version=4.10.3
 revision=1
-# Latest revision from https://ipxe.org/ (2018-09-22)
-_git_tag_ipxe=133f4c47baef6002b2ccb4904a035cda2303c6e5
+# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
+_git_tag_ipxe=356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d
 archs="x86_64*"
-nopie=yes
 configure_args="$(vopt_enable stubdom) --with-system-seabios=/usr/share/seabios/bios.bin"
 hostmakedepends="acpica-utils automake bison fig2dev ghostscript git ocaml
  ocaml-findlib pandoc pkg-config python-Markdown texinfo wget"
@@ -13,21 +12,21 @@ makedepends="SDL-devel dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
  netpbm pciutils-devel pixman-devel python-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
-short_desc="The Xen hypervisor utilities"
+short_desc="Xen hypervisor utilities"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-homepage="https://www.xenproject.org/"
 license="GPL-2.0-or-later"
+homepage="https://www.xenproject.org/"
 distfiles="
  https://downloads.xenproject.org/release/xen/${version}/${pkgname}-${version}.tar.gz
- https://distfiles.voidlinux.de/ipxe-git-${_git_tag_ipxe}.tar.gz"
+ http://xenbits.xen.org/xen-extfiles/ipxe-git-${_git_tag_ipxe}.tar.gz"
 checksum="
- 570d654f357d4085accdf752989c1cbc33e2075feac8fcc505d68bdb81b1a0cf
- ff4811ed5085904cecd89a6c5fa77c97640539402cbb72b0e27c6d7b947e34e9"
+ cb46b53664a692b3d55c6c0052c0afd53b7ad3ba979bd8b4dfdfe435c202f408
+ 251e5516d7de470c434ae5c393aacca2b61fb24d93770592a4a20add60b785c4"
 skip_extraction="ipxe-git-${_git_tag_ipxe}.tar.gz"
+nopie=yes
 
 build_options="stubdom"
-# Currently fails to build for unknown reasons
-# build_options_default="stubdom"
+build_options_default="stubdom"
 desc_option_stubdom="Build xen with stubdom"
 
 if [ "$build_option_stubdom" ]; then