commit: 86d394e1fbf21d8e704e0ef48f8f1159448318be
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Oct 29 21:29:56 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Oct 29 21:29:56 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=86d394e1
app-emulation/qemu: bump to 2.9.0-r57/2.10.0-r1
app-emulation/qemu/Manifest | 4 +++-
.../{qemu-2.10.0.ebuild => qemu-2.10.0-r1.ebuild} | 6 +++++-
app-emulation/qemu/qemu-2.10.0.ebuild | 3 ++-
.../{qemu-2.10.0.ebuild => qemu-2.9.0-r57.ebuild} | 20 ++++++++++++++++++--
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 39a9970..e157c1f 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -23,6 +23,8 @@ AUX qemu-binfmt.initd.head 1445 SHA256
a9b4b1d1ffa82d572c01f14ebfbafb4b3a4c2eb5c
AUX qemu-binfmt.initd.tail 245 SHA256
1b765f5212946b73b8e4d92f64d34a9d2e358ef541c02164f6d6dd93cb15e1e7 SHA512
bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
WHIRLPOOL
41ddd1751101646e700a6fe4ef879bd4149d646a801f97e40534051895697dcbded06a1edda51457a0d624fbf68442c3e57178a3ee8e683e35368b88d10ba4a4
DIST qemu-2.10.0.tar.bz2 30955656 SHA256
7e9f39e1306e6dcc595494e91c1464d4b03f55ddd2053183e0e1b69f7f776d48 SHA512
ea21c014030f8a902df159641e6ccb45f0850ac5cb1cb8ab6845124c44ea5def54845e7bc66a6e80d624c78069f9baa913ee5119704076ae4ff47ab018ace9f9
WHIRLPOOL
58f846788fdf2b0c90e6d17ce921a1fe02556968d38ffc11be7e32b81ebc723dfeaa790f22d8085d4f388eb01fe0daa3ddbc00630c5ecba083df33cc9709fb39
DIST qemu-2.9.0.tar.bz2 28720490 SHA256
00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14 SHA512
4b28966eec0ca44681e35fcfb64a4eaef7c280b8d65c91d03f2efa37f76278fd8c1680e5798c7a30dbfcc8f3c05f4a803f48b8a2dfec3a4181bac079b2a5e422
WHIRLPOOL
d79fe89eb271a56aee0cbd328e5f96999176b711afb5683d164b7b99d91e6dd2bfaf6e2ff4cd820a941c94f28116765cb07ffd5809d75c2f9654a67d56bfc0c1
-EBUILD qemu-2.10.0.ebuild 23200 SHA256
b6ea9761833b289161b9c85a284d7bcdea5f0e0916886ecd78598771e719244d SHA512
82401fb80d0d692b04c3e37abdb9ccedd9379d71f0812c5afbab57c71f6962f62942296fdb2d0a9bff2474f22b246f15452f4c9793cba10135d5f4f06179d763
WHIRLPOOL
df317a5a191e6e127e7cac7ac1efe1fc02d36fd5ea5759010d7dbbc655468c4082906d5f73431498182cf01331fc30abcf1ffd6502770fe0e5b7e9ee0f32ecb3
+EBUILD qemu-2.10.0-r1.ebuild 23285 SHA256
f337c398fd7f5a74694693118ebe5819e9b1eb971b8c35086b596f78ee4a4783 SHA512
e583af677a3c1212d8f607389ae0bf8b5e346e3430d04043de7025bfeca71c9b6d8f8df8ad31d379962acc999513e59d896ad2a1051d377b199b0831f51e58f4
WHIRLPOOL
ada9ea20c8d0d969ffeaa34eb1a2e7a54cce95723b75874c472ddcd3303512285bcf2eb6f3c6608e79f224a30c2f657fb864a73a12647a63ed76258b6665ebb7
+EBUILD qemu-2.10.0.ebuild 23231 SHA256
78ed1f0160c50cebceee9b6cbb2dd1b1ba8362c9d9db2721b1d8a05a43087511 SHA512
017ce62dc209222a1b0b18c488865f101664f40deeb7541c5eeab0e479f70287eeb1d6bc34decb28a677ecc17a2dd24552ec26e4f189cb45cd45d37b24d89585
WHIRLPOOL
8f2470289f9bf68f4380bffa965e36a7f7fdf1bc981d5310f906b48817f349be5c22893f5b491db318076bfed1ba24b8517a99bff0dd951220b76e4669c8c820
EBUILD qemu-2.9.0-r56.ebuild 23947 SHA256
4d5b7dd4c19e0324b14c8890581e9b6b5175feab19240de34d1916709336df2e SHA512
037c64bd8d2dd29ed24ea26368bce4046680d34a3cf106a395e821cb3f46061dfefcf9afea68e40e86dff243948b5e6f99d10340d0e1f0224861119beed03e6c
WHIRLPOOL
6315aa22ddd841d861806f58593e13364829ef38bf5db1c0169f855d6a52368b6d5eba57af35ca72f4f98153f8cb2bff54f43124710457f70cfcb61b837d8429
+EBUILD qemu-2.9.0-r57.ebuild 24000 SHA256
8b0cadd301049fb84f1e97da05d33e063b8fc8b53057ac8f75a6fa6755263694 SHA512
9ffc2682d87f4966c97a414b0f5148311cf0d458dbcc0d4f497bcc6c5bbb82d02bad36ce0df9fc6228d9df5a4b2dd34e7fe7221eeeb6d7005ceb880fbb2ca0d1
WHIRLPOOL
4c137f0a710ace5edd258320927b2f1ac8ffcc581a4db6abf688effc0c9dfa63692b96da6ac572d0db2f728f44eb47341892c8e06351e18335de326891c8056f
MISC metadata.xml 3794 SHA256
149f7bc9927e13bbf7355972e85df6f9f198dd17fb575a7e516817d6a88018fb SHA512
10f130f225b90dacf8262247d795a247abfdcbf3ad5fbe0693e8d4db79f755984f690cb150a7eb5a8e5d669ce404145c4fbb6b200d6362319be74759fd78b6d3
WHIRLPOOL
6a5e88caeb64387f619a19fecb55c39ccf3c8dcd360523e8d61b80051001c02fe81432c55e40b3f360295b35e9f5a1f707c570baf95cad06d18c4cd484da0ceb
diff --git a/app-emulation/qemu/qemu-2.10.0.ebuild
b/app-emulation/qemu/qemu-2.10.0-r1.ebuild
similarity index 99%
copy from app-emulation/qemu/qemu-2.10.0.ebuild
copy to app-emulation/qemu/qemu-2.10.0-r1.ebuild
index fe5cfb4..e7343e3 100644
--- a/app-emulation/qemu/qemu-2.10.0.ebuild
+++ b/app-emulation/qemu/qemu-2.10.0-r1.ebuild
@@ -89,7 +89,7 @@ SOFTMMU_TOOLS_DEPEND="
bzip2? ( app-arch/bzip2[static-libs(+)] )
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
- fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+ fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
gnutls? (
dev-libs/nettle:=[static-libs(+)]
@@ -211,6 +211,7 @@ QA_PREBUILT="
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper
usr/share/qemu/s390-ccw.img
+ usr/share/qemu/s390-netboot.img
usr/share/qemu/u-boot.e500"
QA_WX_LOAD="usr/bin/qemu-i386
@@ -366,6 +367,9 @@ src_prepare() {
# Run after we've applied all patches.
handle_locales
+
+ # Remove bundled copy of libfdt
+ rm -r dtc || die
}
##
diff --git a/app-emulation/qemu/qemu-2.10.0.ebuild
b/app-emulation/qemu/qemu-2.10.0.ebuild
index fe5cfb4..9c32a85 100644
--- a/app-emulation/qemu/qemu-2.10.0.ebuild
+++ b/app-emulation/qemu/qemu-2.10.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2";
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -211,6 +211,7 @@ QA_PREBUILT="
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper
usr/share/qemu/s390-ccw.img
+ usr/share/qemu/s390-netboot.img
usr/share/qemu/u-boot.e500"
QA_WX_LOAD="usr/bin/qemu-i386
diff --git a/app-emulation/qemu/qemu-2.10.0.ebuild
b/app-emulation/qemu/qemu-2.9.0-r57.ebuild
similarity index 96%
copy from app-emulation/qemu/qemu-2.10.0.ebuild
copy to app-emulation/qemu/qemu-2.9.0-r57.ebuild
index fe5cfb4..ffe6437 100644
--- a/app-emulation/qemu/qemu-2.10.0.ebuild
+++ b/app-emulation/qemu/qemu-2.9.0-r57.ebuild
@@ -89,7 +89,7 @@ SOFTMMU_TOOLS_DEPEND="
bzip2? ( app-arch/bzip2[static-libs(+)] )
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
- fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+ fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
gnutls? (
dev-libs/nettle:=[static-libs(+)]
@@ -200,7 +200,19 @@ PATCHES=(
# gentoo patches
"${FILESDIR}"/${PN}-2.5.0-cflags.patch
"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
- "${FILESDIR}"/${PN}-2.10.0-CVE-2017-13711.patch # bug 629350
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-8309.patch # bug 616870
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-8379.patch # bug 616872
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-8380.patch # bug 616874
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-8112.patch # bug 616636
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-7493.patch # bug 618808
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-11434.patch # bug 625614
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-11334.patch # bug 621292
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-9524-1.patch # bug 621292
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-9524-2.patch
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-9503-1.patch # bug 621184
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-9503-2.patch
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-10664.patch # bug 623016
+ "${FILESDIR}"/${PN}-2.9.0-CVE-2017-10806.patch # bug 624088
)
STRIP_MASK="/usr/share/qemu/palcode-clipper"
@@ -366,6 +378,9 @@ src_prepare() {
# Run after we've applied all patches.
handle_locales
+
+ #remove bundled copy of libfdt
+ rm -r dtc || die
}
##
@@ -683,6 +698,7 @@ src_install() {
cd "${S}"
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
+ dodoc docs/qmp-*.txt
if [[ -n ${softmmu_targets} ]]; then
# Remove SeaBIOS since we're using the SeaBIOS packaged one
