Attachment #173902 for bug #212009

Lines 2-8 Link Here

(-)Makefile (-6 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= afl	4	PORTNAME= afl
5	PORTVERSION= 2.29	5	PORTVERSION= 2.32
6	DISTVERSIONSUFFIX= b	6	DISTVERSIONSUFFIX= b
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/	8	MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/
Lines 26-33 Link Here
26	ONLY_FOR_ARCHS= amd64 i386	26	ONLY_FOR_ARCHS= amd64 i386
27	ONLY_FOR_ARCHS_REASON= Uses binary instrumentation	27	ONLY_FOR_ARCHS_REASON= Uses binary instrumentation
28		28
29	LLVM_BUILD_DEPENDS= clang37:devel/llvm37	29	LLVM_VERSION= 38
30	LLVM_RUN_DEPENDS= clang37:devel/llvm37	30
		31	LLVM_BUILD_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
		32	LLVM_RUN_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
31	MINIMIZE_CORPUS_RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash	33	MINIMIZE_CORPUS_RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash
32		34
33	.include <bsd.port.options.mk>	35	.include <bsd.port.options.mk>
Lines 61-73 Link Here
61	${WRKSRC}/afl-as.c	63	${WRKSRC}/afl-as.c
62	.endif	64	.endif
63		65
		66	post-patch-LLVM-on:
		67	${REINPLACE_CMD} \
		68	-e 's\|"clang"\|"clang${LLVM_VERSION}"\|g' \
		69	-e 's\|"clang\+\+"\|"clang\+\+${LLVM_VERSION}"\|g' \
		70	${WRKSRC}/llvm_mode/afl-clang-fast.c
		71
64	.if ! ${OSVERSION} < 1000013	72	.if ! ${OSVERSION} < 1000013
65	# Broken on FreeBSD 9	73	# Broken on FreeBSD 9
66	post-build-LLVM-on:	74	post-build-LLVM-on:
67	@(cd ${WRKSRC}/llvm_mode; ${SETENV} \	75	@(cd ${WRKSRC}/llvm_mode; ${SETENV} \
68	CC=clang37 \	76	CC=clang${LLVM_VERSION} \
69	CXX=clang++37 \	77	CXX=clang++${LLVM_VERSION} \
70	LLVM_CONFIG=llvm-config37 \	78	LLVM_CONFIG=llvm-config${LLVM_VERSION} \
71	CFLAGS="${CFLAGS}" \	79	CFLAGS="${CFLAGS}" \
72	CXXFLAGS="${CXXFLAGS}" \	80	CXXFLAGS="${CXXFLAGS}" \
73	${GMAKE})	81	${GMAKE})

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1470770986	1	TIMESTAMP = 1471758195
2	SHA256 (afl-2.29b.tgz) = 5eeb5b1d7082b263ed9f89c991f694cb42b8b10b3f660a2c5504ae757c6d44e2	2	SHA256 (afl-2.32b.tgz) = 3d08b79e28c2075aec20aa6e6240f9f6fb7af3d29200b498e908f8b3960a7b79
3	SIZE (afl-2.29b.tgz) = 827938	3	SIZE (afl-2.32b.tgz) = 828474

Lines 1-4 Link Here

(-)files/patch-Makefile (-3 / +3 lines)
1	--- Makefile.orig 2016-06-24 02:35:35 UTC	1	--- Makefile.orig 2016-08-07 07:03:02 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -21,6 +21,8 @@ BIN_PATH = $(PREFIX)/bin	3	@@ -21,6 +21,8 @@ BIN_PATH = $(PREFIX)/bin
4	HELPER_PATH = $(PREFIX)/lib/afl	4	HELPER_PATH = $(PREFIX)/lib/afl
Lines 7-15 Link Here
7	+INSTALL_PROGRAM?= install -s -m755	7	+INSTALL_PROGRAM?= install -s -m755
8	+INSTALL_SCRIPT?= install -m755	8	+INSTALL_SCRIPT?= install -m755
9		9
10	# PROGS intentionally omit afl-as, which gets installed to its own dir.	10	# PROGS intentionally omit afl-as, which gets installed elsewhere.
11		11
12	@@ -118,14 +120,15 @@ clean:	12	@@ -120,14 +122,15 @@ clean:
13	install: all	13	install: all
14	mkdir -p -m 755 $${DESTDIR}$(BIN_PATH) $${DESTDIR}$(HELPER_PATH) $${DESTDIR}$(DOC_PATH) $${DESTDIR}$(MISC_PATH)	14	mkdir -p -m 755 $${DESTDIR}$(BIN_PATH) $${DESTDIR}$(HELPER_PATH) $${DESTDIR}$(DOC_PATH) $${DESTDIR}$(MISC_PATH)
15	rm -f $${DESTDIR}$(BIN_PATH)/afl-plot.sh	15	rm -f $${DESTDIR}$(BIN_PATH)/afl-plot.sh




--- 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

Return to bug 212009

Lines 1-15 Link Here

(-)files/patch-llvm__mode_afl-clang-fast.c (-15 lines)
1	--- llvm_mode/afl-clang-fast.c.orig 2016-06-07 18:07:43 UTC
2	+++ llvm_mode/afl-clang-fast.c
3	@@ -106,10 +106,10 @@ static void edit_params(u32 argc, char**
4
5	if (!strcmp(name, "afl-clang-fast++")) {
6	u8* alt_cxx = getenv("AFL_CXX");
7	- cc_params[0] = alt_cxx ? alt_cxx : (u8*)"clang++";
8	+ cc_params[0] = alt_cxx ? alt_cxx : (u8*)"clang++37";
9	} else {
10	u8* alt_cc = getenv("AFL_CC");
11	- cc_params[0] = alt_cc ? alt_cc : (u8*)"clang";
12	+ cc_params[0] = alt_cc ? alt_cc : (u8*)"clang37";
13	}
14
15	/* There are two ways to compile afl-clang-fast. In the traditional mode, we