646cd8897b
Updated block-dmmd script - fate#310510 - fix xenpaging restore changes to integrate paging into xm/xend xenpaging.autostart.patch xenpaging.doc.patch - bnc#787163 - VUL-0: CVE-2012-4544: xen: Domain builder Out-of- memory due to malicious kernel/ramdisk (XSA 25) CVE-2012-4544-xsa25.patch - bnc#779212 - VUL-0: CVE-2012-4411: XEN / qemu: guest administrator can access qemu monitor console (XSA-19) CVE-2012-4411-xsa19.patch - bnc#786516 - VUL-0: CVE-2012-4535: xen: Timer overflow DoS vulnerability CVE-2012-4535-xsa20.patch - bnc#786518 - VUL-0: CVE-2012-4536: xen: pirq range check DoS vulnerability CVE-2012-4536-xsa21.patch - bnc#786517 - VUL-0: CVE-2012-4537: xen: Memory mapping failure DoS vulnerability CVE-2012-4537-xsa22.patch - bnc#786519 - VUL-0: CVE-2012-4538: xen: Unhooking empty PAE entries DoS vulnerability CVE-2012-4538-xsa23.patch - bnc#786520 - VUL-0: CVE-2012-4539: xen: Grant table hypercall infinite loop DoS vulnerability CVE-2012-4539-xsa24.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=212
188 lines
6.0 KiB
Diff
188 lines
6.0 KiB
Diff
changeset: 26078:019ca95dfa34
|
|
user: Olaf Hering <olaf@aepfle.de>
|
|
date: Thu Oct 18 09:35:00 2012 +0100
|
|
files: Makefile README install.sh tools/hotplug/Linux/Makefile tools/hotplug/Linux/xen-backend.agent
|
|
description:
|
|
hotplug/Linux: remove hotplug support, rely on udev instead
|
|
|
|
Hotplug has been replaced by udev since several years. Remove the
|
|
hotplug related files and install udev unconditionally.
|
|
|
|
This makes it possible to remove udev from rpm BuildRequires which
|
|
reduces the buildtime dependency chain. For openSuSE:Factory it was
|
|
done just now:
|
|
http://lists.opensuse.org/opensuse-buildservice/2012-10/msg00085.html
|
|
|
|
The patch by itself will have no practical impact unless someone
|
|
attempts to build and run a Xen dom0 on a really old base system. e.g.
|
|
circa SLES9/2007 or earlier
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
|
Committed-by: Ian Campbell <ian.campbell@citrix.com>
|
|
|
|
|
|
diff -r 33348baecf37 -r 019ca95dfa34 Makefile
|
|
--- a/Makefile Thu Oct 18 09:34:59 2012 +0100
|
|
+++ b/Makefile Thu Oct 18 09:35:00 2012 +0100
|
|
@@ -223,7 +223,6 @@ uninstall:
|
|
$(MAKE) -C xen uninstall
|
|
rm -rf $(D)$(CONFIG_DIR)/init.d/xendomains $(D)$(CONFIG_DIR)/init.d/xend
|
|
rm -rf $(D)$(CONFIG_DIR)/init.d/xencommons $(D)$(CONFIG_DIR)/init.d/xen-watchdog
|
|
- rm -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent
|
|
rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules
|
|
rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules
|
|
rm -f $(D)$(SYSCONFIG_DIR)/xendomains
|
|
diff -r 33348baecf37 -r 019ca95dfa34 README
|
|
--- a/README Thu Oct 18 09:34:59 2012 +0100
|
|
+++ b/README Thu Oct 18 09:35:00 2012 +0100
|
|
@@ -54,7 +54,7 @@ provided by your OS distributor:
|
|
* pkg-config
|
|
* bridge-utils package (/sbin/brctl)
|
|
* iproute package (/sbin/ip)
|
|
- * hotplug or udev
|
|
+ * udev
|
|
* GNU bison and GNU flex
|
|
* GNU gettext
|
|
* 16-bit x86 assembler, loader and compiler (dev86 rpm or bin86 & bcc debs)
|
|
@@ -120,9 +120,9 @@ 4. To rebuild an existing tree without m
|
|
|
|
make install and make dist differ in that make install does the
|
|
right things for your local machine (installing the appropriate
|
|
- version of hotplug or udev scripts, for example), but make dist
|
|
- includes all versions of those scripts, so that you can copy the dist
|
|
- directory to another machine and install from that distribution.
|
|
+ version of udev scripts, for example), but make dist includes all
|
|
+ versions of those scripts, so that you can copy the dist directory
|
|
+ to another machine and install from that distribution.
|
|
|
|
Python Runtime Libraries
|
|
========================
|
|
diff -r 33348baecf37 -r 019ca95dfa34 install.sh
|
|
--- a/install.sh Thu Oct 18 09:34:59 2012 +0100
|
|
+++ b/install.sh Thu Oct 18 09:35:00 2012 +0100
|
|
@@ -27,20 +27,6 @@ echo "Installing Xen from '$src' to '$ds
|
|
echo "Installing Xen from '$src' to '$dst'..."
|
|
(cd $src; tar -cf - * ) | tar -C "$tmp" -xf -
|
|
|
|
-[ -x "$(which udevinfo)" ] && \
|
|
- UDEV_VERSION=$(udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/')
|
|
-
|
|
-[ -z "$UDEV_VERSION" -a -x /sbin/udevadm ] && \
|
|
- UDEV_VERSION=$(/sbin/udevadm info -V | awk '{print $NF}')
|
|
-
|
|
-if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
|
|
- echo " - installing for udev-based system"
|
|
- rm -rf "$tmp/etc/hotplug"
|
|
-else
|
|
- echo " - installing for hotplug-based system"
|
|
- rm -rf "$tmp/etc/udev"
|
|
-fi
|
|
-
|
|
echo " - modifying permissions"
|
|
chmod -R a+rX "$tmp"
|
|
|
|
diff -r 33348baecf37 -r 019ca95dfa34 tools/hotplug/Linux/Makefile
|
|
--- a/tools/hotplug/Linux/Makefile Thu Oct 18 09:34:59 2012 +0100
|
|
+++ b/tools/hotplug/Linux/Makefile Thu Oct 18 09:35:00 2012 +0100
|
|
@@ -27,31 +27,8 @@ XEN_SCRIPT_DATA += block-common.sh vtpm-
|
|
XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh
|
|
XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl
|
|
|
|
-XEN_HOTPLUG_DIR = $(CONFIG_DIR)/hotplug
|
|
-XEN_HOTPLUG_SCRIPTS = xen-backend.agent
|
|
-
|
|
-UDEVVER = 0
|
|
-ifeq ($(shell [ -x /sbin/udevadm ] && echo 1),1)
|
|
-UDEVVER = $(shell /sbin/udevadm info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
|
|
-endif
|
|
-ifeq ($(shell [ -x /usr/bin/udevinfo ] && echo 1),1)
|
|
-UDEVVER = $(shell /usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
|
|
-endif
|
|
-
|
|
UDEV_RULES_DIR = $(CONFIG_DIR)/udev
|
|
UDEV_RULES = xen-backend.rules xend.rules
|
|
-
|
|
-DI = $(if $(DISTDIR),$(shell readlink -f $(DISTDIR)),)
|
|
-DE = $(if $(DESTDIR),$(shell readlink -f $(DESTDIR)),)
|
|
-ifeq ($(findstring $(DI),$(DE)),$(DI))
|
|
-HOTPLUGS=install-hotplug install-udev
|
|
-else
|
|
-ifeq ($(shell [ $(UDEVVER) -ge 059 ] && echo 1),1)
|
|
-HOTPLUGS=install-udev
|
|
-else
|
|
-HOTPLUGS=install-hotplug
|
|
-endif
|
|
-endif
|
|
|
|
.PHONY: all
|
|
all:
|
|
@@ -60,7 +37,7 @@ build:
|
|
build:
|
|
|
|
.PHONY: install
|
|
-install: all install-initd install-scripts $(HOTPLUGS)
|
|
+install: all install-initd install-scripts install-udev
|
|
|
|
# See docs/misc/distro_mapping.txt for INITD_DIR location
|
|
.PHONY: install-initd
|
|
@@ -87,15 +64,6 @@ install-scripts:
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
|
|
done
|
|
|
|
-.PHONY: install-hotplug
|
|
-install-hotplug:
|
|
- [ -d $(DESTDIR)$(XEN_HOTPLUG_DIR) ] || \
|
|
- $(INSTALL_DIR) $(DESTDIR)$(XEN_HOTPLUG_DIR)
|
|
- set -e; for i in $(XEN_HOTPLUG_SCRIPTS); \
|
|
- do \
|
|
- $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_HOTPLUG_DIR); \
|
|
- done
|
|
-
|
|
.PHONY: install-udev
|
|
install-udev:
|
|
[ -d $(DESTDIR)$(UDEV_RULES_DIR) ] || \
|
|
diff -r 33348baecf37 -r 019ca95dfa34 tools/hotplug/Linux/xen-backend.agent
|
|
--- a/tools/hotplug/Linux/xen-backend.agent Thu Oct 18 09:34:59 2012 +0100
|
|
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -1,39 +0,0 @@
|
|
-#! /bin/bash
|
|
-
|
|
-PATH=/etc/xen/scripts:$PATH
|
|
-
|
|
-. /etc/xen/scripts/locking.sh
|
|
-
|
|
-claim_lock xenbus_hotplug_global
|
|
-
|
|
-case "$XENBUS_TYPE" in
|
|
- tap)
|
|
- /etc/xen/scripts/blktap "$ACTION"
|
|
- ;;
|
|
- vbd)
|
|
- /etc/xen/scripts/block "$ACTION"
|
|
- ;;
|
|
- vtpm)
|
|
- /etc/xen/scripts/vtpm "$ACTION"
|
|
- ;;
|
|
- vif)
|
|
- [ -n "$script" ] && $script "$ACTION"
|
|
- ;;
|
|
- vscsi)
|
|
- /etc/xen/scripts/vscsi "$ACTION"
|
|
- ;;
|
|
-esac
|
|
-
|
|
-case "$ACTION" in
|
|
- add)
|
|
- ;;
|
|
- remove)
|
|
- /etc/xen/scripts/xen-hotplug-cleanup
|
|
- ;;
|
|
- online)
|
|
- ;;
|
|
- offline)
|
|
- ;;
|
|
-esac
|
|
-
|
|
-release_lock xenbus_hotplug_global
|