security/afl: 2.29 -> 2.32

- Adds a new LLVM_VERSION knob to control the LLVM version the port uses
  when using the LLVM option
- Switches the default LLVM version from 3.7 to 3.8

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

4 files changed, 20 insertions, 27 deletions

diff --git a/security/afl/Makefile b/security/afl/Makefile
index 992a8bebfc02..ca75cefa08de 100644
--- a/security/afl/Makefile
+++ b/security/afl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	afl
-PORTVERSION=	2.29
+PORTVERSION=	2.32
 DISTVERSIONSUFFIX=	b
 CATEGORIES=	security
 MASTER_SITES=	http://lcamtuf.coredump.cx/afl/releases/
@@ -26,8 +26,10 @@ OPTIONS_SUB=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Uses binary instrumentation
 
-LLVM_BUILD_DEPENDS=	clang37:devel/llvm37
-LLVM_RUN_DEPENDS=	clang37:devel/llvm37
+LLVM_VERSION=	38
+
+LLVM_BUILD_DEPENDS=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
+LLVM_RUN_DEPENDS=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 MINIMIZE_CORPUS_RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 .include <bsd.port.options.mk>
@@ -61,13 +63,19 @@ post-patch:
 		${WRKSRC}/afl-as.c
 .endif
 
+post-patch-LLVM-on:
+	${REINPLACE_CMD} \
+		-e 's|"clang"|"clang${LLVM_VERSION}"|g' \
+		-e 's|"clang\+\+"|"clang\+\+${LLVM_VERSION}"|g' \
+		${WRKSRC}/llvm_mode/afl-clang-fast.c
+
 .if ! ${OSVERSION} < 1000013
 # Broken on FreeBSD 9
 post-build-LLVM-on:
 	@(cd ${WRKSRC}/llvm_mode; ${SETENV} \
-		CC=clang37 \
-		CXX=clang++37 \
-		LLVM_CONFIG=llvm-config37 \
+		CC=clang${LLVM_VERSION} \
+		CXX=clang++${LLVM_VERSION} \
+		LLVM_CONFIG=llvm-config${LLVM_VERSION} \
 		CFLAGS="${CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" \
 		${GMAKE})
diff --git a/security/afl/distinfo b/security/afl/distinfo
index 9aa0fd770af2..151a1c12dadd 100644
--- a/security/afl/distinfo
+++ b/security/afl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470770986
-SHA256 (afl-2.29b.tgz) = 5eeb5b1d7082b263ed9f89c991f694cb42b8b10b3f660a2c5504ae757c6d44e2
-SIZE (afl-2.29b.tgz) = 827938
+TIMESTAMP = 1471758195
+SHA256 (afl-2.32b.tgz) = 3d08b79e28c2075aec20aa6e6240f9f6fb7af3d29200b498e908f8b3960a7b79
+SIZE (afl-2.32b.tgz) = 828474
diff --git a/security/afl/files/patch-Makefile b/security/afl/files/patch-Makefile
index ff5f51dd3422..06cca8f72030 100644
--- a/security/afl/files/patch-Makefile
+++ b/security/afl/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2016-06-24 02:35:35 UTC
+--- Makefile.orig	2016-08-07 07:03:02 UTC
 +++ Makefile
 @@ -21,6 +21,8 @@ BIN_PATH    = $(PREFIX)/bin
  HELPER_PATH = $(PREFIX)/lib/afl
@@ -7,9 +7,9 @@
 +INSTALL_PROGRAM?=	install -s -m755
 +INSTALL_SCRIPT?=	install -m755
  
- # PROGS intentionally omit afl-as, which gets installed to its own dir.
+ # PROGS intentionally omit afl-as, which gets installed elsewhere.
  
-@@ -118,14 +120,15 @@ clean:
+@@ -120,14 +122,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
diff --git a/security/afl/files/patch-llvm__mode_afl-clang-fast.c b/security/afl/files/patch-llvm__mode_afl-clang-fast.c
deleted file mode 100644
index 9515189d5aeb..000000000000
--- a/security/afl/files/patch-llvm__mode_afl-clang-fast.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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**
- 
-   if (!strcmp(name, "afl-clang-fast++")) {
-     u8* alt_cxx = getenv("AFL_CXX");
--    cc_params[0] = alt_cxx ? alt_cxx : (u8*)"clang++";
-+    cc_params[0] = alt_cxx ? alt_cxx : (u8*)"clang++37";
-   } else {
-     u8* alt_cc = getenv("AFL_CC");
--    cc_params[0] = alt_cc ? alt_cc : (u8*)"clang";
-+    cc_params[0] = alt_cc ? alt_cc : (u8*)"clang37";
-   }
- 
-   /* There are two ways to compile afl-clang-fast. In the traditional mode, we