security/afl++: Update to 2.54c

Changes:	https://github.com/vanhauser-thc/AFLplusplus/releases/tag/2.54c

4 files changed, 38 insertions, 17 deletions

diff --git a/security/afl++/Makefile b/security/afl++/Makefile
index 9fba502821fd..e4525961c168 100644
--- a/security/afl++/Makefile
+++ b/security/afl++/Makefile
@@ -2,10 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	afl
-PORTVERSION=	2.53d.a1
+PORTVERSION=	2.54c
 CATEGORIES=	security
 PKGNAMESUFFIX=	++
 
+PATCH_SITES=	https://github.com/vanhauser-thc/AFLplusplus/commit/
+PATCHFILES=	52cbd650b7ae30c64152601fbc34350d61b3e02a.patch:-p1 \
+		efa205289662db40382f9c2a4e83420438419bba.patch:-p1
+
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Fast instrumented fuzzer
 
@@ -21,7 +25,6 @@ USES=		gmake tar:tgz
 USE_GITHUB=	yes
 GH_ACCOUNT=	vanhauser-thc
 GH_PROJECT=	AFLplusplus
-GH_TAGNAME=	8b6a4e575978fac83155efd90d39030c84b2a755
 
 ALL_TARGET=	all libdislocator
 TEST_TARGET=	test_build
@@ -41,6 +44,7 @@ LLVM_RUN_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LLVM_MAKE_ARGS=		LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
 LLVM_ALL_TARGET=	llvm_mode
 LLVM_TEST_TARGET=	test_llvm_mode
+LLVM_BINARY_ALIAS=	llvm-config=llvm-config${LLVM_DEFAULT}
 LLVM_VARS=		CC=clang${LLVM_DEFAULT} \
 			CXX=clang++${LLVM_DEFAULT}
 
@@ -67,7 +71,7 @@ post-patch:
 		${WRKSRC}/Makefile ${WRKSRC}/llvm_mode/Makefile
 .if ${ARCH} == "i386"
 	@${REINPLACE_CMD} 's@\(  as_params\[0\] = afl_as ? afl_as : \)\(.*\)@\1(u8*)"${LOCALBASE}/bin/as";@' \
-		${WRKSRC}/afl-as.c
+		${WRKSRC}/src/afl-as.c
 .endif
 	@${CAT} ${FILESDIR}/Makefile.extra >> ${WRKSRC}/Makefile
 
@@ -87,14 +91,15 @@ post-install:
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/libdislocator/libdislocator.so \
 		${STAGEDIR}${PREFIX}/lib/afl
-	${INSTALL_DATA} ${WRKSRC}/libdislocator/README.dislocator \
-		${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/libdislocator
+	${INSTALL_MAN} ${WRKSRC}/libdislocator/README.md \
+		${STAGEDIR}${DOCSDIR}/libdislocator
 
 post-install-LLVM-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/afl/*.so \
 		${STAGEDIR}${PREFIX}/bin/afl-clang-fast
-	${INSTALL_MAN} ${WRKSRC}/llvm_mode/README.laf-intel \
-		${WRKSRC}/llvm_mode/README.llvm \
-		${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/llvm_mode
+	${INSTALL_MAN} ${WRKSRC}/llvm_mode/README.* \
+		${STAGEDIR}${DOCSDIR}/llvm_mode
 
 .include <bsd.port.mk>
diff --git a/security/afl++/distinfo b/security/afl++/distinfo
index a9bb60d14e2c..299d2d71611d 100644
--- a/security/afl++/distinfo
+++ b/security/afl++/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1565263563
-SHA256 (vanhauser-thc-AFLplusplus-2.53d.a1-8b6a4e575978fac83155efd90d39030c84b2a755_GH0.tar.gz) = 07fffb04760637c4537e396c12d7cccf4ba061330fc36a4133123712b22300c9
-SIZE (vanhauser-thc-AFLplusplus-2.53d.a1-8b6a4e575978fac83155efd90d39030c84b2a755_GH0.tar.gz) = 936061
+TIMESTAMP = 1567675622
+SHA256 (vanhauser-thc-AFLplusplus-2.54c_GH0.tar.gz) = cbf691b5a0287b992f3c417c16ddae4ca7cae0fa9f8132bda836456096522c14
+SIZE (vanhauser-thc-AFLplusplus-2.54c_GH0.tar.gz) = 958461
+SHA256 (52cbd650b7ae30c64152601fbc34350d61b3e02a.patch) = 596075efa9bf07a027737c25feb6c7b9d73d7690b885d27b3e16aa79f8532a10
+SIZE (52cbd650b7ae30c64152601fbc34350d61b3e02a.patch) = 3312
+SHA256 (efa205289662db40382f9c2a4e83420438419bba.patch) = 1d25895b5e8c03aff3fcd69bbb719481545d9ed04cdd555c0855e645e8aea77a
+SIZE (efa205289662db40382f9c2a4e83420438419bba.patch) = 2074
diff --git a/security/afl++/files/Makefile.extra b/security/afl++/files/Makefile.extra
index b8664858dc50..423e60c53b41 100644
--- a/security/afl++/files/Makefile.extra
+++ b/security/afl++/files/Makefile.extra
@@ -1,7 +1,7 @@
 .PHONY: libdislocator llvm_mode test_llvm_mode
 
 libdislocator:
-	$(MAKE) -C libdislocator
+	$(MAKE) -C libdislocator CFLAGS="-I../include ${CFLAGS}"
 	
 llvm_mode:
 	$(MAKE) -C llvm_mode
diff --git a/security/afl++/pkg-plist b/security/afl++/pkg-plist
index 1b602da4c74b..c39b798b665c 100644
--- a/security/afl++/pkg-plist
+++ b/security/afl++/pkg-plist
@@ -10,7 +10,7 @@ bin/afl-fuzz
 bin/afl-gotcpu
 bin/afl-plot
 bin/afl-showmap
-@comment bin/afl-system-config
+bin/afl-system-config
 bin/afl-tmin
 bin/afl-whatsup
 %%X86%%lib/afl/afl-as
@@ -24,6 +24,15 @@ lib/afl/libdislocator.so
 %%LLVM%%lib/afl/libLLVMInsTrim.so
 %%LLVM%%lib/afl/split-compares-pass.so
 %%LLVM%%lib/afl/split-switches-pass.so
+man/man8/afl-cmin.8.gz
+man/man8/afl-fuzz.8.gz
+man/man8/afl-gcc.8.gz
+man/man8/afl-gotcpu.8.gz
+man/man8/afl-plot.8.gz
+man/man8/afl-showmap.8.gz
+man/man8/afl-system-config.8.gz
+man/man8/afl-tmin.8.gz
+man/man8/afl-whatsup.8.gz
 %%DATADIR%%/README.dictionaries
 %%DATADIR%%/README.testcases
 %%DATADIR%%/archives/common/ar/small_archive.a
@@ -79,13 +88,17 @@ lib/afl/libdislocator.so
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/QuickStartGuide.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/README.dislocator
-%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/README.laf-intel
-%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/README.llvm
 %%PORTDOCS%%%%DOCSDIR%%/binaryonly_fuzzing.txt
+%%PORTDOCS%%%%DOCSDIR%%/custom_mutator.txt
 %%PORTDOCS%%%%DOCSDIR%%/env_variables.txt
 %%PORTDOCS%%%%DOCSDIR%%/historical_notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/libdislocator/README.md
 %%PORTDOCS%%%%DOCSDIR%%/life_pro_tips.txt
+%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.md
+%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.instrim.md
+%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.laf-intel.md
+%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.neverzero.md
+%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.whitelist.md
 %%PORTDOCS%%%%DOCSDIR%%/notes_for_asan.txt
 %%PORTDOCS%%%%DOCSDIR%%/parallel_fuzzing.txt
 %%PORTDOCS%%%%DOCSDIR%%/perf_tips.txt
@@ -94,4 +107,3 @@ lib/afl/libdislocator.so
 %%PORTDOCS%%%%DOCSDIR%%/sister_projects.txt
 %%PORTDOCS%%%%DOCSDIR%%/status_screen.txt
 %%PORTDOCS%%%%DOCSDIR%%/technical_details.txt
-%%PORTDOCS%%%%DOCSDIR%%/unicorn_mode.txt