Attachment 172236 Details for Bug 210832 – afl.diff

[patch] afl.diff

afl.diff (text/plain), 4.53 KB, created by Tobias Kortkamp on 2016-07-08 11:45:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2016-07-08 11:45:52 UTC

Size: 4.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 418061)
>+++ Makefile	(working copy)
>@@ -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-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
>Index: distinfo
>===================================================================
>--- distinfo	(revision 418061)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 418061)
>+++ files/patch-Makefile	(working copy)
>@@ -1,4 +1,4 @@
>---- 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
>@@ -5,11 +5,11 @@
>  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)
>Index: files/patch-llvm__mode_afl-clang-fast.c
>===================================================================
>--- files/patch-llvm__mode_afl-clang-fast.c	(revision 418061)
>+++ files/patch-llvm__mode_afl-clang-fast.c	(working copy)
>@@ -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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 418061)
>+++ pkg-plist	(working copy)
>@@ -5,6 +5,8 @@
> %%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++

Flags:

tobik: maintainer-approval+

Actions: View | Diff

Attachments on bug 210832: 172125 | 172236