4.14.1-1

5 files changed, 100 insertions, 149 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f636a5b86c62..a6bd4cdaf62d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xen
 	pkgdesc = Open-source type-1 or baremetal hypervisor
-	pkgver = 4.14.0
-	pkgrel = 4
+	pkgver = 4.14.1
+	pkgrel = 1
 	url = https://xenproject.org/
 	arch = x86_64
 	license = GPL2
@@ -47,25 +47,15 @@ pkgbase = xen
 	noextract = tpm_emulator-0.7.4.tar.gz
 	noextract = zlib-1.2.3.tar.gz
 	options = !buildflags
-	source = https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz
-	source = https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz.sig
-	source = xen_4.14.0_fixes.patch
+	source = https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz
+	source = https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz.sig
 	source = efi-xen.cfg
 	source = xen.conf
 	source = tmpfiles.conf
 	source = xen-ucode-extract.sh
 	source = xen-intel-ucode.hook
 	source = xen-amd-ucode.hook
-	source = xsa286-4.13-1.patch::https://xenbits.xen.org/xsa/xsa286-4.14/0001-x86-pv-Drop-FLUSH_TLB_GLOBAL-in-do_mmu_update-for-XP.patch
-	source = xsa286-4.14-2.patch::https://xenbits.xen.org/xsa/xsa286-4.14/0002-x86-pv-Flush-TLB-in-response-to-paging-structure-cha.patch
-	source = xsa345-4.14-1.patch::https://xenbits.xen.org/xsa/xsa345-4.14/0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch
-	source = xsa345-4.14-2.patch::https://xenbits.xen.org/xsa/xsa345-4.14/0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch
-	source = xsa345-4.14-3.patch::https://xenbits.xen.org/xsa/xsa345-4.14/0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch
-	source = https://xenbits.xen.org/xsa/xsa346/xsa346-1.patch
-	source = https://xenbits.xen.org/xsa/xsa346/xsa346-2.patch
-	source = https://xenbits.xen.org/xsa/xsa347/xsa347-4.14-1.patch
-	source = https://xenbits.xen.org/xsa/xsa347/xsa347-4.14-2.patch
-	source = https://xenbits.xen.org/xsa/xsa347/xsa347-4.14-3.patch
+	source = xen_4.14.1_fixes.patch
 	source = http://xenbits.xen.org/xen-extfiles/gmp-4.3.2.tar.bz2
 	source = http://xenbits.xen.org/xen-extfiles/grub-0.97.tar.gz
 	source = http://xenbits.xen.org/xen-extfiles/lwip-1.3.0.tar.gz
@@ -75,25 +65,15 @@ pkgbase = xen
 	source = http://xenbits.xen.org/xen-extfiles/tpm_emulator-0.7.4.tar.gz
 	source = http://xenbits.xen.org/xen-extfiles/zlib-1.2.3.tar.gz
 	validpgpkeys = 23E3222C145F4475FA8060A783FE14C957E82BD9
-	sha512sums = ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
+	sha512sums = c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
 	sha512sums = SKIP
-	sha512sums = 4c3e8c66f76cf06f7983012e869b7d22d57caf81aacf6553442548d955a9682c0495a7f59c96d313ae58a9e61a71d21743b79bb2af49276c9a675d8d701b16c9
 	sha512sums = 1bbcbcd9fb8344a207409ec9f0064a45b726416f043f902ca587f5e4fa58497a759be4ffd584fa32318e960aa478864cc05ec026c444e8d27ca8e3248bd67420
 	sha512sums = ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b
 	sha512sums = 53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef
 	sha512sums = a9230ec6ef9636ac3f3e4b72b1747ee8c4648a8bf4bd8dc3650365e34f1f67474429dbdd24996907d277b0ff5f235574643e781cb3ff37da954e899ddadbe0d6
 	sha512sums = 7a832de9b35f4b77ee80d33310b23886f4d48d1d42c3d6ef6f8e2b428bec7332a285336864b61cfa01d9a14c2023674015beb7527bd5849b069f2be88e6500cd
 	sha512sums = 99921b94a29fa7988c7fb5c17da8e598e777c972d6cae8c8643c991e5ff911a25525345ea8913945313d5c49fecf9da8cc3b83d47ab03928341e917b304370a9
-	sha512sums = 6044a27a05918600c2c963a69356097a6f274fe0b1c328ba1f5d6673065a4b0d8194de19e54846f38e38734ac67f1463e6ada9a551d9f076cc1f6226a477f909
-	sha512sums = ef94bd3b291711c1312f420a58852be73b5fce42c3e285cc942cc14f96bf610d389a83a796e56fc6a80f072a17da6b0ffb3502697de0cc48587791653ecc1942
-	sha512sums = cca42a9ea18bdb8e690c4a2a27e362f3e2c83e2834dca7ca59f8e99b6bcf576a1122e6242d40c335367e0081aefd7b4b741e67b3473f1940048a3a1c01171dfe
-	sha512sums = f16d0f11f29d79f4de2dcb37dc7aeec52de98addfab350bb644c35efbda621588a75c0ff306d355ed0d6739b6f7bb3706acb9d5972c3956f43988c23ebe08fe2
-	sha512sums = 5be23b19420691bc3f020ff05c2bc97a770999beb8d27a89db05940bc98b105ccdd0d37b8ae778ab6655ce68d2797bc41f08d4753a082f4749d43b493b9eb64a
-	sha512sums = 043366f1c745e9ab068a8ff60f703cce9831ea02c4980067fcc3243575543f069aee419c06ca8179667805ea04a8563b40086ae4efe979145439b954d956829d
-	sha512sums = 2209b558482c976d2ae97552d0de91026b8d957257e13f98e6ac2bcb2ca72e22f11fef50b5a0533087e693af8a97e1568848fcf5eeb3c03db259ad25901a6dab
-	sha512sums = 65857a8b30b5d61283b4a4a29708260b5742f5ec8bbeaaa22dde15c730dac5864901a89dc8495c4eb7618bba8543a80839ad01d23f4c298978799d73a0083c16
-	sha512sums = e02ecd756ceb02781b9dec14647132f4fbf575bea59948bcfd5fce85130282671b11f771c263d05d613700748a4221b4fd29a14e3f8108701b618aa1741e9292
-	sha512sums = 662993bb8312b77866327f5b4e448374a4a6076a9154b5150192f9dab477a98c25bce1bea246db137cea461e16a25c8e624a11ca26d988dde0db4edbf9af3b6f
+	sha512sums = 75c0f3a30c726484b1701ba369ae84e9d4362367a843c5e962945192156b9f15a17b92f9fbf50395e22edc6159e8ceb30d751a7b09944bf5a1a37d0a98c82583
 	sha512sums = 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
 	sha512sums = c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
 	sha512sums = 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d
diff --git a/ChangeLog b/ChangeLog
index 5ddb1176ab1c..861d2ff4aa99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-01-12 Sam Mulvey
+	* 4.14.1-1
+
 2020-11-10 Sam Mulvey
 	* 4.14.0-4
 	re-added XSA patch file handling
diff --git a/PKGBUILD b/PKGBUILD
index 4bbf136eb96e..c0d1bec69a80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,8 +18,8 @@ _zlib=1.2.3
 
 pkgbase=xen
 pkgname=("xen" "xen-docs")
-pkgver=4.14.0
-pkgrel=4
+pkgver=4.14.1
+pkgrel=1
 pkgdesc='Open-source type-1 or baremetal hypervisor'
 arch=('x86_64')
 url='https://xenproject.org/'
@@ -27,72 +27,70 @@ license=('GPL2')
 options=(!buildflags)
 
 # Original depends line
-makedepends=('zlib' 'python' 'ncurses' 'openssl' 'libx11' 'libuuid.so' 'yajl' 'libaio' 'glib2' 'pkgconf'
-         'bridge-utils' 'iproute2' 'inetutils' 'acpica' 'lib32-glibc' 'gnutls'
-		 'vde2' 'lzo' 'pciutils' 'sdl') # last line from namcap, these depends are the xen depends
+makedepends=(
+	'zlib' 'python' 'ncurses' 'openssl' 'libx11' 'libuuid.so' 'yajl' 'libaio' 'glib2' 'pkgconf'
+	'bridge-utils' 'iproute2' 'inetutils' 'acpica' 'lib32-glibc' 'gnutls'
+	'vde2' 'lzo' 'pciutils' 'sdl'
+) # last line from namcap, these depends are the xen depends
 # Actual makedepends.
 makedepends+=('wget' 'pandoc' 'valgrind' 'git' 'bin86' 'dev86' 'bison' 'gettext' 'flex' 'pixman' 'ocaml' 'fig2dev')
 
-source=("https://downloads.xenproject.org/release/xen/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
-		"xen_4.14.0_fixes.patch"
-		"efi-xen.cfg"
-		"xen.conf"
-		"tmpfiles.conf"
-		"xen-ucode-extract.sh"
-		"xen-intel-ucode.hook"
-		"xen-amd-ucode.hook"
-		"xsa286-4.13-1.patch::https://xenbits.xen.org/xsa/xsa286-4.14/0001-x86-pv-Drop-FLUSH_TLB_GLOBAL-in-do_mmu_update-for-XP.patch"
-		"xsa286-4.14-2.patch::https://xenbits.xen.org/xsa/xsa286-4.14/0002-x86-pv-Flush-TLB-in-response-to-paging-structure-cha.patch"
-		"xsa345-4.14-1.patch::https://xenbits.xen.org/xsa/xsa345-4.14/0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch"
-		"xsa345-4.14-2.patch::https://xenbits.xen.org/xsa/xsa345-4.14/0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch"
-		"xsa345-4.14-3.patch::https://xenbits.xen.org/xsa/xsa345-4.14/0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch"
-		"https://xenbits.xen.org/xsa/xsa346/xsa346-1.patch"
-		"https://xenbits.xen.org/xsa/xsa346/xsa346-2.patch"
-		"https://xenbits.xen.org/xsa/xsa347/xsa347-4.14-1.patch"
-		"https://xenbits.xen.org/xsa/xsa347/xsa347-4.14-2.patch"
-		"https://xenbits.xen.org/xsa/xsa347/xsa347-4.14-3.patch"
+source=(
+	"https://downloads.xenproject.org/release/xen/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
+	"efi-xen.cfg"
+	"xen.conf"
+	"tmpfiles.conf"
+	"xen-ucode-extract.sh"
+	"xen-intel-ucode.hook"
+	"xen-amd-ucode.hook"
+	"xen_4.14.1_fixes.patch"
 )
 
-_stubdom_source=("http://xenbits.xen.org/xen-extfiles/gmp-$_gmp.tar.bz2"
-				"http://xenbits.xen.org/xen-extfiles/grub-$_grub.tar.gz"
-				"http://xenbits.xen.org/xen-extfiles/lwip-$_lwip.tar.gz"
-				"http://xenbits.xen.org/xen-extfiles/newlib-$_newlib.tar.gz"
-				"http://xenbits.xen.org/xen-extfiles/pciutils-$_pciutils.tar.bz2"
-				"http://xenbits.xen.org/xen-extfiles/polarssl-$_polarssl-gpl.tgz"
-				"http://xenbits.xen.org/xen-extfiles/tpm_emulator-$_tpm_emulator.tar.gz"
-				"http://xenbits.xen.org/xen-extfiles/zlib-$_zlib.tar.gz")
-
-sha512sums=('ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0'
-            'SKIP'
-            '4c3e8c66f76cf06f7983012e869b7d22d57caf81aacf6553442548d955a9682c0495a7f59c96d313ae58a9e61a71d21743b79bb2af49276c9a675d8d701b16c9'
-            '1bbcbcd9fb8344a207409ec9f0064a45b726416f043f902ca587f5e4fa58497a759be4ffd584fa32318e960aa478864cc05ec026c444e8d27ca8e3248bd67420'
-            'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b'
-            '53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef'
-            'a9230ec6ef9636ac3f3e4b72b1747ee8c4648a8bf4bd8dc3650365e34f1f67474429dbdd24996907d277b0ff5f235574643e781cb3ff37da954e899ddadbe0d6'
-            '7a832de9b35f4b77ee80d33310b23886f4d48d1d42c3d6ef6f8e2b428bec7332a285336864b61cfa01d9a14c2023674015beb7527bd5849b069f2be88e6500cd'
-            '99921b94a29fa7988c7fb5c17da8e598e777c972d6cae8c8643c991e5ff911a25525345ea8913945313d5c49fecf9da8cc3b83d47ab03928341e917b304370a9'
-            '6044a27a05918600c2c963a69356097a6f274fe0b1c328ba1f5d6673065a4b0d8194de19e54846f38e38734ac67f1463e6ada9a551d9f076cc1f6226a477f909'
-            'ef94bd3b291711c1312f420a58852be73b5fce42c3e285cc942cc14f96bf610d389a83a796e56fc6a80f072a17da6b0ffb3502697de0cc48587791653ecc1942'
-            'cca42a9ea18bdb8e690c4a2a27e362f3e2c83e2834dca7ca59f8e99b6bcf576a1122e6242d40c335367e0081aefd7b4b741e67b3473f1940048a3a1c01171dfe'
-            'f16d0f11f29d79f4de2dcb37dc7aeec52de98addfab350bb644c35efbda621588a75c0ff306d355ed0d6739b6f7bb3706acb9d5972c3956f43988c23ebe08fe2'
-            '5be23b19420691bc3f020ff05c2bc97a770999beb8d27a89db05940bc98b105ccdd0d37b8ae778ab6655ce68d2797bc41f08d4753a082f4749d43b493b9eb64a'
-            '043366f1c745e9ab068a8ff60f703cce9831ea02c4980067fcc3243575543f069aee419c06ca8179667805ea04a8563b40086ae4efe979145439b954d956829d'
-            '2209b558482c976d2ae97552d0de91026b8d957257e13f98e6ac2bcb2ca72e22f11fef50b5a0533087e693af8a97e1568848fcf5eeb3c03db259ad25901a6dab'
-            '65857a8b30b5d61283b4a4a29708260b5742f5ec8bbeaaa22dde15c730dac5864901a89dc8495c4eb7618bba8543a80839ad01d23f4c298978799d73a0083c16'
-            'e02ecd756ceb02781b9dec14647132f4fbf575bea59948bcfd5fce85130282671b11f771c263d05d613700748a4221b4fd29a14e3f8108701b618aa1741e9292'
-            '662993bb8312b77866327f5b4e448374a4a6076a9154b5150192f9dab477a98c25bce1bea246db137cea461e16a25c8e624a11ca26d988dde0db4edbf9af3b6f')
-
-
-
-_stub_sums=('2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf'
-            'c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb'
-            '1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d'
-            '40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3'
-            '2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5'
-            '88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad'
-            '4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35'
-            '021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e')
 
+# Follow the Xen securite mailing lists, and if a patch is applicable to our package
+# add the URL here.
+_patches=()
+
+_stubdom_source=(
+	"http://xenbits.xen.org/xen-extfiles/gmp-$_gmp.tar.bz2"
+	"http://xenbits.xen.org/xen-extfiles/grub-$_grub.tar.gz"
+	"http://xenbits.xen.org/xen-extfiles/lwip-$_lwip.tar.gz"
+	"http://xenbits.xen.org/xen-extfiles/newlib-$_newlib.tar.gz"
+	"http://xenbits.xen.org/xen-extfiles/pciutils-$_pciutils.tar.bz2"
+	"http://xenbits.xen.org/xen-extfiles/polarssl-$_polarssl-gpl.tgz"
+	"http://xenbits.xen.org/xen-extfiles/tpm_emulator-$_tpm_emulator.tar.gz"
+	"http://xenbits.xen.org/xen-extfiles/zlib-$_zlib.tar.gz"
+)
+
+
+sha512sums=(
+	'c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9'
+	'SKIP'
+	'1bbcbcd9fb8344a207409ec9f0064a45b726416f043f902ca587f5e4fa58497a759be4ffd584fa32318e960aa478864cc05ec026c444e8d27ca8e3248bd67420'
+	'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b'
+	'53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef'
+	'a9230ec6ef9636ac3f3e4b72b1747ee8c4648a8bf4bd8dc3650365e34f1f67474429dbdd24996907d277b0ff5f235574643e781cb3ff37da954e899ddadbe0d6'
+	'7a832de9b35f4b77ee80d33310b23886f4d48d1d42c3d6ef6f8e2b428bec7332a285336864b61cfa01d9a14c2023674015beb7527bd5849b069f2be88e6500cd'
+	'99921b94a29fa7988c7fb5c17da8e598e777c972d6cae8c8643c991e5ff911a25525345ea8913945313d5c49fecf9da8cc3b83d47ab03928341e917b304370a9'
+	'75c0f3a30c726484b1701ba369ae84e9d4362367a843c5e962945192156b9f15a17b92f9fbf50395e22edc6159e8ceb30d751a7b09944bf5a1a37d0a98c82583'
+)
+
+
+_stub_sums=(
+	'2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf'
+	'c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb'
+	'1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d'
+	'40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3'
+	'2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5'
+	'88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad'
+	'4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35'
+	'021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e'
+)
+
+
+# Patch and stubdum handling
+
+source=("${source[@]}" "${_patches[@]}")
 if [ "${_build_stubdom}" == "true" ]; then
 	source=("${source[@]}" "${_stubdom_source[@]}")
 	sha512sums=("${sha512sums[@]}" "${_stub_sums[@]}")
@@ -122,12 +120,11 @@ validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9') # Xen.org Xen tree cod
 # TODO: Setup users, dirs, etc.
 
 prepare() {
-	patches=($(ls -d xsa*patch))
 
 	cd "${pkgbase}-${pkgver}"
 
 	# mostly from: https://github.com/olafhering/xen/commit/1a1d86fef44444e8e265fd8bc687f8238a0d1615
-	patch -p1 < ../xen_4.14.0_fixes.patch
+	patch -p1 < ../xen_4.14.1_fixes.patch
 
 	if [ "${_build_stubdom}" == "true" ]; then
 
@@ -184,14 +181,18 @@ build() {
 package_xen() {
 	pkgdesc='Open-source type-1 or baremetal hypervisor'
 
-	depends=('zlib' 'python' 'ncurses' 'openssl' 'libx11' 'libuuid.so' 'yajl' 'libaio' 'glib2' 'pkgconf'
-         	 'bridge-utils' 'iproute2' 'inetutils' 'acpica' 'lib32-glibc' 'gnutls'
-		 	 'vde2' 'lzo' 'pciutils' 'sdl') 
+	depends=(
+		'zlib' 'python' 'ncurses' 'openssl' 'libx11' 'libuuid.so' 'yajl' 'libaio' 'glib2' 'pkgconf'
+		'bridge-utils' 'iproute2' 'inetutils' 'acpica' 'lib32-glibc' 'gnutls'
+		'vde2' 'lzo' 'pciutils' 'sdl'
+	)
 
-	optdepends=('ed2k-ovmf: UEFI support'
-            	'seabios: SeaBIOS payload support'
-				'xen-docs: HTML documentation and man pages'
-				'grub-xen-git: GRUB and pvgrub2 bootloader support')
+	optdepends=(
+		'ed2k-ovmf: UEFI support'
+		'seabios: SeaBIOS payload support'
+		'xen-docs: HTML documentation and man pages'
+		'grub-xen-git: GRUB and pvgrub2 bootloader support'
+	)
 
 	if [ "${_build_qemu}" == "false" ]; then
 		optdepends+=("qemu: HVM and PV support")
@@ -200,11 +201,12 @@ package_xen() {
 	install="xen.install"
 
 
-	backup=("etc/conf.d/xencommons"
-			"etc/conf.d/xendomains"
-			"etc/xen/efi-xen.cfg"
-			"etc/xen/cpupool"
-			"etc/xen/xl.conf"
+	backup=(
+		"etc/conf.d/xencommons"
+		"etc/conf.d/xendomains"
+		"etc/xen/efi-xen.cfg"
+		"etc/xen/cpupool"
+		"etc/xen/xl.conf"
 	)
 
 
diff --git a/xen_4.14.0_fixes.patch b/xen_4.14.0_fixes.patch
deleted file mode 100644
index 68836a9b74c5..000000000000
--- a/xen_4.14.0_fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur orig/tools/libxl/libxlu_pci.c patched/tools/libxl/libxlu_pci.c
---- orig/tools/libxl/libxlu_pci.c	2020-07-23 08:07:51.000000000 -0700
-+++ patched/tools/libxl/libxlu_pci.c	2020-07-29 14:40:08.956666630 -0700
-@@ -50,6 +50,7 @@
-     unsigned state = STATE_DOMAIN;
-     unsigned dom, bus, dev, func, vslot = 0;
-     char *buf2, *tok, *ptr, *end, *optkey = NULL;
-+	dom = bus = dev = func = 0;
- 
-     if ( NULL == (buf2 = ptr = strdup(str)) )
-         return ERROR_NOMEM;
-diff -Naur orig/tools/libxl/libxl_utils.c patched/tools/libxl/libxl_utils.c
---- orig/tools/libxl/libxl_utils.c	2020-07-23 08:07:51.000000000 -0700
-+++ patched/tools/libxl/libxl_utils.c	2020-07-29 14:40:08.956666630 -0700
-@@ -1252,14 +1252,16 @@
-                                struct sockaddr_un *un, const char *path,
-                                const char *what)
- {
--    if (sizeof(un->sun_path) <= strlen(path)) {
-+ 	 size_t len = strlen(path);
-+
-+ 	 if (sizeof(un->sun_path) <= len) {
-         LOG(ERROR, "UNIX socket path '%s' is too long for %s", path, what);
--        LOG(DEBUG, "Path must be less than %zu bytes", sizeof(un->sun_path));
-+		LOG(DEBUG, "Path of len %zu must be less than %zu bytes", len, sizeof(un->sun_path));
-         return ERROR_INVAL;
-     }
-     memset(un, 0, sizeof(struct sockaddr_un));
-     un->sun_family = AF_UNIX;
--    strncpy(un->sun_path, path, sizeof(un->sun_path));
-+	memcpy(un->sun_path, path, len);
-     return 0;
- }
-
-diff -Naur orig/stubdom/vtpmmgr/vtpmmgr.h changed/stubdom/vtpmmgr/vtpmmgr.h
---- orig/stubdom/vtpmmgr/vtpmmgr.h	2020-05-14 05:19:32.000000000 -0700
-+++ changed/stubdom/vtpmmgr/vtpmmgr.h	2020-05-20 12:04:28.506666463 -0700
-@@ -50,7 +50,7 @@
- #define RSA_KEY_SIZE 0x0800
- #define RSA_CIPHER_SIZE (RSA_KEY_SIZE / 8)
- 
--enum {
-+extern enum {
-     TPM1_HARDWARE = 1,
-     TPM2_HARDWARE,
- } tpm_version;
diff --git a/xen_4.14.1_fixes.patch b/xen_4.14.1_fixes.patch
new file mode 100644
index 000000000000..4f1f87b2a37f
--- /dev/null
+++ b/xen_4.14.1_fixes.patch
@@ -0,0 +1,12 @@
+diff -Naur orig/stubdom/vtpmmgr/vtpmmgr.h changed/stubdom/vtpmmgr/vtpmmgr.h
+--- orig/stubdom/vtpmmgr/vtpmmgr.h	2020-05-14 05:19:32.000000000 -0700
++++ changed/stubdom/vtpmmgr/vtpmmgr.h	2020-05-20 12:04:28.506666463 -0700
+@@ -50,7 +50,7 @@
+ #define RSA_KEY_SIZE 0x0800
+ #define RSA_CIPHER_SIZE (RSA_KEY_SIZE / 8)
+ 
+-enum {
++extern enum {
+     TPM1_HARDWARE = 1,
+     TPM2_HARDWARE,
+ } tpm_version;