Index: head/security/afl/Makefile =================================================================== --- head/security/afl/Makefile (revision 445739) +++ head/security/afl/Makefile (revision 445740) @@ -1,80 +1,86 @@ # Created by: Fabian Keil # $FreeBSD$ PORTNAME= afl -PORTVERSION= 2.43 +PORTVERSION= 2.47 DISTVERSIONSUFFIX= b CATEGORIES= security MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/ MAINTAINER= tobik@FreeBSD.org COMMENT= Fast instrumented fuzzer LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/docs/COPYING # In theory afl supports other architectures with the LLVM plugin. # It has to be compiled with AFL_NO_X86=1 in that case. ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Uses binary instrumentation USES= gmake tar:tgz +ALL_TARGET= all libdislocator TEST_TARGET= test_build OPTIONS_DEFINE= DEBUG DOCS LLVM 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} .include .if ${ARCH} == "i386" # Clang i386 emits .cfi_sections which base as(1) doesn't understand BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils .endif post-patch: # Disable the instrumentation tests to make sure building packages in # jails works by default. afl needs shmget() which usually isn't # available in jails. @${REINPLACE_CMD} 's@^\(all.*\) test_build@\1@' \ ${WRKSRC}/Makefile ${WRKSRC}/llvm_mode/Makefile .if ${ARCH} == "i386" @${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} \ -e 's|"clang"|"clang${LLVM_VERSION}"|g' \ -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 .endfor @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/afl/afl-as .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 Index: head/security/afl/distinfo =================================================================== --- head/security/afl/distinfo (revision 445739) +++ head/security/afl/distinfo (revision 445740) @@ -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 Index: head/security/afl/files/Makefile.extra =================================================================== --- head/security/afl/files/Makefile.extra (nonexistent) +++ head/security/afl/files/Makefile.extra (revision 445740) @@ -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 Property changes on: head/security/afl/files/Makefile.extra ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/afl/pkg-plist =================================================================== --- head/security/afl/pkg-plist (revision 445739) +++ head/security/afl/pkg-plist (revision 445740) @@ -1,83 +1,87 @@ bin/afl-analyze bin/afl-clang bin/afl-clang++ %%LLVM%%bin/afl-clang-fast %%LLVM%%bin/afl-clang-fast++ %%LLVM%%lib/afl/afl-llvm-pass.so %%LLVM%%lib/afl/afl-llvm-rt.o %%LLVM%%lib/afl/afl-llvm-rt-32.o %%LLVM%%lib/afl/afl-llvm-rt-64.o bin/afl-cmin bin/afl-fuzz bin/afl-g++ bin/afl-gcc bin/afl-gotcpu bin/afl-plot bin/afl-showmap 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 %%DATADIR%%/tiff.dict %%DATADIR%%/webp.dict %%DATADIR%%/xml.dict %%DATADIR%%/archives/common/ar/small_archive.a %%DATADIR%%/archives/common/bzip2/small_archive.bz2 %%DATADIR%%/archives/common/cab/small_archive.cab %%DATADIR%%/archives/common/compress/small_archive.Z %%DATADIR%%/archives/common/cpio/small_archive.cpio %%DATADIR%%/archives/common/gzip/small_archive.gz %%DATADIR%%/archives/common/lzo/small_archive.lzo %%DATADIR%%/archives/common/rar/small_archive.rar %%DATADIR%%/archives/common/tar/small_archive.tar %%DATADIR%%/archives/common/xz/small_archive.xz %%DATADIR%%/archives/common/zip/small_archive.zip %%DATADIR%%/archives/exotic/arj/small_archive.arj %%DATADIR%%/archives/exotic/lha/small_archive.lha %%DATADIR%%/archives/exotic/lrzip/small_archive.lrz %%DATADIR%%/archives/exotic/lzip/small_archive.lz %%DATADIR%%/archives/exotic/lzma/small_archive.lzma %%DATADIR%%/archives/exotic/rzip/small_archive.rz %%DATADIR%%/archives/exotic/zoo/small_archive.zoo %%DATADIR%%/images/bmp/not_kitty.bmp %%DATADIR%%/images/gif/not_kitty.gif %%DATADIR%%/images/ico/not_kitty.ico %%DATADIR%%/images/jp2/not_kitty.jp2 %%DATADIR%%/images/jpeg/not_kitty.jpg %%DATADIR%%/images/jxr/not_kitty.jxr %%DATADIR%%/images/png/not_kitty.png %%DATADIR%%/images/png/not_kitty_alpha.png %%DATADIR%%/images/png/not_kitty_gamma.png %%DATADIR%%/images/png/not_kitty_icc.png %%DATADIR%%/images/tiff/not_kitty.tiff %%DATADIR%%/images/webp/not_kitty.webp %%DATADIR%%/multimedia/h264/small_movie.mp4 %%DATADIR%%/others/elf/small_exec.elf %%DATADIR%%/others/js/small_script.js %%DATADIR%%/others/pcap/small_capture.pcap %%DATADIR%%/others/pdf/small.pdf %%DATADIR%%/others/rtf/small_document.rtf %%DATADIR%%/others/sql/simple_queries.sql %%DATADIR%%/others/text/hello_world.txt %%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 %%PORTDOCS%%%%DOCSDIR%%/notes_for_asan.txt %%PORTDOCS%%%%DOCSDIR%%/parallel_fuzzing.txt %%PORTDOCS%%%%DOCSDIR%%/perf_tips.txt %%PORTDOCS%%%%DOCSDIR%%/sister_projects.txt %%PORTDOCS%%%%DOCSDIR%%/status_screen.txt %%PORTDOCS%%%%DOCSDIR%%/technical_details.txt %%PORTDOCS%%%%DOCSDIR%%/QuickStartGuide.txt