gentoo auto-resync : 19:09:2022 - 23:22:40

4 files changed, 55 insertions, 2 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index ba69ccf8f699..e02031814c20 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/honggfuzz/Manifest b/app-forensics/honggfuzz/Manifest
index 79e07eba9ec0..02c2ae394e01 100644
--- a/app-forensics/honggfuzz/Manifest
+++ b/app-forensics/honggfuzz/Manifest
@@ -1,4 +1,5 @@
 AUX honggfuzz-2.0-no-werror.patch 518 BLAKE2B aaf123687ea5f7fd584d1fd5e57f2f6ac50a8d80c3a1555d8b01d42df91a106848ec1d73007e6b67127e767770d91effa5e95dd9016f47fecac0e465e74cfe61 SHA512 7775f683cd5b22d91d3cf16cb0f8e7df50f5159a3f16ef42dc6125c961a856ddfc59c944319575e403747a2af768cd3f93437fc0bbc32bfc12f833f4cd7db0eb
+AUX honggfuzz-2.5_binutils239.patch 1895 BLAKE2B 1ef6df8193ce12d1d8dca32f1a3b3e4e3ff0d9d6749bbdc48ac061d806411680364de9caf797e3f5593f485cb143bdbc93172069cb8e88436f07afa392c2e6ba SHA512 b740afbaabdb229e00cf3fbf06f22a8f0c98876185a91f43ba5785b7fcaa77b9eda0078347cfaf3faedc93a1051114015f503697a7b48f6535a839e161396b8a
 DIST honggfuzz-2.5.tar.gz 65224877 BLAKE2B 610a15a674cfa928eb4b4d9fda91e5494fe08be4b01857f390c36925872479c77b5424c06ed4df87ad791de29598d848d88eb5437d6f5f9bf9521ff67aaa5ded SHA512 d1ff23471372a3d9d62de768bda8beba0e75c49f9550bc106efb4ab49ea626c1ccc078f7a9950051a99fbc841615a81faae2c3b39270facd6c0064e28956c419
-EBUILD honggfuzz-2.5.ebuild 944 BLAKE2B 96403749b490e129b19e23784783b594ba1234c3945620f8eb4717a164fdecad12973970f16fc52b80826aa66e0152d92c097b18c8ab7533e8ddbff1f2e5ce39 SHA512 9c92ba86e00b0b20451aa93d9b15ddd4602a6f0728e4595f0631698150bed950c5d6dd57f8cbf20a94f8b4366e2c5ff9b027963cf33e64beb00ff99f6afecce5
+EBUILD honggfuzz-2.5-r1.ebuild 988 BLAKE2B 4d4ed4ae24cee5dbf74d97b985542df08d989e07e8231ec32d4e0f334ec806b31a7dea256f770a367cfd5b7451c9f73f215b4c07bb9b1bb25e20e2a04478a99b SHA512 64a859313a188198fa09661d180c4f6bb52aba864da992681bdf7a9f16d89d8034cc4a25cf9f50b0ba391cd17c9bdb26b1f26d2df947afc38dc8b51413d345d6
 MISC metadata.xml 444 BLAKE2B c91cbea147520dcda86e37764f46b10166bc25238833818cf961a2cb69b4711a4cd4bce87b55937dcdd53592b5cd2fc67d940d7d25f418c8338fa321709ae420 SHA512 38e00bb52cf6436c9f5c89201b5f0ae2b9f73a7c9df1a639e89bfe298b045f6b4181a620220a3e8b0f97f4d84a24d17f1db001de77e032bc6b51bf7f338396a7
diff --git a/app-forensics/honggfuzz/files/honggfuzz-2.5_binutils239.patch b/app-forensics/honggfuzz/files/honggfuzz-2.5_binutils239.patch
new file mode 100644
index 000000000000..af574bc495a0
--- /dev/null
+++ b/app-forensics/honggfuzz/files/honggfuzz-2.5_binutils239.patch
@@ -0,0 +1,51 @@
+From 23c3da7ea63e4a841fa0e181d173e16b437adff0 Mon Sep 17 00:00:00 2001
+From: Robert Swiecki <robert@swiecki.net>
+Date: Thu, 2 Jun 2022 23:17:49 +0200
+Subject: [PATCH] Always pass 4 arguments to init_disassemble_info(), no matter
+ what's the declaration. binutils/libopcode offers an unstable interface
+
+---
+ linux/bfd.c | 23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/linux/bfd.c b/linux/bfd.c
+index 228365f69..236f050ec 100644
+--- a/linux/bfd.c
++++ b/linux/bfd.c
+@@ -197,6 +197,24 @@ static int arch_bfdFPrintF(void* buf, const char* fmt, ...) {
+     return ret;
+ }
+ 
++static int arch_bfdFPrintFStyled(void* buf, int style HF_ATTR_UNUSED, const char* fmt, ...) {
++    va_list args;
++    va_start(args, fmt);
++    int ret = util_vssnprintf(buf, _HF_INSTR_SZ, fmt, args);
++    va_end(args);
++
++    return ret;
++}
++
++/*
++ * binutils/libopcode has an unstable public interface. At some point in time the function
++ * init_disassemble_info() started taking 4 arguments instead of 3. Always pass 4 arguments to it,
++ * no matter what's the declaration.
++ */
++static void arch_bfdInitDisassembleInfoStub(
++    struct disassemble_info* info, char* instr, void* bfd_printf_func, void* bfd_printf_styled_func)
++    __attribute__((weakref, alias("init_disassemble_info")));
++
+ void arch_bfdDisasm(pid_t pid, uint8_t* mem, size_t size, char* instr) {
+     MX_SCOPED_LOCK(&arch_bfd_mutex);
+ 
+@@ -227,8 +245,9 @@ void arch_bfdDisasm(pid_t pid, uint8_t* mem, size_t size, char* instr) {
+         return;
+     }
+ 
+-    struct disassemble_info info;
+-    init_disassemble_info(&info, instr, arch_bfdFPrintF);
++    struct disassemble_info info = {};
++
++    arch_bfdInitDisassembleInfoStub(&info, instr, arch_bfdFPrintF, arch_bfdFPrintFStyled);
+     info.arch          = bfd_get_arch(bfdh);
+     info.mach          = bfd_get_mach(bfdh);
+     info.buffer        = mem;
diff --git a/app-forensics/honggfuzz/honggfuzz-2.5.ebuild b/app-forensics/honggfuzz/honggfuzz-2.5-r1.ebuild
index 69db69f71a79..54fe2dc7889f 100644
--- a/app-forensics/honggfuzz/honggfuzz-2.5.ebuild
+++ b/app-forensics/honggfuzz/honggfuzz-2.5-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE="clang"
 
 RDEPEND="
-	<sys-libs/binutils-libs-2.39:=
+	>=sys-libs/binutils-libs-2.29:=
 	sys-libs/libunwind:=
 	app-arch/xz-utils
 	clang? ( sys-libs/blocksruntime )
@@ -33,6 +33,7 @@ DOCS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0-no-werror.patch
+	"${FILESDIR}"/${PN}-2.5_binutils239.patch
 )
 
 pkg_pretend() {