From 69e4493fb1e676f29347701a58f67d81bd76b1eb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 21 Sep 2021 00:02:34 +0200 Subject: [PATCH] package/xen: security bump to version 4.14.3 Includes a number of bugfixes and the security fixes up to xsa-384: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-3/ Drop the now upstream 0002-libs-foreignmemory-Fix-osdep_xenforeignmemory_map-prototype.patch, and renumber the remaining patches. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ... 0002-Fix-build-with-64-bits-time_t.patch} | 0 ...osdep_xenforeignmemory_map-prototype.patch | 33 ------------------- ...libs-light-fix-tv_sec-printf-format.patch} | 0 ...ibs-light-fix-tv_sec-fprintf-format.patch} | 0 package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 6 files changed, 2 insertions(+), 35 deletions(-) rename package/xen/{0003-Fix-build-with-64-bits-time_t.patch => 0002-Fix-build-with-64-bits-time_t.patch} (100%) delete mode 100644 package/xen/0002-libs-foreignmemory-Fix-osdep_xenforeignmemory_map-prototype.patch rename package/xen/{0004-libs-light-fix-tv_sec-printf-format.patch => 0003-libs-light-fix-tv_sec-printf-format.patch} (100%) rename package/xen/{0005-libs-light-fix-tv_sec-fprintf-format.patch => 0004-libs-light-fix-tv_sec-fprintf-format.patch} (100%) diff --git a/package/xen/0003-Fix-build-with-64-bits-time_t.patch b/package/xen/0002-Fix-build-with-64-bits-time_t.patch similarity index 100% rename from package/xen/0003-Fix-build-with-64-bits-time_t.patch rename to package/xen/0002-Fix-build-with-64-bits-time_t.patch diff --git a/package/xen/0002-libs-foreignmemory-Fix-osdep_xenforeignmemory_map-prototype.patch b/package/xen/0002-libs-foreignmemory-Fix-osdep_xenforeignmemory_map-prototype.patch deleted file mode 100644 index 170d1c22c2..0000000000 --- a/package/xen/0002-libs-foreignmemory-Fix-osdep_xenforeignmemory_map-prototype.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5d3e4ebb5c71477d74a0c503438545a0126d3863 Mon Sep 17 00:00:00 2001 -From: Anthony PERARD -Date: Tue, 1 Jun 2021 16:41:47 +0100 -Subject: [PATCH] libs/foreignmemory: Fix osdep_xenforeignmemory_map prototype - -Commit cf8c4d3d13b8 made some preparation to have one day -variable-length-array argument, but didn't declare the array in the -function prototype the same way as in the function definition. And now -GCC 11 complains about it. - -Fixes: cf8c4d3d13b8 ("tools/libs/foreignmemory: pull array length argument to map forward") -Signed-off-by: Anthony PERARD -Reviewed-by: Jan Beulich -[Retrieved from: -https://github.com/xen-project/xen/commit/5d3e4ebb5c71477d74a0c503438545a0126d3863] -Signed-off-by: Fabrice Fontaine ---- - tools/libs/foreignmemory/private.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/libs/foreignmemory/private.h b/tools/libs/foreignmemory/private.h -index 1ee3626dd278..5bb0cefb0987 100644 ---- a/tools/libs/foreignmemory/private.h -+++ b/tools/libs/foreignmemory/private.h -@@ -32,7 +32,7 @@ int osdep_xenforeignmemory_close(xenforeignmemory_handle *fmem); - void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, - uint32_t dom, void *addr, - int prot, int flags, size_t num, -- const xen_pfn_t arr[num], int err[num]); -+ const xen_pfn_t arr[/*num*/], int err[/*num*/]); - int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, - void *addr, size_t num); - diff --git a/package/xen/0004-libs-light-fix-tv_sec-printf-format.patch b/package/xen/0003-libs-light-fix-tv_sec-printf-format.patch similarity index 100% rename from package/xen/0004-libs-light-fix-tv_sec-printf-format.patch rename to package/xen/0003-libs-light-fix-tv_sec-printf-format.patch diff --git a/package/xen/0005-libs-light-fix-tv_sec-fprintf-format.patch b/package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch similarity index 100% rename from package/xen/0005-libs-light-fix-tv_sec-fprintf-format.patch rename to package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch diff --git a/package/xen/xen.hash b/package/xen/xen.hash index fd0310c921..e30db09516 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e35099a963070e3c9f425d1e36cbb1c40b7874ef449bfafd6688343783cb25ad xen-4.14.2.tar.gz +sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index b84214ed16..b635996afb 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.14.2 +XEN_VERSION = 4.14.3 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING -- 2.30.2