Attachment #172236 for bug #210832

Lines 2-8 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= afl	4	PORTNAME= afl
5	PORTVERSION= 2.07b	5	PORTVERSION= 2.19
		6	DISTVERSIONSUFFIX= b
6	CATEGORIES= security	7	CATEGORIES= security
7	MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/	8	MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/
8		9
Lines 74-80 Link Here
74		75
75	post-install:	76	post-install:
76	${INSTALL_DATA} ${WRKSRC}/docs/COPYING ${STAGEDIR}${DOCSDIR}/	77	${INSTALL_DATA} ${WRKSRC}/docs/COPYING ${STAGEDIR}${DOCSDIR}/
77
78	.for afl_script in afl-cmin afl-plot afl-whatsup	78	.for afl_script in afl-cmin afl-plot afl-whatsup
79	${INSTALL_SCRIPT} ${WRKSRC}/${afl_script} ${STAGEDIR}${PREFIX}/bin/	79	${INSTALL_SCRIPT} ${WRKSRC}/${afl_script} ${STAGEDIR}${PREFIX}/bin/
80	.endfor	80	.endfor

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (afl-2.07b.tgz) = 9dd324bc3930ec1dbb44d00df8dcf8a3c8ca54b765665cc7f20b89e71d70b184	1	TIMESTAMP = 1467977424
2	SIZE (afl-2.07b.tgz) = 814913	2	SHA256 (afl-2.19b.tgz) = be12df9920c9cf68c412fb06ef5c7153f4b17e450b0195535a69663e749d8af2
		3	SIZE (afl-2.19b.tgz) = 817294




--- 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?=	install -m755
 
 # 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

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

Lines 1-4 Link Here

(-)files/patch-llvm__mode_afl-clang-fast.c (-2 / +2 lines)
1	--- llvm_mode/afl-clang-fast.c.orig 2015-09-08 22:37:25 UTC	1	--- llvm_mode/afl-clang-fast.c.orig 2016-06-07 18:07:43 UTC
2	+++ llvm_mode/afl-clang-fast.c	2	+++ llvm_mode/afl-clang-fast.c
3	@@ -106,10 +106,10 @@ static void edit_params(u32 argc, char**	3	@@ -106,10 +106,10 @@ static void edit_params(u32 argc, char**
4		4
Lines 12-15 Link Here
12	+ cc_params[0] = alt_cc ? alt_cc : (u8*)"clang37";	12	+ cc_params[0] = alt_cc ? alt_cc : (u8*)"clang37";
13	}	13	}
14		14
15	cc_params[cc_par_cnt++] = "-Xclang";	15	/* There are two ways to compile afl-clang-fast. In the traditional mode, we

Lines 5-10 Link Here

(-)pkg-plist (+2 lines)
5	%%LLVM_SUB%%%%LLVM%%bin/afl-clang-fast++	5	%%LLVM_SUB%%%%LLVM%%bin/afl-clang-fast++
6	%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-pass.so	6	%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-pass.so
7	%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt.o	7	%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt.o
		8	%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt-32.o
		9	%%LLVM_SUB%%%%LLVM%%lib/afl/afl-llvm-rt-64.o
8	%%MINIMIZE_CORPUS%%bin/afl-cmin	10	%%MINIMIZE_CORPUS%%bin/afl-cmin
9	bin/afl-fuzz	11	bin/afl-fuzz
10	bin/afl-g++	12	bin/afl-g++

Return to bug 210832

Lines 1-4 Link Here

(-)files/patch-Makefile (-6 / +8 lines)
1	--- Makefile.orig 2016-02-16 07:14:22 UTC	1	--- Makefile.orig 2016-06-24 02:35:35 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 5-15 Link Here
5	DOC_PATH = $(PREFIX)/share/doc/afl	5	DOC_PATH = $(PREFIX)/share/doc/afl
6	MISC_PATH = $(PREFIX)/share/afl	6	MISC_PATH = $(PREFIX)/share/afl
7	+INSTALL_PROGRAM?= install -s -m755	7	+INSTALL_PROGRAM?= install -s -m755
8	+INSTALL_SCRIPT?= isntall -m755	8	+INSTALL_SCRIPT?= install -m755
9		9
10	PROGS = afl-gcc afl-fuzz afl-showmap afl-tmin afl-gotcpu afl-analyze	10	# PROGS intentionally omit afl-as, which gets installed to its own dir.
11	SH_PROGS = afl-plot afl-cmin afl-whatsup	11
12	@@ -115,12 +117,13 @@ clean:	12	@@ -118,14 +120,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
Lines 20-26 Link Here
20	- if [ -f afl-qemu-trace ]; then install -m 755 afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi	20	- if [ -f afl-qemu-trace ]; then install -m 755 afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi
21	- 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	21	- 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
22	+ if [ -f afl-qemu-trace ]; then ${INSTALL_PROGRAM} afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi	22	+ if [ -f afl-qemu-trace ]; then ${INSTALL_PROGRAM} afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi
23	+ 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	23	+ 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
		24	if [ -f afl-llvm-rt-32.o ]; then set -e; install -m 755 afl-llvm-rt-32.o $${DESTDIR}$(HELPER_PATH); fi
		25	if [ -f afl-llvm-rt-64.o ]; then set -e; install -m 755 afl-llvm-rt-64.o $${DESTDIR}$(HELPER_PATH); fi
24	set -e; for i in afl-g++ afl-clang afl-clang++; do ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/$$i; done	26	set -e; for i in afl-g++ afl-clang afl-clang++; do ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/$$i; done
25	- install -m 755 afl-as $${DESTDIR}$(HELPER_PATH)	27	- install -m 755 afl-as $${DESTDIR}$(HELPER_PATH)
26	+ ${INSTALL_PROGRAM} afl-as $${DESTDIR}$(HELPER_PATH)	28	+ ${INSTALL_PROGRAM} afl-as $${DESTDIR}$(HELPER_PATH)