Index: head/security/afl++/Makefile =================================================================== --- head/security/afl++/Makefile (revision 511162) +++ head/security/afl++/Makefile (revision 511163) @@ -1,100 +1,105 @@ # Created by: Fabian Keil # $FreeBSD$ PORTNAME= afl -PORTVERSION= 2.53d.a1 +PORTVERSION= 2.54c CATEGORIES= security PKGNAMESUFFIX= ++ +PATCH_SITES= https://github.com/vanhauser-thc/AFLplusplus/commit/ +PATCHFILES= 52cbd650b7ae30c64152601fbc34350d61b3e02a.patch:-p1 \ + efa205289662db40382f9c2a4e83420438419bba.patch:-p1 + MAINTAINER= tobik@FreeBSD.org COMMENT= Fast instrumented fuzzer LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/docs/COPYING # In theory afl supports non-x86 architectures with the LLVM plugin. # This has only been run tested on aarch64 so far. ONLY_FOR_ARCHS= aarch64 amd64 i386 ONLY_FOR_ARCHS_REASON= uses x86-only instrumentation or requires complete LLVM support USES= gmake tar:tgz USE_GITHUB= yes GH_ACCOUNT= vanhauser-thc GH_PROJECT= AFLplusplus -GH_TAGNAME= 8b6a4e575978fac83155efd90d39030c84b2a755 ALL_TARGET= all libdislocator TEST_TARGET= test_build CONFLICTS_INSTALL= afl OPTIONS_DEFINE= DEBUG DOCS LLVM OPTIONS_DEFAULT= LLVM # On non-x86 architectures LLVM is mandatory OPTIONS_SLAVE= ${ARCH:Namd64:Ni386:S/${ARCH}/LLVM/} OPTIONS_SUB= yes LLVM_DESC= LLVM-based instrumentation LLVM_BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} LLVM_RUN_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} LLVM_MAKE_ARGS= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} LLVM_ALL_TARGET= llvm_mode LLVM_TEST_TARGET= test_llvm_mode +LLVM_BINARY_ALIAS= llvm-config=llvm-config${LLVM_DEFAULT} LLVM_VARS= CC=clang${LLVM_DEFAULT} \ CXX=clang++${LLVM_DEFAULT} .include .if ${ARCH} == "i386" || ${ARCH} == "amd64" PLIST_SUB+= X86="" .else MAKE_ARGS+= AFL_NO_X86=1 PLIST_SUB+= X86="@comment " .endif .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 + ${WRKSRC}/src/afl-as.c .endif @${CAT} ${FILESDIR}/Makefile.extra >> ${WRKSRC}/Makefile post-patch-LLVM-on: @${REINPLACE_CMD} \ -e 's|"clang"|"clang${LLVM_DEFAULT}"|g' \ -e 's|"clang\+\+"|"clang\+\+${LLVM_DEFAULT}"|g' \ ${WRKSRC}/llvm_mode/afl-clang-fast.c 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} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/libdislocator + ${INSTALL_MAN} ${WRKSRC}/libdislocator/README.md \ + ${STAGEDIR}${DOCSDIR}/libdislocator post-install-LLVM-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/afl/*.so \ ${STAGEDIR}${PREFIX}/bin/afl-clang-fast - ${INSTALL_MAN} ${WRKSRC}/llvm_mode/README.laf-intel \ - ${WRKSRC}/llvm_mode/README.llvm \ - ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/llvm_mode + ${INSTALL_MAN} ${WRKSRC}/llvm_mode/README.* \ + ${STAGEDIR}${DOCSDIR}/llvm_mode .include Index: head/security/afl++/distinfo =================================================================== --- head/security/afl++/distinfo (revision 511162) +++ head/security/afl++/distinfo (revision 511163) @@ -1,3 +1,7 @@ -TIMESTAMP = 1565263563 -SHA256 (vanhauser-thc-AFLplusplus-2.53d.a1-8b6a4e575978fac83155efd90d39030c84b2a755_GH0.tar.gz) = 07fffb04760637c4537e396c12d7cccf4ba061330fc36a4133123712b22300c9 -SIZE (vanhauser-thc-AFLplusplus-2.53d.a1-8b6a4e575978fac83155efd90d39030c84b2a755_GH0.tar.gz) = 936061 +TIMESTAMP = 1567675622 +SHA256 (vanhauser-thc-AFLplusplus-2.54c_GH0.tar.gz) = cbf691b5a0287b992f3c417c16ddae4ca7cae0fa9f8132bda836456096522c14 +SIZE (vanhauser-thc-AFLplusplus-2.54c_GH0.tar.gz) = 958461 +SHA256 (52cbd650b7ae30c64152601fbc34350d61b3e02a.patch) = 596075efa9bf07a027737c25feb6c7b9d73d7690b885d27b3e16aa79f8532a10 +SIZE (52cbd650b7ae30c64152601fbc34350d61b3e02a.patch) = 3312 +SHA256 (efa205289662db40382f9c2a4e83420438419bba.patch) = 1d25895b5e8c03aff3fcd69bbb719481545d9ed04cdd555c0855e645e8aea77a +SIZE (efa205289662db40382f9c2a4e83420438419bba.patch) = 2074 Index: head/security/afl++/files/Makefile.extra =================================================================== --- head/security/afl++/files/Makefile.extra (revision 511162) +++ head/security/afl++/files/Makefile.extra (revision 511163) @@ -1,10 +1,10 @@ .PHONY: libdislocator llvm_mode test_llvm_mode libdislocator: - $(MAKE) -C libdislocator + $(MAKE) -C libdislocator CFLAGS="-I../include ${CFLAGS}" llvm_mode: $(MAKE) -C llvm_mode test_llvm_mode: $(MAKE) -C llvm_mode test_build Index: head/security/afl++/pkg-plist =================================================================== --- head/security/afl++/pkg-plist (revision 511162) +++ head/security/afl++/pkg-plist (revision 511163) @@ -1,97 +1,109 @@ bin/afl-analyze %%X86%%bin/afl-clang %%X86%%bin/afl-clang++ %%LLVM%%bin/afl-clang-fast %%LLVM%%bin/afl-clang-fast++ bin/afl-cmin bin/afl-fuzz %%X86%%bin/afl-g++ %%X86%%bin/afl-gcc bin/afl-gotcpu bin/afl-plot bin/afl-showmap -@comment bin/afl-system-config +bin/afl-system-config bin/afl-tmin bin/afl-whatsup %%X86%%lib/afl/afl-as %%LLVM%%lib/afl/afl-llvm-pass.so %%X86%%%%LLVM%%lib/afl/afl-llvm-rt-32.o %%LLVM%%lib/afl/afl-llvm-rt-64.o %%LLVM%%lib/afl/afl-llvm-rt.o %%X86%%lib/afl/as %%LLVM%%lib/afl/compare-transform-pass.so lib/afl/libdislocator.so %%LLVM%%lib/afl/libLLVMInsTrim.so %%LLVM%%lib/afl/split-compares-pass.so %%LLVM%%lib/afl/split-switches-pass.so +man/man8/afl-cmin.8.gz +man/man8/afl-fuzz.8.gz +man/man8/afl-gcc.8.gz +man/man8/afl-gotcpu.8.gz +man/man8/afl-plot.8.gz +man/man8/afl-showmap.8.gz +man/man8/afl-system-config.8.gz +man/man8/afl-tmin.8.gz +man/man8/afl-whatsup.8.gz %%DATADIR%%/README.dictionaries %%DATADIR%%/README.testcases %%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%%/gif.dict %%DATADIR%%/html_tags.dict %%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%%/jpeg.dict %%DATADIR%%/js.dict %%DATADIR%%/json.dict %%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 %%DATADIR%%/pdf.dict %%DATADIR%%/png.dict %%DATADIR%%/sql.dict %%DATADIR%%/tiff.dict %%DATADIR%%/webp.dict %%DATADIR%%/xml.dict %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/QuickStartGuide.txt %%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/README.dislocator -%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/README.laf-intel -%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/README.llvm %%PORTDOCS%%%%DOCSDIR%%/binaryonly_fuzzing.txt +%%PORTDOCS%%%%DOCSDIR%%/custom_mutator.txt %%PORTDOCS%%%%DOCSDIR%%/env_variables.txt %%PORTDOCS%%%%DOCSDIR%%/historical_notes.txt +%%PORTDOCS%%%%DOCSDIR%%/libdislocator/README.md %%PORTDOCS%%%%DOCSDIR%%/life_pro_tips.txt +%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.md +%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.instrim.md +%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.laf-intel.md +%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.neverzero.md +%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.whitelist.md %%PORTDOCS%%%%DOCSDIR%%/notes_for_asan.txt %%PORTDOCS%%%%DOCSDIR%%/parallel_fuzzing.txt %%PORTDOCS%%%%DOCSDIR%%/perf_tips.txt %%PORTDOCS%%%%DOCSDIR%%/power_schedules.txt %%PORTDOCS%%%%DOCSDIR%%/python_mutators.txt %%PORTDOCS%%%%DOCSDIR%%/sister_projects.txt %%PORTDOCS%%%%DOCSDIR%%/status_screen.txt %%PORTDOCS%%%%DOCSDIR%%/technical_details.txt -%%PORTDOCS%%%%DOCSDIR%%/unicorn_mode.txt