diff options
| -rw-r--r-- | app-emulation/xen-tools/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emulation/xen-tools/Manifest | 13 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch | 29 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild | 11 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild | 16 |
5 files changed, 58 insertions, 19 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index 3340aff36702..637efd24b56a 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.150 2013/05/16 05:26:22 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.151 2013/05/17 15:15:57 idella4 Exp $ + + 17 May 2013; Ian Delaney <idella4@gentoo.org> + +files/xen-tools-4-qemu-xen-doc.patch, xen-tools-4.2.1-r3.ebuild, + xen-tools-4.2.2-r1.ebuild: + patch to fix build issue with qemu.doc.html, fixes Bug #70048 by Tomas Mozes + who sourced the patch, re-add ocaml in IUSE for now 16 May 2013; Ian Delaney <idella4@gentoo.org> +files/xen-tools-4.2-xen_disk_leak.patch, xen-tools-4.2.1-r3.ebuild, diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index ac789bad1c93..29f8dcf0787d 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -20,6 +20,7 @@ AUX xen-tools-3.3.0-nostrip.patch 1021 SHA256 2debac718c01a7eac4daf3182a7ae04aa5 AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 SHA256 d00a1954447fc29500ab2f1a8c7900310e0dee81942be5c922ad66b6b42dfb74 SHA512 496c61ec237506c77577e832828de923283f55ab07ad141718af1a719b1b5bcdb8152a8cffddc679ff4a3e389582e7b8de8aaf1b4c8b1124bf1563467bdf674f WHIRLPOOL f80a557ed62cc26a51f85bc8682a738ab29d4573e3261c440f6e66f50cd81263fa2c6898b1aa1b1c227a2d3923cc9fd718ffad2e123ee69c6d7929def7906433 AUX xen-tools-4-add-nopie.patch 629 SHA256 9a84886118c22a926a1bc05ac8639d34dab76e0bc06348140d8d9622bf716347 SHA512 3a07f77d0ac810caf7501031a56208007e01cbf8cca0e1bd2b838c478aa429cdd5b5e120fce5dfdbfd9c22b5a6c32f7843bf277dc28c55d0076fd82a3c970f44 WHIRLPOOL 301c6f823cd9ec47618c3f78e7e9331bd0a124f289b83e4d01cd8a32a2ab16aef139ccf9dbf497b8edb2f7af24d47b1fd4ea617aa5e515185d101d6ae56a149a AUX xen-tools-4-docfix.patch 438 SHA256 016120c2333667aa84861ac9289c48a072c4842fb517936570882e1fc4060de6 SHA512 0a67d703749df823f5223b555c6dc896420e73ed7eeb5e77a8f8b950fc8bafaf9e20d66c35b29883b3cee6f8ca5054af3b55f804d20ae20d676feeeabf92b489 WHIRLPOOL fed73bd521b4cbea804ef4bc3b4b3a4007e7765cf0ab67e700e95afd328181ab5fce246b53a5e2a462baf6029664b25f82ffeabc1aaeb45fa99af344ecc957a5 +AUX xen-tools-4-qemu-xen-doc.patch 820 SHA256 691b2d84f7312388d528c83f3e9e90521e6b2c97abae8ca8a83325655264c98a SHA512 bc07420be7629796e49e128c1cfbde8fa7d4dc3b66174462448e9033f78c0c982dfdbd4dde9b1c54a9862fd2f9602c6bac0be1dfc0df8280aaaf8de60acb708f WHIRLPOOL 4fc2907a42bc3f824160f92586392f7dba07c2229382585f5f7bf4c0f3ab2574a814e8e8fd076b68abb2580497492e1fc0e6181ffb8f1acb5c70e60caff81505 AUX xen-tools-4.1.1-bridge.patch 449 SHA256 71eea5408e3600c3c6f7ce4e8363ea2c19db36c1882e20cf0ef8143af527782b SHA512 3e4021c363bae11874b13675a8ad6aaf5b733e42a18e0d1259dce1cf2c305440dde13a7a08a584213dd96fa4b0a788048f6cb87a0f5b3ce777a2048215dbd779 WHIRLPOOL 9363d615578696899ba84d6d2026d3cc5115756a9d0ca5a91071ac4db6e2fa425135bbf6db320e90daf78f89c6203b291dcb2cc25a6e5db82b7c094d3c940cde AUX xen-tools-4.1.1-curl.patch 550 SHA256 4bdb2875b36e7dbb0bd8d61b697da78007bb22922f56e020795c91ebb9ddd50b SHA512 d59a89a29ac687340953f48742451dcfebd94b8ede409184154d32a2371214cd8eae799240ff8a04aa0627973ea604b1461c9d937bc5ac0c86009dfa2b0875fe WHIRLPOOL 26262524f0a5cb6cb827cf65e52b3fbf86c98ab8928aa077fdc5ce5d81ee6d9a3c69d1b2fdc019560a9b0c528b318e1a0ca5c70a403b7a2627e087d43f0d9618 AUX xen-tools-4.1.1-libxl-tap.patch 1071 SHA256 ee03a5b68a9edf5d4fe78a322ff261e13f6ded879f3898b0ea72c407f678f885 SHA512 6ce2ab4240b90d8490458747b2cc9df71a722c11987b3fa4632a7f174e4111df623a50796bf37ef5b3864a84530305de8da923525a0a7ce416942efc13d0b950 WHIRLPOOL a4bde6ea31a116b92c929eac01ec7425ec9d32c05ed1675f2bf62d96897cb6876ea8f55455c9825e8e55670afe4c6c61a99ecb24925ac93d2825903dcb617050 @@ -43,15 +44,15 @@ DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe EBUILD xen-tools-4.2.0-r3.ebuild 10190 SHA256 759af2416598e871367071f7045cd4971659309459c5efd6541c4d4e920a69a0 SHA512 85cdbfc9abd901b14990b1f2952748aaa861adc9b21c6b8859a2523e8c3e62e2f677da9c20218675d3a1aedb3e70a48f5b48eeb3fb37c5389f8e091ff43c5e5e WHIRLPOOL c881d9929ab45be9baec55e863c54e32328c5f7650f6c469171e7efd10c6589d0c454afb7295b89ab7bd649de1d7c5f3d835ae527463217b56e6076c42728afb EBUILD xen-tools-4.2.1-r1.ebuild 10119 SHA256 d21c0bd5a1a44a7a87aa2521d9a1c9f8b569968ddf570aeae7f47bebc3c843c6 SHA512 ef77c4c08ec57970c699c09f51879f8b8dc5fc36141b3d68ad8fecce161d8810c79f7341b39c5b9944df9d1bc7e69fc85109fa9c23eb2e2d5a9e405bae652648 WHIRLPOOL 54597bf2c032718d0461017e22524f4ca1c6ab8ff55df54cd08f19f7c43d1cdc69f4a45d3aac695f34e0b67cb20186baa8aa4b2cdc3665049eb3ce52ca56a9d4 EBUILD xen-tools-4.2.1-r2.ebuild 10256 SHA256 7a2eb13b5dce1cd71ea2ea45f6848d67e578fe531367480fbaa3ae18b3862af7 SHA512 0b79429e45747b6d1fd6da1f90807de3d97daee86b7ac76a288c6b5f08402c61f44a5f22064d749560a7decdf747114e92dcdaef1e7b0c236a59c59a4f54eddf WHIRLPOOL 5d3e42614d241fca5f2fa898c8bef6e527cd0e2967ea1a993ddb43d719158c9fe7646c1e67278c6a3444dced0be48090fb126262bcfee35baaf075d7d5251ebd -EBUILD xen-tools-4.2.1-r3.ebuild 10436 SHA256 1f58231916fa06640214962492d133a2cfbe51322f245c6c3bc9eb58f1022c5c SHA512 b0ab902e1b86b68095156bb11e54ef2817c0d266b5c61fcc097aafcc4adcd981085d38fa81ead4e075a04accc3a47f5bcd4b5b38ad3660b35aacedd1c70b94ad WHIRLPOOL 8aaab9165d51e0dd6c2b2deff536e3ec563b17eac2acb930d0c675e4ff67551d9f1f6e5ccddaecc876c62bbc8ecddcf251f0c9ef4acd9b9d43e285a0e9eb944f +EBUILD xen-tools-4.2.1-r3.ebuild 10527 SHA256 043d8eb90cdc79b0b6191c5dce9ca6250853cd8d05bd88357526ed75724dd789 SHA512 591abe7dd89b4284405231be4ea72d55a45a97a7e0066b45be090c2dd0cb05934677c8341a3f8e22af25a9e7f04f49cf6ca21fa0ae88589693590d8f326e56c9 WHIRLPOOL 143e472acb0f843300605cba7366feb87df07eae3e23ec2a07d689a44baac4696318b3173f4c5ec9fc0d1417c309553ef413fbf57a80d4c9bec148417a630027 EBUILD xen-tools-4.2.1.ebuild 10279 SHA256 763ee5f7cce3cc7e55b7e3bab4d271c03115000053c809793ec30a14ad6681a4 SHA512 c91f648bce05a476780267cf2839431e200944bb4d9379f8cd9370b91ec241df2c29d119e4b4160f4802949a03bc2b93f2c837187325d9b72f0a573d3a951e03 WHIRLPOOL 88aa1ec2beb59fa5b62f88cd711a3823dbeebfca22395d12445e587c87e1de11333c07f9e0535b0e61ccb5403d75ea562f4e4759fc7f1a81489634061e22f852 -EBUILD xen-tools-4.2.2-r1.ebuild 10309 SHA256 d38864562506b7512ff23caa2693f162cd057bb7329932bd0c0e22f9e2c2cb33 SHA512 66d4d28ef92e271641c08e57c2425947d1e65532aaeb5cbae58b5805e2726f585f8249d44322ea4085f243dc705d29f10f93c1ddea1044ef8e1e84597169a08f WHIRLPOOL c2530f996de11be4d0add6204e3a68258d1213103b17fd5d85ed4ff34358bdb01ca9c5ff687a372b4085cfd3a13ccdd6bfb97230533db6d90f8aa771a13589ca -MISC ChangeLog 36061 SHA256 6d25a15e6a5ff0961a8422ddba273a76cdd07b7422037f447685ecb7979829be SHA512 f839a94be78fe5cfc17dedcdc8c4f6cc3ce15f08cab0136845627c60c1254a64536053752f27b70e5dbd46840e0cec30fe9b6f1da0705f9e548a2c3010ccec10 WHIRLPOOL 4679d79d4421765a73449077a05be2bed83d215c888cb16849d09979801ef8253710f1aa8c13c40f0162159be1e8fd2b3ef7dac4f96569357101a2beedf564d5 +EBUILD xen-tools-4.2.2-r1.ebuild 10444 SHA256 d9062af856ea6f6076c3325f689ed41ac4fa48ac5f93723f9c231e164376a1e6 SHA512 d631f50dc70f855f7edd16aee645ac1f4c12b9ed25e2d14bde29336e468781de9bfefbdb41fbf00978ab9b16b021baa44cb07bf94c72909eeb1dc1da8c5949b9 WHIRLPOOL 28d3caa5b1001c11122765aff41356e8d07af3486c13b0de9144acdf3ddbafaae8f3f83b9f3d7c38f290142e719395dea93d55d4e00f2f2ed283b094b03622a6 +MISC ChangeLog 36340 SHA256 97c080be64fce6813145bd842f9c7b3b8ddfbc4c7ccf3e0fcfea3cf3af15524f SHA512 3b18c0d69fa43f893da909de5322ed71db29b7ea8e76f68d394662c3b3e074333aafe2c9df03bb0e3f4c77550d8e02961010b8eddda1516db9e859968de33a15 WHIRLPOOL 9b7dcc5cb7aa98ba1f565311db61aefd51c387694e954e59bf858b69f1f5f6df7d3ac9b698ce2be09e1e24e9a0d285b31c72c97ce2ea44a99e6cdbb24bea4284 MISC metadata.xml 881 SHA256 52d19c65a78ed979b0d6df2f83fc281e8622296e2686c199dbc58cb76a70a57b SHA512 3e2400037f840272c38b0a7b9d46f9975d512bea13e6dc21bf8458fb68b1c741f4458a9eaf18aa53c3183ef4f83e70e8ae50e28132e563fc4a1d6463c77a586d WHIRLPOOL 3b030061503f4c2beec7f51d3bf790f358a4837d78d7a0faf0eee5214832fe888445a53c0b09b94bf8dd811e44523e0bb05535d58583499df97b32280f722312 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlGUbiQACgkQso7CE7gHKw2K4ACfVPWw24KNB8OvpyHsNnY9QocF -8RkAnRis3KuyZafTS61TWgS4DtTI2lx+ -=cEpv +iEYEAREIAAYFAlGWSb4ACgkQso7CE7gHKw3AYQCbBVzQhWvoSNlvVvEbmpnLSz+C +ACoAn3hPhTuRrAnshPWqlTlVzFirzdTe +=NYQ+ -----END PGP SIGNATURE----- diff --git a/app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch b/app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch new file mode 100644 index 000000000000..cd9658cd1e89 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch @@ -0,0 +1,29 @@ +diff -ur xen-4.2.2.orig/tools/qemu-xen/qemu-options.hx xen-4.2.2/tools/qemu-xen/qemu-options.hx +--- tools/qemu-xen/qemu-options.hx 2013-04-06 07:39:54.000000000 +0800 ++++ tools/qemu-xen/qemu-options.hx 2013-05-17 22:16:56.924728753 +0800 +@@ -1799,18 +1799,13 @@ + devices. + + Syntax for specifying a sheepdog device +-@table @list +-``sheepdog:<vdiname>'' +- +-``sheepdog:<vdiname>:<snapid>'' +- +-``sheepdog:<vdiname>:<tag>'' +- +-``sheepdog:<host>:<port>:<vdiname>'' +- +-``sheepdog:<host>:<port>:<vdiname>:<snapid>'' +- +-``sheepdog:<host>:<port>:<vdiname>:<tag>'' ++@table @code ++@item sheepdog:<vdiname> ++@item sheepdog:<vdiname>:<snapid> ++@item sheepdog:<vdiname>:<tag> ++@item sheepdog:<host>:<port>:<vdiname> ++@item sheepdog:<host>:<port>:<vdiname>:<snapid> ++@item sheepdog:<host>:<port>:<vdiname>:<tag> + @end table + + Example diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild index 2b9750101d55..e386dd2f71f4 100644 --- a/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.1-r3.ebuild,v 1.2 2013/05/16 05:26:22 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild,v 1.3 2013/05/17 15:15:57 idella4 Exp $ EAPI=5 @@ -67,8 +67,8 @@ DEPEND="${CDEPEND} dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) - hvm? ( x11-proto/xproto - )" + hvm? ( x11-proto/xproto ) + qemu? ( >=sys-apps/texinfo-5 )" RDEPEND="${CDEPEND} sys-apps/iproute2 net-misc/bridge-utils @@ -165,8 +165,9 @@ src_prepare() { sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die fi - # Fix texi2html build error with new texi2html - epatch "${FILESDIR}"/${PN}-4-docfix.patch + # Fix texi2html build error with new texi2html, qemu.doc.html + epatch "${FILESDIR}"/${PN}-4-docfix.patch \ + "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch # Fix network broadcast on bridged networks epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild index cca5a597617a..345b82fe5be8 100644 --- a/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.2-r1.ebuild,v 1.2 2013/05/16 05:26:22 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild,v 1.3 2013/05/17 15:15:57 idella4 Exp $ EAPI=5 @@ -32,7 +32,7 @@ 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" +IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend" REQUIRED_USE="hvm? ( qemu )" @@ -68,11 +68,12 @@ DEPEND="${CDEPEND} dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) - hvm? ( x11-proto/xproto - )" + hvm? ( x11-proto/xproto ) + qemu? ( >=sys-apps/texinfo-5 )" RDEPEND="${CDEPEND} sys-apps/iproute2 net-misc/bridge-utils + ocaml? ( >=dev-lang/ocaml-4 ) screen? ( app-misc/screen app-admin/logrotate @@ -165,8 +166,9 @@ src_prepare() { sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die fi - # Fix texi2html build error with new texi2html - epatch "${FILESDIR}"/${PN}-4-docfix.patch + # Fix texi2html build error with new texi2html, qemu.doc.html + epatch "${FILESDIR}"/${PN}-4-docfix.patch \ + "${FILESDIR}"/${PN}-4-qemu-xen-doc.patch # Fix network broadcast on bridged networks epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" @@ -197,7 +199,7 @@ src_prepare() { epatch "${FILESDIR}"/xen-4-ulong.patch \ "${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch - #Sec patch, currently valid + #Security patches, currently valid epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \ "${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \ "${FILESDIR}"/xen-4-CVE-2013-1952-XSA-49.patch |