From owner-svn-ports-head@freebsd.org Sat Jul 9 12:52:42 2016 Return-Path: Delivered-To: svn-ports-head@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 0AB79B75CA2; Sat, 9 Jul 2016 12:52:42 +0000 (UTC) (envelope-from junovitch@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 BF9001955; Sat, 9 Jul 2016 12:52:41 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u69CqeQq020897; Sat, 9 Jul 2016 12:52:40 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u69CqeQt020892; Sat, 9 Jul 2016 12:52:40 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201607091252.u69CqeQt020892@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sat, 9 Jul 2016 12:52:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418275 - in head/security/afl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2016 12:52:42 -0000 Author: junovitch Date: Sat Jul 9 12:52:40 2016 New Revision: 418275 URL: https://svnweb.freebsd.org/changeset/ports/418275 Log: security/afl: update 2.07b -> 2.19b PR: 210832 Submitted by: Tobias Kortkamp (maintainer) Modified: head/security/afl/Makefile head/security/afl/distinfo head/security/afl/files/patch-Makefile head/security/afl/files/patch-llvm__mode_afl-clang-fast.c head/security/afl/pkg-plist Modified: head/security/afl/Makefile ============================================================================== --- head/security/afl/Makefile Sat Jul 9 12:44:39 2016 (r418274) +++ head/security/afl/Makefile Sat Jul 9 12:52:40 2016 (r418275) @@ -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-build-LLVM-on: 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 Modified: head/security/afl/distinfo ============================================================================== --- head/security/afl/distinfo Sat Jul 9 12:44:39 2016 (r418274) +++ head/security/afl/distinfo Sat Jul 9 12:52:40 2016 (r418275) @@ -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 Modified: head/security/afl/files/patch-Makefile ============================================================================== --- head/security/afl/files/patch-Makefile Sat Jul 9 12:44:39 2016 (r418274) +++ head/security/afl/files/patch-Makefile Sat Jul 9 12:52:40 2016 (r418275) @@ -1,15 +1,15 @@ ---- 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 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) Modified: head/security/afl/files/patch-llvm__mode_afl-clang-fast.c ============================================================================== --- head/security/afl/files/patch-llvm__mode_afl-clang-fast.c Sat Jul 9 12:44:39 2016 (r418274) +++ head/security/afl/files/patch-llvm__mode_afl-clang-fast.c Sat Jul 9 12:52:40 2016 (r418275) @@ -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 Modified: head/security/afl/pkg-plist ============================================================================== --- head/security/afl/pkg-plist Sat Jul 9 12:44:39 2016 (r418274) +++ head/security/afl/pkg-plist Sat Jul 9 12:52:40 2016 (r418275) @@ -5,6 +5,8 @@ bin/afl-clang++ %%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++