Tue Feb 14 15:45:58 2023 UTC ()
honggfuzz: add a patch for portability to NetBSD/powerpc.

Now it at least builds.  Needed atomic64.mk as well.


(he)
diff -r1.3 -r1.4 pkgsrc/devel/honggfuzz/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/honggfuzz/distinfo
diff -r0 -r1.1 pkgsrc/devel/honggfuzz/patches/patch-netbsd_trace.c

cvs diff -r1.3 -r1.4 pkgsrc/devel/honggfuzz/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/honggfuzz/Makefile 2020/07/22 21:53:59 1.3
+++ pkgsrc/devel/honggfuzz/Makefile 2023/02/14 15:45:58 1.4
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.3 2020/07/22 21:53:59 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2023/02/14 15:45:58 he Exp $
2 2
3DISTNAME= honggfuzz-2.3.1 3DISTNAME= honggfuzz-2.3.1
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=google/}
6 6
7MAINTAINER= kamil@NetBSD.org 7MAINTAINER= kamil@NetBSD.org
8HOMEPAGE= https://github.com/google/honggfuzz/ 8HOMEPAGE= https://github.com/google/honggfuzz/
9COMMENT= Security oriented fuzzer based on code coverage 9COMMENT= Security oriented fuzzer based on code coverage
10LICENSE= apache-2.0 10LICENSE= apache-2.0
11 11
12FORTIFY_SUPPORTED= no # fortify-source intercepts some functions 12FORTIFY_SUPPORTED= no # fortify-source intercepts some functions
13 13
14USE_TOOLS+= bash:run gmake 14USE_TOOLS+= bash:run gmake
15 15
16.include "../../lang/libBlocksRuntime/buildlink3.mk" 16.include "../../lang/libBlocksRuntime/buildlink3.mk"
17.include "../../devel/capstone/buildlink3.mk" 17.include "../../devel/capstone/buildlink3.mk"
 18.include "../../mk/atomic64.mk"
18.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"

cvs diff -r1.6 -r1.7 pkgsrc/devel/honggfuzz/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/honggfuzz/distinfo 2022/05/08 10:23:25 1.6
+++ pkgsrc/devel/honggfuzz/distinfo 2023/02/14 15:45:58 1.7
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.6 2022/05/08 10:23:25 nia Exp $ 1$NetBSD: distinfo,v 1.7 2023/02/14 15:45:58 he Exp $
2 2
3BLAKE2s (honggfuzz-2.3.1.tar.gz) = f1d9be563b12d563ef8ccc5b3324c61036031b90413a86874d0c0f83fb9522a4 3BLAKE2s (honggfuzz-2.3.1.tar.gz) = f1d9be563b12d563ef8ccc5b3324c61036031b90413a86874d0c0f83fb9522a4
4SHA512 (honggfuzz-2.3.1.tar.gz) = 36b3182a0075289467c385b5e03f881fd20193b938dfcec6e364f502637ffc797b6b8ddaddbc5851c4482758088e40eee1e4ca2850bff0294c04c04a036359bf 4SHA512 (honggfuzz-2.3.1.tar.gz) = 36b3182a0075289467c385b5e03f881fd20193b938dfcec6e364f502637ffc797b6b8ddaddbc5851c4482758088e40eee1e4ca2850bff0294c04c04a036359bf
5Size (honggfuzz-2.3.1.tar.gz) = 65221820 bytes 5Size (honggfuzz-2.3.1.tar.gz) = 65221820 bytes
6SHA1 (patch-Makefile) = a1464b208d260fca3cf3b9a50f07e2709024a1a0 6SHA1 (patch-Makefile) = a1464b208d260fca3cf3b9a50f07e2709024a1a0
 7SHA1 (patch-netbsd_trace.c) = 7571a7cde3b52a868d77649c96e31d8d98441e31

File Added: pkgsrc/devel/honggfuzz/patches/patch-netbsd_trace.c
$NetBSD: patch-netbsd_trace.c,v 1.1 2023/02/14 15:45:58 he Exp $

Provide portability to powerpc.

--- netbsd/trace.c.orig	2020-07-22 21:04:55.000000000 +0000
+++ netbsd/trace.c
@@ -187,6 +187,8 @@ static size_t arch_getPC(
     *status_reg = r.regs[_REG_EFLAGS];
 #elif defined(__x86_64__)
     *status_reg = r.regs[_REG_RFLAGS];
+#elif defined(__powerpc__)
+    *status_reg = r.xer;
 #else
 #error unsupported CPU architecture
 #endif
@@ -225,6 +227,9 @@ static void arch_getInstrStr(pid_t pid, 
 #elif defined(__x86_64__)
     arch        = CS_ARCH_X86;
     mode        = CS_MODE_64;
+#elif defined(__powerpc__)
+    arch	= CS_ARCH_PPC;
+    mode	= CS_MODE_32;
 #else
 #error Unsupported CPU architecture
 #endif