From owner-svn-ports-head@freebsd.org Fri Aug 26 06:06:17 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 59491BC6815; Fri, 26 Aug 2016 06:06:17 +0000 (UTC) (envelope-from pi@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 34BF41653; Fri, 26 Aug 2016 06:06:17 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7Q66GTT058576; Fri, 26 Aug 2016 06:06:16 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7Q66GfX058573; Fri, 26 Aug 2016 06:06:16 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201608260606.u7Q66GfX058573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Fri, 26 Aug 2016 06:06:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420891 - 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: Fri, 26 Aug 2016 06:06:17 -0000 Author: pi Date: Fri Aug 26 06:06:15 2016 New Revision: 420891 URL: https://svnweb.freebsd.org/changeset/ports/420891 Log: security/afl: 2.29 -> 2.32 - Adds a new LLVM_VERSION knob to control the LLVM version the port uses when using the LLVM option - Switches the default LLVM version from 3.7 to 3.8 PR: 212009 Submitted by: Tobias Kortkamp (maintainer) Deleted: head/security/afl/files/patch-llvm__mode_afl-clang-fast.c Modified: head/security/afl/Makefile head/security/afl/distinfo head/security/afl/files/patch-Makefile Modified: head/security/afl/Makefile ============================================================================== --- head/security/afl/Makefile Fri Aug 26 06:00:47 2016 (r420890) +++ head/security/afl/Makefile Fri Aug 26 06:06:15 2016 (r420891) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= afl -PORTVERSION= 2.29 +PORTVERSION= 2.32 DISTVERSIONSUFFIX= b CATEGORIES= security MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/ @@ -26,8 +26,10 @@ OPTIONS_SUB= yes 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 @@ -61,13 +63,19 @@ post-patch: ${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}) Modified: head/security/afl/distinfo ============================================================================== --- head/security/afl/distinfo Fri Aug 26 06:00:47 2016 (r420890) +++ head/security/afl/distinfo Fri Aug 26 06:06:15 2016 (r420891) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470770986 -SHA256 (afl-2.29b.tgz) = 5eeb5b1d7082b263ed9f89c991f694cb42b8b10b3f660a2c5504ae757c6d44e2 -SIZE (afl-2.29b.tgz) = 827938 +TIMESTAMP = 1471758195 +SHA256 (afl-2.32b.tgz) = 3d08b79e28c2075aec20aa6e6240f9f6fb7af3d29200b498e908f8b3960a7b79 +SIZE (afl-2.32b.tgz) = 828474 Modified: head/security/afl/files/patch-Makefile ============================================================================== --- head/security/afl/files/patch-Makefile Fri Aug 26 06:00:47 2016 (r420890) +++ head/security/afl/files/patch-Makefile Fri Aug 26 06:06:15 2016 (r420891) @@ -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