Date: Thu, 27 Feb 2020 13:14:29 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527253 - head/security/afl++ Message-ID: <202002271314.01RDETRV006207@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Thu Feb 27 13:14:28 2020 New Revision: 527253 URL: https://svnweb.freebsd.org/changeset/ports/527253 Log: security/afl++: Update to 2.61c Changes: https://github.com/vanhauser-thc/AFLplusplus/releases/tag/2.61c Modified: head/security/afl++/Makefile head/security/afl++/distinfo head/security/afl++/pkg-plist Modified: head/security/afl++/Makefile ============================================================================== --- head/security/afl++/Makefile Thu Feb 27 13:05:50 2020 (r527252) +++ head/security/afl++/Makefile Thu Feb 27 13:14:28 2020 (r527253) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= afl -PORTVERSION= 2.60c -PORTREVISION= 1 +PORTVERSION= 2.61c CATEGORIES= security PKGNAMESUFFIX= ++ @@ -13,32 +12,38 @@ 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 powerpc64 ONLY_FOR_ARCHS_REASON= uses x86-only instrumentation or requires complete LLVM support +TEST_DEPENDS= bash:shells/bash + USES= gmake tar:tgz USE_GITHUB= yes GH_ACCOUNT= vanhauser-thc GH_PROJECT= AFLplusplus MAKE_ARGS= STRIP_CMD="${STRIP_CMD}" -ALL_TARGET= all libdislocator libtokencap +ALL_TARGET= all libtokencap INSTALL_TARGET= install-strip TEST_TARGET= test_build CONFLICTS_INSTALL= afl -OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GCC LLVM PYTHON -OPTIONS_DEFAULT= GCC LLVM PYTHON +OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GCC LIBDISLOCATOR LLVM PYTHON +OPTIONS_DEFAULT= GCC LIBDISLOCATOR LLVM PYTHON + +# libdislocator fails to build on FreeBSD 11.x +# error: typedef redefinition with different types ('struct max_align_t' vs '__max_align_t') +OPTIONS_EXCLUDE_FreeBSD_11= LIBDISLOCATOR + # On non-x86 architectures LLVM is mandatory -OPTIONS_SLAVE= ${ARCH:Namd64:Ni386:S/${ARCH}/LLVM/} -OPTIONS_SUB= yes +OPTIONS_SLAVE= ${ARCH:Namd64:Ni386:S/${ARCH}/LLVM/} +OPTIONS_SUB= yes -GCC_DESC= Build GCC plugin and afl-gcc-fast -LLVM_DESC= LLVM-based instrumentation -PYTHON_DESC= Python mutators support +GCC_DESC= Build GCC plugin and afl-gcc-fast +LIBDISLOCATOR_DESC= Abusive allocator for uncovering heap-related bugs +LLVM_DESC= LLVM-based instrumentation +PYTHON_DESC= Python mutators support GCC_BUILD_DEPENDS= gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT} GCC_RUN_DEPENDS= gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT} @@ -47,6 +52,8 @@ GCC_MAKE_ARGS= GCC=gcc${GCC_DEFAULT:S/-devel$//} \ GCC_ALL_TARGET= gcc_plugin GCC_TEST_TARGET= test_gcc_plugin +LIBDISLOCATOR_ALL_TARGET= libdislocator + LLVM_BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} LLVM_RUN_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} LLVM_MAKE_ARGS= CC=clang${LLVM_DEFAULT} \ @@ -89,12 +96,6 @@ post-patch: @${REINPLACE_CMD} '/export AFL_CC/d' ${WRKSRC}/test/test.sh @${ECHO_CMD} "include ${FILESDIR}/Makefile.extra" >> ${WRKSRC}/Makefile -post-patch-GCC-on: - @${REINPLACE_CMD} \ - -e 's|"gcc"|"gcc${GCC_DEFAULT:S/-devel$//}"|g' \ - -e 's|"g\+\+"|"g\+\+${GCC_DEFAULT:S/-devel$//}"|g' \ - ${WRKSRC}/gcc_plugin/afl-gcc-fast.c - post-patch-LLVM-on: @${REINPLACE_CMD} \ -e 's|"clang"|"clang${LLVM_DEFAULT}"|g' \ @@ -102,18 +103,23 @@ post-patch-LLVM-on: ${WRKSRC}/llvm_mode/afl-clang-fast.c post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR}/libdislocator \ + @${MKDIR} ${STAGEDIR}${DOCSDIR}/libtokencap + ${INSTALL_MAN} ${WRKSRC}/libtokencap/README.md \ ${STAGEDIR}${DOCSDIR}/libtokencap - ${INSTALL_MAN} ${WRKSRC}/libdislocator/README.dislocator.md \ - ${STAGEDIR}${DOCSDIR}/libdislocator - ${INSTALL_MAN} ${WRKSRC}/libtokencap/README.tokencap.md \ - ${STAGEDIR}${DOCSDIR}/libtokencap + @cd ${STAGEDIR}${PREFIX} && \ + ${FIND} lib/afl -name 'argvfuzz*.so' -or -name 'socketfuzz*.so' \ + >> ${TMPPLIST} post-install-GCC-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/gcc_plugin ${INSTALL_MAN} ${WRKSRC}/gcc_plugin/README.* \ ${STAGEDIR}${DOCSDIR}/gcc_plugin +post-install-LIBDISLOCATOR-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR}/libdislocator + ${INSTALL_MAN} ${WRKSRC}/libdislocator/README.md \ + ${STAGEDIR}${DOCSDIR}/libdislocator + post-install-LLVM-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/llvm_mode ${INSTALL_MAN} ${WRKSRC}/llvm_mode/README.* \ @@ -121,7 +127,7 @@ post-install-LLVM-on: post-install-PYTHON-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/python_mutators - @cd ${WRKSRC} && \ + @cd ${WRKSRC}/examples && \ ${COPYTREE_SHARE} python_mutators ${STAGEDIR}${EXAMPLESDIR} post-test: Modified: head/security/afl++/distinfo ============================================================================== --- head/security/afl++/distinfo Thu Feb 27 13:05:50 2020 (r527252) +++ head/security/afl++/distinfo Thu Feb 27 13:14:28 2020 (r527253) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577798797 -SHA256 (vanhauser-thc-AFLplusplus-2.60c_GH0.tar.gz) = 8b82c585c255f87536a7aef76da635d72675d75674dfc017dfe2e0d8d8bf397b -SIZE (vanhauser-thc-AFLplusplus-2.60c_GH0.tar.gz) = 1215299 +TIMESTAMP = 1582579005 +SHA256 (vanhauser-thc-AFLplusplus-2.61c_GH0.tar.gz) = b7559811f4182d7f9cc80d4f70742b51fd58b2e11522db72fd044e6f80f760db +SIZE (vanhauser-thc-AFLplusplus-2.61c_GH0.tar.gz) = 1268094 Modified: head/security/afl++/pkg-plist ============================================================================== --- head/security/afl++/pkg-plist Thu Feb 27 13:05:50 2020 (r527252) +++ head/security/afl++/pkg-plist Thu Feb 27 13:14:28 2020 (r527253) @@ -6,6 +6,7 @@ bin/afl-analyze %%GCC%%bin/afl-g++-fast %%GCC%%bin/afl-gcc-fast bin/afl-cmin +bin/afl-cmin.bash bin/afl-fuzz %%X86%%bin/afl-g++ %%X86%%bin/afl-gcc @@ -22,20 +23,19 @@ bin/afl-whatsup %%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/argvfuzz32.so -lib/afl/argvfuzz64.so %%X86%%lib/afl/as %%LLVM%%lib/afl/compare-transform-pass.so -lib/afl/libdislocator.so +%%LIBDISLOCATOR%%lib/afl/libdislocator.so lib/afl/libtokencap.so %%LLVM%%lib/afl/libLLVMInsTrim.so -%%X86%%lib/afl/socketfuzz32.so -lib/afl/socketfuzz64.so %%LLVM%%lib/afl/split-compares-pass.so %%LLVM%%lib/afl/split-switches-pass.so +man/man8/afl-analyze.8.gz +man/man8/afl-as.8.gz %%LLVM%%man/man8/afl-clang-fast.8.gz %%LLVM%%man/man8/afl-clang-fast++.8.gz man/man8/afl-cmin.8.gz +man/man8/afl-cmin.bash.8.gz man/man8/afl-fuzz.8.gz %%GCC%%man/man8/afl-g++-fast.8.gz %%GCC%%man/man8/afl-gcc-fast.8.gz @@ -47,7 +47,6 @@ man/man8/afl-system-config.8.gz man/man8/afl-tmin.8.gz man/man8/afl-whatsup.8.gz %%DATADIR%%/README.md -%%DATADIR%%/README.testcases %%DATADIR%%/archives/common/ar/small_archive.a %%DATADIR%%/archives/common/bzip2/small_archive.bz2 %%DATADIR%%/archives/common/cab/small_archive.cab @@ -99,31 +98,37 @@ man/man8/afl-whatsup.8.gz %%DATADIR%%/tiff.dict %%DATADIR%%/webp.dict %%DATADIR%%/xml.dict -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/QuickStartGuide.txt +%%PORTDOCS%%%%DOCSDIR%%/Changelog.md +%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md +%%PORTDOCS%%%%DOCSDIR%%/PATCHES.md +%%PORTDOCS%%%%DOCSDIR%%/QuickStartGuide.md +%%PORTDOCS%%%%DOCSDIR%%/README.MOpt.md %%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/binaryonly_fuzzing.txt -%%PORTDOCS%%%%DOCSDIR%%/custom_mutator.txt -%%PORTDOCS%%%%DOCSDIR%%/env_variables.txt -%%GCC%%%%PORTDOCS%%%%DOCSDIR%%/gcc_plugin/README.gcc.md +%%PORTDOCS%%%%DOCSDIR%%/README.radamsa.md +%%PORTDOCS%%%%DOCSDIR%%/binaryonly_fuzzing.md +%%PORTDOCS%%%%DOCSDIR%%/custom_mutator.md +%%PORTDOCS%%%%DOCSDIR%%/env_variables.md +%%GCC%%%%PORTDOCS%%%%DOCSDIR%%/gcc_plugin/README.md %%GCC%%%%PORTDOCS%%%%DOCSDIR%%/gcc_plugin/README.whitelist.md -%%PORTDOCS%%%%DOCSDIR%%/historical_notes.txt -%%PORTDOCS%%%%DOCSDIR%%/libdislocator/README.dislocator.md -%%PORTDOCS%%%%DOCSDIR%%/libtokencap/README.tokencap.md -%%PORTDOCS%%%%DOCSDIR%%/life_pro_tips.txt -%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.md +%%PORTDOCS%%%%DOCSDIR%%/historical_notes.md +%%PORTDOCS%%%%DOCSDIR%%/ideas.md +%%LIBDISLOCATOR%%%%PORTDOCS%%%%DOCSDIR%%/libdislocator/README.md +%%PORTDOCS%%%%DOCSDIR%%/libtokencap/README.md +%%PORTDOCS%%%%DOCSDIR%%/life_pro_tips.md +%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.cmplog.md %%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.instrim.md %%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.laf-intel.md +%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.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%%/notes_for_asan.md +%%PORTDOCS%%%%DOCSDIR%%/parallel_fuzzing.md +%%PORTDOCS%%%%DOCSDIR%%/perf_tips.md +%%PORTDOCS%%%%DOCSDIR%%/power_schedules.md +%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python_mutators.md +%%PORTDOCS%%%%DOCSDIR%%/sister_projects.md +%%PORTDOCS%%%%DOCSDIR%%/status_screen.md +%%PORTDOCS%%%%DOCSDIR%%/technical_details.md %%PYTHON%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python_mutators/README %%PYTHON%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python_mutators/XmlMutatorMin.py %%PYTHON%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python_mutators/common.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002271314.01RDETRV006207>