diff options
author | Yixun Lan <dlan@gentoo.org> | 2014-02-18 10:37:12 +0000 |
---|---|---|
committer | Yixun Lan <dlan@gentoo.org> | 2014-02-18 10:37:12 +0000 |
commit | b8ad5d510dd0e7ce65cebfbec3965738d6fb7b71 (patch) | |
tree | 144444a45396112cef1e8cb0cfea961433fc4afb /app-emulation | |
parent | Version bump (diff) | |
download | gentoo-2-b8ad5d510dd0e7ce65cebfbec3965738d6fb7b71.tar.gz gentoo-2-b8ad5d510dd0e7ce65cebfbec3965738d6fb7b71.tar.bz2 gentoo-2-b8ad5d510dd0e7ce65cebfbec3965738d6fb7b71.zip |
fix 496708, thanks Radoslaw Szkodzinski; drop idella4 from metadata.xml
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/xen-tools/ChangeLog | 11 | ||||
-rw-r--r-- | app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch | 33 | ||||
-rw-r--r-- | app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch | 22 | ||||
-rw-r--r-- | app-emulation/xen-tools/metadata.xml | 4 | ||||
-rw-r--r-- | app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild | 400 | ||||
-rw-r--r-- | app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild | 4 | ||||
-rw-r--r-- | app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild (renamed from app-emulation/xen-tools/xen-tools-4.3.1-r3.ebuild) | 34 |
7 files changed, 484 insertions, 24 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index a5d4b636f6a5..add1cf73e223 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.221 2014/02/15 21:28:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.222 2014/02/18 10:37:12 dlan Exp $ + +*xen-tools-4.3.1-r6 (18 Feb 2014) +*xen-tools-4.2.3-r1 (18 Feb 2014) + + 18 Feb 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.3-r1.ebuild, + -xen-tools-4.3.1-r3.ebuild, xen-tools-4.3.1-r5.ebuild, + +xen-tools-4.3.1-r6.ebuild, +files/xen-tools-4-unbundle-ipxe.patch, + +files/xen-tools-4-unbundle-seabios.patch, metadata.xml: + fix bug #496708, thanks Radoslaw Szkodzinski 15 Feb 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.3.1-r5.ebuild: Stable for x86, wrt bug #500530 diff --git a/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch b/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch new file mode 100644 index 000000000000..902c9ac4efbd --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch @@ -0,0 +1,33 @@ +--- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig 2012-05-27 21:57:04.481812859 +0100 ++++ xen-4.2.0/tools/firmware/hvmloader/Makefile 2012-06-02 18:52:44.935034128 +0100 +@@ -48,7 +48,7 @@ + else + CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin + endif +-ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) ++ETHERBOOT_ROMS := $(addprefix /usr/share/ipxe/, $(addsuffix .rom, $(ETHERBOOT_NICS))) + endif + + ROMS := +--- xen-4.2.0/Config.mk.orig 2012-05-27 21:57:04.479812884 +0100 ++++ xen-4.2.0/Config.mk 2012-06-02 18:55:14.087169469 +0100 +@@ -206,7 +206,7 @@ + # Wed Jun 26 16:30:45 2013 +0100 + # xen: Don't perform SMP setup. + +-ETHERBOOT_NICS ?= rtl8139 8086100e ++ETHERBOOT_NICS ?= 10ec8139 8086100e + + # Specify which qemu-dm to use. This may be `ioemu' to use the old + # Mercurial in-tree version, or a local directory, or a git URL. +--- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-27 21:57:04.480812871 +0100 ++++ xen-4.2.0/tools/firmware/Makefile 2012-06-02 19:03:52.254691484 +0100 +@@ -10,7 +10,7 @@ + #SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir + SUBDIRS-$(CONFIG_ROMBIOS) += rombios + SUBDIRS-$(CONFIG_ROMBIOS) += vgabios +-SUBDIRS-$(CONFIG_ROMBIOS) += etherboot ++#SUBDIRS-$(CONFIG_ROMBIOS) += etherboot + SUBDIRS-y += hvmloader + + ovmf: diff --git a/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch b/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch new file mode 100644 index 000000000000..86d46aa40de4 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch @@ -0,0 +1,22 @@ +--- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-12 16:40:47.000000000 +0100 ++++ xen-4.2.0/tools/firmware/Makefile 2012-05-27 21:55:23.438076078 +0100 +@@ -7,7 +7,7 @@ + + SUBDIRS-y := + SUBDIRS-$(CONFIG_OVMF) += ovmf +-SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir ++#SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir + SUBDIRS-$(CONFIG_ROMBIOS) += rombios + SUBDIRS-$(CONFIG_ROMBIOS) += vgabios + SUBDIRS-$(CONFIG_ROMBIOS) += etherboot +--- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig 2012-05-12 16:40:47.000000000 +0100 ++++ xen-4.2.0/tools/firmware/hvmloader/Makefile 2012-05-27 21:53:45.625298906 +0100 +@@ -70,7 +70,7 @@ + ifeq ($(CONFIG_SEABIOS),y) + OBJS += seabios.o + CFLAGS += -DENABLE_SEABIOS +-SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin ++SEABIOS_ROM := /usr/share/seabios/bios.bin + ROMS += $(SEABIOS_ROM) + endif + diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml index d4b0bc5a1dc4..bd4d8c1491bc 100644 --- a/app-emulation/xen-tools/metadata.xml +++ b/app-emulation/xen-tools/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>xen</herd> - <maintainer> - <email>idella4@gentoo.org</email> - <name>Ian 'idella4' Delaney</name> - </maintainer> <use> <flag name='api'>Build the C libxenapi bindings</flag> <flag name='flask'>Enable the Flask XSM module from NSA</flag> diff --git a/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild new file mode 100644 index 000000000000..c754bec87013 --- /dev/null +++ b/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild @@ -0,0 +1,400 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild,v 1.1 2014/02/18 10:37:12 dlan Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE='xml,threads' + +if [[ $PV == *9999 ]]; then + KEYWORDS="" + REPO="xen-unstable.hg" + EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" + S="${WORKDIR}/${REPO}" + live_eclass="mercurial" +else + KEYWORDS="~amd64 ~x86" + UPSTREAM_VER=0 + GENTOO_VER= + + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" + + SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz + ${UPSTRAM_PATCHSET_URI} + ${GENTOO_PATCHSET_URI}" + S="${WORKDIR}/xen-${PV}" +fi + +inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} + +DESCRIPTION="Xend daemon and tools" +HOMEPAGE="http://xen.org/" +DOCS=( README docs/README.xen-bugtool ) + +LICENSE="GPL-2" +SLOT="0" +IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend" + +REQUIRED_USE="hvm? ( qemu ) + ${PYTHON_REQUIRED_USE}" + +DEPEND="dev-libs/lzo:2 + dev-libs/glib:2 + dev-libs/yajl + dev-libs/libgcrypt + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pypam[${PYTHON_USEDEP}] + sys-libs/zlib + sys-power/iasl + sys-firmware/seabios + sys-firmware/ipxe + dev-ml/findlib + hvm? ( media-libs/libsdl ) + ${PYTHON_DEPS} + api? ( dev-libs/libxml2 + net-misc/curl ) + ${PYTHON_DEPS} + pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) + sys-devel/bin86 + sys-devel/dev86 + dev-lang/perl + app-misc/pax-utils + doc? ( + app-doc/doxygen + dev-tex/latex2html[png,gif] + media-gfx/transfig + media-gfx/graphviz + dev-tex/xcolor + dev-texlive/texlive-latexextra + virtual/latex-base + dev-tex/latexmk + dev-texlive/texlive-latex + dev-texlive/texlive-pictures + dev-texlive/texlive-latexrecommended + ) + hvm? ( x11-proto/xproto + !net-libs/libiscsi )" +RDEPEND="sys-apps/iproute2 + net-misc/bridge-utils + ocaml? ( >=dev-lang/ocaml-4 ) + screen? ( + app-misc/screen + app-admin/logrotate + ) + virtual/udev" + +# hvmloader is used to bootstrap a fully virtualized kernel +# Approved by QA team in bug #144032 +QA_WX_LOAD="usr/lib/xen/boot/hvmloader" + +RESTRICT="test" + +pkg_setup() { + python-single-r1_pkg_setup + export "CONFIG_LOMOUNT=y" + + if has_version dev-libs/libgcrypt; then + export "CONFIG_GCRYPT=y" + fi + + if use qemu; then + export "CONFIG_IOEMU=y" + else + export "CONFIG_IOEMU=n" + fi + + if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then + eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" + eerror "an amd64 multilib profile is required. Remove the hvm use flag" + eerror "to build xen-tools on your current profile." + die "USE=hvm is unsupported on this system." + fi + + if [[ -z ${XEN_TARGET_ARCH} ]] ; then + if use x86 && use amd64; then + die "Confusion! Both x86 and amd64 are set in your use flags!" + elif use x86; then + export XEN_TARGET_ARCH="x86_32" + elif use amd64 ; then + export XEN_TARGET_ARCH="x86_64" + else + die "Unsupported architecture!" + fi + fi + + use api && export "LIBXENAPI_BINDINGS=y" + use flask && export "FLASK_ENABLE=y" +} + +src_prepare() { + # Upstream's patchset + if [[ -n ${UPSTREAM_VER} ]]; then + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches-upstream + fi + + # Gentoo's patchset + if [[ -n ${GENTOO_VER} ]]; then + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches-gentoo + fi + + # Drop .config, fixes to gcc-4.6 + epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch + + # Xend + if ! use xend; then + sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ + -i tools/misc/Makefile || die "Disabling xend failed" + sed -e 's:^XEND_INITD:#XEND_INITD:' \ + -i tools/examples/Makefile || die "Disabling xend failed" + fi + + # if the user *really* wants to use their own custom-cflags, let them + if use custom-cflags; then + einfo "User wants their own CFLAGS - removing defaults" + + # try and remove all the default cflags + find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ + -exec sed \ + -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ + -i {} + || die "failed to re-set custom-cflags" + fi + + if ! use pygrub; then + sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die + fi + + # Disable hvm support on systems that don't support x86_32 binaries. + if ! use hvm; then + sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die + sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die + fi + + # Don't bother with qemu, only needed for fully virtualised guests + if ! use qemu; then + sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die + sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die + fi + + # Fix texi2html build error with new texi2html, qemu.doc.html + epatch "${FILESDIR}"/${PN}-4-docfix.patch \ + "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch + + # Fix network broadcast on bridged networks + epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" + + # Bug 496708 + epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch + epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch + + # Fix bridge by idella4, bug #362575 + epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" + + # Don't build ipxe with pie on hardened, Bug #360805 + if gcc-specs-pie; then + epatch "${FILESDIR}"/ipxe-nopie.patch + fi + + # Prevent double stripping of files at install + epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch + + # fix jobserver in Makefile + epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch + + # add missing header, Bug #467200 + epatch "${FILESDIR}"/xen-4-ulong.patch \ + "${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch + + # Set dom0-min-mem to kb; Bug #472982 + epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch + + # Bug 463840 + epatch "${FILESDIR}"/${PN}-4.2.2-install.patch + epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch + + # Bug 379537 + epatch "${FILESDIR}"/fix-gold-ld.patch + + # Bug 472438 + sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ + -i Config.mk || die + + # Bug 445986 + sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die + + + # fix QA warning, create /var/run/, /var/lock dynamically + sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ + tools/libxl/Makefile || die + + sed -i -e "/\/var\/run\//d" \ + tools/xenstore/Makefile \ + tools/pygrub/Makefile || die + + sed -i -e "/\/var\/lock\/subsys/d" \ + tools/Makefile || die + + # xencommons, Bug #492332, sed lighter weight than patching + sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ + -i tools/hotplug/Linux/init.d/xencommons || die + + epatch_user +} + +src_compile() { + export VARTEXFONTS="${T}/fonts" + local myopt + use debug && myopt="${myopt} debug=y" + + use custom-cflags || unset CFLAGS + if test-flag-CC -fno-strict-overflow; then + append-flags -fno-strict-overflow + fi + + unset LDFLAGS + unset CFLAGS + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} + + use doc && emake -C docs txt html + emake -C docs man-pages +} + +src_install() { + # Override auto-detection in the build system, bug #382573 + export INITD_DIR=/tmp/init.d + export CONFIG_LEAF_DIR=../tmp/default + + # Let the build system compile installed Python modules. + local PYTHONDONTWRITEBYTECODE + export PYTHONDONTWRITEBYTECODE + + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \ + XEN_PYTHON_NATIVE_INSTALL=y install-tools + # Fix the remaining Python shebangs. + python_fix_shebang "${ED}" + + # Remove RedHat-specific stuff + rm -rf "${D}"tmp || die + + # uncomment lines in xl.conf + sed -e 's:^#autoballoon=1:autoballoon=1:' \ + -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ + -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ + -i tools/examples/xl.conf || die + + # Reset bash completion dir; Bug 472438 + mv "${D}"bash-completion "${D}"usr/share/ || die + + if use doc; then + emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs + + dohtml -r docs/ + docinto pdf + dodoc ${DOCS[@]} + [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html + fi + + rm -rf "${D}"/usr/share/doc/xen/ + doman docs/man?/* + + if use xend; then + newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" + fi + newconfd "${FILESDIR}"/xendomains.confd xendomains + newconfd "${FILESDIR}"/xenstored.confd xenstored + newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled + newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains + newinitd "${FILESDIR}"/xenstored.initd xenstored + newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled + newinitd "${FILESDIR}"/xencommons.initd xencommons + newconfd "${FILESDIR}"/xencommons.confd xencommons + + if use screen; then + cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die + cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die + keepdir /var/log/xen-consoles + fi + + if [[ "${ARCH}" == 'amd64' ]] && use qemu; then + mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die + mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die + fi + + # For -static-libs wrt Bug 384355 + if ! use static-libs; then + rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a + fi + + # xend expects these to exist + keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen + + # for xendomains + keepdir /etc/xen/auto + + # Temp QA workaround + dodir "$(udev_get_udevdir)" + mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)" + rm -rf "${D}"/etc/udev + + # Remove files failing QA AFTER emake installs them, avoiding seeking absent files + find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ + -o -name openbios-ppc -o -name palcode-clipper \) -delete || die +} + +pkg_postinst() { + elog "Official Xen Guide and the offical wiki page:" + elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml" + elog "http://wiki.xen.org/wiki/Main_Page" + elog "" + elog "Recommended to utilise the xencommons script to config sytem at boot." + elog "Add by use of rc-update on completion of the install" + + if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then + echo + ewarn "xend may not work when python is built with stack smashing protection (ssp)." + ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" + ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug." + fi + + # TODO: we need to have the current Python slot here. + if ! has_version "dev-lang/python[ncurses]"; then + echo + ewarn "NB: Your dev-lang/python is built without USE=ncurses." + ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." + fi + + if has_version "sys-apps/iproute2[minimal]"; then + echo + ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" + ewarn "will not work until you rebuild iproute2 without USE=minimal." + fi + + if ! use hvm; then + echo + elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" + elog "support enable the hvm use flag." + elog "An x86 or amd64 multilib system is required to build HVM support." + fi + + if use xend; then + echo + elog "xend capability has been enabled and installed" + fi + + if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then + echo + elog "xensv is broken upstream (Gentoo bug #142011)." + elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." + fi +} diff --git a/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild index 7b17e44ef78d..1a321814cd28 100644 --- a/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild,v 1.3 2014/02/15 21:28:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild,v 1.4 2014/02/18 10:37:12 dlan Exp $ EAPI=5 @@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" live_eclass="mercurial" else - KEYWORDS="amd64 x86" + KEYWORDS="amd64 -x86" SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz $IPXE_TARBALL_URL $XEN_SEABIOS_URL" diff --git a/app-emulation/xen-tools/xen-tools-4.3.1-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild index 96716429ac73..9617d3628d9e 100644 --- a/app-emulation/xen-tools/xen-tools-4.3.1-r3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild @@ -1,15 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r3.ebuild,v 1.5 2014/01/27 08:58:09 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild,v 1.1 2014/02/18 10:37:12 dlan Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE='xml,threads' -IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" -XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130720.tar.gz" - if [[ $PV == *9999 ]]; then KEYWORDS="" REPO="xen-unstable.hg" @@ -17,10 +14,8 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" live_eclass="mercurial" else - KEYWORDS="amd64 x86" - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - $IPXE_TARBALL_URL - $XEN_SEABIOS_URL" + KEYWORDS="~amd64 -x86" + SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" S="${WORKDIR}/xen-${PV}" fi @@ -42,12 +37,15 @@ REQUIRED_USE="hvm? ( qemu ) pygrub? ( python )" DEPEND="dev-libs/lzo:2 + dev-libs/glib:2 dev-libs/yajl dev-libs/libgcrypt dev-python/lxml[${PYTHON_USEDEP}] pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) sys-libs/zlib sys-power/iasl + sys-firmware/seabios + sys-firmware/ipxe hvm? ( media-libs/libsdl ) ${PYTHON_DEPS} api? ( dev-libs/libxml2 @@ -90,6 +88,13 @@ QA_WX_LOAD="usr/lib/xen/boot/hvmloader" RESTRICT="test" +# Security patches +XSA_PATCHES=( + "${FILESDIR}"/${PN/-tools/}-4-CVE-2012-6075-XSA-41.patch + "${FILESDIR}"/${PN/-tools/}-4-CVE-XSA-86.patch #bug #500530 + "${FILESDIR}"/${PN}-4-CVE-2014-1950-XSA-88.patch #bug #501080 +) + pkg_setup() { python-single-r1_pkg_setup export "CONFIG_LOMOUNT=y" @@ -178,13 +183,9 @@ src_prepare() { # Fix network broadcast on bridged networks epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - # Prevent the downloading of ipxe, seabios - epatch "${FILESDIR}"/${PN/-tools/}-4.3-anti-download.patch - cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die - mv ../seabios-dir-remote tools/firmware/ || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null + # Bug 496708 + epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch + epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch # Fix bridge by idella4, bug #362575 epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" @@ -206,8 +207,7 @@ src_prepare() { # Set dom0-min-mem to kb; Bug #472982 epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch - #Security patches, currently valid - epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch + [[ ${XSA_PATCHES[@]} ]] && epatch "${XSA_PATCHES[@]}" # Bug 472438 sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ |