Re: [update] afl 2.57b

On Wed, Apr 13, 2022 at 07:57:29AM +0200, Theo Buehler wrote:
> Seems lcamtuf no longer maintains this and most distros now ship the
> version from Google opensource where there is still the occasional
> commit once in a while. The Makefile installs an empty README file, so I
> added a patch to install README.md instead and a sed to make sources
> point to it.
>
> The release notes don't show anything earth-shattering. Works for me.
> https://github.com/google/AFL/releases

daniel@ proposed this without the README change a while back
not sure why that didn't go in

afl-clang/afl-fuzz still work here in a quick (incomplete) test

ok jsg@

>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/afl/Makefile,v
> retrieving revision 1.50
> diff -u -p -r1.50 Makefile
> --- Makefile 11 Mar 2022 18:49:31 -0000 1.50
> +++ Makefile 12 Apr 2022 21:24:03 -0000
> @@ -1,13 +1,14 @@
> ONLY_FOR_ARCHS= i386 amd64
>
> +V= 2.57b
> COMMENT= instrumented fuzzer
> -DISTNAME= afl-2.52b
> -EXTRACT_SUFX= .tgz
> +PKGNAME= afl-$V
> CATEGORIES= devel
> -REVISION = 0
>
> -HOMEPAGE= http://lcamtuf.coredump.cx/afl
> -MASTER_SITES= ${HOMEPAGE}/releases/
> +HOMEPAGE= https://lcamtuf.coredump.cx/afl
> +GH_ACCOUNT= google
> +GH_PROJECT= AFL
> +GH_TAGNAME= v$V
> MAINTAINER= Jonathan Gray <jsg@openbsd.org>
>
> # Apache 2.0
> @@ -17,5 +18,8 @@ USE_GMAKE= Yes
> FAKE_FLAGS= PREFIX="${TRUEPREFIX}"
> TEST_TARGET= test_build
> WANTLIB= c
> +
> +pre-configure:
> + sed -i 's,%s/README,&.md,' ${WRKSRC}/afl-{tmin,showmap,fuzz,analyze}.c
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/afl/distinfo,v
> retrieving revision 1.47
> diff -u -p -r1.47 distinfo
> --- distinfo 8 Nov 2017 00:15:21 -0000 1.47
> +++ distinfo 3 Apr 2022 22:38:23 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (afl-2.52b.tgz) = Q2FLS5HAFNOe8IbFzIT/XwaAEMJkwsBb8ZnfYImM4EU=
> -SIZE (afl-2.52b.tgz) = 835907
> +SHA256 (AFL-2.57b.tar.gz) = bwWmUVwHq+Sfbykr0TyWAEzB4Ba9oMPMnCdp3UPxY+4=
> +SIZE (AFL-2.57b.tar.gz) = 839871
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/afl/patches/patch-Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 patch-Makefile
> --- patches/patch-Makefile 11 Mar 2022 18:49:31 -0000 1.24
> +++ patches/patch-Makefile 3 Apr 2022 22:44:44 -0000
> @@ -1,5 +1,6 @@
> ---- Makefile.orig Sat Aug 6 09:12:53 2016
> -+++ Makefile Sat Aug 6 14:07:48 2016
> +Index: Makefile
> +--- Makefile.orig
> ++++ Makefile
> @@ -18,7 +18,7 @@ VERSION = $(shell grep '^\#define VERSION ' config
>
> PREFIX ?= /usr/local
> @@ -17,4 +18,13 @@
> +all: test_x86 $(PROGS) afl-as
>
> ifndef AFL_NO_X86
> +
> +@@ -133,7 +133,7 @@ endif
> + set -e; for i in afl-g++ afl-clang afl-clang++; do ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/$$i; done
> + install -m 755 afl-as $${DESTDIR}$(HELPER_PATH)
> + ln -sf afl-as $${DESTDIR}$(HELPER_PATH)/as
> +- install -m 644 docs/README docs/ChangeLog docs/*.txt $${DESTDIR}$(DOC_PATH)
> ++ install -m 644 README.md docs/ChangeLog docs/*.txt $${DESTDIR}$(DOC_PATH)
> + cp -r testcases/ $${DESTDIR}$(MISC_PATH)
> + cp -r dictionaries/ $${DESTDIR}$(MISC_PATH)
>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/afl/pkg/PLIST,v
> retrieving revision 1.17
> diff -u -p -r1.17 PLIST
> --- pkg/PLIST 11 Mar 2022 18:49:31 -0000 1.17
> +++ pkg/PLIST 12 Apr 2022 21:04:06 -0000
> @@ -24,6 +24,7 @@ share/afl/dictionaries/js.dict
> share/afl/dictionaries/json.dict
> share/afl/dictionaries/pdf.dict
> share/afl/dictionaries/png.dict
> +share/afl/dictionaries/regexp.dict
> share/afl/dictionaries/sql.dict
> share/afl/dictionaries/tiff.dict
> share/afl/dictionaries/webp.dict
> @@ -103,6 +104,11 @@ share/afl/testcases/others/pcap/
> share/afl/testcases/others/pcap/small_capture.pcap
> share/afl/testcases/others/pdf/
> share/afl/testcases/others/pdf/small.pdf
> +share/afl/testcases/others/regexp/
> +share/afl/testcases/others/regexp/reg1
> +share/afl/testcases/others/regexp/reg2
> +share/afl/testcases/others/regexp/reg3
> +share/afl/testcases/others/regexp/reg4
> share/afl/testcases/others/rtf/
> share/afl/testcases/others/rtf/small_document.rtf
> share/afl/testcases/others/sql/
> @@ -114,7 +120,7 @@ share/afl/testcases/others/xml/small_doc
> share/doc/afl/
> share/doc/afl/ChangeLog
> share/doc/afl/QuickStartGuide.txt
> -share/doc/afl/README
> +share/doc/afl/README.md
> share/doc/afl/env_variables.txt
> share/doc/afl/historical_notes.txt
> share/doc/afl/life_pro_tips.txt
>