diff options
| author | Sean Bruno <sbruno@FreeBSD.org> | 2016-02-13 19:18:11 +0000 |
|---|---|---|
| committer | Sean Bruno <sbruno@FreeBSD.org> | 2016-02-13 19:18:11 +0000 |
| commit | 2846f8d02746d12810031e641c7e4c944e2d7936 (patch) | |
| tree | c938e7ac1b6ec464930e01880d1ddc92a340fff0 | |
| parent | 7171299527463844e4858ec3289d74bec030cbe9 (diff) | |
| download | ports-2846f8d02746d12810031e641c7e4c944e2d7936.tar.gz ports-2846f8d02746d12810031e641c7e4c944e2d7936.zip | |
Update qemu-sbruno and qemu-user-static.
Sync bsd-user do_obreak with linux-user (do_brk).
Merging to QEMU upstream provides fixes for the following CVEs:
CVE-2015-8345
CVE-2015-8567
CVE-2015-8568
CVE-2015-8613
CVE-2015-8619
CVE-2015-8701
libvxl upstream has been updated to 1.12 and has accepted a slightly
modified version that addresses the issue in the patch.
PR: 205813
Notes
Notes:
svn path=/head/; revision=408825
| -rw-r--r-- | emulators/qemu-sbruno/Makefile | 4 | ||||
| -rw-r--r-- | emulators/qemu-sbruno/distinfo | 8 | ||||
| -rw-r--r-- | emulators/qemu-sbruno/files/patch-disas-libvixl-a64-disasm-a64.cc | 12 |
3 files changed, 6 insertions, 18 deletions
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile index 28a5fd710d7a..25c5fd6de713 100644 --- a/emulators/qemu-sbruno/Makefile +++ b/emulators/qemu-sbruno/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.5.50.g20160114 +PORTVERSION= 2.5.50.g20160213 CATEGORIES= emulators MASTER_SITES= GH \ LOCAL/nox:dtc \ @@ -18,7 +18,7 @@ COMMENT?= QEMU CPU Emulator - github bsd-user branch USE_GITHUB= yes GH_ACCOUNT= seanbruno GH_PROJECT= ${PORTNAME}-bsd-user -GH_TAGNAME= e624b04 +GH_TAGNAME= 9522a30 HAS_CONFIGURE= yes USES= gmake pkgconfig bison perl5 python:2,build USE_PERL5= build diff --git a/emulators/qemu-sbruno/distinfo b/emulators/qemu-sbruno/distinfo index b0f54be4d9d8..7f88fb6e8439 100644 --- a/emulators/qemu-sbruno/distinfo +++ b/emulators/qemu-sbruno/distinfo @@ -1,4 +1,4 @@ -SHA256 (qemu/2.5.50.g20160114/seanbruno-qemu-bsd-user-2.5.50.g20160114-e624b04_GH0.tar.gz) = 863109c38e88a6e3750265f9b51fbd34db847b934287d5b45ac0e0ae6fb5b80e -SIZE (qemu/2.5.50.g20160114/seanbruno-qemu-bsd-user-2.5.50.g20160114-e624b04_GH0.tar.gz) = 11705897 -SHA256 (qemu/2.5.50.g20160114/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 -SIZE (qemu/2.5.50.g20160114/dtc-v1.4.0.tar.gz) = 131893 +SHA256 (qemu/2.5.50.g20160213/seanbruno-qemu-bsd-user-2.5.50.g20160213-9522a30_GH0.tar.gz) = 99b85c461cf12e7098ace4d7a964b579a80dd90d3036f75788f8d81d674f9d6c +SIZE (qemu/2.5.50.g20160213/seanbruno-qemu-bsd-user-2.5.50.g20160213-9522a30_GH0.tar.gz) = 11850660 +SHA256 (qemu/2.5.50.g20160213/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 +SIZE (qemu/2.5.50.g20160213/dtc-v1.4.0.tar.gz) = 131893 diff --git a/emulators/qemu-sbruno/files/patch-disas-libvixl-a64-disasm-a64.cc b/emulators/qemu-sbruno/files/patch-disas-libvixl-a64-disasm-a64.cc deleted file mode 100644 index 3cfe79312f65..000000000000 --- a/emulators/qemu-sbruno/files/patch-disas-libvixl-a64-disasm-a64.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- a/disas/libvixl/a64/disasm-a64.cc -+++ b/disas/libvixl/a64/disasm-a64.cc -@@ -1337,7 +1337,8 @@ void Disassembler::AppendPCRelativeOffse - int64_t offset) { - USE(instr); - char sign = (offset < 0) ? '-' : '+'; -- AppendToOutput("#%c0x%" PRIx64, sign, std::abs(offset)); -+ // AppendToOutput("#%c0x%" PRIx64, sign, std::abs(offset)); -+ AppendToOutput("#%c0x%" PRIx64, sign, offset < 0 ? -offset : offset); - } - - |