gentoo resync : 05.02.2020

3 files changed, 33 insertions, 2 deletions

diff --git a/app-forensics/honggfuzz/Manifest b/app-forensics/honggfuzz/Manifest
index 72cddf2e4876..d7ba3fb73dd5 100644
--- a/app-forensics/honggfuzz/Manifest
+++ b/app-forensics/honggfuzz/Manifest
@@ -1,8 +1,9 @@
 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-1.9.tar.gz 78491908 BLAKE2B 961562d87e063804cb6a91d6ba0cffd0a4c3b3cb140f93a9362bd6749b8da251f7203e9ff7643bbad561620a8fdb9ca755758beb45fc46194c5907ecafcf0d2a SHA512 07ee10de723b14bc8ed9df9de196bcf308d8c10a825ba18b20d4f881d22c4254a45455bcbf965653572d9f71b2bff009284a34d0d5a6f879114b149b456c2eda
 DIST honggfuzz-2.0.tar.gz 65205954 BLAKE2B fb01fdb12cd5bf9a7c316c9df3a4ac9eb91ee535cbcdbb93436e7abcb81405a3af0fb5140b935abe44d11f5917f6f5189d697e86d3e81abfd9da38db2f899c36 SHA512 91e633ffe439aae6cb944f71cd5998f8adc2f1e6892c17b6d7876d707b3f167008a0574ad4b5671b82371cbe21e6c536acb148c0b844665fb3789c5e7fda52ba
 EBUILD honggfuzz-1.9.ebuild 756 BLAKE2B 0a1e81bb1e64e4edcb30234b3727cd03313fb957f53447772389c124d4f926dbac8b9e46393dccc8d0826983b3a0d289a9b38fd8f1fb5fe54f28016e0f1ce00e SHA512 97f2e79023819a1f4123e92a96be0bad72e5f0d9c0bfd276c42f66cff0579f971aeaecef5cb4eb0ad69c27d89a0e3cd3be04f25d864562dd29dc04247a3e7651
-EBUILD honggfuzz-2.0.ebuild 758 BLAKE2B 0992936bcc847dea1cc407b507929c8bbdc9af4e26ac44240bb974d8227a3fbdb508f3dea9d0f9fa59f475ba62be419046fe51969325df1a0ee51e19c83bf5a0 SHA512 bccfc334464cbb8e564f94d72e9f4f9410e47e0401a31c9f125ecc4e9fcd255e844d999a7d897636fdc286167826146352a05efbf8c993d0698c539c833e47bf
+EBUILD honggfuzz-2.0.ebuild 898 BLAKE2B 577c991f62485d5164a796e98a9fc59b502815dfd1637377b62b745c1e302db0435ccc5729b3286a43c7928592cda1fad6b933cc7b8ed2aae6a380d5b81f2d97 SHA512 6a8747e30433da00a9857ecdac529eab15ce997b21bb374f86af26ae6b7bd3af34f807a655bcc90139aa44c753196c78ca606a2344b8032e0fd98f5654458b22
 MISC metadata.xml 332 BLAKE2B 72702618670b8f8ef24ef68d5f9b1b29c8d25c3630cc5fb22ef859ea7879af84d0c7fc758a02a0b4175e10707f2c161930151b65e2e3d07f154a1b2c48fee152 SHA512 1f75a39cce6995d550344225849dafb3a980df19cc6afd10025e58e6c08086a27a67173ff435c084660970cb4ed18183914afeba712dc461d7fd55f83f9e679d
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
new file mode 100644
index 000000000000..45da65c1c6d3
--- /dev/null
+++ b/app-forensics/honggfuzz/files/honggfuzz-2.0-binutils-2.34.patch
@@ -0,0 +1,22 @@
+--- 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.0.ebuild b/app-forensics/honggfuzz/honggfuzz-2.0.ebuild
index f486d019eb3b..f58c1b9e7c81 100644
--- a/app-forensics/honggfuzz/honggfuzz-2.0.ebuild
+++ b/app-forensics/honggfuzz/honggfuzz-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-binutils-2.29.patch
 )
 
+src_prepare() {
+	default
+
+	if has_version ">=sys-libs/binutils-libs-2.34"; then
+		eapply "${FILESDIR}"/${PN}-2.0-binutils-2.34.patch
+	fi
+}
+
 src_compile() {
 	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" emake
 }