| 1 |
commit: 8c806a02b9c71d1614ce73cc840d2f95c2c76c64 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Apr 17 18:33:16 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Apr 17 18:33:16 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8c806a02 |
| 7 |
|
| 8 |
app-emulation/qemu: version bump to 2.8.1-r1 |
| 9 |
|
| 10 |
and 2.8.0-r10 |
| 11 |
|
| 12 |
app-emulation/qemu/Manifest | 4 +-- |
| 13 |
...{qemu-2.8.0-r9.ebuild => qemu-2.8.0-r10.ebuild} | 35 ++++++++++++---------- |
| 14 |
.../{qemu-2.8.1.ebuild => qemu-2.8.1-r1.ebuild} | 2 +- |
| 15 |
3 files changed, 22 insertions(+), 19 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest |
| 18 |
index 394f74d..1b3ada7 100644 |
| 19 |
--- a/app-emulation/qemu/Manifest |
| 20 |
+++ b/app-emulation/qemu/Manifest |
| 21 |
@@ -33,6 +33,6 @@ AUX qemu-binfmt.initd.tail 245 SHA256 1b765f5212946b73b8e4d92f64d34a9d2e358ef541 |
| 22 |
DIST qemu-2.8.0-CVE-2016-9602-patches.tar.xz 16264 SHA256 18ac829c6003a3f997db4030a46b422028c58fead158f0c5ffe36ad65acb84e0 SHA512 a56694d1600e4fd1ffd6bbe031a0db226fc5c88306797cc4e42d1dc6127b83d1791cb4e026988b3aad82eab84382e41077ae71e532d1d3489e179730185c0964 WHIRLPOOL 22057b001c478b2b0d97ad70393c973aefc6277d89bb5a1ae03c3c39b5182ddfbe541964761f512ed5735dc442e1f40d0a955ad5b270758e21ce815be86b24bd |
| 23 |
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5 |
| 24 |
DIST qemu-2.8.1.tar.bz2 28366270 SHA256 018e4c7ed22c220395cf41f835d01505e49d0e579a548bd3d72b03809442bbcd SHA512 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda WHIRLPOOL c41f53f18fac44efd1c81ba9d95204d23e9a70dc9c21624177be2fe92a327428fd5704b25bc334229fa36ae395fb4c82ba3955db39719c4458343978a4d3141a |
| 25 |
-EBUILD qemu-2.8.0-r9.ebuild 23415 SHA256 332494856afccbb1f1347731f97fc9293ededcea348e2227e9c05a0a68cdcea2 SHA512 499730d9913480fd8dd696a2201a7ac8542d046e516756bb58c001be83db043b1b88f7cf34d4c98188b37bc52569034803c1d225a97b2fc02a45eb466486e6fd WHIRLPOOL 9b561abcd59ec05024b3370ff45c05c7d0fcf617bce7a29aece0f9bada3a077ab4700ffeb777ddac9d1c1eda9a80dfe24f36d60110bc34026cb1380e1454ae25 |
| 26 |
-EBUILD qemu-2.8.1.ebuild 22805 SHA256 fd50a516ec50da69dc8c4dc2ea83c0a3391fcd6087d62650f37183d46c70d933 SHA512 cf05a4725142584b213a1fc03106fc4faa5eeeda5d8e5e1ef020095a2f3b289842537a731a959f628bfd5e36c03786a8404288058514e8057cc1db779b97f6eb WHIRLPOOL ba86ba5234aae044690657585f2f384b0724061e37c74a4b55df50c0c0bce5615abbb1e6566d2e1cb56b51e4e49fc1495c78cae3f25a4741b8dd7eb493d22a8a |
| 27 |
+EBUILD qemu-2.8.0-r10.ebuild 23278 SHA256 c94a06a16fb45995d37e0bfa62dc742601c169156d30b97456d923856693efd1 SHA512 ebd5ea426efc57bb2eb78489049f212e11eb4ab70d23418ad7c04c3161a749ec638edcdd39355107762915c4f13079a3dc1555c58f3d696cd286a9fd6bd25491 WHIRLPOOL 94c220281705e2d6414a7d52b8f93373ae193f0095c88fd76d9e0b10f7a11266e3350d3b354651f87c094a3cf63e12b9374beefb839a1a9f0d17f92732786a01 |
| 28 |
+EBUILD qemu-2.8.1-r1.ebuild 22805 SHA256 067a0713f27ed9aa1a44465dc1d1ec7664f2f539cbe6f8b8572423f97b6b5529 SHA512 ddd47ad7f5ee26eb0e60217bcb821bd67d7f6e99700b99a77b3633b76ff68686514d0186c0bc271bcba3343f9afbc70be4543f644ce434bc40c961033b4ad8c5 WHIRLPOOL 458dd42f06f89db818da2eb4817fcaad7b1ed4d25dff863ab6e05523025d61a95fbf6a63fe7ca213334d80178a3705918f0ff4d9318d8fcd11c329edbbd6ab3c |
| 29 |
MISC metadata.xml 3794 SHA256 149f7bc9927e13bbf7355972e85df6f9f198dd17fb575a7e516817d6a88018fb SHA512 10f130f225b90dacf8262247d795a247abfdcbf3ad5fbe0693e8d4db79f755984f690cb150a7eb5a8e5d669ce404145c4fbb6b200d6362319be74759fd78b6d3 WHIRLPOOL 6a5e88caeb64387f619a19fecb55c39ccf3c8dcd360523e8d61b80051001c02fe81432c55e40b3f360295b35e9f5a1f707c570baf95cad06d18c4cd484da0ceb |
| 30 |
|
| 31 |
diff --git a/app-emulation/qemu/qemu-2.8.0-r9.ebuild b/app-emulation/qemu/qemu-2.8.0-r10.ebuild |
| 32 |
similarity index 97% |
| 33 |
rename from app-emulation/qemu/qemu-2.8.0-r9.ebuild |
| 34 |
rename to app-emulation/qemu/qemu-2.8.0-r10.ebuild |
| 35 |
index 97305f1..7a4fa23 100644 |
| 36 |
--- a/app-emulation/qemu/qemu-2.8.0-r9.ebuild |
| 37 |
+++ b/app-emulation/qemu/qemu-2.8.0-r10.ebuild |
| 38 |
@@ -69,18 +69,17 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 39 |
# The attr lib isn't always linked in (although the USE flag is always |
| 40 |
# respected). This is because qemu supports using the C library's API |
| 41 |
# when available rather than always using the extranl library. |
| 42 |
-# |
| 43 |
-# To configure and compile qemu user targets or tools alone the following |
| 44 |
-# dependencies are not strictly necessary: |
| 45 |
-# alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
| 46 |
-# fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) |
| 47 |
-# pulseaudio? ( media-sound/pulseaudio ) |
| 48 |
-# seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) |
| 49 |
-# but these are so few it is not worth the effort to separate this list. |
| 50 |
-TARGETS_DEPEND=" |
| 51 |
+ALL_DEPEND=" |
| 52 |
>=dev-libs/glib-2.0[static-libs(+)] |
| 53 |
>=x11-libs/pixman-0.28.0[static-libs(+)] |
| 54 |
sys-libs/zlib[static-libs(+)] |
| 55 |
+ python? ( ${PYTHON_DEPS} ) |
| 56 |
+ systemtap? ( dev-util/systemtap ) |
| 57 |
+ xattr? ( sys-apps/attr[static-libs(+)] )" |
| 58 |
+ |
| 59 |
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) |
| 60 |
+# softmmu targets (qemu-system-*). |
| 61 |
+SOFTMMU_TOOLS_DEPEND=" |
| 62 |
accessibility? ( |
| 63 |
app-accessibility/brltty[api] |
| 64 |
app-accessibility/brltty[static-libs(+)] |
| 65 |
@@ -125,7 +124,6 @@ TARGETS_DEPEND=" |
| 66 |
) |
| 67 |
png? ( media-libs/libpng:0=[static-libs(+)] ) |
| 68 |
pulseaudio? ( media-sound/pulseaudio ) |
| 69 |
- python? ( ${PYTHON_DEPS} ) |
| 70 |
rbd? ( sys-cluster/ceph[static-libs(+)] ) |
| 71 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
| 72 |
sdl? ( |
| 73 |
@@ -146,13 +144,11 @@ TARGETS_DEPEND=" |
| 74 |
>=app-emulation/spice-0.12.0[static-libs(+)] |
| 75 |
) |
| 76 |
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) |
| 77 |
- systemtap? ( dev-util/systemtap ) |
| 78 |
- usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) |
| 79 |
usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) |
| 80 |
+ usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) |
| 81 |
vde? ( net-misc/vde[static-libs(+)] ) |
| 82 |
virgl? ( media-libs/virglrenderer[static-libs(+)] ) |
| 83 |
virtfs? ( sys-libs/libcap ) |
| 84 |
- xattr? ( sys-apps/attr[static-libs(+)] ) |
| 85 |
xen? ( app-emulation/xen-tools:= ) |
| 86 |
xfs? ( sys-fs/xfsprogs[static-libs(+)] )" |
| 87 |
|
| 88 |
@@ -170,7 +166,10 @@ X86_FIRMWARE_DEPEND=" |
| 89 |
)" |
| 90 |
|
| 91 |
CDEPEND=" |
| 92 |
- !static? ( ${TARGETS_DEPEND//\[static-libs(+)]} ) |
| 93 |
+ !static? ( |
| 94 |
+ ${ALL_DEPEND//\[static-libs(+)]} |
| 95 |
+ ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} |
| 96 |
+ ) |
| 97 |
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) |
| 98 |
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )" |
| 99 |
DEPEND="${CDEPEND} |
| 100 |
@@ -180,8 +179,11 @@ DEPEND="${CDEPEND} |
| 101 |
virtual/pkgconfig |
| 102 |
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
| 103 |
gtk? ( nls? ( sys-devel/gettext ) ) |
| 104 |
- static? ( ${TARGETS_DEPEND} ) |
| 105 |
- static-user? ( ${TARGETS_DEPEND} ) |
| 106 |
+ static? ( |
| 107 |
+ ${ALL_DEPEND} |
| 108 |
+ ${SOFTMMU_TOOLS_DEPEND} |
| 109 |
+ ) |
| 110 |
+ static-user? ( ${ALL_DEPEND} ) |
| 111 |
test? ( |
| 112 |
dev-libs/glib[utils] |
| 113 |
sys-devel/bc |
| 114 |
@@ -220,6 +222,7 @@ PATCHES=( |
| 115 |
"${FILESDIR}"/${PN}-2.8.0-CVE-2017-6058.patch #609638 |
| 116 |
"${FILESDIR}"/${PN}-2.8.0-CVE-2017-2620.patch #609206 |
| 117 |
"${FILESDIR}"/${PN}-2.8.0-CVE-2017-6505.patch #612220 |
| 118 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-7377.patch #614744 |
| 119 |
"${S}-CVE-2016-9602-patches" |
| 120 |
) |
| 121 |
|
| 122 |
|
| 123 |
diff --git a/app-emulation/qemu/qemu-2.8.1.ebuild b/app-emulation/qemu/qemu-2.8.1-r1.ebuild |
| 124 |
similarity index 100% |
| 125 |
rename from app-emulation/qemu/qemu-2.8.1.ebuild |
| 126 |
rename to app-emulation/qemu/qemu-2.8.1-r1.ebuild |
| 127 |
index 30f278e..d4f9c15 100644 |
| 128 |
--- a/app-emulation/qemu/qemu-2.8.1.ebuild |
| 129 |
+++ b/app-emulation/qemu/qemu-2.8.1-r1.ebuild |
| 130 |
@@ -67,7 +67,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 131 |
# when available rather than always using the extranl library. |
| 132 |
ALL_DEPEND=" |
| 133 |
>=dev-libs/glib-2.0[static-libs(+)] |
| 134 |
- >=x11-libs/pixman-0.28.0[static-libs(+)] |
| 135 |
sys-libs/zlib[static-libs(+)] |
| 136 |
python? ( ${PYTHON_DEPS} ) |
| 137 |
systemtap? ( dev-util/systemtap ) |
| 138 |
@@ -76,6 +75,7 @@ ALL_DEPEND=" |
| 139 |
# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) |
| 140 |
# softmmu targets (qemu-system-*). |
| 141 |
SOFTMMU_TOOLS_DEPEND=" |
| 142 |
+ >=x11-libs/pixman-0.28.0[static-libs(+)] |
| 143 |
accessibility? ( |
| 144 |
app-accessibility/brltty[api] |
| 145 |
app-accessibility/brltty[static-libs(+)] |
Archives