Update to 4.12.0-1

4 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ae8f230d0d4..1bb4494f016b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xen
-	pkgver = 4.11.0
-	pkgrel = 2
+	pkgver = 4.12.0
+	pkgrel = 1
 	url = http://www.xenproject.org/
 	changelog = ChangeLog
 	arch = x86_64
@@ -45,25 +45,23 @@ pkgbase = xen
 	noextract = ipxe-git.tar.gz
 	options = !buildflags
 	options = !strip
-	source = https://downloads.xenproject.org/release/xen/4.11.0/xen-4.11.0.tar.gz
-	source = https://downloads.xenproject.org/release/xen/4.11.0/xen-4.11.0.tar.gz.sig
-	source = ipxe-git.tar.gz::http://xenbits.xen.org/xen-extfiles/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz
+	source = https://downloads.xenproject.org/release/xen/4.12.0/xen-4.12.0.tar.gz
+	source = https://downloads.xenproject.org/release/xen/4.12.0/xen-4.12.0.tar.gz.sig
+	source = ipxe-git.tar.gz::http://xenbits.xen.org/xen-extfiles/ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz
 	source = grub-mkconfig-helper
 	source = efi-xen.cfg
 	source = grub.conf
 	source = xen.conf
 	source = tmpfiles.conf
-	source = ipxe-git-use-no-pie-on-newer-versions-of-gcc.patch::https://git.ipxe.org/ipxe.git/patch/7c395b0e21806b946fe944a27fc273407f357ea1
 	validpgpkeys = 23E3222C145F4475FA8060A783FE14C957E82BD9
-	sha256sums = 826e3a9f6d0eac94a825d272cc2c1294e22640ae75af906eb13920f9ad667643
+	sha256sums = 6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64
 	sha256sums = SKIP
-	sha256sums = 251e5516d7de470c434ae5c393aacca2b61fb24d93770592a4a20add60b785c4
+	sha256sums = 38061598a5147ebcda8ae41c356396cce59f087cf27253b6bf8fb50ae0919ca1
 	sha256sums = 23c3b0eab4cb06260bd07324d2060356560c9bc52270aaaf6130e1c130fc6e5e
 	sha256sums = ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f
 	sha256sums = 3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568
 	sha256sums = 50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c
 	sha256sums = 40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf
-	sha256sums = 51ff22b2d0f7e9d7a13666adb2c32321e725e9c0bf0f434b3cc7c760d88620c6
 
 pkgname = xen
 	pkgdesc = Virtual Machine Hypervisor & Tools
@@ -92,7 +90,7 @@ pkgname = xen
 	optdepends = openvswitch: Optional Networking support
 	optdepends = seabios: Boot VMs with BIOS
 	optdepends = ovmf: Boot VMs with UEFI
-	provides = xen-4.11.0
+	provides = xen-4.12.0
 	backup = etc/conf.d/xencommons
 	backup = etc/conf.d/xendomains
 	backup = etc/xen/efi-xen.cfg
@@ -104,5 +102,5 @@ pkgname = xen
 pkgname = xen-docs
 	pkgdesc = Virtual Machine Hypervisor documentation
 	arch = any
-	provides = xen-docs-4.11.0
+	provides = xen-docs-4.12.0
 
diff --git a/ChangeLog b/ChangeLog
index e3d849967de3..3135cf2d5d0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-04-29 Maik Broemme
+	* 4.12.0-1
+	Xen 4.12.0
+
 2018-07-24 Maik Broemme
 	* 4.11.0-2
 	Updated version in 'xen.install' file
diff --git a/PKGBUILD b/PKGBUILD
index 7ca34000087e..79f7dbb844bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ _build_stubdom=${build_stubdom:-false}
 
 pkgbase="xen"
 pkgname=("xen" "xen-docs")
-pkgver="4.11.0"
-pkgrel="2"
+pkgver="4.12.0"
+pkgrel="1"
 arch=("x86_64") # TODO What about ARM?
 url="http://www.xenproject.org/"
 license=("GPL2")
@@ -62,7 +62,7 @@ makedepends=(
 source=(
   "https://downloads.xenproject.org/release/xen/${pkgver}/${pkgbase}-${pkgver}.tar.gz"
   "https://downloads.xenproject.org/release/xen/${pkgver}/${pkgbase}-${pkgver}.tar.gz.sig"
-  "ipxe-git.tar.gz::http://xenbits.xen.org/xen-extfiles/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz"
+  "ipxe-git.tar.gz::http://xenbits.xen.org/xen-extfiles/ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz"
 
   # Helper and config files.
   "grub-mkconfig-helper"
@@ -74,12 +74,11 @@ source=(
   # XSA patches.
 
   # Compile fixes.
-  "ipxe-git-use-no-pie-on-newer-versions-of-gcc.patch::https://git.ipxe.org/ipxe.git/patch/7c395b0e21806b946fe944a27fc273407f357ea1"
 )
 sha256sums=(
-  "826e3a9f6d0eac94a825d272cc2c1294e22640ae75af906eb13920f9ad667643"
+  "6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64"
   "SKIP"
-  "251e5516d7de470c434ae5c393aacca2b61fb24d93770592a4a20add60b785c4"
+  "38061598a5147ebcda8ae41c356396cce59f087cf27253b6bf8fb50ae0919ca1"
 
   # Helper and config files.
   "23c3b0eab4cb06260bd07324d2060356560c9bc52270aaaf6130e1c130fc6e5e"
@@ -91,7 +90,6 @@ sha256sums=(
   # XSA patches.
 
   # Compile fixes.
-  "51ff22b2d0f7e9d7a13666adb2c32321e725e9c0bf0f434b3cc7c760d88620c6"
 )
 noextract=(
   "ipxe-git.tar.gz"
@@ -157,9 +155,7 @@ prepare() {
   # Misc compile fixes (removed in future versions if not needed anymore).
   msg2 'Applying misc compile fixes...'
 
-  # Compile fix for ipxe package with gcc-8.
-  cp "${srcdir}/ipxe-git-use-no-pie-on-newer-versions-of-gcc.patch" "${srcdir}/${pkgbase}-${pkgver}/tools/firmware/etherboot/patches"
-  echo "ipxe-git-use-no-pie-on-newer-versions-of-gcc.patch" >> "${srcdir}/${pkgbase}-${pkgver}/tools/firmware/etherboot/patches/series"
+  # Compile fixes.
 
   # Fix Install Paths.
   msg2 'Fixing installation paths...'
diff --git a/xen.install b/xen.install
index 031bb864a428..6e21a5230e6f 100644
--- a/xen.install
+++ b/xen.install
@@ -32,11 +32,11 @@ __EOF__
 
 upgrade_msg() {
 	cat << __EOF__
-Xen 4.11
+Xen 4.12
 Release notes
-http://wiki.xen.org/wiki/Xen_Project_4.11_Release_Notes
+http://wiki.xen.org/wiki/Xen_Project_4.12_Release_Notes
 Feature list
-http://wiki.xen.org/wiki/Xen_Project_4.11_Feature_List
+http://wiki.xen.org/wiki/Xen_Project_4.12_Feature_List
 __EOF__
 
 	if [ "$(vercmp 4.8.0-4 "$1")" -lt 0 ]; then