Attachment 173885 Details for Bug 212009 – afl.diff

[patch] afl.diff

afl.diff (text/plain), 3.78 KB, created by Tobias Kortkamp on 2016-08-20 05:48:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2016-08-20 05:48:10 UTC

Size: 3.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 420499)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	afl
>-PORTVERSION=	2.29
>+PORTVERSION=	2.31
> DISTVERSIONSUFFIX=	b
> CATEGORIES=	security
> MASTER_SITES=	http://lcamtuf.coredump.cx/afl/releases/
>@@ -26,8 +26,10 @@
> 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 @@
> 		${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})
>Index: distinfo
>===================================================================
>--- distinfo	(revision 420499)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1470770986
>-SHA256 (afl-2.29b.tgz) = 5eeb5b1d7082b263ed9f89c991f694cb42b8b10b3f660a2c5504ae757c6d44e2
>-SIZE (afl-2.29b.tgz) = 827938
>+TIMESTAMP = 1471658405
>+SHA256 (afl-2.31b.tgz) = 54b91c9704867b566599242ec00f82b5d55215d8a792a58d8d62b8486867df74
>+SIZE (afl-2.31b.tgz) = 828441
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 420499)
>+++ files/patch-Makefile	(working copy)
>@@ -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
>Index: files/patch-llvm__mode_afl-clang-fast.c
>===================================================================
>--- files/patch-llvm__mode_afl-clang-fast.c	(revision 420499)
>+++ files/patch-llvm__mode_afl-clang-fast.c	(nonexistent)
>@@ -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
>
>Property changes on: files/patch-llvm__mode_afl-clang-fast.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

tobik: maintainer-approval+

Actions: View | Diff

Attachments on bug 212009: 173885 | 173902