security/afl: update 2.07b -> 2.19b

PR:		210832
Submitted by:	Tobias Kortkamp <t@tobik.me> (maintainer)

5 files changed, 17 insertions, 12 deletions

diff --git a/security/afl/Makefile b/security/afl/Makefile
index 21824a36548a..08b1b859a8c5 100644
--- a/security/afl/Makefile
+++ b/security/afl/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	afl
-PORTVERSION=	2.07b
+PORTVERSION=	2.19
+DISTVERSIONSUFFIX=	b
 CATEGORIES=	security
 MASTER_SITES=	http://lcamtuf.coredump.cx/afl/releases/
 
@@ -74,7 +75,6 @@ post-build-LLVM-on:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/COPYING ${STAGEDIR}${DOCSDIR}/
-
 .for afl_script in afl-cmin afl-plot afl-whatsup
 	${INSTALL_SCRIPT} ${WRKSRC}/${afl_script} ${STAGEDIR}${PREFIX}/bin/
 .endfor
diff --git a/security/afl/distinfo b/security/afl/distinfo
index 33e558b9b54b..85ab7ba5ba28 100644
--- a/security/afl/distinfo
+++ b/security/afl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (afl-2.07b.tgz) = 9dd324bc3930ec1dbb44d00df8dcf8a3c8ca54b765665cc7f20b89e71d70b184
-SIZE (afl-2.07b.tgz) = 814913
+TIMESTAMP = 1467977424
+SHA256 (afl-2.19b.tgz) = be12df9920c9cf68c412fb06ef5c7153f4b17e450b0195535a69663e749d8af2
+SIZE (afl-2.19b.tgz) = 817294
diff --git a/security/afl/files/patch-Makefile b/security/afl/files/patch-Makefile
index fab7011b9bf0..ff5f51dd3422 100644
--- a/security/afl/files/patch-Makefile
+++ b/security/afl/files/patch-Makefile
@@ -1,15 +1,15 @@
---- Makefile.orig	2016-02-16 07:14:22 UTC
+--- Makefile.orig	2016-06-24 02:35:35 UTC
 +++ Makefile
 @@ -21,6 +21,8 @@ BIN_PATH    = $(PREFIX)/bin
  HELPER_PATH = $(PREFIX)/lib/afl
  DOC_PATH    = $(PREFIX)/share/doc/afl
  MISC_PATH   = $(PREFIX)/share/afl
 +INSTALL_PROGRAM?=	install -s -m755
-+INSTALL_SCRIPT?=	isntall -m755
++INSTALL_SCRIPT?=	install -m755
  
- PROGS       = afl-gcc afl-fuzz afl-showmap afl-tmin afl-gotcpu afl-analyze
- SH_PROGS    = afl-plot afl-cmin afl-whatsup
-@@ -115,12 +117,13 @@ clean:
+ # PROGS intentionally omit afl-as, which gets installed to its own dir.
+ 
+@@ -118,14 +120,15 @@ clean:
  install: all
  	mkdir -p -m 755 $${DESTDIR}$(BIN_PATH) $${DESTDIR}$(HELPER_PATH) $${DESTDIR}$(DOC_PATH) $${DESTDIR}$(MISC_PATH)
  	rm -f $${DESTDIR}$(BIN_PATH)/afl-plot.sh
@@ -20,7 +20,9 @@
 -	if [ -f afl-qemu-trace ]; then install -m 755 afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi
 -	if [ -f afl-clang-fast -a -f afl-llvm-pass.so -a -f afl-llvm-rt.o ]; then set -e; install -m 755 afl-clang-fast $${DESTDIR}$(BIN_PATH); ln -sf afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang-fast++; install -m 755 afl-llvm-pass.so afl-llvm-rt.o $${DESTDIR}$(HELPER_PATH); fi
 +	if [ -f afl-qemu-trace ]; then ${INSTALL_PROGRAM} afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi
-+	if [ -f afl-clang-fast -a -f afl-llvm-pass.so -a -f afl-llvm-rt.o ]; then set -e; ${INSTALL_PROGRAM} afl-clang-fast $${DESTDIR}$(BIN_PATH); ln -sf afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang-fast++; ${INSTALL_PROGRAM} afl-llvm-pass.so $${DESTDIR}$(HELPER_PATH); install -m 755 afl-llvm-rt.o $${DESTDIR}$(HELPER_PATH); fi
++	if [ -f afl-clang-fast -a -f afl-llvm-pass.so -a -f afl-llvm-rt.o ]; then set -e; ${INSTALL_PROGRAM} afl-clang-fast $${DESTDIR}$(BIN_PATH); ln -sf afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang-fast++; ${INSTALL_PROGRAM} afl-llvm-pass.so afl-llvm-rt.o $${DESTDIR}$(HELPER_PATH); fi
+ 	if [ -f afl-llvm-rt-32.o ]; then set -e; install -m 755 afl-llvm-rt-32.o $${DESTDIR}$(HELPER_PATH); fi
+ 	if [ -f afl-llvm-rt-64.o ]; then set -e; install -m 755 afl-llvm-rt-64.o $${DESTDIR}$(HELPER_PATH); fi
  	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)
 +	${INSTALL_PROGRAM} afl-as $${DESTDIR}$(HELPER_PATH)
diff --git a/security/afl/files/patch-llvm__mode_afl-clang-fast.c b/security/afl/files/patch-llvm__mode_afl-clang-fast.c
index 7720b6cc4a1b..9515189d5aeb 100644
--- a/security/afl/files/patch-llvm__mode_afl-clang-fast.c
+++ b/security/afl/files/patch-llvm__mode_afl-clang-fast.c
@@ -1,4 +1,4 @@
---- llvm_mode/afl-clang-fast.c.orig	2015-09-08 22:37:25 UTC
+--- llvm_mode/afl-clang-fast.c.orig	2016-06-07 18:07:43 UTC
 +++ llvm_mode/afl-clang-fast.c
 @@ -106,10 +106,10 @@ static void edit_params(u32 argc, char**
  
@@ -12,4 +12,4 @@
 +    cc_params[0] = alt_cc ? alt_cc : (u8*)"clang37";
    }
  
-   cc_params[cc_par_cnt++] = "-Xclang";
+   /* There are two ways to compile afl-clang-fast. In the traditional mode, we
diff --git a/security/afl/pkg-plist b/security/afl/pkg-plist
index 65d3aad97626..4b03094152ff 100644
--- a/security/afl/pkg-plist
+++ b/security/afl/pkg-plist
@@ -5,6 +5,8 @@ bin/afl-clang++
 %%LLVM_SUB%%%%LLVM%%bin/afl-clang-fast++
 %%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-pass.so
 %%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt.o
+%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt-32.o
+%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt-64.o
 %%MINIMIZE_CORPUS%%bin/afl-cmin
 bin/afl-fuzz
 bin/afl-g++