gentoo resync : 29.10.2017

4 files changed, 68 insertions, 2 deletions

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 642399593e26..06cff990d6cf 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,8 @@
 AUX radare2-0.9.9-nogit.patch 352 SHA256 cb87e4093d4ace137f48e79d899576e89c91805934b0ad0f0b1c5f4a965332f9 SHA512 5a84c2f768b60dc6ffb35130f409714e0ffc4cbc6fb9e08bc4bf86d28651060398d809fed8abafcd56cabde86aa9e8672df77212f0d8c0b6dfc056b243e1c270 WHIRLPOOL fcbc1358c844e486366f766061b82c2ae72f7d513b2e504e7b488057e88f1af732667a5f02b05a8c8f91642799f3fdd47ad8f17e82f9659377c651d3e8d9c7d7
+AUX radare2-2.0.1-635618-p1.patch 938 SHA256 072847408019c7eb48b38ec334a64d801d35d5d95a638e8c7f08e5170a8b774e SHA512 526a0570b60ee90464f441c26c66167bbae734e400d043e3eb54ce335e2e0874a29330e885f3703d116fc3175d5341f0ac9297705757bec54273db4cc0937e8f WHIRLPOOL 9915a5673abf0a67cdae8fca10cc547de238557e036b0842ea45a5c1ee0690004c721d44576af007a01794b2a933610933555e7f5b86950545eece7f711f9374
+AUX radare2-2.0.1-635618-p2.patch 963 SHA256 aef6dae283943c82323c7b8ea273e686d47853b904efe3374892139533070cbe SHA512 d912a3be1b136d963c99c53032fef48b4176421213ffcc12a40ee625a7c126cc1fb0b55b9316fe0385caf5c605396a6d826842d649229ec514d619ce86a752fe WHIRLPOOL a084de94ed6f666e60488aa8d4a4e1e7ee161b4236fb496a359eedad4675b3da167eef7afd124d5e45ea374eb10b55558216110d85a7baf0ce8958d09c8cf3f6
 DIST radare2-2.0.1.tar.gz 6001927 SHA256 d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd SHA512 1a8db3c71895fd9ccf284e7d0747770a5490872c5ee7f8e6d1c3a2590d2b344873bfc11b5f686bd08caa441bb787b2ec86aae9e83bf61e296f6a233d3ba35207 WHIRLPOOL 276f5628482a56eba3596a04f42a5fa60ed267ed09efea1adef1305cb3313d6ff59b0821ad05b5421620caa3e902f0839c61c619156f5bc1e1966d33261d1e3e
-EBUILD radare2-2.0.1.ebuild 1100 SHA256 509a02f4bbfe3b6a8947abe6cf0d5e97f3c828a991ed35ffe8e54a530f5abc6c SHA512 960f6846a24780b390e10f090c0678cd6c2295d9dcc4597d55972d158b580b05206b291e5608ee5452d5b269d0eed679b60ddf5d4a123fae7fab382c02fad9c3 WHIRLPOOL 79744466fa01042b680683ae643f195a2459e0c55b842eb681ab61f5518824da80aca11bc180fd329ff18cf751352aa37359efb3e9f7a59ab30e7c0953ba936d
+EBUILD radare2-2.0.1-r1.ebuild 1173 SHA256 822fa9abbf738a6240055c42465403b7530d892fe489710c3ec708ebfdd0d2c4 SHA512 d2b9207d58847675ad5eafa9cc26465fd9bca05f6b9b16d32748e28b74d5b04776bfca981bce57986c1974fa5979f9042ea0d88d8b0021f0ea61ead9ef433986 WHIRLPOOL 87f141d3e6c16ba1804d61acdc00ab03ffbcbf5a43cd2d63833c83655efd746ce0e25d0b4dd912a2d21a4627f9300cfcd61dca7090a5d9c18def5c24ab78846f
 EBUILD radare2-9999.ebuild 1100 SHA256 509a02f4bbfe3b6a8947abe6cf0d5e97f3c828a991ed35ffe8e54a530f5abc6c SHA512 960f6846a24780b390e10f090c0678cd6c2295d9dcc4597d55972d158b580b05206b291e5608ee5452d5b269d0eed679b60ddf5d4a123fae7fab382c02fad9c3 WHIRLPOOL 79744466fa01042b680683ae643f195a2459e0c55b842eb681ab61f5518824da80aca11bc180fd329ff18cf751352aa37359efb3e9f7a59ab30e7c0953ba936d
 MISC ChangeLog 4607 SHA256 0849da5ab6d072ad7593d03e9b9b22d917dd2595cfbf2c13f24428ad36d2dca0 SHA512 eed5b7c00d816f0704b108ab36b69cb017ee2db9765c1faec063d4cf1d7b51d707c6d3cd94e29b754327cf9a786aa8e2337e327e1fb2b2dcce2c295307bac9d2 WHIRLPOOL 164b4dc5cd791295f748fed843fc23bb2108da6bc7d844cf83e862536ede59edcabca277462a964ae14bb373328c77ccb3f01125dd3205d0843e589d45d094e2
 MISC ChangeLog-2015 791 SHA256 4dd712e34e1b2e2ab9be03f8f9ad678dfd8e6a26da95bb9ae76c9a4f2d618430 SHA512 b618b8c70903664d4f78ce1318761460114c52a6b83320f22bef114988919a3c5a9961e01c16b40a1e0b063f4a4f7e367af93c9977dfb0c2d675e3c325541198 WHIRLPOOL 694b555dd75664961bee62ad4fe60394ad7a38e757c5d67218a174c46811557b10271575ee62c2be1617f3019b3e703dbcda281d159cb6d2c8af093ab1f60e9e
diff --git a/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch b/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch
new file mode 100644
index 000000000000..5644e50cc115
--- /dev/null
+++ b/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch
@@ -0,0 +1,29 @@
+From c6d0076c924891ad9948a62d89d0bcdaf965f0cd Mon Sep 17 00:00:00 2001
+From: pancake <pancake@nopcode.org>
+Date: Wed, 25 Oct 2017 18:00:11 +0200
+Subject: [PATCH] Fix #8731 - Crash in ELF parser with negative 32bit number
+
+---
+ libr/bin/format/elf/elf.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
+index 90f6acd30..e3c852fd3 100644
+--- a/libr/bin/format/elf/elf.c
++++ b/libr/bin/format/elf/elf.c
+@@ -900,7 +900,11 @@ static Sdb *store_versioninfo_gnu_verneed(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
+ 			free (s);
+ 		}
+ 		sdb_num_set (sdb_version, "cnt", entry->vn_cnt, 0);
+-		vstart += entry->vn_aux;
++		st32 vnaux = entry->vn_aux;
++		if (vnaux < 1) {
++			goto beach;
++		}
++		vstart += vnaux;
+ 		for (j = 0, isum = i + entry->vn_aux; j < entry->vn_cnt && vstart + sizeof (Elf_(Vernaux)) <= end; ++j) {
+ 			int k;
+ 			Elf_(Vernaux) * aux = NULL;
+-- 
+2.14.3
+
diff --git a/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch b/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch
new file mode 100644
index 000000000000..242f4cc6220c
--- /dev/null
+++ b/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch
@@ -0,0 +1,30 @@
+From 44ded3ff35b8264f54b5a900cab32ec489d9e5b9 Mon Sep 17 00:00:00 2001
+From: pancake <pancake@nopcode.org>
+Date: Wed, 25 Oct 2017 18:09:24 +0200
+Subject: [PATCH] Fix #8743 - Crash in ELF version parser on 32bit systems
+
+---
+ libr/bin/format/elf/elf.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
+index e3c852fd3..2248731b3 100644
+--- a/libr/bin/format/elf/elf.c
++++ b/libr/bin/format/elf/elf.c
+@@ -748,7 +748,12 @@ static Sdb *store_versioninfo_gnu_verdef(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
+ 		verdef->vd_hash = READ32 (dfs, j)
+ 		verdef->vd_aux = READ32 (dfs, j)
+ 		verdef->vd_next = READ32 (dfs, j)
+-		vstart += verdef->vd_aux;
++		int vdaux = verdef->vd_aux;
++		if (vdaux < 1) {
++			sdb_free (sdb_verdef);
++			goto out_error;
++		}
++		vstart += vdaux;
+ 		if (vstart > end || vstart + sizeof (Elf_(Verdaux)) > end) {
+ 			sdb_free (sdb_verdef);
+ 			goto out_error;
+-- 
+2.14.3
+
diff --git a/dev-util/radare2/radare2-2.0.1.ebuild b/dev-util/radare2/radare2-2.0.1-r1.ebuild
index cf3939d92997..78ee0f1268ef 100644
--- a/dev-util/radare2/radare2-2.0.1.ebuild
+++ b/dev-util/radare2/radare2-2.0.1-r1.ebuild
@@ -14,9 +14,14 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-	PATCHES=( "${FILESDIR}"/${PN}-0.9.9-nogit.patch )
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
+	"${FILESDIR}"/${P}-635618-p1.patch
+	"${FILESDIR}"/${P}-635618-p2.patch
+)
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="ssl +system-capstone zsh-completion"