From 252ad98d20cacfd90a625f4c81ddc536985bbc0c Mon Sep 17 00:00:00 2001 From: Mario Preksavec Date: Fri, 17 Jul 2015 04:26:47 +0200 Subject: system/xen: Updated for version 4.5.1. Signed-off-by: Mario Preksavec --- system/xen/dom0/kernel-xen.sh | 2 +- system/xen/patches/xsa119-unstable.patch | 99 -------------------------------- system/xen/xen.SlackBuild | 5 +- system/xen/xen.info | 6 +- 4 files changed, 5 insertions(+), 107 deletions(-) delete mode 100644 system/xen/patches/xsa119-unstable.patch (limited to 'system/xen') diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh index b08f27fd59..a48c686833 100644 --- a/system/xen/dom0/kernel-xen.sh +++ b/system/xen/dom0/kernel-xen.sh @@ -6,7 +6,7 @@ # Modified by Mario Preksavec KERNEL=${KERNEL:-3.10.17} -XEN=${XEN:-4.3.3} +XEN=${XEN:-4.5.1} BOOTLOADER=${BOOTLOADER:-lilo} ROOTMOD=${ROOTMOD:-ext4} diff --git a/system/xen/patches/xsa119-unstable.patch b/system/xen/patches/xsa119-unstable.patch deleted file mode 100644 index f696eb5b6e..0000000000 --- a/system/xen/patches/xsa119-unstable.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f433bfafbaf7d8a41c4c27aa3e8e78b1ab900b69 Mon Sep 17 00:00:00 2001 -From: Ian Campbell -Date: Fri, 20 Feb 2015 14:41:09 +0000 -Subject: [PATCH] tools: libxl: Explicitly disable graphics backends on qemu - cmdline - -By default qemu will try to create some sort of backend for the -emulated VGA device, either SDL or VNC. - -However when the user specifies sdl=0 and vnc=0 in their configuration -libxl was not explicitly disabling either backend, which could lead to -one unexpectedly running. - -If either sdl=1 or vnc=1 is configured then both before and after this -change only the backends which are explicitly enabled are configured, -i.e. this issue only occurs when all backends are supposed to have -been disabled. - -This affects qemu-xen and qemu-xen-traditional differently. - -If qemu-xen was compiled with SDL support then this would result in an -SDL window being opened if $DISPLAY is valid, or a failure to start -the guest if not. Passing "-display none" to qemu before any further --sdl options disables this default behaviour and ensures that SDL is -only started if the libxl configuration demands it. - -If qemu-xen was compiled without SDL support then qemu would instead -start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 -(IPv4 localhost) with IPv6 preferred if available. Explicitly pass -"-vnc none" when vnc is not enabled in the libxl configuration to -remove this possibility. - -qemu-xen-traditional would never start a vnc backend unless asked. -However by default it will start an SDL backend, the way to disable -this is to pass a -vnc option. In other words passing "-vnc none" will -disable both vnc and sdl by default. sdl can then be reenabled if -configured by subsequent use of the -sdl option. - -Tested with both qemu-xen and qemu-xen-traditional built with SDL -support and: - xl cr # defaults - xl cr sdl=0 vnc=0 - xl cr sdl=1 vnc=0 - xl cr sdl=0 vnc=1 - xl cr sdl=0 vnc=0 vga=\"none\" - xl cr sdl=0 vnc=0 nographic=1 -with both valid and invalid $DISPLAY. - -This is XSA-119. - -Reported-by: Sander Eikelenboom -Signed-off-by: Ian Campbell -Acked-by: Ian Jackson ---- - tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- - 1 file changed, 19 insertions(+), 2 deletions(-) - -diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c -index 8599a6a..3b918c6 100644 ---- a/tools/libxl/libxl_dm.c -+++ b/tools/libxl/libxl_dm.c -@@ -180,7 +180,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, - if (libxl_defbool_val(vnc->findunused)) { - flexarray_append(dm_args, "-vncunused"); - } -- } -+ } else -+ /* -+ * VNC is not enabled by default by qemu-xen-traditional, -+ * however passing -vnc none causes SDL to not be -+ * (unexpectedly) enabled by default. This is overridden by -+ * explicitly passing -sdl below as required. -+ */ -+ flexarray_append_pair(dm_args, "-vnc", "none"); - - if (sdl) { - flexarray_append(dm_args, "-sdl"); -@@ -522,7 +529,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, - } - - flexarray_append(dm_args, vncarg); -- } -+ } else -+ /* -+ * Ensure that by default no vnc server is created. -+ */ -+ flexarray_append_pair(dm_args, "-vnc", "none"); -+ -+ /* -+ * Ensure that by default no display backend is created. Further -+ * options given below might then enable more. -+ */ -+ flexarray_append_pair(dm_args, "-display", "none"); - - if (sdl) { - flexarray_append(dm_args, "-sdl"); --- -2.1.4 - diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild index 23483d3971..4b08a011b4 100644 --- a/system/xen/xen.SlackBuild +++ b/system/xen/xen.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xen -VERSION=${VERSION:-4.5.0} +VERSION=${VERSION:-4.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -114,9 +114,6 @@ tar -xf $CWD/seabios-git-rel-1.7.5.tar.gz \ cp $CWD/{lwip,zlib,newlib,pciutils,grub,gmp,tpm_emulator}-*.tar.?z* \ $CWD/polarssl-*.tgz stubdom -# Patch from upstream -patch -p1 <$CWD/patches/xsa119-unstable.patch - # Occasionally, parallel building fails patch -p1 <$CWD/patches/libcacard_fix_parallel_compile.patch diff --git a/system/xen/xen.info b/system/xen/xen.info index c742539226..503770ff57 100644 --- a/system/xen/xen.info +++ b/system/xen/xen.info @@ -1,7 +1,7 @@ PRGNAM="xen" -VERSION="4.5.0" +VERSION="4.5.1" HOMEPAGE="http://www.xenproject.org/" -DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.5.0.tar.gz \ +DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.5.1.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/lwip-1.3.0.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/zlib-1.2.3.tar.gz \ @@ -12,7 +12,7 @@ DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.5.0.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/gmp-4.3.2.tar.bz2 \ http://mirror.slackware.hr/sources/xen-extfiles/tpm_emulator-0.7.4.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/seabios-git-rel-1.7.5.tar.gz" -MD5SUM="9bac43d2419d05a647064d9253bb03fa \ +MD5SUM="d12dc9e5e8bd22a68b5c7f53119221f1 \ 7496268cebf47d5c9ccb0696e3b26065 \ 36cc57650cffda9a0269493be2a169bb \ debc62758716a169df9f62e6ab2bc634 \ -- cgit v1.2.3