Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Dec 2019 16:21:46 +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: r521642 - in head/security/afl++: . files
Message-ID:  <201912311621.xBVGLkrc056855@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Tue Dec 31 16:21:45 2019
New Revision: 521642
URL: https://svnweb.freebsd.org/changeset/ports/521642

Log:
  security/afl++: Update to 2.60c
  
  Changes:	https://github.com/vanhauser-thc/AFLplusplus/releases/tag/2.60c

Modified:
  head/security/afl++/Makefile
  head/security/afl++/distinfo
  head/security/afl++/files/Makefile.extra
  head/security/afl++/pkg-plist

Modified: head/security/afl++/Makefile
==============================================================================
--- head/security/afl++/Makefile	Tue Dec 31 16:20:26 2019	(r521641)
+++ head/security/afl++/Makefile	Tue Dec 31 16:21:45 2019	(r521642)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	afl
-PORTVERSION=	2.59c
+PORTVERSION=	2.60c
 CATEGORIES=	security
 PKGNAMESUFFIX=	++
 
@@ -39,21 +39,21 @@ GCC_DESC=	Build GCC plugin and afl-gcc-fast
 LLVM_DESC=	LLVM-based instrumentation
 PYTHON_DESC=	Python mutators support
 
-GCC_BUILD_DEPENDS=	gcc${GCC_DEFAULT}:lang/gcc${GCC_DEFAULT}
-GCC_RUN_DEPENDS=	gcc${GCC_DEFAULT}:lang/gcc${GCC_DEFAULT}
-GCC_MAKE_ARGS=		GCC=gcc${GCC_DEFAULT} \
-			GXX=g++${GCC_DEFAULT}
+GCC_BUILD_DEPENDS=	gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
+GCC_RUN_DEPENDS=	gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
+GCC_MAKE_ARGS=		GCC=gcc${GCC_DEFAULT:S/-devel$//} \
+			GXX=g++${GCC_DEFAULT:S/-devel$//}
 GCC_ALL_TARGET=		gcc_plugin
 GCC_TEST_TARGET=	test_gcc_plugin
 
 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_MAKE_ARGS=		CC=clang${LLVM_DEFAULT} \
+			CXX=clang++${LLVM_DEFAULT} \
+			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}
 
 PYTHON_USES=		gettext-runtime python:3.7
 PYTHON_MAKE_ARGS_OFF=	PYTHON_INCLUDE=/nonexistent
@@ -90,8 +90,8 @@ post-patch:
 
 post-patch-GCC-on:
 	@${REINPLACE_CMD} \
-		-e 's|"gcc"|"gcc${GCC_DEFAULT}"|g' \
-		-e 's|"g\+\+"|"g\+\+${GCC_DEFAULT}"|g' \
+		-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:

Modified: head/security/afl++/distinfo
==============================================================================
--- head/security/afl++/distinfo	Tue Dec 31 16:20:26 2019	(r521641)
+++ head/security/afl++/distinfo	Tue Dec 31 16:21:45 2019	(r521642)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576666209
-SHA256 (vanhauser-thc-AFLplusplus-2.59c_GH0.tar.gz) = 858c81fa6221ef2b8b2a8977a70dc86c2624c23230d0629b3037130fd0d8d685
-SIZE (vanhauser-thc-AFLplusplus-2.59c_GH0.tar.gz) = 1211443
+TIMESTAMP = 1577798797
+SHA256 (vanhauser-thc-AFLplusplus-2.60c_GH0.tar.gz) = 8b82c585c255f87536a7aef76da635d72675d75674dfc017dfe2e0d8d8bf397b
+SIZE (vanhauser-thc-AFLplusplus-2.60c_GH0.tar.gz) = 1215299

Modified: head/security/afl++/files/Makefile.extra
==============================================================================
--- head/security/afl++/files/Makefile.extra	Tue Dec 31 16:20:26 2019	(r521641)
+++ head/security/afl++/files/Makefile.extra	Tue Dec 31 16:21:45 2019	(r521642)
@@ -4,7 +4,8 @@ install-strip: install
 	@cd ${DESTDIR}${BIN_PATH} && ${STRIP_CMD} ${PROGS}
 	@-${STRIP_CMD} ${DESTDIR}${BIN_PATH}/afl-clang-fast
 	@-${STRIP_CMD} ${DESTDIR}${BIN_PATH}/afl-gcc-fast
-	@cd ${DESTDIR}${HELPER_PATH} && ${STRIP_CMD} afl-as *.so
+# XXX: strip(1) trips up when stripping all things in HELPER_PATH in one go?
+	@cd ${DESTDIR}${HELPER_PATH} && for f in afl-as *.so; do ${STRIP_CMD} $${f}; done
 
 libdislocator:
 	$(MAKE) -C libdislocator CFLAGS="-I../include ${CFLAGS}"

Modified: head/security/afl++/pkg-plist
==============================================================================
--- head/security/afl++/pkg-plist	Tue Dec 31 16:20:26 2019	(r521641)
+++ head/security/afl++/pkg-plist	Tue Dec 31 16:21:45 2019	(r521642)
@@ -22,11 +22,15 @@ 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
 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
 %%LLVM%%man/man8/afl-clang-fast.8.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912311621.xBVGLkrc056855>