gentoo resync : 25.04.2020

6 files changed, 46 insertions, 41 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 7502d1eb6d06..1c2aeefa36b9 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/honggfuzz/Manifest b/app-forensics/honggfuzz/Manifest
index 408630230fe3..93d1eb0e1cfc 100644
--- a/app-forensics/honggfuzz/Manifest
+++ b/app-forensics/honggfuzz/Manifest
@@ -1,7 +1,6 @@
-AUX honggfuzz-1.1-binutils-2.29.patch 569 BLAKE2B 63198bc698c56517cb7f6394808096e8cdf3261e244f398ae18b24a8031e95c7e55bf8cc131aafc3f0a6b92414a7ebae54c7087f6dd46983b581f50579398c62 SHA512 c86927faf45e345fd56ff0eaaebadaaff41f020f853df8c791dc04b7f00890d3bdfe173cd0e78d5293c0eeba88f0626585c611f40d9a5cd49e705135922e59fb
-AUX honggfuzz-1.7-no-werror.patch 219 BLAKE2B 704987f5aa2bcd805e1235baf063c4e1a32ac203b1008899e4e2ee4c899a9d14534835fdffe244a6df58cf640ea7b4860182a3c5c2f98f6654f7ad8cfde8054b SHA512 9bae5bec03a1d22a80f4841aaf4b6a6659ccb3745f4c0fe43f6c60e73e9b09c71490e121bca4eb41612fb463132f4f3ec2769c4262ef0b5d954b8ccd0f3e7f2c
-AUX honggfuzz-2.0-binutils-2.34.patch 1059 BLAKE2B b29419ff139a824d66cdad5d9a2ca52ec7478c0e0ecaa3a28cbfae6e7aecb346b8f502458349c831df823ac2b357f814316ba6bfc4490bdc703b8db33c49112a SHA512 18f2f7a21574858427680951b037855fd999d8e90e1af7a218dc1e225344eb622556deeb611604cfc22087c79dc8043cb8eb3477cd0c60073f49531ecd8e918c
 AUX honggfuzz-2.0-no-werror.patch 518 BLAKE2B aaf123687ea5f7fd584d1fd5e57f2f6ac50a8d80c3a1555d8b01d42df91a106848ec1d73007e6b67127e767770d91effa5e95dd9016f47fecac0e465e74cfe61 SHA512 7775f683cd5b22d91d3cf16cb0f8e7df50f5159a3f16ef42dc6125c961a856ddfc59c944319575e403747a2af768cd3f93437fc0bbc32bfc12f833f4cd7db0eb
 DIST honggfuzz-2.1.tar.gz 65209308 BLAKE2B 83882aaba55e1a809c7477c528f92e3617ea912794680c21de680da38a17e5b6ccf6dbfa9e3c6da263fd8730a0007cf44b5038b8f1c80ecd9cc8dffec7548a99 SHA512 04505085779ba824a494f414b9eb7d9f5f5e6962ca4736cd4fa4bc00438c9cb63c5a367db9510f8e1b0383469207d70fad1e978e696912c721a14a5340e9ad2b
+DIST honggfuzz-2.2.tar.gz 65219878 BLAKE2B f842c6d3dea22525d1335fbdbdffa349ace743762386e81e40f1eab99dafa8f34b935c1cb4871b25ade76e3ac8f846d0329ef01bc0097a888e60b400819ada2d SHA512 8e6a0cf027d521967a69828afa6e0ae5306ad7387c595405f9d3151344e2aa91f9537355fafdf03f06e6702014e2faa0609c3d249f22af5793663f3c9d09180d
 EBUILD honggfuzz-2.1.ebuild 713 BLAKE2B f0ffd49f38bc7ed25a962c3cc82b25d8c6b2fff45083836adb59f36f5f0f392119f608dfd62eb3e63249308e6c9559bd746a56af06f33e482bbb454dd48bc46f SHA512 0dec4491e85044a226e5063f6cebf55a4600266aaae9220baca994d50b204e913eed9463e5717579f1693eed8e7f14d09e042204de61d456083e8e170b2c8af4
+EBUILD honggfuzz-2.2.ebuild 732 BLAKE2B 80c1cc582f4a4b55ecd4b4ef2e14b113d05ec14e0c5d59f2412426855e18f53032649a76ac2b5516cf5e5c7e5cd2a4d133d31d948d5f708d806d10459ef0038d SHA512 8bbbeae38009b3aab10f1383ee008570bc3cd8a24c55a76782badd12889f82d027ac741d88977eb00bfa6a07acb9eaffdb095f735ca840342a8cb9908633065f
 MISC metadata.xml 332 BLAKE2B 72702618670b8f8ef24ef68d5f9b1b29c8d25c3630cc5fb22ef859ea7879af84d0c7fc758a02a0b4175e10707f2c161930151b65e2e3d07f154a1b2c48fee152 SHA512 1f75a39cce6995d550344225849dafb3a980df19cc6afd10025e58e6c08086a27a67173ff435c084660970cb4ed18183914afeba712dc461d7fd55f83f9e679d
diff --git a/app-forensics/honggfuzz/files/honggfuzz-1.1-binutils-2.29.patch b/app-forensics/honggfuzz/files/honggfuzz-1.1-binutils-2.29.patch
deleted file mode 100644
index 31a57784ed8f..000000000000
--- a/app-forensics/honggfuzz/files/honggfuzz-1.1-binutils-2.29.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Adapt to binutils-2.29 API change caused by
-https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=003ca0fd22863aaf1a9811c8a35a0133a2d27fb1
-diff --git a/linux/bfd.c b/linux/bfd.c
-index bcd247f..e9e16ab 100644
---- a/linux/bfd.c
-+++ b/linux/bfd.c
-@@ -163,3 +163,3 @@ void arch_bfdDisasm(pid_t pid, uint8_t * mem, size_t size, char *instr)
- 
--    disassembler_ftype disassemble = disassembler(bfdh);
-+    disassembler_ftype disassemble = disassembler(bfd_get_arch(bfdh), bfd_little_endian(bfdh), bfd_get_mach(bfdh), bfdh);
-     if (disassemble == NULL) {
diff --git a/app-forensics/honggfuzz/files/honggfuzz-1.7-no-werror.patch b/app-forensics/honggfuzz/files/honggfuzz-1.7-no-werror.patch
deleted file mode 100644
index bf4d65377369..000000000000
--- a/app-forensics/honggfuzz/files/honggfuzz-1.7-no-werror.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -29 +29 @@ HFUZZ_CC_SRCS := hfuzz_cc/hfuzz-cc.c
--COMMON_CFLAGS := -D_GNU_SOURCE -Wall -Werror -Wno-format-truncation -I.
-+COMMON_CFLAGS := -D_GNU_SOURCE -Wall -Wno-format-truncation -I.
diff --git a/app-forensics/honggfuzz/files/honggfuzz-2.0-binutils-2.34.patch b/app-forensics/honggfuzz/files/honggfuzz-2.0-binutils-2.34.patch
deleted file mode 100644
index 45da65c1c6d3..000000000000
--- a/app-forensics/honggfuzz/files/honggfuzz-2.0-binutils-2.34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/linux/bfd.c
-+++ b/linux/bfd.c
-@@ -122,8 +122,8 @@ void arch_bfdDemangle(funcs_t* funcs, size_t funcCnt) {
- 
- static struct bfd_section* arch_getSectionForPc(bfd* bfdh, uint64_t pc) {
-     for (struct bfd_section* section = bfdh->sections; section; section = section->next) {
--        uintptr_t vma = (uintptr_t)bfd_get_section_vma(bfdh, section);
--        uintptr_t sz = (uintptr_t)bfd_get_section_size(section);
-+        uintptr_t vma = (uintptr_t)bfd_section_vma(section);
-+        uintptr_t sz = (uintptr_t)bfd_section_size(section);
-         if ((pc > vma) && (pc < (vma + sz))) {
-             return section;
-         }
-@@ -160,7 +160,7 @@ void arch_bfdResolveSyms(pid_t pid, funcs_t* funcs, size_t num) {
-             continue;
-         }
- 
--        long sec_offset = (long)funcs[i].pc - bfd_get_section_vma(bfdParams.bfdh, section);
-+        long sec_offset = (long)funcs[i].pc - bfd_section_vma(section);
- 
-         if (bfd_find_nearest_line(
-                 bfdParams.bfdh, section, bfdParams.syms, sec_offset, &file, &func, &line) == TRUE) {
diff --git a/app-forensics/honggfuzz/honggfuzz-2.2.ebuild b/app-forensics/honggfuzz/honggfuzz-2.2.ebuild
new file mode 100644
index 000000000000..087d70b53f6e
--- /dev/null
+++ b/app-forensics/honggfuzz/honggfuzz-2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A general purpose fuzzer with feedback support"
+HOMEPAGE="https://google.github.io/honggfuzz/"
+SRC_URI="https://github.com/google/honggfuzz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=sys-libs/binutils-libs-2.29:=
+	sys-libs/libunwind:=
+	app-arch/xz-utils
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	CHANGELOG
+	COPYING
+	CONTRIBUTING
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0-no-werror.patch
+)
+
+src_compile() {
+	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	dobin ${PN}
+
+	einstalldocs
+}