From owner-svn-ports-all@freebsd.org Fri Jul 14 09:38:16 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4660D9C4CE; Fri, 14 Jul 2017 09:38:16 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8DDFA83F89; Fri, 14 Jul 2017 09:38:16 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6E9cFVF086581; Fri, 14 Jul 2017 09:38:15 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6E9cF0Q086577; Fri, 14 Jul 2017 09:38:15 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201707140938.v6E9cF0Q086577@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 14 Jul 2017 09:38:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445740 - in head/security/afl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/security/afl: . files X-SVN-Commit-Revision: 445740 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2017 09:38:16 -0000 Author: tobik Date: Fri Jul 14 09:38:15 2017 New Revision: 445740 URL: https://svnweb.freebsd.org/changeset/ports/445740 Log: Update to 2.47b - Also install libdislocator Changes: http://lcamtuf.coredump.cx/afl/ChangeLog.txt Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D11599 Added: head/security/afl/files/ head/security/afl/files/Makefile.extra (contents, props changed) Modified: head/security/afl/Makefile head/security/afl/distinfo head/security/afl/pkg-plist Modified: head/security/afl/Makefile ============================================================================== --- head/security/afl/Makefile Fri Jul 14 09:14:11 2017 (r445739) +++ head/security/afl/Makefile Fri Jul 14 09:38:15 2017 (r445740) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= afl -PORTVERSION= 2.43 +PORTVERSION= 2.47 DISTVERSIONSUFFIX= b CATEGORIES= security MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/ @@ -20,6 +20,7 @@ ONLY_FOR_ARCHS_REASON= Uses binary instrumentation USES= gmake tar:tgz +ALL_TARGET= all libdislocator TEST_TARGET= test_build OPTIONS_DEFINE= DEBUG DOCS LLVM @@ -27,9 +28,13 @@ OPTIONS_DEFAULT= LLVM OPTIONS_SUB= yes LLVM_DESC= LLVM-based instrumentation + LLVM_VERSION= 40 + +LLVM_ALL_TARGET= llvm_mode LLVM_BUILD_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} LLVM_RUN_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} +LLVM_TEST_TARGET= test_llvm_mode LLVM_VARS= CC=clang${LLVM_VERSION} CXX=clang++${LLVM_VERSION} \ MAKE_ARGS=LLVM_CONFIG=llvm-config${LLVM_VERSION} @@ -51,6 +56,7 @@ post-patch: @${REINPLACE_CMD} 's@\( as_params\[0\] = afl_as ? afl_as : \)\(.*\)@\1(u8*)"${LOCALBASE}/bin/as";@' \ ${WRKSRC}/afl-as.c .endif + @${CAT} ${FILESDIR}/Makefile.extra >> ${WRKSRC}/Makefile post-patch-LLVM-on: @${REINPLACE_CMD} \ @@ -58,12 +64,6 @@ post-patch-LLVM-on: -e 's|"clang\+\+"|"clang\+\+${LLVM_VERSION}"|g' \ ${WRKSRC}/llvm_mode/afl-clang-fast.c -post-build-LLVM-on: - @(cd ${WRKSRC}/llvm_mode; ${DO_MAKE_BUILD} ${ALL_TARGET}) - -post-test-LLVM-on: - @(cd ${WRKSRC}/llvm_mode; ${DO_MAKE_BUILD} ${TEST_TARGET}) - post-install: .for script in afl-cmin afl-plot afl-whatsup ${INSTALL_SCRIPT} ${WRKSRC}/${script} ${STAGEDIR}${PREFIX}/bin @@ -72,9 +72,15 @@ post-install: .for prog in afl-analyze afl-fuzz afl-gcc afl-gotcpu afl-showmap afl-tmin @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${prog} .endfor + ${INSTALL_LIB} ${WRKSRC}/libdislocator/libdislocator.so \ + ${STAGEDIR}${PREFIX}/lib/afl + ${INSTALL_DATA} ${WRKSRC}/libdislocator/README.dislocator \ + ${STAGEDIR}${DOCSDIR} post-install-LLVM-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/afl/afl-llvm-pass.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/afl-clang-fast + ${INSTALL_DATA} ${WRKSRC}/llvm_mode/README.llvm \ + ${STAGEDIR}${DOCSDIR} .include Modified: head/security/afl/distinfo ============================================================================== --- head/security/afl/distinfo Fri Jul 14 09:14:11 2017 (r445739) +++ head/security/afl/distinfo Fri Jul 14 09:38:15 2017 (r445740) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497944263 -SHA256 (afl-2.43b.tgz) = 9db797848efa9507e509379aeffdd89b3806a79a119dfa2c4477cc5156f262cb -SIZE (afl-2.43b.tgz) = 832384 +TIMESTAMP = 1500023149 +SHA256 (afl-2.47b.tgz) = 280587271c87051d9eb6f90859eedfe4a20e54a09256ad710cadc48f40b05daf +SIZE (afl-2.47b.tgz) = 834271 Added: head/security/afl/files/Makefile.extra ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/afl/files/Makefile.extra Fri Jul 14 09:38:15 2017 (r445740) @@ -0,0 +1,10 @@ +.PHONY: libdislocator llvm_mode test_llvm_mode + +libdislocator: + $(MAKE) -C libdislocator + +llvm_mode: + $(MAKE) -C llvm_mode + +test_llvm_mode: + $(MAKE) -C llvm_mode test_build Modified: head/security/afl/pkg-plist ============================================================================== --- head/security/afl/pkg-plist Fri Jul 14 09:14:11 2017 (r445739) +++ head/security/afl/pkg-plist Fri Jul 14 09:38:15 2017 (r445740) @@ -18,12 +18,14 @@ bin/afl-tmin bin/afl-whatsup lib/afl/afl-as lib/afl/as +lib/afl/libdislocator.so %%DATADIR%%/README.dictionaries %%DATADIR%%/README.testcases %%DATADIR%%/gif.dict %%DATADIR%%/html_tags.dict %%DATADIR%%/jpeg.dict %%DATADIR%%/js.dict +%%DATADIR%%/json.dict %%DATADIR%%/pdf.dict %%DATADIR%%/png.dict %%DATADIR%%/sql.dict @@ -71,6 +73,8 @@ lib/afl/as %%DATADIR%%/others/xml/small_document.xml %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.dislocator +%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/README.llvm %%PORTDOCS%%%%DOCSDIR%%/env_variables.txt %%PORTDOCS%%%%DOCSDIR%%/historical_notes.txt %%PORTDOCS%%%%DOCSDIR%%/life_pro_tips.txt