From d1a1049d052128449f39a7fb2193153d890a473c Mon Sep 17 00:00:00 2001 From: Yixun Lan Date: Sat, 28 Mar 2015 13:30:41 +0000 Subject: [PATCH] drop 4.3.x, bump 4.4.2, prepare security patch setting Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xAABEFD55 --- app-emulation/xen-pvgrub/ChangeLog | 8 +- app-emulation/xen-pvgrub/Manifest | 37 ++-- .../xen-pvgrub/xen-pvgrub-4.3.3.ebuild | 139 -------------- ...b-4.5.0.ebuild => xen-pvgrub-4.4.2.ebuild} | 5 +- app-emulation/xen-tools/ChangeLog | 9 +- app-emulation/xen-tools/Manifest | 42 ++--- .../xen-tools/files/gentoo-patches.conf | 21 +-- .../xen-tools/xen-tools-4.2.5-r3.ebuild | 17 +- ...4.3.3-r5.ebuild => xen-tools-4.4.2.ebuild} | 177 +++++++++++------- .../xen-tools/xen-tools-4.5.0-r2.ebuild | 22 ++- app-emulation/xen/ChangeLog | 8 +- app-emulation/xen/Manifest | 41 ++-- app-emulation/xen/xen-4.2.5-r7.ebuild | 16 +- .../{xen-4.3.3-r8.ebuild => xen-4.4.2.ebuild} | 51 +++-- app-emulation/xen/xen-4.5.0-r4.ebuild | 16 +- 15 files changed, 303 insertions(+), 306 deletions(-) delete mode 100644 app-emulation/xen-pvgrub/xen-pvgrub-4.3.3.ebuild rename app-emulation/xen-pvgrub/{xen-pvgrub-4.5.0.ebuild => xen-pvgrub-4.4.2.ebuild} (96%) rename app-emulation/xen-tools/{xen-tools-4.3.3-r5.ebuild => xen-tools-4.4.2.ebuild} (74%) rename app-emulation/xen/{xen-4.3.3-r8.ebuild => xen-4.4.2.ebuild} (74%) diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog index 77daef553d48..7c801a4b9169 100644 --- a/app-emulation/xen-pvgrub/ChangeLog +++ b/app-emulation/xen-pvgrub/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/xen-pvgrub # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.63 2015/03/13 09:48:41 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.64 2015/03/28 13:30:30 dlan Exp $ + +*xen-pvgrub-4.4.2 (28 Mar 2015) + + 28 Mar 2015; Yixun Lan -xen-pvgrub-4.3.3.ebuild, + +xen-pvgrub-4.4.2.ebuild, -xen-pvgrub-4.5.0.ebuild: + drop 4.3.x, bump 4.4.2, prepare security patch setting 13 Mar 2015; Agostino Sarubbo xen-pvgrub-4.4.1.ebuild: Stable for amd64, wrt bug #542266 diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest index 85437cbba86a..2f981ad75e70 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -17,31 +17,32 @@ DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9 DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368 -DIST xen-4.3.3.tar.gz 16479922 SHA256 59eb0e1c4a1f66965fe56dcf27cdb5872bf7e0585b7f2e60bd7967ec7f744ebf SHA512 cd9b7199d2859a856c719b75ee50a059c480f7493bbc493bcc3701d20321bd6d83c6fe1dd58e7b37695639bccf15e6420fb52f7e699586e7750ea665e99f82fc WHIRLPOOL 17ee263cb2a4c7b37d399e8baa88dab5b01386959de9d481e8666340d486bc9f32d57d6e1cef1568009fe8dbb2437b9ad90c1bed832cdfedd4be3fe5bf0a7dec DIST xen-4.4.1.tar.gz 18134427 SHA256 55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25 SHA512 bcd577014f4e8cb37b934f17a4dfb6f12e72e865a9e553cc435fdbe6665c733a4d20a812bf126727eca0946188a6abbd9419579757d7e03a38059f3656371c1c WHIRLPOOL f29eab626729f36de3f2e2c6c8446da4a05085818e18c28f07fe364065e05f0af67602eeb988091df3027a844ad0ccd52b6a0ee86592c7ff6008f961b9bd4bcf +DIST xen-4.4.2.tar.gz 18137195 SHA256 cd53592e86669e5e8c4d4a731b0199e8af17d8eadbb8f26dbb69f1b751259204 SHA512 7dae2a1d601d5c65c350ea9fe9870551ec53dff47b6ebe56e99285fd1112aa1cba3a2594e294b871defcf43fb7fccace9f18910e69f02dfce162d7bf453eb07b WHIRLPOOL 2dfe3de5fd800d2172ad2c95117e0646c6b2045cfcb9fa5eccc46b695f1c58aa861bf2a591f78db5baf5a89894b3fa26dc1ba63cb0d57f87be4df5c445c82a94 DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 EBUILD xen-pvgrub-4.2.5.ebuild 5031 SHA256 889f4d0122b1915076f7a21a318db4862ac36b79ac6cf92fdb36cbcac3098258 SHA512 f243e73b72881e418cbc7126e407ff12d71da1051e0d63dd90c29637e63c28fd48a5388191b197197babfd043da8d8d79aa20d9da884ac90a1d210cf58165f4d WHIRLPOOL def926d32dfb76d8fdf3d8218c0253dc56192c083eb676a9f0c8d8ce4e278bd69f094cf033e805f229c182f11fbf70d7c4efb131a20a19f9d4a46a5a8bc969de -EBUILD xen-pvgrub-4.3.3.ebuild 4488 SHA256 f9be2596390e8e4de06d77f725bae2dfd2bd80e9d5b48eb20621e733269cd6cf SHA512 473d67e8bc5b3fd62756233ae1354c473881bb21c6a51271710ececa094bb5c05e69d6c2f2397f9d08b9f0885dfbc135adb8bec95c011a1a0379efa1255cb817 WHIRLPOOL bf89ba00db9999bfa6924b624f8fe1ea6b5993e8e0d592f52c61079b5da795dbeb8744327023edd69eedb82bc8757091f4ba139c0d8b04ac3c5428f76857977e EBUILD xen-pvgrub-4.4.1.ebuild 4421 SHA256 fa983a404e9ba8ed0e087d62eec40e492ad89b291274fac30bc2c2f7cfae1964 SHA512 0e007efade0e7c36c6b929e76b99882be517dc0a89b8fbad9bd1a179fb08b249558dfa4465956e86b66c758750a115908e27865a69cfd4b255af7fe58771d196 WHIRLPOOL 2b2d09fd0bda987b6ac228034b7aadeedbe9d09bbf7384a1df8eb8f77050dfdb2da89b80f9e66d4b9fa9b73c9b8c5f2f9e067d71a70f3434a52bed4e949b4553 +EBUILD xen-pvgrub-4.4.2.ebuild 4423 SHA256 4eefa151f33b25fee29d8bf0bf53d390fadf636e56717d8f3c00a8f45bfafc58 SHA512 128fb81f4f52300d05eb427adf531611fa33476bf1de9750bed804b41010a17ffb8d2e43c4ae36ca3cbdf12b07e6aaf1457ef536b71196b8ee3afc3964f3e1f4 WHIRLPOOL c40296d5211acab543460e9d63ffacf54cfec8de921963d7741d561ae41ae86b9c2282900e9de8808afad33ee2695a57795a3f55aec805589a88870a35ab0d38 EBUILD xen-pvgrub-4.5.0-r1.ebuild 4527 SHA256 2fb0f6f74b941592ef257e40d2a1456bf9846c3f9b184f1a220cf9fdf0801f84 SHA512 7b18bf891f40b18692de604c9d7e2aad7900e2b7700278c2685c93cf469ddd2fdcba10e01d610e226e1307f12daa2bab37b81513d8447e0bebcc7da408e2d2bb WHIRLPOOL dc4eb38ce5f683e318771fd8201de6913afb94694b4fd552a14ad8f915d006b5379f67bf3e760714af525bd2670c10d744ad2a35bbc275c873b49457ff335608 -EBUILD xen-pvgrub-4.5.0.ebuild 4324 SHA256 781479049296815da91e6749bc2832a601279e8abad22176a4a85465ae27d2d5 SHA512 4fad750763cc606b2f90e8dc968bbfed9d74a33e47cdbd7af92ced0a7c9109fd749c5e415f5e0303ccaa581c17a0ddedfd1ebb9c31e5d857ecb224abc5ea7810 WHIRLPOOL d893822bf02026eaa78154742c507bd7e163c940fdee08962eb0ebd85f0cc3630f44bc965824a89730a7741604877ffd23964bda54b723aee630e1dcf3f95976 -MISC ChangeLog 13769 SHA256 960f75d6730d75af6f4db25ca73883fca3f3c94fb0329b083dbaa0e5dc5faf1d SHA512 73d1b01c048d6ed0f1b4c92957463153340421d5bf3430f443b8c1e0c7b906da38569a2fc45de8c2b051737a4b4b7acb896c897c0f49e7abe77cdd845dd381ea WHIRLPOOL 2b356a995ad45a217c81cbb2d779ec415f371dfab54aada4ca52f2d43dcf0c66a7fab2e9e4fbb86f87fdb09fd1698590cd219620605db28ab331558f8935bcf3 +MISC ChangeLog 13984 SHA256 936745c42f86ab8e2d3f2353395b47850d9d7aa49cbda1b2afefbd0a79634b8d SHA512 91a0be22340a930ce970190efd54f2924dc2915f3797cb606707693e41ae0c801cf1d3fc51180023f7151f86eb7244000a0f0caeb97400c7fb2fcd47987ebe78 WHIRLPOOL 1fb3d0d22c9771d542634c3c3a268738951ecbe312264af72815886409805f5b35f912ae541b63e76e3af7a3b952d9fdac75d2cbe8adab9891dd1b795d6145d5 MISC metadata.xml 156 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2 SHA512 66b610ce3a3c525f52ad132e0c6cab329866069d8f40cbfc7302b12f8fc1217705ce9d5aab9c08ee3f7eb86bd880b5c3595b10c3eb67932148a109ec11b88c22 WHIRLPOOL e7f151fa553d737c02f8791448170ddd88b9330b1b01a868cd5c32a875b58b36dd1e2b041308f657d35550f22e5798cd96037c3c890c0646119046f984505c23 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJVArJ6AAoJELp701BxlEWfeU4P/2XCm7QmNLNg1vNXcwGDGOkR -jNLdUwArH74wI4pcrDwdlyTS2XxbwwptmGjVNbl66DnuRXw7cDMjx/s97C+DEVhY -RJsdpZDxo6knZxpEN3VdUVh2VbMW0ouGNcORKqMyVzR8UMYaD8UTrRFWiZQr7hTE -jH9JTvXUcKfhDn5rk4pLw9qDdegjhf1wRItQeklSO2Iedm1acduDs/MCIY+uTbiz -GlgF0Sy4fXGxHUO4ZMM/uFBNmvLl8HzVXqjwZnF3JhEyucCbjOl6V6+x7/UOokPB -PV80vnA8Q9wbp0MK1JZd9YZ2M9Z8wbEo1WEFyM/VvNk7sHfj2slMQGVuEf5UcOhR -NMtQF/WALAViX6m0NhIfRWqlqgDsOTR3g1j8rqCf7+LjJ+gVs2oMgoUYZGfXt1Ws -/ziXA0s5NyJYHbRDUnRna58SjbOI9cqLoSdoacE6wcwsUSPq2G8+BMgshzAx/3q1 -WY3/zOmlTa/7HTsmPgunIRU7DlWX+xtHkeIxV23+KzSWJWJGX9GitL8SlV5r2YAs -bsijmLoKW6rharhq4/ud98e+/a6oHuMsbUFExDUyXgD23pWzjZBzgwChUoedTSUN -UFzBb1GR9bvp5w1ZEAHlL67QTURMA5yAMgCFzYHHL//iL4wYJc2B47iz6pqXZLRz -5GmVJNb9qSuWAgEpeBvZ -=L244 +iQJ8BAEBCABmBQJVFqz9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz +MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtSdIP/0f3YMlER6O0MoV+l/wuHXvq +Miazfz+oz1aOjLO5/7bI+3fIV8eD8WF7o+TDNsNBAHEKhOB3vkvJ32MEqggAG5BP +9nEQj4TmAktfOyFgZaLELt2qKoCf1xdxJdX66qaT13O+5PzMt40mhi1IQBU2kQps +Dt6LmWJN9cFKqTZt9EMzSr9u+QjUeboAYqxh2iKA/iPjF6P5MqoJfYRJAFlmwMOv +dZvrGif7NmV5UipCXWn7GIyWQtZodZC4kHo5nTTv6ZI8j00+fl9jVa4ukEwZbSZj +mY2tYcIwlmsUa83cCgNz3ZhRhKMMeLoU/7nF+VKM6SLp8sPCQTgGvt8gqLRZqS6g +cB87Iiy4E5t/Td38OnAmKRMoX4FZbpVnspClsu9zI7HnAXPXJUa4plg/K619ACrS +kARNNr6zE/sNcDJ6ys43Kqc30PiZQN6bxef9dkE6pbI3FGVlY7S0Wbt97M5gxJ9L +erjkZJLE/fS1rXJo/fj0okCWwEn4G1WN1CfmhkDxuunTItDE9h54K9gOm8iLI1Y1 +oHu5+ZshF342un0gowKCl7muRa2Tbvadu4iNwC/cOD/TO6nYPAr/BvsoO/aNu8ky +iefDuhaYXlxIx1oUtijLJ9EBCJzLgit2UnifU1NMNyn14oRXJW7SPtqjvK/j0CEU +SZxhrgVjql9BM9toCSS7 +=aqMZ -----END PGP SIGNATURE----- diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.3.3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.3.3.ebuild deleted file mode 100644 index 16b9abf7e3f6..000000000000 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.3.3.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.3.3.ebuild,v 1.2 2014/10/14 13:15:04 ago Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE='xml,threads' - -inherit flag-o-matic eutils multilib python-single-r1 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 -SRC_URI=" - http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - $GRUB_URL/grub-0.97.tar.gz - $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz - $LIBPCI_URL/pciutils-2.2.9.tar.bz2 - $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz - $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz" - -S="${WORKDIR}/xen-${PV}" - -DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" -HOMEPAGE="http://xen.org/" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 -x86" -IUSE="custom-cflags" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="sys-devel/gettext - sys-devel/bin86 - sys-apps/texinfo" - -RDEPEND=">=app-emulation/xen-4.2.1" - -pkg_setup() { - python-single-r1_pkg_setup -} - -retar-externals() { - # Purely to unclutter src_prepare - local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz" - - # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative - sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ - -i "${WORKDIR}"/zlib-1.2.3/configure - sed -e 's:^AR=ar rc:AR=ar:' \ - -e s':$(AR) $@:$(AR) rc $@:' \ - -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} - einfo "zlib Makefile edited" - - cd "${WORKDIR}" - tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz - tar czp grub-0.97 -f grub-0.97.tar.gz - tar czp lwip -f lwip-1.3.0.tar.gz - tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz - tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz - mv $set "${S}"/stubdom/ - einfo "tarballs moved to source" -} - -src_prepare() { - # 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 {} \; - fi - - # Patch the unmergeable newlib, fix most of the leftover gcc QA issues - cp "${FILESDIR}"/newlib-implicits.patch stubdom || die - - # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading - epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch - - # Drop .config and Fix gcc-4.6 - epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN}-4.2-jserver.patch - - # gcc warnings/QA fix - epatch "${FILESDIR}"/${PN}-4.3.1-qa.patch - - #Substitute for internal downloading. pciutils copied only due to the only .bz2 - cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" - retar-externals || die "re-tar procedure failed" -} - -src_compile() { - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include - - if use x86; then - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub - elif use amd64; then - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ - XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub - if has_multilib_profile; then - multilib_toolchain_setup x86 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub - fi - fi -} - -src_install() { - if use x86; then - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub - fi - if use amd64; then - emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub - if has_multilib_profile; then - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub - fi - fi -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "http://wiki.xen.org/wiki/Main_Page" -} diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.4.2.ebuild similarity index 96% rename from app-emulation/xen-pvgrub/xen-pvgrub-4.5.0.ebuild rename to app-emulation/xen-pvgrub/xen-pvgrub-4.4.2.ebuild index d785124a55e4..63760bd7f219 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0.ebuild,v 1.1 2015/01/21 02:29:45 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.4.2.ebuild,v 1.1 2015/03/28 13:30:30 dlan Exp $ EAPI=5 @@ -84,6 +84,9 @@ src_prepare() { # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch + # Drop .config and Fix gcc-4.6 + epatch "${FILESDIR}"/${PN/-pvgrub/}-4.4-fix_dotconfig-gcc.patch + # fix jobserver in Makefile epatch "${FILESDIR}"/${PN}-4.2-jserver.patch diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index f677e1b402de..340b2e6d51a5 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.276 2015/03/26 22:10:58 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.277 2015/03/28 13:27:54 dlan Exp $ + +*xen-tools-4.4.2 (28 Mar 2015) + + 28 Mar 2015; Yixun Lan xen-tools-4.2.5-r3.ebuild, + -xen-tools-4.3.3-r5.ebuild, +xen-tools-4.4.2.ebuild, + xen-tools-4.5.0-r2.ebuild, files/gentoo-patches.conf: + drop 4.3.x, bump 4.4.2, prepare security patch setting 26 Mar 2015; Yixun Lan -xen-tools-4.2.5-r2.ebuild, -xen-tools-4.4.1-r6.ebuild: diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index efd35e9ff1e8..88a6192d2b9e 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gentoo-patches.conf 3285 SHA256 18457559d8887729b47643ff9715ccfb661b8be74b4db41b88e20c3cc1d4e280 SHA512 a843a68dd519e6b1e588a7fe6a20d6da6a7ff250bfa0d803deb9a3e0f5da72824bb3f44795638cb2e521fef9326867d28d9fc2c249f67457150a0f830b441cb7 WHIRLPOOL bf9d3b72776b145948916e80fc842e3d278bf4b749c24ca68361cda5960f125403dd8d805d58cad1580743a3cc63899ddee178e61c1f597dbc2ced9f8775aa1e +AUX gentoo-patches.conf 2984 SHA256 ec0bfdc6370fd2dd2318f52d63bd2f97b93a03b21057de7d7868b0b34ac839fe SHA512 587d7e1357dcd85e47e2273cb7af52c8595a71df697bbcba226537df66ae8742a0ad5b38b3c3504f075f5896518e6a359e1f817336e5109c33a3518889a7e98e WHIRLPOOL 3c565f138dcc21bf12bbe85839b0449708be4a336f2b47230f245a76589753f8a66d8b1c5779ef08fa1ac2b2713186fb93e7d18eacb1b428b21ed2784a1325f4 AUX stubs-32.h 537 SHA256 4c903162da80cefd394404cb8cd9963a6ef6e3ad6c7adcbaa450a002d929bfc5 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68 WHIRLPOOL 9c006e266bea6bb9d623e76011a4eac07c5fe4fdf76a041cc42a2289a7e9163988bad0fb2f458e300e45aabf9fb864ec764a496d7f89d58e57a506bac206a5f1 AUX xen-consoles.logrotate 63 SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 WHIRLPOOL be108bf298202851de434af513ac8c03a533e7621623c2a7e8f26d498074b3eec81b85b2ae29ad2ec67f4fe9937c88bd78c5f5e260793e7e69ec964d4adb989e AUX xencommons.confd 109 SHA256 e19b950b1bb4103f9006a0c2648a8d4bc890e2c67417de2700b82fb456802640 SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17 WHIRLPOOL a8b7df6f9a8515b9c3c845379a3aa4424490972d5f882e8779a30fd2d44b77cb66deaa5c1496125ea7bc82e06044a485e14e904ad5c9c79222c008fb6ccc4e74 @@ -17,42 +17,40 @@ AUX xenstored.confd 42 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b3007 AUX xenstored.initd 1057 SHA256 15c22c41ade7a329f8a2b5c857cab865fb89752413b427c651ce5cffb45bc8fe SHA512 e74d3e95af079b96b4f2bbf3e436d2cebd84726f9c098ec1fad3dd9015a45cb2dac97fa5ee1ef9fe1f6bf332e97f1cbd38601c397a1a513cde60039ee15c8925 WHIRLPOOL 5071b02be32fe6fc1ca0eb07ad81d46e03ddd1b3344cdabf632552b87b8c2a4d45c58ba148f6706a1140e30525c1ee68394e1cbad8442886d697b3e033038a6d DIST ovmf-20131208.tar.bz2 32493270 SHA256 73363666b9e1b906905812347ec1d3bebec1375cb72160ee9edcebed188d1b39 SHA512 2ef53456d409d0e97973da5e2267b3ba2d49fbedcbdd86c3e1b87fa44f98f5f8d154ee5179ee325f1b3f9dca95eee373977b7c146a4e5cd9d1e2267a199ce82d WHIRLPOOL 4883ca2f960a65f846cec96861a124524f9f6c19916148cef7c93277b8b4c8984761b04b6372422e5c14b7ebfd1832a3368f7417aa5c49b81704f48f26b6aa3d DIST seabios-1.6.3.2.tar.gz 422376 SHA256 888aafe37ef3d1f502a73518a5e4dd0e9373ce4cd41681c354771314f1e41dd7 SHA512 c54431d8e81d25b74427696da689e90d3ab68c7c1be1dec05c81658d28b650f53daa34dcee2da826c1cf5d5d39396b12b0b16ea20ed6fd89de8f732163c8cca5 WHIRLPOOL 826c0e034ca46291661faa363189ee6cf56098cabc39f8fc84d2c442cc2da2174c2fa027cc11e11a7c3fed619f2e524f2aee804d9836d256448cdad28631d69a -DIST seabios-1.7.1-stable-xen.tar.gz 437679 SHA256 f45a2815fb3cce1e0d0acadcf06c6eaecf1f104bb18138a566cb5eaf414f88e5 SHA512 60b686a4dfc56b390bee3592c999d5485ad3fef8adb6115a999eb4c2d850b33ac22e67d8c58513a2d3aba3997c1402b86a01bfb7e8f19834a23623e32010f73b WHIRLPOOL 3bff0ff214d83ea1521a2689f56c6f261d59c760eb1fb5789492e4be6a638073de393d11b93a3e0a71d6f43f5fd597dc2deac326f64bb55af4346579821a28c8 DIST seabios-1.7.3.1.tar.gz 463801 SHA256 e1f5845c3fa01a9280421d587dcd866273d5d6c0002b9fe70a6736e56ef5c36f SHA512 6b2c376f6c2644e1ecad687079fc8ec63eb064b82ec3ac2d24f4ec7b56432c7ed69d41539e7b212aa134368272198bdaf50fed23637a29fcf1e653db008b2009 WHIRLPOOL 8e37ef66722580b9db67c5b98282e23074847eadbdd2db5ed8b999d25c1ce7cbe9ab54fbbb15d2985f403e18e6b2fa2ea36d87ce46ec30b0e5bbbc0f69623007 DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90 DIST xen-4.2.5-upstream-patches-6.tar.xz 19908 SHA256 29e0eb892f18fba8de51a7cfae9d7781e376f45adda7b57ab295b619832cbb95 SHA512 0f1a00b1a339e0d9fc0f0dbb440cc68b80bc8acc030898e7ad5de5b9c064ac0459b1a9228a4b7ef06fc46572fd921bd70121f407d8481ace9a5495607d94e7bd WHIRLPOOL 06e4eabbe9be3a2f94fa65e7658d3019155f802f7fff90c0b8250e5fd21435b08cde9ce4ddb9322f52a5c6e45a5f04dc2a2f7082402af736d34dbb37844f0f28 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368 -DIST xen-4.3.3-upstream-patches-7.tar.xz 56984 SHA256 781e429fc441cb1a6c1fca94c62b9ea2754eee64b5b916096847eb319733ac7f SHA512 597fd2dcd68887debd08082f47d941352f4d991296cbcba073d19b998b8f039eb516d02572592835a86ed822adbb63287ae2b10b54d3706a6730e421a84f0340 WHIRLPOOL 38c2606eb858b3d145be1d9405db6a7840c58f27193cfaa37f2f48e1c42a25f6f2bb2821188f2b86e87773ac1b8cc7223f04e557b5a8732713bce298431b0fe5 -DIST xen-4.3.3.tar.gz 16479922 SHA256 59eb0e1c4a1f66965fe56dcf27cdb5872bf7e0585b7f2e60bd7967ec7f744ebf SHA512 cd9b7199d2859a856c719b75ee50a059c480f7493bbc493bcc3701d20321bd6d83c6fe1dd58e7b37695639bccf15e6420fb52f7e699586e7750ea665e99f82fc WHIRLPOOL 17ee263cb2a4c7b37d399e8baa88dab5b01386959de9d481e8666340d486bc9f32d57d6e1cef1568009fe8dbb2437b9ad90c1bed832cdfedd4be3fe5bf0a7dec DIST xen-4.4.1-upstream-patches-8.tar.xz 65272 SHA256 727d76c83e0697f9698b6bf52d36060372c1030a24f29798b39108c6ba850f38 SHA512 fc435be990ff8bf4b4d79150e7de54b63d8673be1fcc75c6f89a985d83052d19f45e350c21365d8301118b8bf1f386d2c5e0b5dda9dc44d2104de1ad3c46c745 WHIRLPOOL 0833495199258f53099c7e141c5cc641f45db6ec648487c2c624cb59ba788cd61d73baf7c5b3d2f155b91814c42173e15d101c5f1baa27cb153a2ac9455d65dc DIST xen-4.4.1.tar.gz 18134427 SHA256 55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25 SHA512 bcd577014f4e8cb37b934f17a4dfb6f12e72e865a9e553cc435fdbe6665c733a4d20a812bf126727eca0946188a6abbd9419579757d7e03a38059f3656371c1c WHIRLPOOL f29eab626729f36de3f2e2c6c8446da4a05085818e18c28f07fe364065e05f0af67602eeb988091df3027a844ad0ccd52b6a0ee86592c7ff6008f961b9bd4bcf +DIST xen-4.4.2.tar.gz 18137195 SHA256 cd53592e86669e5e8c4d4a731b0199e8af17d8eadbb8f26dbb69f1b751259204 SHA512 7dae2a1d601d5c65c350ea9fe9870551ec53dff47b6ebe56e99285fd1112aa1cba3a2594e294b871defcf43fb7fccace9f18910e69f02dfce162d7bf453eb07b WHIRLPOOL 2dfe3de5fd800d2172ad2c95117e0646c6b2045cfcb9fa5eccc46b695f1c58aa861bf2a591f78db5baf5a89894b3fa26dc1ba63cb0d57f87be4df5c445c82a94 DIST xen-4.5.0-upstream-patches-3.tar.xz 27560 SHA256 25bd1414f56b2279efc0ba6a915fd86cf5d3c2fdee26da5876a8a4e875aa0132 SHA512 73bfba732b344bc45bf484b586b004852207fed08d69263ba1354ad14a2941df131526c2669a93b8bc55f231ddfc13f1d30a3f4aefdbb7e609616ab555396f76 WHIRLPOOL 454f8d1b5e4b433bca7691323220867ab50467aca998ccdfeb4dc51a44e4315ac32d830560cdf29ea31f39fc3c41d03945aee2ec0bb4e8cb8c8912654ac34ff6 DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924 DIST xen-gentoo-patches-0.tar.xz 22240 SHA256 cfe809b2ca278a4ad6771a59ea5bf4848423e5eb5c72c2f3092163c772774e3c SHA512 05c3416859e24b6704e4cf3442fe20411e78a63689d20f97dfd228a15a7e5bb6cf0c4310278ef6cb15a37bc5e07933137ffa17ccb0a8b7096fc45f3a1c16ba90 WHIRLPOOL ea1c3a4679368bcc37f4638400e91f773126a43f6c180084cb8c8f737d9bdae476d67e310453ac3b10e3fe71a0e2c760906ad707234ee6933c0963d6f3c7f061 DIST xen-gentoo-patches-3.tar.xz 23364 SHA256 66e37bc63376ac9aa9c8c9b16d7a154d3fb8c9906f963bb32f3d7baec6c95c68 SHA512 20b6bcede882b454bd84d349b0b70bf7e7150afb25ff89718f2feb938b120bd051547b7c129e58656e5281b39263de29bc2ed0510070fcfc2297110f0a597b4d WHIRLPOOL 293b1db1061e5af0f4f6e5c4d102d2ea8203539ad17adec3545ef35184ffae7d5c3f7a99dc5c367b9ad84b39aa6fa9624598620bdeb308c08ccf03b56b379e90 DIST xen-ovmf-patches-0.tar.xz 4356 SHA256 cd192a98114e534ce7454dc7ea45a42cea7ca83899d01fc8d695e2b110fdeaaf SHA512 03b844040ebad1a18d759418b0107d56feb9b8095291b7da1d36eb3409041764ad4bfd87679176b820221180e1038f6fad4314e8ad877096c052505de6339cf8 WHIRLPOOL e5c0aca3c786d905ad13f4d58a3b9b78260350df3dbe769ea6b66ac409e25ea0a368f9554c9da9b1a3f6f01ea1540038893b496fa5e637b18007076f8d305ee6 -EBUILD xen-tools-4.2.5-r3.ebuild 10704 SHA256 57f5d1b9724544a15f4a9f3ef895abe9ff4ebd8eca62d5ffc1ccffefe4e96a51 SHA512 0bd5bc4d60e0e1acbf285f322c5da50be8b8260f3c68e2e9a04baa0bbfcea48883236b0c015046c8d769f98fbb3a0fe90c4729d3a3cabca0381d5a3107332385 WHIRLPOOL 3580176fdc3694507f5baae352fb812ab7429bf58fcffdae71f04099aeab71ca042b4084448d360b4fe511c569e9fd96ede88344887d68c992ba2b2c0d3b753c -EBUILD xen-tools-4.3.3-r5.ebuild 12097 SHA256 a39fb78deee215f6bbeec00279b07b6b4306e0f8887f9558d2a21d5ac016bda1 SHA512 465181094175712fa7c209c4116758cc132100bd9727ecd8f772e6adebd7d4c99051d7101dd0f20fe8eade69a386b2c4f7983c392f87bb35760dc7cc8e302d2a WHIRLPOOL f20181604fa4369480203409e92cdbc93cacc9f1373b2213190ca02cd898d71becd63253b2a403c02390546ff3d335a7824d42733de74858d2815ad4266a0d2e +EBUILD xen-tools-4.2.5-r3.ebuild 11213 SHA256 a05c5eeb2b100bb0dcb54893c90524506dc43874a5afe345ce4bd52d2e2c0b41 SHA512 c407b0d603babd56c1a0ec5f9bde96086aaf58ac03ba8bd61d1fd6340da58f07966530a674c494f8a80c7a166672abf9fbd061b9a9f0d6f4fdd657e33d82265e WHIRLPOOL 6b7c3f26a5bc5ee7ebd7a8be29ed909b1f15d8a2d2db51b1e50ada70b3510b688803ef2512ad128eea55e588b2dbb1d2105963bcf488d7c6b3aedfad19d24bca EBUILD xen-tools-4.4.1-r7.ebuild 13173 SHA256 89256f747b1a4a2c125f9d795cfddcb596af16e75421f53b4e39e9f78e849923 SHA512 af1038e5d36f27cbe587be9fe17b93410e6e474b79d7fe541fd3075454ee941f7ab525ddee0b6ac735064d381b7e4e104dcc56c258c3c9f1a3202bb91ab05939 WHIRLPOOL b74e41351733ac7a61cdd0b015ff818191456d571fecf697cec7804d58791461e0a11923fe30e791fe126b73bfbf59f30352f7c1a92f8165e2150da74c0173e6 -EBUILD xen-tools-4.5.0-r2.ebuild 12960 SHA256 777e59857d467d60601478c98c8e303b1ed3e426b9f819a338a16097af1043bb SHA512 4b154e8e71b36ffa2f71f25c01e81b672da9d534d27b8998893799ce6e395d0f809e61620d725c43e70470316370aa25b4469140b2e4be383bc25659d4615b8b WHIRLPOOL ecb52ccf25cb22f4f6e5ae4c6f17e3d7ead309948076d58803c293335c434d2d79c8230473bde7ce30c16529352aeae1e374f34c09eebde54b96e529dedbf096 -MISC ChangeLog 65055 SHA256 837ada33ba2c815321c7ad6237f4a7a58da9063793b6619d93da21d29b8ed7b4 SHA512 8b80df6fee56f75fc9b5449daaad3e8c798d93d7bd9c7f4e05cdec2a42864b49feac74ab92f60c765a80f58b5c6b683615cfc4a7bcebc358cd3feb223ca0f9fa WHIRLPOOL ca6ca5824db07b49d4fd319355c6d266b4f02b5ba63506310b9255589bcdee32009bcd5b2a487d3542e60ae41e3d447e49abacd6b34061816faf07999951b199 +EBUILD xen-tools-4.4.2.ebuild 13719 SHA256 2dc72757aaa4bba9e23e9fb03f56c08603a332ccae9183f8db290f22cb2fbaf3 SHA512 6bf04308fb58f7d2ce22768452a4955fac70364be5abcef2102b64b403e9ba322e98ce669ddf400612a39f5b941b8873f543b6c2ffd5c37c3a2fdca2432b125f WHIRLPOOL 780c6c7b0cfc7e40f6c64656590f2d7c99983cb2b924d8384692d06715a4ddcc14ed6802730183173f4408a8becff2e68a983638d8e8583c64bcd67dff9dadd2 +EBUILD xen-tools-4.5.0-r2.ebuild 13508 SHA256 cffca4bb62c08c675637d13e317f102d06c0fa05323b3b13495af8aba653941c SHA512 f40ed0bcdebce2d3b80518e71ffea3890b199a254dcce8993bb1ffec9ea94b98a098395acc2314d04adf614ca7d155ebd5168a381c6aff8abe765da29e99198e WHIRLPOOL 0d3b7bdbced559fcba576e3f3a8dffadc13e9375447b4ce4546499f6e68efffbfcd309b757325964e8c6376b4b3eb2e3fe53f3779a8ed2aeddb2251e00e9e290 +MISC ChangeLog 65326 SHA256 84505ae121d19dca6f3ec095884ba5c2b708548fdbda61dcef31853ee886f697 SHA512 bda939158541a916e90ca5565f90ebd379bff3371e08a44e46334285dfa58a959216d7e6ada2225931d2dc27ab5b245bbca45bfe3dcd2202a64ab62c2e65a6b3 WHIRLPOOL d7505cc274e62308076f327cfa8ba6dc4eff4680e82901d256422b2a12f2159e252ed777dccba10bd6f2a3a8c25250481693f0492b88200f49d4ef4f11504a7f MISC metadata.xml 1016 SHA256 c308885b5aaa9733dcc866837e1847a89ef6085cf360a32a819cc38436d3569f SHA512 d93403690acb20d330e3af8e76b0a63daf69abce63f41e2edb7268158fafa15aa2c3f58fa1b6ec5f4667e55262685840bd1e47c12b2dfb95f702a7ecf7926390 WHIRLPOOL f02be8f37834b7d01328f99664268a0f6a47876c520f4bb36690b70c436a65e1a34cc6fed9e3429a804f1668c8e6c379bff39bf7375842d0b6c1efe3c01f756d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVFIP4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVFqxoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz -MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtCWQP+wfq0DMA6a3g8Z50oFnH2Vf1 -P0ZgLa6q3v5i5eMm5F/toHZaIKwWmJtG+15sK/oGvTPYfmNyDG6iMCkpAKaOouDZ -FbDg3/QijHTR/bmKzoHifh5TZaHuFSHFXW4UoGQ2IXG6hObCdhqbDMuwy3nqCixK -JuVFeFz/o+2XY+kOjOMScnV1ZxdmrjhVtqL1Co20vvOMD1s95eCk5pcnCkEXFiJO -2GvMeb8lOqJMNFBrD/5IN40Ls5ygFY9gDazGx0F/A90ncc5tYR+MhrqQLVmTrPnp -FRcEh2mxAbKXbKwyczI6L6W65Ew9U21KevI1Yh4WOEfKNZ/cBDH4XundOQeyDIKZ -XEd6ihvcXstT5uwUvr9H6L6jiECPiyO0JeoeeIitHDUDQaED6QYm4qhnaUNqEOwu -pFej+MwAXCELpQdmkkiGYqgXJmwDIeDm+c5ETHdApLXcieL5q/h2OVOkIJsB6qYi -vOqHL4A+Xcb/EdPUU9XVpY8AByeEP3MRAEtCHSMsVOdhhMvmPj+wKo/eoBvkhqJW -srCmoLPzYfWtXCbuJaEBg9vYfLolJepnb8GBbQGjRVfNvF22ULIsJ6pwJfXfRp/3 -+Yujoexxxp4A2/ch+YtfMxXhCIbnKABqwGnDimJZut1RAY2Cx+lKeMju9JZ4ppDz -n7/HatraZSc76xfCpKDA -=GIH9 +MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtL+MP/2KTZL4e+wo7nrk/QA/4+B7m +61s2zsGxoSekijaSHsR2aLLFjylihCwPzxWogUMDni6nS3B5v/t2hTE8rUjt4rfV +hO8IOzlxuxHyA3FN479VT/KiOIUyJKyhTUduRS2GAVQzt6dKuWK7pqiJCjNGoADb +0OF0ljv7G7f9/0uoTBaesPpN3YtpGLQNzmO4LxY0cbhbNz4FTuBAta7iUMXPgM/7 +npbFXwV75GvIw3NNf1VPcVrqE1CzTSRkSqY3Awp+mZEqCOkD1qo9+GsBF+PIAnlo +H6BOCI0kJxJ2MmK9t1xYOiqHUcHJpEK/qpAzMZtsKaPXeoGL6IPk5Vu58m5xIRXR +Rc/NB6JEDgrMiZ7Tu9AstQNjco25oGnYnwoabjcYtlaNmyqjkCWM5RDPY4F4mUmE ++4jA+uqKEny/C8hA9hGOyoZRYJ4zVa26VW3XCgH7W7k6wpXeuaCUW8spsHc39Qz2 +hnubWlplE/6+OrRK98CULAycvtHK0FzRPK2wkA+9s64AmG+L9M0B98rGvAg/D9rc +Ep4U2/LXxOxEKwlP3pDOBw+pIKcLMWbEkKBVVwu3jfjZteKVaY7AZD5L6kqO5/OL +N0h/aRJWj/A9P4r9QD1H1u1yR4Casya4NlLmzHVMi/O0gceLc1C3qSPreq1cNUwJ +bAK/pUd3aOH1CnPs4r7h +=CxiL -----END PGP SIGNATURE----- diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf index 4da8e45fe7e1..7b5d99950d12 100644 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ b/app-emulation/xen-tools/files/gentoo-patches.conf @@ -83,30 +83,17 @@ ${_gx011} ${_gx012} ${_gx013} ${_gx014} ${_gx015} ${_gx016} ${_gx017} ${_gx018} ${_gx019} " -# xen-tools-4.3.3 patches set -_gpv_xen_tools_433_0=" -${_gx020} ${_gx002} ${_gx003} -${_gx007} ${_gx008} ${_gx009} ${_gx010} -${_gx021} ${_gx012} ${_gx014} ${_gx022} -${_gx017} ${_gx023} ${_gx019} -" - # xen-tools-4.4.1 patches set -_gpv_xen_tools_441_0=" +_gpv_xen_tools_441_2=" ${_gx007} ${_gx008} ${_gx009} ${_gx024} ${_gx021} ${_gx014} ${_gx022} ${_gx017} ${_gx025} ${_gx026} ${_gx027} ${_gx019} +${_gx028} ${_gx029} " -_gpv_xen_tools_441_1=" -${_gx007} ${_gx008} ${_gx009} -${_gx024} ${_gx021} ${_gx014} -${_gx022} ${_gx017} ${_gx025} -${_gx026} ${_gx027} ${_gx019} -${_gx028} -" -_gpv_xen_tools_441_2=" +# xen-tools-4.4.2 patches set +_gpv_xen_tools_442_0=" ${_gx007} ${_gx008} ${_gx009} ${_gx024} ${_gx021} ${_gx014} ${_gx022} ${_gx017} ${_gx025} diff --git a/app-emulation/xen-tools/xen-tools-4.2.5-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r3.ebuild index f1f1d5317cfe..1fe1fc59bc50 100644 --- a/app-emulation/xen-tools/xen-tools-4.2.5-r3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.5-r3.ebuild,v 1.3 2015/03/16 13:22:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5-r3.ebuild,v 1.4 2015/03/28 13:27:54 dlan Exp $ EAPI=5 @@ -16,6 +16,7 @@ if [[ $PV == *9999 ]]; then else KEYWORDS="amd64 x86" UPSTREAM_VER=6 + SECURITY_VER= # xen-tools's gentoo patches tarball GENTOO_VER=0 # xen-tools's gentoo patches version which apply to this specific ebuild @@ -24,6 +25,8 @@ else [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" @@ -31,6 +34,7 @@ else http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} ${GENTOO_PATCHSET_URI}" S="${WORKDIR}/xen-${PV}" fi @@ -135,14 +139,25 @@ pkg_setup() { src_prepare() { # Upstream's patchset if [[ -n ${UPSTREAM_VER} ]]; then + einfo "Try to apply Xen Upstream patcheset" EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ EPATCH_OPTS="-p1" \ epatch "${WORKDIR}"/patches-upstream fi + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patcheset" + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}/patches-security/${PV}" + fi + # Gentoo's patchset if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then + einfo "Try to apply Gentoo specific patcheset" source "${FILESDIR}"/gentoo-patches.conf _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} for i in ${!_gpv}; do diff --git a/app-emulation/xen-tools/xen-tools-4.3.3-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.4.2.ebuild similarity index 74% rename from app-emulation/xen-tools/xen-tools-4.3.3-r5.ebuild rename to app-emulation/xen-tools/xen-tools-4.4.2.ebuild index b154f73a169d..8214b1715a88 100644 --- a/app-emulation/xen-tools/xen-tools-4.3.3-r5.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.4.2.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2015 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.3-r5.ebuild,v 1.1 2015/03/14 13:15:05 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.2.ebuild,v 1.1 2015/03/28 13:27:54 dlan Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) +MY_PV=${PV/_/-} + +PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='xml,threads' if [[ $PV == *9999 ]]; then @@ -14,25 +16,37 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" live_eclass="mercurial" else - KEYWORDS="~amd64 -x86" - UPSTREAM_VER=7 + KEYWORDS="~amd64 ~arm -x86" + UPSTREAM_VER= + SECURITY_VER= # xen-tools's gentoo patches tarball - GENTOO_VER=0 + GENTOO_VER=3 # xen-tools's gentoo patches version which apply to this specific ebuild GENTOO_GPV=0 - SEABIOS_VER=1.7.1-stable-xen + # xen-tools ovmf's patches + OVMF_VER=0 + + SEABIOS_VER=1.7.3.1 + OVMF_PV=20131208 [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz" + [[ -n ${OVMF_VER} ]] && \ + OVMF_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz + SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz + http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2 ${UPSTREAM_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${PV}" + ${SECURITY_PATCHSET_URI} + ${GENTOO_PATCHSET_URI} + ${OVMF_PATCHSET_URI}" + S="${WORKDIR}/xen-${MY_PV}" fi inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} @@ -43,32 +57,40 @@ DOCS=( README docs/README.xen-bugtool ) LICENSE="GPL-2" SLOT="0" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make +# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make # >=dev-lang/ocaml-4 stable # Masked in profiles/eapi-5-files instead -IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-seabios" +IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios" -REQUIRED_USE="hvm? ( qemu ) +REQUIRED_USE="hvm? ( || ( qemu system-qemu ) ) ${PYTHON_REQUIRED_USE} - pygrub? ( python )" + pygrub? ( python ) + ovmf? ( hvm ) + qemu? ( !system-qemu )" -DEPEND="dev-libs/lzo:2 +COMMON_DEPEND=" + dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl + dev-libs/libaio dev-libs/libgcrypt:0 + sys-libs/zlib +" + +DEPEND="${COMMON_DEPEND} dev-python/lxml[${PYTHON_USEDEP}] pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) - sys-libs/zlib - sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe hvm? ( media-libs/libsdl ) ${PYTHON_DEPS} api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) - sys-devel/bin86 - sys-devel/dev86 + arm? ( >=sys-apps/dtc-1.4.0 ) + !arm? ( sys-devel/bin86 + system-seabios? ( sys-firmware/seabios ) + sys-firmware/ipxe + sys-devel/dev86 + sys-power/iasl ) dev-lang/perl app-misc/pax-utils dev-python/markdown[${PYTHON_USEDEP}] @@ -88,9 +110,12 @@ DEPEND="dev-libs/lzo:2 hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman ) + system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )" -RDEPEND="sys-apps/iproute2 + +RDEPEND="${COMMON_DEPEND} + sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen @@ -100,7 +125,8 @@ RDEPEND="sys-apps/iproute2 # hvmloader is used to bootstrap a fully virtualized kernel # Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" +QA_WX_LOAD="usr/lib/xen/boot/hvmloader + usr/share/qemu-xen/qemu/s390-ccw.img" RESTRICT="test" @@ -115,12 +141,6 @@ pkg_setup() { export "CONFIG_GCRYPT=y" fi - if use qemu; then - export "CONFIG_IOEMU=y" - else - export "CONFIG_IOEMU=n" - 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!" @@ -128,6 +148,8 @@ pkg_setup() { export XEN_TARGET_ARCH="x86_32" elif use amd64 ; then export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" else die "Unsupported architecture!" fi @@ -137,14 +159,25 @@ pkg_setup() { src_prepare() { # Upstream's patchset if [[ -n ${UPSTREAM_VER} ]]; then + einfo "Try to apply Xen Upstream patcheset" EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ EPATCH_OPTS="-p1" \ epatch "${WORKDIR}"/patches-upstream fi + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patcheset" + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}/patches-security/${PV}" + fi + # Gentoo's patchset if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then + einfo "Try to apply Gentoo specific patcheset" source "${FILESDIR}"/gentoo-patches.conf _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} for i in ${!_gpv}; do @@ -154,17 +187,35 @@ src_prepare() { done fi - # Bug 496708 - use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch + # Ovmf's patchset + if [[ -n ${OVMF_VER} ]]; then + einfo "Try to apply Ovmf patcheset" + pushd "${WORKDIR}"/ovmf-*/ > /dev/null + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}"/patches-ovmf + popd > /dev/null + fi - # Bug 478064 mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die + mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die pushd tools/firmware/ > /dev/null ln -s seabios-dir-remote seabios-dir || die popd > /dev/null + # Fix texi2html build error with new texi2html, qemu.doc.html + sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die + + use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die + sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ + -i tools/firmware/Makefile || die + + # Drop .config, fixes to gcc-4.6 + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + # 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" @@ -188,9 +239,7 @@ src_prepare() { sed -e '/^SUBDIRS-y += python$/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 # Bug 351648 elif ! use x86 && ! has x86 $(get_all_abis); then @@ -201,8 +250,7 @@ src_prepare() { # 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 + sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die fi # Reset bash completion dir; Bug 472438 @@ -210,18 +258,23 @@ src_prepare() { -i Config.mk || die sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/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 - # Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844 - sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \ - -i tools/libxl/libxl_bootloader.c || die + # respect multilib, usr/lib/libcacard.so.0.0.0 + sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ + -i tools/qemu-xen/configure || die + + #bug 518136, don't build 32bit exactuable for nomultilib profile + if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then + sed -i -e "/x86_emulator/d" tools/tests/Makefile || die + fi + + # Bug 477884, 518136 + if [[ "${ARCH}" == 'amd64' ]]; then + sed -i -e "/LIBEXEC =/s|/lib/xen/bin|/$(get_libdir)/xen/bin|" config/StdGNU.mk || die + fi # fix QA warning, create /var/run/, /var/lock dynamically sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ @@ -238,20 +291,22 @@ src_prepare() { } src_configure() { - local myconf="--prefix=/usr --disable-werror" - - if use ocaml - then - myconf="${myconf} $(use_enable ocaml ocamltools)" - else - myconf="${myconf} --disable-ocamltools" - fi - - if ! use pam - then - myconf="${myconf} --disable-pam" - fi - + local myconf="--prefix=/usr \ + --libdir=/usr/$(get_libdir) \ + --disable-werror \ + --disable-xen \ + --enable-tools \ + --enable-docs \ + $(use_with system-qemu) \ + $(use_enable pam) \ + $(use_enable api xenapi) \ + $(use_enable ovmf) \ + $(use_enable ocaml ocamltools) \ + " + # disable qemu-traditional for arm, fail to build + use arm || myconf+=" --enable-qemu-traditional" + use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" + use qemu || myconf+=" --with-system-qemu" econf ${myconf} } @@ -326,12 +381,6 @@ src_install() { keepdir /var/log/xen-consoles fi - # Move files built with use qemu, Bug #477884 - if [[ "${ARCH}" == 'amd64' ]] && use qemu; then - mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die - mv "${D}"usr/lib/xen/bin/* "${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 diff --git a/app-emulation/xen-tools/xen-tools-4.5.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.5.0-r2.ebuild index 49dd91a443f4..e7ca60433ae7 100644 --- a/app-emulation/xen-tools/xen-tools-4.5.0-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.5.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.5.0-r2.ebuild,v 1.1 2015/03/14 13:15:05 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.5.0-r2.ebuild,v 1.2 2015/03/28 13:27:54 dlan Exp $ EAPI=5 @@ -18,6 +18,7 @@ if [[ $PV == *9999 ]]; then else KEYWORDS="~arm ~arm64 ~amd64 -x86" UPSTREAM_VER=3 + SECURITY_VER= # xen-tools's gentoo patches tarball GENTOO_VER=3 # xen-tools's gentoo patches version which apply to this specific ebuild @@ -29,7 +30,9 @@ else OVMF_PV=20131208 [[ -n ${UPSTREAM_VER} ]] && \ - UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" + UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz" [[ -n ${OVMF_VER} ]] && \ @@ -39,7 +42,8 @@ else http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2 - ${UPSTRAM_PATCHSET_URI} + ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} ${GENTOO_PATCHSET_URI} ${OVMF_PATCHSET_URI}" S="${WORKDIR}/xen-${MY_PV}" @@ -157,14 +161,25 @@ pkg_setup() { src_prepare() { # Upstream's patchset if [[ -n ${UPSTREAM_VER} ]]; then + einfo "Try to apply Xen Upstream patcheset" EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ EPATCH_OPTS="-p1" \ epatch "${WORKDIR}"/patches-upstream fi + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patcheset" + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}/patches-security/${PV}" + fi + # Gentoo's patchset if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then + einfo "Try to apply Gentoo specific patcheset" source "${FILESDIR}"/gentoo-patches.conf _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} for i in ${!_gpv}; do @@ -176,6 +191,7 @@ src_prepare() { # Ovmf's patchset if [[ -n ${OVMF_VER} ]]; then + einfo "Try to apply Ovmf patcheset" pushd "${WORKDIR}"/ovmf-*/ > /dev/null EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog index a2cbf25abc61..49fd36bc5769 100644 --- a/app-emulation/xen/ChangeLog +++ b/app-emulation/xen/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/xen # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.193 2015/03/14 12:31:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.194 2015/03/28 13:25:42 dlan Exp $ + +*xen-4.4.2 (28 Mar 2015) + + 28 Mar 2015; Yixun Lan xen-4.2.5-r7.ebuild, + -xen-4.3.3-r8.ebuild, +xen-4.4.2.ebuild, xen-4.5.0-r4.ebuild: + drop 4.3.x, bump 4.4.2, prepare security patch setting *xen-4.5.0-r4 (14 Mar 2015) *xen-4.4.1-r9 (14 Mar 2015) diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 79be30308dde..8663dc789ad8 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -9,35 +9,36 @@ AUX xen-4.5-efi.patch 1940 SHA256 f977cd11b28f3d8a8cd808c8910c661c6abd92864414ca DIST xen-4.2.5-upstream-patches-5.tar.xz 18600 SHA256 0deb548dc5b4c5bbeea590133c3e2037bc356a49b069645c552fc5e695b88fae SHA512 18f34981a4ebc2cb8510dd903438dab1f322ba0e8c4b7da2d2e7d57be70dec7342e729cc1b3790ca3f4a1ce3fff9668f2a7fb948d649be79c25ad8dd368fe350 WHIRLPOOL c67b960ec92311844d65128dd3c16a1a8788c0d50df36d589302e2505e4bd6b91a41dfcabedc14d032f51668d94ecba19aaeba0bbd19dee5a0194cea9ba674d4 DIST xen-4.2.5-upstream-patches-6.tar.xz 19908 SHA256 29e0eb892f18fba8de51a7cfae9d7781e376f45adda7b57ab295b619832cbb95 SHA512 0f1a00b1a339e0d9fc0f0dbb440cc68b80bc8acc030898e7ad5de5b9c064ac0459b1a9228a4b7ef06fc46572fd921bd70121f407d8481ace9a5495607d94e7bd WHIRLPOOL 06e4eabbe9be3a2f94fa65e7658d3019155f802f7fff90c0b8250e5fd21435b08cde9ce4ddb9322f52a5c6e45a5f04dc2a2f7082402af736d34dbb37844f0f28 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368 -DIST xen-4.3.3-upstream-patches-7.tar.xz 56984 SHA256 781e429fc441cb1a6c1fca94c62b9ea2754eee64b5b916096847eb319733ac7f SHA512 597fd2dcd68887debd08082f47d941352f4d991296cbcba073d19b998b8f039eb516d02572592835a86ed822adbb63287ae2b10b54d3706a6730e421a84f0340 WHIRLPOOL 38c2606eb858b3d145be1d9405db6a7840c58f27193cfaa37f2f48e1c42a25f6f2bb2821188f2b86e87773ac1b8cc7223f04e557b5a8732713bce298431b0fe5 -DIST xen-4.3.3.tar.gz 16479922 SHA256 59eb0e1c4a1f66965fe56dcf27cdb5872bf7e0585b7f2e60bd7967ec7f744ebf SHA512 cd9b7199d2859a856c719b75ee50a059c480f7493bbc493bcc3701d20321bd6d83c6fe1dd58e7b37695639bccf15e6420fb52f7e699586e7750ea665e99f82fc WHIRLPOOL 17ee263cb2a4c7b37d399e8baa88dab5b01386959de9d481e8666340d486bc9f32d57d6e1cef1568009fe8dbb2437b9ad90c1bed832cdfedd4be3fe5bf0a7dec DIST xen-4.4.1-upstream-patches-7.tar.xz 63336 SHA256 7a6a81759485416972fb8237c2f93f7e4b3ecadcfb15eb4ddad9f69f4c50be25 SHA512 d8e4bbfd41aed49b6e0f7eb62ca478abd94401d8d5a9f88290bfda6461f33f276c0340a51af5d5b6e1d3e5fb06764f3fdf5702e5d5f6cda8f06b265694909baf WHIRLPOOL 1a1267eb5fff947663860030a819d2960c8682dc8cfcc6108bf7c42c97a9ce8450ef9b0210df804dfba1dcbc5685c17e6009aba8d754e9a47e4001f9568e90f8 DIST xen-4.4.1-upstream-patches-8.tar.xz 65272 SHA256 727d76c83e0697f9698b6bf52d36060372c1030a24f29798b39108c6ba850f38 SHA512 fc435be990ff8bf4b4d79150e7de54b63d8673be1fcc75c6f89a985d83052d19f45e350c21365d8301118b8bf1f386d2c5e0b5dda9dc44d2104de1ad3c46c745 WHIRLPOOL 0833495199258f53099c7e141c5cc641f45db6ec648487c2c624cb59ba788cd61d73baf7c5b3d2f155b91814c42173e15d101c5f1baa27cb153a2ac9455d65dc DIST xen-4.4.1.tar.gz 18134427 SHA256 55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25 SHA512 bcd577014f4e8cb37b934f17a4dfb6f12e72e865a9e553cc435fdbe6665c733a4d20a812bf126727eca0946188a6abbd9419579757d7e03a38059f3656371c1c WHIRLPOOL f29eab626729f36de3f2e2c6c8446da4a05085818e18c28f07fe364065e05f0af67602eeb988091df3027a844ad0ccd52b6a0ee86592c7ff6008f961b9bd4bcf +DIST xen-4.4.2.tar.gz 18137195 SHA256 cd53592e86669e5e8c4d4a731b0199e8af17d8eadbb8f26dbb69f1b751259204 SHA512 7dae2a1d601d5c65c350ea9fe9870551ec53dff47b6ebe56e99285fd1112aa1cba3a2594e294b871defcf43fb7fccace9f18910e69f02dfce162d7bf453eb07b WHIRLPOOL 2dfe3de5fd800d2172ad2c95117e0646c6b2045cfcb9fa5eccc46b695f1c58aa861bf2a591f78db5baf5a89894b3fa26dc1ba63cb0d57f87be4df5c445c82a94 DIST xen-4.5.0-upstream-patches-3.tar.xz 27560 SHA256 25bd1414f56b2279efc0ba6a915fd86cf5d3c2fdee26da5876a8a4e875aa0132 SHA512 73bfba732b344bc45bf484b586b004852207fed08d69263ba1354ad14a2941df131526c2669a93b8bc55f231ddfc13f1d30a3f4aefdbb7e609616ab555396f76 WHIRLPOOL 454f8d1b5e4b433bca7691323220867ab50467aca998ccdfeb4dc51a44e4315ac32d830560cdf29ea31f39fc3c41d03945aee2ec0bb4e8cb8c8912654ac34ff6 DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924 EBUILD xen-4.2.5-r6.ebuild 4223 SHA256 52aa2f77fa720abeafca2f3357166703415670866156a1f29dd6300d339078a8 SHA512 a0f08a01445b570bc9facb2cdce2a8ccf9c4f21198e0c7416fc6122d4bef8556fca3f005c4869badd3df12ec9330bd7cb634049b5771c12fd8c7434377983de1 WHIRLPOOL 41ead4f9bfc92a2d0fc32f31c1004aa37910fb53b13b45037aca53f83669026782ebd9770cd57223c3843274c4b7732ad9be5c22c645f90717ec7d108d4d871b -EBUILD xen-4.2.5-r7.ebuild 4226 SHA256 8bf111f251da648d13e2181c92a298d130214f0df9384f960cc9b0df4b698838 SHA512 bee097e09376ed116ae90a911cbc07de92e339cbfb3f0f36e07f6dd93b76221b59145012fb0c951d9366ba503a03b5b753f512cd4a6d1bade0c05ec76f1a7d1b WHIRLPOOL c024d46039f9238604a2d4c0b26cb97d151b7e4f0f23086e4a3e4752fb2ee2ba56c7391ed0220357fc0fb51b10db5ffaa0f55788c7a3311a3984faa6cdeb1f6f -EBUILD xen-4.3.3-r8.ebuild 4120 SHA256 80b236746b130c8802983eabf407c02092a565029ee635972d3badf6d7ef8554 SHA512 b83e143fa517d710397158c6ec5daca351aeded2eb095c3bf07678d4c2b228b14e371e12c691a7c58b39ede6d44e3c635a6e429e1ebf3989c2d9c957448ea521 WHIRLPOOL 43e0121ac5bff44b013d3c7c0c2dfbd13d52380650721bb82c4ca8766211fdca53435da7583385e5a7b11a95ffcfff6a2dd157a7c6dcea8c178737c15fb94b2f +EBUILD xen-4.2.5-r7.ebuild 4588 SHA256 7ac3076861f3a3ad63200c73f6b5087bd721b823ea08f4fc05c851fd3c95edde SHA512 88c80f73d01f0cfe76e1ab506a81e7a71e138e182dd49630202dd8c076c4e2d49b8bf23b46694f3ae8ca1b2ab2ff01bb40ddfde4f73921662e51b2c9637d45f5 WHIRLPOOL 69f02c9beb83c5980a90c7f1b342c1cdf2d6142f375b30003261704fbc04fac9f01942400b64508628252a459ae607e482bd244e578a3738b38eb4fbf28be227 EBUILD xen-4.4.1-r8.ebuild 4347 SHA256 d55b80e6abbfda8eee5faf26b85975363a1aff0877ccc80f80509c9e79486678 SHA512 74cafc2e6c199eb6bac27c9c8ddb2c3c444320dff840479b3c58b37b20775d8a2cd94360d1b29045299b4a6086f08da7090a3c108a1b25948e832f40843e3e4d WHIRLPOOL 3a989629b0a0a74a4246cd4b199bac8a307366a30a84a68a6decff8bc6fce3a858be786384f0ec98119016e1420165975f949dbf2a6abea2cc91c93662e7854c EBUILD xen-4.4.1-r9.ebuild 4349 SHA256 8b300b58f60f0c2db57ce659b5150e88d9059e9706137eb37fecb8b495a94fb8 SHA512 d53a20d23f81a8b75fc2ddce1ae6db470aabdbd9fa643de451c820a88ead6688bd8c11fd4072e8afee753e1a8b9c8e8b6d601c8ec3644e07b31ba3b734e21099 WHIRLPOOL 37db13c785c4e322b2105d621658a3bc97a816b26702f9415eabf10584e3713d93c70f0eb122b341c6e1c70a3c356de2503279b3c552b28783533998ab6843ae -EBUILD xen-4.5.0-r4.ebuild 4408 SHA256 b897f707a6bdaf80c13b6c173d4440e06ffc493c3ce1424b4d39432774caa533 SHA512 ec8f7252da9b4a30736495602785d156d144b93e256e89c55aaa60db0c7c5d45792d31d322eabee3be9e96c659fb19d616488d26cbc45e67e4efae4caeeaf9bc WHIRLPOOL 9f5b3466d4f0aba5ca60cc19e335c7f3a4cef60e8c3ae14a44554dbf786c958377060208e11a3c1dc2e631792726e5d816cff1d28c514af76c6c9b74c973e789 -MISC ChangeLog 36318 SHA256 4ff84dec5530f87ecc48f8d3ba112304a5dbdf289621800e209dbcd8c107b429 SHA512 b46057cea717187d891d338d3dd4d4c763a34a67e0c466219e4c32a3134a91a7148df12dc3962a40664b67ca1a67d58b96069197ee517d4dc78b157fff82d097 WHIRLPOOL a1f31cc5638a1ceb53ac7a19c8f8d8d37e5c13f059df290da41ff65062722df5de30c70ab3eb55a0e63d57b2794fb0f11c9f3e33e70598a643a233cf3e6d2500 +EBUILD xen-4.4.2.ebuild 4707 SHA256 582030d64c89f31633038cc13580b18a0270de417eb4263cb431406e9cf93a1d SHA512 cb61787026575d1c992051a120a907e2f19d57b7cb51aedce47384d6b8ac7e4ddd109984e4b1b023a30412c69f108b42579d8ee73806d6f969dbd508c91ea967 WHIRLPOOL a519c26e2ab6ba8697038c336c92b875db96d26e26764687a204ac4ea85c320c3d34e728bef1d3ad1fdd4d89a41bb6fce797b0a5871694660ec312290992f111 +EBUILD xen-4.5.0-r4.ebuild 4770 SHA256 ef1f250d774c09a8e7e6ae152c8b1b098b2fbe2f21c069b8604de20b5f2f9103 SHA512 205f1ae654553a1a35ff92f7f71b5a3cf7bb5b4ea7e2dafd96988a9afef5126dff500e28ce16f98cb9f212b2375f988fee1593ff75f051c1cb5ee982abfd76b7 WHIRLPOOL 639564358aa1837e6fb3938ef538ab276cd86a9c0fa2f02d5d0033403c01f47aa7db0d65a9cb028e5c013ea1368153bc398de5a483ed2ac988e5a9a59b8465b4 +MISC ChangeLog 36530 SHA256 e48d4fb2aa211f9f38d5a7acd5f52f631fc4cbaee891729b1ed4cee1e8adc508 SHA512 7336bd77d608847e1945c16b1ad7db0985c4ec403ad3ce98333f6a360d6553be7a60a02a90d05b306ec1f9a243ba149dcd3b8eacf9ed3c224d02d35fa8d83ed5 WHIRLPOOL a6839757ebdc4a50688cec265118c4f4c0ac7aee6dfb2459ccae9a3753fc9ac8cf30ecc264e56cda7f84fa7ce3e161094c1ea13215dc0eec5b3178cbb16d575a MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJVBCobAAoJEJIMDbyqvv1VQnEP/14Srnrx/lCulogl7xdNQ9vi -IMWvhJHhwznWpVxmkyeV31gtGzj01vVlQEA9WTBy0pz8A83iNbCXeXCJ3exddA5o -F/Be4cF8QLKA9ffVgtTv5UMyU4qqA7/wcgS4bJEmmZ3Y3pgu5dl4RR3MNYa2snd2 -4P/auk1iB2/WzR+jKPWxwh1rZvy14Q8G5BvMQorHSS1MJHe1BnqAqno7D+P8URft -sKDxukLZ23d8fvMIRHmZcC+GoYaQRK5Qo6VcWWJ6D24hdJEpXEiGeIf6Q0+9PhJa -7LoDRUHfArt+mfLnQHwpiGLNYPgtD1gSBtPGiG3DEy28G57LHPmoY7KiM4Re5wKE -lhBlCj0clLll3DIWhT/fRYuE/9B6Ig/N8F9Z9Be9fqakBakGY2BP0E3r0++s42q9 -yoB2KGBioMGJJM0tNGVQVHEAQG0OlyYWUoa/KTMzUM2jiRcfntVtKvGALzYuW03S -fp0g5Jj3UoKJuLIBWOwm3+sPgyiPclhpcnrd/LWXFl7Hhq5l3AvRxO3u7xWH+SYo -wBAuoiNHTJLsd5weFaikZGmMUyMpF341/wiBp987ptKeEGPNBAADFgGF6aJ/8XA8 -HcGTOsLOijqYeAX3sAG4eTl9wEP9MYCF0/fNpFTCIuV8vzzjf2sFDZVtV8YNFTPP -fzg3BaaPQBVGLM85UbbW -=37DD +iQJ8BAEBCABmBQJVFqvlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz +MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvt6HQP/jfMvqCdTl29Cz5YdH40NZ07 +hm1CBplcMOBdWrfi5JRsc28TFEPEJRGtz+VBPdu21IsZWrMPNR1jsIfgppEjSRtf +Sq+0Ld/SMgLcevErL2f66ZtdYrfXcDC/rKEkKTyaIYJ2qv7DebXa0FRj+oxQ3SyM +vZYRUjqL6sdfAumfr7WdK7tkycQ7jHcF1B1b+JKW51yz0a0NSRJ5XgZlz2X4E8Ah +vk3Tp1cihTd7TkXGfvTBwYopI10sQXuAtPNuHOtLvLui9UKLBTOmq1gq/5qN4FOY +qcGp5MqaCXphcL94But7b/u6La+ofn2Cfk9G7AzlUdqzmqo6dVBaRj8lrgoZlsES +EiWuzcnqRBuqsJI3zthA/pO8mGQUZW0E6nikS434ypRwuHuIkXux/J3M3Kk93tVV +jLuaWGYuSWelH54hUgbqGG7kMsp+Vp+0qyufykaQI8l/UE1Bj31bOkirRZU0c1c8 +mIPzVfTDrk22MTtwEvnVNK1t9k1CHQT4KPvZ51hqHwjxGT9RmUstdHVzRIMjG8Eb +//6BmCbcZVmrKTzy9GJmfFIJzPnG9l8WTtZTxfuBoPW/CoX3hAvx/AcefKA4iSD1 +xJ0FN5qucjsfV4YKFWN7GskwRkOUrj9YzPMvh/Vs3aZXYoVOjoerCwUnIfGr+dPQ +otBUWQWwsGbQJeDLmP5x +=35XS -----END PGP SIGNATURE----- diff --git a/app-emulation/xen/xen-4.2.5-r7.ebuild b/app-emulation/xen/xen-4.2.5-r7.ebuild index 27e4a3c2d6f5..75bd64ea0331 100644 --- a/app-emulation/xen/xen-4.2.5-r7.ebuild +++ b/app-emulation/xen/xen-4.2.5-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r7.ebuild,v 1.1 2015/03/14 12:31:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r7.ebuild,v 1.2 2015/03/28 13:25:42 dlan Exp $ EAPI=5 @@ -15,14 +15,18 @@ if [[ $PV == *9999 ]]; then else KEYWORDS="~amd64 ~x86" UPSTREAM_VER=6 + SECURITY_VER= GENTOO_VER= [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} ${GENTOO_PATCHSET_URI}" fi @@ -80,6 +84,14 @@ src_prepare() { epatch "${WORKDIR}"/patches-upstream fi + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}/patches-security/${PV}" + fi + # Gentoo's patchset if [[ -n ${GENTOO_VER} ]]; then EPATCH_SUFFIX="patch" \ diff --git a/app-emulation/xen/xen-4.3.3-r8.ebuild b/app-emulation/xen/xen-4.4.2.ebuild similarity index 74% rename from app-emulation/xen/xen-4.3.3-r8.ebuild rename to app-emulation/xen/xen-4.4.2.ebuild index 48c220fb7030..7654ed6bc181 100644 --- a/app-emulation/xen/xen-4.3.3-r8.ebuild +++ b/app-emulation/xen/xen-4.4.2.ebuild @@ -1,30 +1,35 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.3-r8.ebuild,v 1.1 2015/03/14 12:31:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.2.ebuild,v 1.1 2015/03/28 13:25:42 dlan Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) +MY_PV=${PV/_/-} +MY_P=${PN}-${PV/_/-} + if [[ $PV == *9999 ]]; then KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" + EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git" + live_eclass="git-2" else - # Set to match entry in stable 4.3.1-r1, Bug 493944 - KEYWORDS="~amd64 -x86" - UPSTREAM_VER=7 + KEYWORDS="~amd64 ~arm -x86" + UPSTREAM_VER= + SECURITY_VER= GENTOO_VER= [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" + SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} ${GENTOO_PATCHSET_URI}" + fi inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass} @@ -46,7 +51,10 @@ RESTRICT="test" # Approved by QA team in bug #144032 QA_WX_LOAD="boot/xen-syms-${PV}" -REQUIRED_USE="flask? ( xsm )" +REQUIRED_USE="flask? ( xsm ) + arm? ( debug )" + +S="${WORKDIR}/${MY_P}" pkg_setup() { python-any-r1_pkg_setup @@ -57,6 +65,8 @@ pkg_setup() { export XEN_TARGET_ARCH="x86_32" elif use amd64; then export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" else die "Unsupported architecture!" fi @@ -79,6 +89,14 @@ src_prepare() { epatch "${WORKDIR}"/patches-upstream fi + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}/patches-security/${PV}" + fi + # Gentoo's patchset if [[ -n ${GENTOO_VER} ]]; then EPATCH_SUFFIX="patch" \ @@ -86,11 +104,11 @@ src_prepare() { epatch "${WORKDIR}"/patches-gentoo fi - # Drop .config and fix gcc-4.6 - epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch + # Drop .config + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" if use efi; then - epatch "${FILESDIR}"/${PN}-4.2-efi.patch + epatch "${FILESDIR}"/${PN}-4.4-efi.patch export EFI_VENDOR="gentoo" export EFI_MOUNTPOINT="boot" fi @@ -108,6 +126,9 @@ src_prepare() { -i {} \; || die "failed to re-set custom-cflags" fi + # remove -Werror for gcc-4.6's sake + find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ + xargs sed -i 's/ *-Werror */ /' # not strictly necessary to fix this sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" @@ -115,6 +136,8 @@ src_prepare() { } src_configure() { + use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" + use debug && myopt="${myopt} debug=y" if use custom-cflags; then diff --git a/app-emulation/xen/xen-4.5.0-r4.ebuild b/app-emulation/xen/xen-4.5.0-r4.ebuild index 8044593b95d6..91fcb8f9c9f2 100644 --- a/app-emulation/xen/xen-4.5.0-r4.ebuild +++ b/app-emulation/xen/xen-4.5.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r4.ebuild,v 1.1 2015/03/14 12:31:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r4.ebuild,v 1.2 2015/03/28 13:25:42 dlan Exp $ EAPI=5 @@ -16,14 +16,18 @@ if [[ $PV == *9999 ]]; then else KEYWORDS="~arm ~arm64 ~amd64" UPSTREAM_VER=3 + SECURITY_VER= GENTOO_VER= [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} ${GENTOO_PATCHSET_URI}" fi @@ -87,6 +91,14 @@ src_prepare() { epatch "${WORKDIR}"/patches-upstream fi + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}/patches-security/${PV}" + fi + # Gentoo's patchset if [[ -n ${GENTOO_VER} ]]; then EPATCH_SUFFIX="patch" \ -- 2.26.2