afl++: update to 4.34c

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: afl++: update to 4.34c
From: kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 17 Oct 2025 11:38:29 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Fri Oct 17 13:37:44 2025 +0200
Changeset:	d9564fc104d359d10078d32d15e2fcf13466d802

Modified Files:
	afl++/Makefile
	afl++/PLIST
	afl++/distinfo
Added Files:
	afl++/patches/patch-GNUmakefile
	afl++/patches/patch-GNUmakefile.llvm
	afl++/patches/patch-afl-cmin
Removed Files:
	afl++/patches/patch-examples_argv__fuzzing_Makefile
	afl++/patches/patch-examples_socket__fuzzing_Makefile

Log Message:
afl++: update to 4.34c

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d9564fc104d359d10078d32d15e2fcf13466d802

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 afl++/Makefile                                     |  23 +--
 afl++/PLIST                                        | 179 ++++++++++++++++++---
 afl++/distinfo                                     |  11 +-
 afl++/patches/patch-GNUmakefile                    |  43 +++++
 afl++/patches/patch-GNUmakefile.llvm               |  15 ++
 afl++/patches/patch-afl-cmin                       |  25 +++
 .../patches/patch-examples_argv__fuzzing_Makefile  |  17 --
 .../patch-examples_socket__fuzzing_Makefile        |  17 --
 8 files changed, 255 insertions(+), 75 deletions(-)

diffs:
diff --git a/afl++/Makefile b/afl++/Makefile
index 055e7d700e..4e5c66d92d 100644
--- a/afl++/Makefile
+++ b/afl++/Makefile
@@ -1,24 +1,21 @@
 # $NetBSD: Makefile,v 1.6 2024/10/14 06:45:35 wiz Exp $
 
-DISTNAME=	AFLplusplus-2.62c
+DISTNAME=	AFLplusplus-4.34c
 PKGNAME=	${DISTNAME:C/AFLplusplus/afl++/}
-PKGREVISION=	2
 GITHUB_PROJECT=	AFLplusplus
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=AFLplusplus/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/AFLplusplus/AFLplusplus/
 COMMENT=	American Fuzzy Lop ++, a fuzzing tool for finding bugs by random input
 LICENSE=	apache-2.0
 
-PYTHON_VERSIONS_ACCEPTED=	27
-
-.include "../../lang/python/pyversion.mk"
 PYTHON_INCLUDE_CMD=	python${PYVERSSUFFIX}-config --includes
 PYTHON_VERSION_CMD=	python${PYVERSSUFFIX} --version
-
-PYTHON_LIB_CMD=	python${PYVERSSUFFIX}-config --ldflags
+PYTHON_LIB_CMD=		python${PYVERSSUFFIX}-config --libs --embed --ldflags
+REPLACE_PYTHON+=	afl-cmin.py
 
 MAKE_FLAGS+=	PYTHON_INCLUDE=${PYTHON_INCLUDE_CMD:sh:Q}
 MAKE_FLAGS+=	PYTHON_VERSION=${PYTHON_VERSION_CMD:sh:Q}
@@ -26,15 +23,19 @@ MAKE_FLAGS+=	PYTHON_LIB=${PYTHON_LIB_CMD:sh:Q}
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	bash:run gmake
-REPLACE_SH+=	afl-plot
 REPLACE_BASH+=	afl-cmin
 REPLACE_BASH+=	afl-cmin.bash
+REPLACE_BASH+=	afl-persistent-config
+MAKE_FILE=	GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=	amd64
-.if ${MACHINE_ARCH} == "x86_64"
-PLIST.amd64=	yes
+# for backtrace
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
+LDFLAGS+=	-lexecinfo
 .endif
 
+DEPENDS+=	gawk-[0-9]*:../../lang/gawk
+
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/afl++/PLIST b/afl++/PLIST
index dc72bcd91e..3c0fbda5c5 100644
--- a/afl++/PLIST
+++ b/afl++/PLIST
@@ -1,49 +1,173 @@
-@comment $NetBSD: PLIST,v 1.2 2022/04/17 07:34:46 nia Exp $
+@comment $NetBSD$
+bin/afl-addseeds
 bin/afl-analyze
+bin/afl-c++
+bin/afl-cc
 bin/afl-clang
 bin/afl-clang++
+bin/afl-clang-fast
+bin/afl-clang-fast++
 bin/afl-cmin
 bin/afl-cmin.bash
+bin/afl-cmin.py
 bin/afl-fuzz
 bin/afl-g++
 bin/afl-gcc
 bin/afl-gotcpu
+bin/afl-persistent-config
 bin/afl-plot
 bin/afl-showmap
 bin/afl-system-config
 bin/afl-tmin
 bin/afl-whatsup
-lib/afl/afl-as
-${PLIST.amd64}lib/afl/argvfuzz32.so
-${PLIST.amd64}lib/afl/argvfuzz64.so
-lib/afl/as
-${PLIST.amd64}lib/afl/socketfuzz32.so
-${PLIST.amd64}lib/afl/socketfuzz64.so
+include/afl/afl-fuzz.h
+include/afl/afl-mutations.h
+include/afl/afl-persistent-replay.h
+include/afl/afl-prealloc.h
+include/afl/afl-record-compat.h
+include/afl/alloc-inl.h
+include/afl/android-ashmem.h
+include/afl/cmplog.h
+include/afl/common.h
+include/afl/config.h
+include/afl/coverage-32.h
+include/afl/coverage-64.h
+include/afl/debug.h
+include/afl/envs.h
+include/afl/forkserver.h
+include/afl/hash.h
+include/afl/list.h
+include/afl/sharedmem.h
+include/afl/snapshot-inl.h
+include/afl/t1ha.h
+include/afl/t1ha0_ia32aes_b.h
+include/afl/t1ha_bits.h
+include/afl/t1ha_selfcheck.h
+include/afl/types.h
+include/afl/xxhash.h
+lib/afl/SanitizerCoveragePCGUARD.so
+lib/afl/afl-compiler-rt-32.o
+lib/afl/afl-compiler-rt-64.o
+lib/afl/afl-compiler-rt.o
+lib/afl/afl-llvm-dict2file.so
+lib/afl/afl-llvm-ijon-pass.so
+lib/afl/afl-llvm-pass.so
+lib/afl/cmplog-instructions-pass.so
+lib/afl/cmplog-routines-pass.so
+lib/afl/cmplog-switches-pass.so
+lib/afl/compare-transform-pass.so
+lib/afl/dynamic_list.txt
+lib/afl/injection-pass.so
+lib/afl/libAFLDriver.a
+lib/afl/libAFLQemuDriver.a
+lib/afl/split-compares-pass.so
+lib/afl/split-switches-pass.so
+man/man8/afl-addseeds.8
 man/man8/afl-analyze.8
-man/man8/afl-as.8
+man/man8/afl-c++.8
+man/man8/afl-cc.8
+man/man8/afl-clang-fast++.8
+man/man8/afl-clang-fast.8
 man/man8/afl-cmin.8
 man/man8/afl-cmin.bash.8
+man/man8/afl-cmin.py.8
 man/man8/afl-fuzz.8
-man/man8/afl-gcc.8
 man/man8/afl-gotcpu.8
+man/man8/afl-persistent-config.8
 man/man8/afl-plot.8
 man/man8/afl-showmap.8
 man/man8/afl-system-config.8
 man/man8/afl-tmin.8
 man/man8/afl-whatsup.8
 share/afl/dictionaries/README.md
+share/afl/dictionaries/aff.dict
+share/afl/dictionaries/ass.dict
+share/afl/dictionaries/atom.dict
+share/afl/dictionaries/av1_dc.dict
+share/afl/dictionaries/bash.dict
+share/afl/dictionaries/bdf.dict
+share/afl/dictionaries/bmp.dict
+share/afl/dictionaries/bz2.dict
+share/afl/dictionaries/creole.dict
+share/afl/dictionaries/css.dict
+share/afl/dictionaries/csv.dict
+share/afl/dictionaries/dds.dict
+share/afl/dictionaries/djvu.dict
+share/afl/dictionaries/docommand.dict
+share/afl/dictionaries/exif.dict
+share/afl/dictionaries/fbs.dict
+share/afl/dictionaries/ftp.dict
 share/afl/dictionaries/gif.dict
+share/afl/dictionaries/graphviz.dict
+share/afl/dictionaries/heif.dict
+share/afl/dictionaries/hoextdown.dict
 share/afl/dictionaries/html_tags.dict
+share/afl/dictionaries/http.dict
+share/afl/dictionaries/icc.dict
+share/afl/dictionaries/iccprofile.dict
+share/afl/dictionaries/icns.dict
+share/afl/dictionaries/initfile.dict
+share/afl/dictionaries/jbig2.dict
 share/afl/dictionaries/jpeg.dict
+share/afl/dictionaries/jpeg2000.dict
 share/afl/dictionaries/js.dict
 share/afl/dictionaries/json.dict
+share/afl/dictionaries/jsonnet.dict
+share/afl/dictionaries/jsonschema.dict
+share/afl/dictionaries/markdown.dict
+share/afl/dictionaries/math.dict
+share/afl/dictionaries/mathml.dict
+share/afl/dictionaries/mp4.dict
+share/afl/dictionaries/mysqld.dict
+share/afl/dictionaries/ogg.dict
+share/afl/dictionaries/openexr.dict
+share/afl/dictionaries/otf.dict
+share/afl/dictionaries/pbm.dict
+share/afl/dictionaries/pcap.dict
 share/afl/dictionaries/pdf.dict
+share/afl/dictionaries/perl.dict
 share/afl/dictionaries/png.dict
+share/afl/dictionaries/proj4.dict
+share/afl/dictionaries/protobuf.dict
+share/afl/dictionaries/ps.dict
+share/afl/dictionaries/psd.dict
 share/afl/dictionaries/regexp.dict
+share/afl/dictionaries/riff.dict
+share/afl/dictionaries/rss.dict
+share/afl/dictionaries/rst.dict
+share/afl/dictionaries/rtf.dict
+share/afl/dictionaries/ruby.dict
+share/afl/dictionaries/sas.dict
+share/afl/dictionaries/spss.dict
 share/afl/dictionaries/sql.dict
+share/afl/dictionaries/stata.dict
+share/afl/dictionaries/svg.dict
+share/afl/dictionaries/tex.dict
+share/afl/dictionaries/theme-load-fuzz.dict
 share/afl/dictionaries/tiff.dict
+share/afl/dictionaries/tokener_parse_ex.dict
+share/afl/dictionaries/toml.dict
+share/afl/dictionaries/type42.dict
+share/afl/dictionaries/url.dict
+share/afl/dictionaries/utf8.dict
+share/afl/dictionaries/vcf.dict
+share/afl/dictionaries/vhd.dict
+share/afl/dictionaries/vpx_dec.dict
+share/afl/dictionaries/wav.dict
+share/afl/dictionaries/webm.dict
 share/afl/dictionaries/webp.dict
+share/afl/dictionaries/wkt.dict
+share/afl/dictionaries/x86.dict
 share/afl/dictionaries/xml.dict
+share/afl/dictionaries/xml_UTF_16.dict
+share/afl/dictionaries/xml_UTF_16BE.dict
+share/afl/dictionaries/xml_UTF_16LE.dict
+share/afl/dictionaries/xpath.dict
+share/afl/dictionaries/xslt.dict
+share/afl/dictionaries/yaml.dict
+share/afl/dictionaries/yara.dict
+share/afl/dictionaries/zip.dict
+share/afl/injections.dic
 share/afl/testcases/README.md
 share/afl/testcases/archives/common/ar/small_archive.a
 share/afl/testcases/archives/common/bzip2/small_archive.bz2
@@ -85,23 +209,28 @@ share/afl/testcases/others/sql/simple_queries.sql
 share/afl/testcases/others/text/hello_world.txt
 share/afl/testcases/others/xml/small_document.xml
 share/doc/afl/Changelog.md
+share/doc/afl/FAQ.md
+share/doc/afl/IJON.md
 share/doc/afl/INSTALL.md
-share/doc/afl/PATCHES.md
-share/doc/afl/QuickStartGuide.md
-share/doc/afl/README.MOpt.md
+share/doc/afl/README.cmplog.md
+share/doc/afl/README.gcc_plugin.md
+share/doc/afl/README.injections.md
+share/doc/afl/README.instrument_list.md
+share/doc/afl/README.laf-intel.md
+share/doc/afl/README.llvm.md
+share/doc/afl/README.lto.md
 share/doc/afl/README.md
-share/doc/afl/README.radamsa.md
-share/doc/afl/binaryonly_fuzzing.md
-share/doc/afl/custom_mutator.md
+share/doc/afl/README.persistent_mode.md
+share/doc/afl/SAND.md
+share/doc/afl/afl-fuzz_approach.md
+share/doc/afl/best_practices.md
+share/doc/afl/custom_mutators.md
 share/doc/afl/env_variables.md
-share/doc/afl/historical_notes.md
+share/doc/afl/features.md
+share/doc/afl/fuzzing_binary-only_targets.md
+share/doc/afl/fuzzing_in_depth.md
 share/doc/afl/ideas.md
-share/doc/afl/life_pro_tips.md
-share/doc/afl/notes_for_asan.md
-share/doc/afl/parallel_fuzzing.md
-share/doc/afl/perf_tips.md
-share/doc/afl/power_schedules.md
-share/doc/afl/python_mutators.md
-share/doc/afl/sister_projects.md
-share/doc/afl/status_screen.md
-share/doc/afl/technical_details.md
+share/doc/afl/important_changes.md
+share/doc/afl/rpc_statsd.md
+share/doc/afl/third_party_tools.md
+share/doc/afl/tutorials.md
diff --git a/afl++/distinfo b/afl++/distinfo
index dedc0d7a26..714fc00aa1 100644
--- a/afl++/distinfo
+++ b/afl++/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.3 2021/10/26 10:14:13 nia Exp $
 
-BLAKE2s (AFLplusplus-2.62c.tar.gz) = 382f2f46f8fe607b5a45895e00e7455a1194e3553b891bd5b2d7cd1460281b2a
-SHA512 (AFLplusplus-2.62c.tar.gz) = 0214845af0acc889c5f80bbfc6f50b662cb608c4c0959061075db29ee60bdaca7b11499368b44597674e1a11c49e60725abe2f919a7ddf7850c410019902eb40
-Size (AFLplusplus-2.62c.tar.gz) = 1272000 bytes
-SHA1 (patch-examples_argv__fuzzing_Makefile) = 04032386558713ca4d142964f63cc6820ae010c8
-SHA1 (patch-examples_socket__fuzzing_Makefile) = 46b5474f61029d5ea4a4449cfad6de0d6f5c8d66
+BLAKE2s (AFLplusplus-4.34c.tar.gz) = 4d06625771850f7204b83c2b4f4866dbe00a87dc218272017e62be7f8119962b
+SHA512 (AFLplusplus-4.34c.tar.gz) = 42f8618f8da4bfd1b4e4dc97ba827cfab730b1e2755a6143dce41d9e256aadb0ff18c2f61b07ae50790612f090371f58cd1e434996373d9c799a8a00b867b574
+Size (AFLplusplus-4.34c.tar.gz) = 3100867 bytes
+SHA1 (patch-GNUmakefile) = 7c628d33c5f542bbbcdeafcbad37a50ac3820dd3
+SHA1 (patch-GNUmakefile.llvm) = cf76d3b5bb81e17a331c531bbbb174f2c918ac04
+SHA1 (patch-afl-cmin) = 4c821a9a7efcf40f86737dcc04abd12e614dbdc8
diff --git a/afl++/patches/patch-GNUmakefile b/afl++/patches/patch-GNUmakefile
new file mode 100644
index 0000000000..7686607b28
--- /dev/null
+++ b/afl++/patches/patch-GNUmakefile
@@ -0,0 +1,43 @@
+$NetBSD$
+
+* Fix pathes
+* Disable gcc_plugin
+
+--- GNUmakefile.orig	2025-10-01 07:45:10.000000000 +0000
++++ GNUmakefile
+@@ -24,7 +24,7 @@ BIN_PATH     = $(PREFIX)/bin
+ HELPER_PATH  = $(PREFIX)/lib/afl
+ DOC_PATH     = $(PREFIX)/share/doc/afl
+ MISC_PATH    = $(PREFIX)/share/afl
+-MAN_PATH     = $(PREFIX)/share/man/man8
++MAN_PATH     = $(PREFIX)/man/man8
+ INCLUDE_PATH = $(PREFIX)/include/afl
+ 
+ PROGNAME    = afl
+@@ -329,7 +329,7 @@ ifeq "$(ARCH)" "aarch64"
+ endif
+ 
+ .PHONY: all
+-all:	test_x86 test_shm test_python ready $(PROGS) llvm gcc_plugin test_build all_done
++all:	test_x86 test_shm test_python ready $(PROGS) llvm
+ 	-$(MAKE) -C utils/aflpp_driver
+ 	@echo
+ 	@echo
+@@ -703,7 +703,6 @@ endif
+ distrib: all
+ 	-$(MAKE) -j$(nproc) -f GNUmakefile.llvm
+ ifneq "$(SYS)" "Darwin"
+-	-$(MAKE) -f GNUmakefile.gcc_plugin
+ 	-$(MAKE) -C utils/libdislocator
+ 	-$(MAKE) -C utils/libtokencap
+ endif
+@@ -859,9 +858,6 @@ install: all $(MANPAGES)
+ 	@if [ -f utils/aflpp_driver/libAFLDriver.a ]; then set -e; install -m 644 utils/aflpp_driver/libAFLDriver.a $${DESTDIR}$(HELPER_PATH); fi
+ 	@if [ -f utils/aflpp_driver/libAFLQemuDriver.a ]; then set -e; install -m 644 utils/aflpp_driver/libAFLQemuDriver.a $${DESTDIR}$(HELPER_PATH); fi
+ 	-$(MAKE) -f GNUmakefile.llvm install
+-ifneq "$(SYS)" "Darwin"
+-	-$(MAKE) -f GNUmakefile.gcc_plugin install
+-endif
+ 	ln -sf afl-cc $${DESTDIR}$(BIN_PATH)/afl-gcc
+ 	ln -sf afl-cc $${DESTDIR}$(BIN_PATH)/afl-g++
+ 	ln -sf afl-cc $${DESTDIR}$(BIN_PATH)/afl-clang
diff --git a/afl++/patches/patch-GNUmakefile.llvm b/afl++/patches/patch-GNUmakefile.llvm
new file mode 100644
index 0000000000..bf3c0fc4c5
--- /dev/null
+++ b/afl++/patches/patch-GNUmakefile.llvm
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* Fix pathes
+
+--- GNUmakefile.llvm.orig	2025-10-01 07:45:10.000000000 +0000
++++ GNUmakefile.llvm
+@@ -24,7 +24,7 @@ HELPER_PATH ?= $(PREFIX)/lib/afl
+ BIN_PATH    ?= $(PREFIX)/bin
+ DOC_PATH    ?= $(PREFIX)/share/doc/afl
+ MISC_PATH   ?= $(PREFIX)/share/afl
+-MAN_PATH    ?= $(PREFIX)/share/man/man8
++MAN_PATH    ?= $(PREFIX)/man/man8
+ 
+ BUILD_DATE  ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
+ 
diff --git a/afl++/patches/patch-afl-cmin b/afl++/patches/patch-afl-cmin
new file mode 100644
index 0000000000..65731ba9a4
--- /dev/null
+++ b/afl++/patches/patch-afl-cmin
@@ -0,0 +1,25 @@
+$NetBSD$
+
+* Use gawk instead of awk
+* Use getconf instead of nproc
+
+--- afl-cmin.orig	2025-10-01 07:45:10.000000000 +0000
++++ afl-cmin
+@@ -16,7 +16,7 @@ test "$SYS" = "Darwin" && {
+ export AFL_QUIET=1
+ export ASAN_OPTIONS=detect_leaks=0
+ export PATH="${THISPATH}:$PATH"
+-awk -f - -- ${@+"$@"} <<'EOF'
++gawk -f - -- ${@+"$@"} <<'EOF'
+ #!/usr/bin/awk -f
+ # awk script to minimize a test corpus of input files
+ #
+@@ -383,7 +383,7 @@ BEGIN {
+   }
+ 
+   if (threads) {
+-    cmd = "nproc"
++    cmd = "getconf NPROCESSORS_ONLN"
+     cmd | getline nproc
+     close(cmd)
+     if (threads == "all") {
diff --git a/afl++/patches/patch-examples_argv__fuzzing_Makefile b/afl++/patches/patch-examples_argv__fuzzing_Makefile
deleted file mode 100644
index 607f288434..0000000000
--- a/afl++/patches/patch-examples_argv__fuzzing_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-examples_argv__fuzzing_Makefile,v 1.1 2020/04/17 17:51:09 wiz Exp $
-
-Honor CFLAGS and LDFLAGS.
-
---- examples/argv_fuzzing/Makefile.orig	2020-02-28 00:13:28.000000000 +0000
-+++ examples/argv_fuzzing/Makefile
-@@ -17,8 +17,8 @@ PREFIX     ?= /usr/local
- BIN_PATH    = $(PREFIX)/bin
- HELPER_PATH = $(PREFIX)/lib/afl
- 
--CFLAGS = -fPIC -Wall -Wextra
--LDFLAGS = -shared
-+CFLAGS += -fPIC -Wall -Wextra
-+LDFLAGS += -shared
- 
- ifneq "$(filter Linux GNU%,$(shell uname))" ""
-   LDFLAGS  += -ldl
diff --git a/afl++/patches/patch-examples_socket__fuzzing_Makefile b/afl++/patches/patch-examples_socket__fuzzing_Makefile
deleted file mode 100644
index 810cbf7b44..0000000000
--- a/afl++/patches/patch-examples_socket__fuzzing_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-examples_socket__fuzzing_Makefile,v 1.1 2020/04/17 17:51:09 wiz Exp $
-
-Honor CFLAGS and LDFLAGS.
-
---- examples/socket_fuzzing/Makefile.orig	2020-02-28 00:13:28.000000000 +0000
-+++ examples/socket_fuzzing/Makefile
-@@ -15,8 +15,8 @@ PREFIX     ?= /usr/local
- BIN_PATH    = $(PREFIX)/bin
- HELPER_PATH = $(PREFIX)/lib/afl
- 
--CFLAGS = -fPIC -Wall -Wextra
--LDFLAGS = -shared
-+CFLAGS += -fPIC -Wall -Wextra
-+LDFLAGS += -shared
- 
- ifneq "$(filter Linux GNU%,$(shell uname))" ""
-   LDFLAGS  += -ldl
Prev by Date: Import devel/afl++
Next by Date: rumdl: update to 0.0.162
Previous by Thread: Import devel/afl++
Next by Thread: rumdl: update to 0.0.162
Indexes:
Home | Main Index | Thread Index | Old Index