diff options
19 files changed, 9 insertions, 516 deletions
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest index 713c70e..609c2d6 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -2,5 +2,5 @@ DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47 DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d WHIRLPOOL 63bdd9eb70f168ba2006a8f4bbe166b68528abe8364b23cdc1d468ccc4b137bb3447bf90695920f016e09d53d3b93ccf6e3697b3c46840f00b794789cb424acc DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e -DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37 +DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch b/app-emulation/xen-pvgrub/files/xen-4.2.2-CC.patch index 9280e38..9280e38 100644 --- a/app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch +++ b/app-emulation/xen-pvgrub/files/xen-4.2.2-CC.patch diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.2.2-externals.patch index 2c3b1b7..2c3b1b7 100644 --- a/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch +++ b/app-emulation/xen-pvgrub/files/xen-4.2.2-externals.patch diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild index 558bbb3..5fbd6de 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild,v 1.3 2013/02/10 08:20:23 idella4 Exp $ -EAPI=4 +EAPI=5 PYTHON_DEPEND="2:2.6" inherit flag-o-matic eutils multilib python toolchain-funcs @@ -10,6 +10,7 @@ inherit flag-o-matic eutils multilib python toolchain-funcs XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci GRUB_URL=mirror://gnu-alpha/grub +# Todo: bump? change urls to real upstreams? SRC_URI=" http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz $GRUB_URL/grub-0.97.tar.gz @@ -29,7 +30,7 @@ IUSE="custom-cflags" DEPEND="sys-devel/gettext" -RDEPEND=">=app-emulation/xen-4.2.1" +RDEPEND="~app-emulation/xen-${PV}" pkg_setup() { python_set_active_version 2 diff --git a/app-emulation/xen-stubdom/Manifest b/app-emulation/xen-stubdom/Manifest index 713c70e..609c2d6 100644 --- a/app-emulation/xen-stubdom/Manifest +++ b/app-emulation/xen-stubdom/Manifest @@ -2,5 +2,5 @@ DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47 DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d WHIRLPOOL 63bdd9eb70f168ba2006a8f4bbe166b68528abe8364b23cdc1d468ccc4b137bb3447bf90695920f016e09d53d3b93ccf6e3697b3c46840f00b794789cb424acc DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e -DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37 +DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 diff --git a/app-emulation/xen-stubdom/files/xen-4.2.1-CC.patch b/app-emulation/xen-stubdom/files/xen-4.2.2-CC.patch index 9280e38..9280e38 100644 --- a/app-emulation/xen-stubdom/files/xen-4.2.1-CC.patch +++ b/app-emulation/xen-stubdom/files/xen-4.2.2-CC.patch diff --git a/app-emulation/xen-stubdom/files/xen-4.2.1-externals.patch b/app-emulation/xen-stubdom/files/xen-4.2.2-externals.patch index 2c3b1b7..2c3b1b7 100644 --- a/app-emulation/xen-stubdom/files/xen-4.2.1-externals.patch +++ b/app-emulation/xen-stubdom/files/xen-4.2.2-externals.patch diff --git a/app-emulation/xen-stubdom/xen-stubdom-4.2.1.ebuild b/app-emulation/xen-stubdom/xen-stubdom-4.2.2.ebuild index c9ca43c..c9ca43c 100644 --- a/app-emulation/xen-stubdom/xen-stubdom-4.2.1.ebuild +++ b/app-emulation/xen-stubdom/xen-stubdom-4.2.2.ebuild diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 3e187d1..39f4dba 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,5 +1,4 @@ DIST ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz 2888480 SHA256 ea2a52a999afab7fefa6300e0f1b38409c170a7503a51d8b572d790e71f2d0f0 SHA512 02314727af850bdf51c1963e8da258a65868f3ef116e9833918c770b8737cd1501891d4dc90d787702a1f34e35198e57373d730b7e2e6671e5fa93ece7c2f073 WHIRLPOOL 9a232852c3dee266dcbd27fae6814497814a0f65123484c37196a99c6cc746a348cf38c77ba084e62e052c64e950b34aa2f152a154e99c0366746f97941b23d7 DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c SHA512 c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4 WHIRLPOOL 58b7459aaf7323968e2f4d1cdcb563a04a0ee40d7d0e8fc600495baf6914127fbbbcddfb66199cd9f462eb59565b3d1ae90a05b3c771b8f13c2d2dcb6070eebc DIST seabios-0-20121121.tar.bz2 2199282 SHA256 f7f67181c6c0b4cea3a9db48e2569fdcbbc81b732a2f672079c42fb44153ee62 SHA512 4f886088ebaa911590b8cb19db5c5dbc8f1384d2d5a7c4bf04df083e177513b3123b1839dad744171670eded8b69ce092a774288aec1804d00aa32b1b6778599 WHIRLPOOL f2e62682d7213ee5eaecbc2590637ef36d9c86f746840c0ee758c0c153139f485032ea2cd098c87bb8a2b5f17f91375b8fb65599e3b71b45b1645df85a88887f -DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0 -DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37 +DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea diff --git a/app-emulation/xen-tools/files/xen-tools-3.3.0-nostrip.patch b/app-emulation/xen-tools/files/xen-tools-3.3.0-nostrip.patch deleted file mode 100644 index 48e7cd5..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.3.0-nostrip.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: xen-3.3.0/tools/ioemu-qemu-xen/Makefile -=================================================================== ---- xen-3.3.0.orig/tools/ioemu-qemu-xen/Makefile -+++ xen-3.3.0/tools/ioemu-qemu-xen/Makefile -@@ -205,7 +205,7 @@ endif - install: all $(if $(BUILD_DOCS),install-doc) - mkdir -p "$(DESTDIR)$(bindir)" - ifneq ($(TOOLS),) -- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" -+ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" - endif - mkdir -p "$(DESTDIR)$(datadir)" - set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ -Index: xen-3.3.0/tools/ioemu-qemu-xen/Makefile.target -=================================================================== ---- xen-3.3.0.orig/tools/ioemu-qemu-xen/Makefile.target -+++ xen-3.3.0/tools/ioemu-qemu-xen/Makefile.target -@@ -707,7 +707,7 @@ clean: - - install: all install-hook - ifneq ($(PROGS),) -- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" -+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" - endif - - # Include automatically generated dependency files diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch deleted file mode 100644 index c3fd913..0000000 --- a/app-emulation/xen-tools/files/xen-tools-4.1.1-curl.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ur xen-4.1.1.orig//tools/check/check_curl xen-4.1.1/tools/check/check_curl ---- xen-4.1.1.orig//tools/check/check_curl 2011-06-15 00:03:44.000000000 +0800 -+++ xen-4.1.1/tools/check/check_curl 2011-10-14 00:42:08.189717078 +0800 -@@ -9,5 +9,6 @@ - fi - - has_or_fail curl-config - curl_libs=`curl-config --libs` || fail "curl-config --libs failed" -+curl_libs=`echo $curl_libs | sed -re 's/-(W|march|mtune|pipe)[^[:space:]]*[[:space:]]//g'` || fail "curl-config --libs failed" - test_link $curl_libs || fail "dependency libraries for curl are missing" diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch b/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch deleted file mode 100644 index 5b14e4c..0000000 --- a/app-emulation/xen-tools/files/xen-tools-4.1.2-pyxml.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/python/xen/xm/create.py -+++ tools/python/xen/xm/create.py -@@ -1538,6 +1538,9 @@ - SXPPrettyPrint.prettyprint(config) - - if opts.vals.xmldryrun and serverType == SERVER_XEN_API: -+ import xml -+ if hasattr(xml, "use_pyxml"): -+ xml.use_pyxml() - from xml.dom.ext import PrettyPrint as XMLPrettyPrint - XMLPrettyPrint(doc) - diff --git a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild deleted file mode 100644 index b426ab7..0000000 --- a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild +++ /dev/null @@ -1,342 +0,0 @@ -# Copyright 1999-2012 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.1.2-r2.ebuild,v 1.3 2012/01/12 13:40:01 alexxy Exp $ - -EAPI="4" -PYTHON_DEPEND="2" -PYTHON_USE_WITH="xml threads" - -IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" -XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2" - -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" - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - $IPXE_TARBALL_URL - $XEN_SEABIOS_URL" - S="${WORKDIR}/xen-${PV}" -fi -inherit flag-o-matic eutils multilib python toolchain-funcs ${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 pygrub screen static-libs xend" - -REQUIRED_USE="hvm? ( qemu )" - -CDEPEND="<dev-libs/yajl-2 - dev-python/lxml - dev-python/pypam - dev-python/pyxml - sys-libs/zlib - sys-devel/bin86 - sys-devel/dev86 - dev-ml/findlib - hvm? ( media-libs/libsdl - sys-power/iasl ) - api? ( dev-libs/libxml2 net-misc/curl )" - -DEPEND="${CDEPEND} - sys-devel/gcc - dev-lang/perl - app-misc/pax-utils - dev-ml/findlib - 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 - sys-devel/dev86 - ) pygrub? ( dev-lang/python[ncurses] ) - " - -RDEPEND="${CDEPEND} - sys-apps/iproute2 - net-misc/bridge-utils - >=dev-lang/ocaml-3.12.0 - screen? ( - app-misc/screen - app-admin/logrotate - ) - || ( sys-fs/udev sys-apps/hotplug )" - -# 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_set_active_version 2 - python_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() { - sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS" - - # Drop .config - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - # 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" || die - sed -e 's:^XEND_INITD:#XEND_INITD:' \ - -i tools/examples/Makefile || "Disabling xend failed" || die - 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 custom-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 build for gcc-4.6 - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) -exec sed \ - -e "s:-Werror::g" \ - -i {} \; || die "Failed to remove -Werror" - - # Fix texi2html build error with new texi2html - sed -r -e "s:(texi2html.*) -number:\1:" -i tools/qemu-xen-traditional/Makefile - - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - - # Prevent the downloading of ipxe, seabios - epatch "${FILESDIR}"/${P/-tools/}-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 - - # 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}"/${P/-tools/}-nostrip.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${P/-tools/}-jserver.patch -} - -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 CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} - - if use doc; then - sh ./docs/check_pkgs || die "package check failed" - emake docs - emake dev-docs - fi - - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/etc/init.d - export CONFIG_LEAF_DIR=default - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Remove RedHat-specific stuff - rm -rf "${ED}"/etc/init.d/xen* "${ED}"/etc/default || 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 - - if use doc; then - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/api/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${ED}"/usr/share/doc/xen ] && mv "${ED}"/usr/share/doc/xen/* "${ED}"/usr/share/doc/${PF}/html - fi - - rm -rf "${ED}"/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 - - 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 - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f ${ED}usr/$(get_libdir)/*.a ${ED}usr/$(get_libdir)/ocaml/*/*.a - fi - - #python_convert_shebangs -r 2 "${ED}" - # 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 - mkdir -p "${ED}"$(get_libdir) - mv "${ED}"etc/udev "${ED}"$(get_libdir) - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - rm -f $(find "${ED}" -name openbios-sparc32) \ - $(find "${ED}" -name openbios-sparc64) \ - $(find "${ED}" -name openbios-ppc) \ - $(find "${ED}" -name palcode-clipper) || die -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " http://www.gentoo.org/doc/en/xen-guide.xml" - elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - if [[ "$(scanelf -s __guard -q $(type -P 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 probablem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - 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." - echo - elog "The qemu use flag has been removed and replaced with hvm." - 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 - python_mod_optimize $(use pygrub && echo grub) xen -} - -pkg_postrm() { - python_mod_cleanup $(use pygrub && echo grub) xen -} diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2.ebuild index a1c3581..a1c3581 100644 --- a/app-emulation/xen-tools/xen-tools-4.2.1-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.2.ebuild diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index ddf30d9..44e619d 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,2 +1 @@ -DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0 -DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37 +DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea diff --git a/app-emulation/xen/files/xen-4-CVE-2012-5634-XSA-33.patch b/app-emulation/xen/files/xen-4-CVE-2012-5634-XSA-33.patch deleted file mode 100644 index 20342ec..0000000 --- a/app-emulation/xen/files/xen-4-CVE-2012-5634-XSA-33.patch +++ /dev/null @@ -1,18 +0,0 @@ -VT-d: fix interrupt remapping source validation for devices behind legacy bridges -Using SVT_VERIFY_BUS here doesn't make sense; - -native Linux also uses SVT_VERIFY_SID_SQ here instead. -This is XSA-33 / CVE-2012-5634. -Signed-off-by: Jan Beulich <jbeulich@suse.com> - ---- xen/drivers/passthrough/vtd/intremap.c -+++ xen/drivers/passthrough/vtd/intremap.c -@@ -466,7 +466,7 @@ static void set_msi_source_id(struct pci_dev *pdev, struct iremap_entry *ire) - set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16, - (bus << 8) | pdev->bus); - else if ( pdev_type(seg, bus, devfn) == DEV_TYPE_LEGACY_PCI_BRIDGE ) -- set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16, -+ set_ire_sid(ire, SVT_VERIFY_SID_SQ, SQ_ALL_16, - PCI_BDF2(bus, devfn)); - } - break; diff --git a/app-emulation/xen/files/xen-4-CVE-2013-0151-XSA-34_35.patch b/app-emulation/xen/files/xen-4-CVE-2013-0151-XSA-34_35.patch deleted file mode 100644 index f074fa6..0000000 --- a/app-emulation/xen/files/xen-4-CVE-2013-0151-XSA-34_35.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit 66141b2e068fa39f28bdda6be05882e323663687 -Author: Michael Young -Date: Tue Jan 22 22:22:10 2013 +0000 - - Security fix from nested virtualization CVE-2013-0151, - restore status option to xend which is used by libvirt -#diff --git a/xsa34-4.2.patch b/xsa34-4.2.patch -#new file mode 100644 -#index 0000000..f5328ef -#--- /dev/null -#+++ xsa34-4.2.patch -#@@ -0,0 +1,30 @@ -#+x86_32: don't allow use of nested HVM -#+ -#+There are (indirect) uses of map_domain_page() in the nested HVM code -#+that are unsafe when not just using the 1:1 mapping. -#+ -#+This is XSA-34 / CVE-2013-0151. -#+ -#+Signed-off-by: Jan Beulich -#+ -#diff --git a/xsa35-4.2-with-xsa34.patch b/xsa35-4.2-with-xsa34.patch -#new file mode 100644 -#index 0000000..28c6171 -#--- /dev/null -#+++ xsa35-4.2-with-xsa34.patch -#@@ -0,0 +1,24 @@ -#+xen: Do not allow guests to enable nested HVM on themselves -#+ -#+There is no reason for this and doing so exposes a memory leak to -#+guests. Only toolstacks need write access to this HVM param. -#+ -#+This is XSA-35 / CVE-2013-0152. -#+ -#+Signed-off-by: Ian Campbell -#+Acked-by: Jan Beulich -#+ ---- xen/arch/x86/hvm/hvm.c -+++ xen/arch/x86/hvm/hvm.c -@@ -3858,6 +3858,11 @@ - rc = -EINVAL; - break; - case HVM_PARAM_NESTEDHVM: -+ if ( !IS_PRIV(current->domain) ) -+ { -+ rc = -EPERM; -+ break; -+ } - if ( a.value > 1 ) - rc = -EINVAL; - if ( !is_hvm_domain(d) ) -@@ -3926,6 +3926,10 @@ long do_hvm_op(unsigned long op, XEN_GUE - rc = -EINVAL; - break; - case HVM_PARAM_NESTEDHVM: -+#ifdef __i386__ -+ if ( a.value ) -+ rc = -EINVAL; -+#else - if ( a.value > 1 ) - rc = -EINVAL; - if ( !is_hvm_domain(d) ) -@@ -3940,6 +3944,7 @@ long do_hvm_op(unsigned long op, XEN_GUE - for_each_vcpu(d, v) - if ( rc == 0 ) - rc = nestedhvm_vcpu_initialise(v); -+#endif - break; - case HVM_PARAM_BUFIOREQ_EVTCHN: - rc = -EINVAL; diff --git a/app-emulation/xen/files/xen-4-CVE-2013-0154-XSA-37.patch b/app-emulation/xen/files/xen-4-CVE-2013-0154-XSA-37.patch deleted file mode 100644 index bb43acd..0000000 --- a/app-emulation/xen/files/xen-4-CVE-2013-0154-XSA-37.patch +++ /dev/null @@ -1,23 +0,0 @@ -x86: fix assertion in get_page_type() - -c/s 22998:e9fab50d7b61 (and immediately following ones) made it -possible that __get_page_type() returns other than -EINVAL, in -particular -EBUSY. Consequently, the assertion in get_page_type() -should check for only the return values we absolutely don't expect to -see there. - -This is XSA-37 / CVE-2013-0154. - -Signed-off-by: Jan Beulich <jbeulich@suse.com> - ---- xen/arch/x86/mm.c -+++ xen/arch/x86/mm.c -@@ -2586,7 +2586,7 @@ int get_page_type(struct page_info *page - int rc = __get_page_type(page, type, 0); - if ( likely(rc == 0) ) - return 1; -- ASSERT(rc == -EINVAL); -+ ASSERT(rc != -EINTR && rc != -EAGAIN); - return 0; - } - diff --git a/app-emulation/xen/xen-4.2.1-r2.ebuild b/app-emulation/xen/xen-4.2.2.ebuild index b7951e9..ad8588b 100644 --- a/app-emulation/xen/xen-4.2.1-r2.ebuild +++ b/app-emulation/xen/xen-4.2.2.ebuild @@ -67,8 +67,8 @@ src_prepare() { if use efi; then epatch "${FILESDIR}"/${PN}-4.2-efi.patch - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="boot" + export EFI_VENDOR="${EFI_VENDOR:-gentoo}" + export EFI_MOUNTPOINT="${EFI_MOUNTPOINT:-boot}" fi # if the user *really* wants to use their own custom-cflags, let them @@ -86,11 +86,6 @@ src_prepare() { # not strictly necessary to fix this sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" - - #Security patches - epatch "${FILESDIR}"/${PN}-4-CVE-2012-5634-XSA-33.patch \ - "${FILESDIR}"/${PN}-4-CVE-2013-0151-XSA-34_35.patch \ - "${FILESDIR}"/${PN}-4-CVE-2013-0154-XSA-37.patch } src_configure() { |