Page MenuHomeFreeBSD
Files F140161502

D11599.id30777.diff
No OneTemporary
Actions

D11599.id30777.diff
View Options

Index: head/security/afl/Makefile
===================================================================
--- head/security/afl/Makefile
+++ head/security/afl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= afl
-PORTVERSION= 2.43
+PORTVERSION= 2.47
DISTVERSIONSUFFIX= b
CATEGORIES= security
MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/
@@ -20,6 +20,7 @@
USES= gmake tar:tgz
+ALL_TARGET= all libdislocator
TEST_TARGET= test_build
OPTIONS_DEFINE= DEBUG DOCS LLVM
@@ -27,9 +28,13 @@
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}
@@ -51,6 +56,7 @@
@${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} \
@@ -58,12 +64,6 @@
-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
@@ -72,9 +72,15 @@
.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 <bsd.port.mk>
Index: head/security/afl/distinfo
===================================================================
--- head/security/afl/distinfo
+++ head/security/afl/distinfo
@@ -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
+++ head/security/afl/files/Makefile.extra
@@ -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
Index: head/security/afl/pkg-plist
===================================================================
--- head/security/afl/pkg-plist
+++ head/security/afl/pkg-plist
@@ -18,12 +18,14 @@
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
@@ -71,6 +73,8 @@
%%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

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 22, 12:23 AM (15 m, 58 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27126401
Default Alt Text
D11599.id30777.diff (3 KB)

Event Timeline