svn commit: r506192 - in head/net/spoofer: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Jul  7 19:16:14 2019
New Revision: 506192
URL: https://svnweb.freebsd.org/changeset/ports/506192

Log:
  Fix arc4random_stir on FreeBSD 13+
  
  PR:		239029
  Submitted by:	Matthew Luckie <mjl at luckie.org.nz> (maintainer)

Added:
  head/net/spoofer/files/patch-common-util.cc   (contents, props changed)
Modified:
  head/net/spoofer/Makefile

Modified: head/net/spoofer/Makefile
==============================================================================
--- head/net/spoofer/Makefile	Sun Jul  7 19:16:09 2019	(r506191)
+++ head/net/spoofer/Makefile	Sun Jul  7 19:16:14 2019	(r506192)
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	protoc:devel/protobuf
 LIB_DEPENDS=	libprotobuf-lite.so:devel/protobuf
 RUN_DEPENDS=	scamper:net/scamper
 
-USES=		compiler:c++11-lib qt:5
+USES=		compiler:c++11-lib
 
 CONFIGURE_ARGS=	--disable-development --with-protobuf=${LOCALBASE}
 GNU_CONFIGURE=	yes
@@ -27,29 +27,20 @@ OPTIONS_DEFINE=	DOCS GUI
 OPTIONS_DEFAULT=GUI
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+GUI_CONFIGURE_ENABLE=	manager
+GUI_USE=	GL=gl QT=buildtools_build,qmake_build,core,network,gui,widgets
+GUI_USES=	gl qt:5
+GUI_VARS=	USE_RC_SUBR=${PORTNAME}
 
-.if ${PORT_OPTIONS:MGUI}
-USE_QT=		buildtools_build qmake_build core network gui widgets
-USE_GL+=	gl
-USE_RC_SUBR=	${PORTNAME}
-.else
-CONFIGURE_ARGS+=	--disable-manager
-.endif
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
-post-install:
-.if ${PORT_OPTIONS:MGUI}
+do-install-GUI-on:
 .for r in 16 32 48 64 128 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${r}x${r}/apps
 	${INSTALL_DATA} ${WRKSRC}/icons/spoofer${r}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${r}x${r}/apps/spoofer.png
-.endfor
-.endif
-
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>

Added: head/net/spoofer/files/patch-common-util.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/spoofer/files/patch-common-util.cc	Sun Jul  7 19:16:14 2019	(r506192)
@@ -0,0 +1,14 @@
+--- common/util.cc.orig	2019-02-28 19:32:23 UTC
++++ common/util.cc
+@@ -180,10 +180,7 @@ void win_init(void) {
+ void spoofer_rand_stir()
+ {
+ #if defined(HAVE_ARC4RANDOM)
+- #if defined(__OpenBSD__) && !defined(HAVE_ARC4RANDOM_STIR)
+-    // On OpenBSD 5.5+, the arc4random() function is not actually the ARC4
+-    // algorithm, and there is no arc4random_stir() function.
+- #else
++ #if defined(HAVE_ARC4RANDOM_STIR)
+     arc4random_stir();
+  #endif
+ #elif defined(HAVE_SRANDOMDEV)