Attachment #238374 for bug #268017

View | Details | Raw Unified | Return to bug 268017
Collapse All | Expand All




GH_ACCOUNT=	greenbone
GH_PROJECT=	${PORTNAME}-scanner

USES=		bison cmake gnome pkgconfig python:3.5+ ssl
USE_GNOME=	glib20

USERS=		gvm

.include <bsd.port.pre.mk>

post-patch:
	@${REINPLACE_CMD} -e 's|g_pattern_match_string|g_pattern_spec_match_string|g' ${WRKSRC}/misc/strutils.c
.if ${OSVERSION} < 1301000
	@${REINPLACE_CMD} -e 's|-Wunused-but-set-variable|-Wunused-variable|g' ${WRKSRC}/nasl/nasl_grammar.y
.endif
	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>||g' ${WRKSRC}/src/nasl_plugins.c
	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>|#include <unistd.h>|g' ${WRKSRC}//src/pluginload.c

post-install:




--- src/attack.c.orig	2022-07-18 09:07:38 UTC
+++ src/attack.c
@@ -40,7 +40,7 @@
 #include "utils.h"
 
 #include <arpa/inet.h> /* for inet_ntoa() */
-#include <bsd/unistd.h>
+
 #include <errno.h> /* for errno() */
 #include <fcntl.h>
 #include <glib.h>
@@ -53,6 +53,7 @@
 #include <gvm/util/nvticache.h> /* for nvticache_t */
 #include <pthread.h>
 #include <stdlib.h>   /* for exit() */
+#include <stdint.h>   /* for intmax_t */
 #include <string.h>   /* for strlen() */
 #include <sys/wait.h> /* for waitpid() */
 #include <unistd.h>   /* for close() */
@@ -1493,13 +1494,13 @@ stop:
 
   gettimeofday (&now, NULL);
   if (test_alive_hosts_only)
-    g_message ("Vulnerability scan %s finished in %ld seconds: "
+    g_message ("Vulnerability scan %s finished in %jd seconds: "
                "%d alive hosts of %d",
-               globals->scan_id, now.tv_sec - then.tv_sec,
+               globals->scan_id, (intmax_t)(now.tv_sec - then.tv_sec),
                gvm_hosts_count (alive_hosts_list), gvm_hosts_count (hosts));
   else
-    g_message ("Vulnerability scan %s finished in %ld seconds: %d hosts",
-               globals->scan_id, now.tv_sec - then.tv_sec,
+    g_message ("Vulnerability scan %s finished in %jd seconds: %d hosts",
+               globals->scan_id, (intmax_t)(now.tv_sec - then.tv_sec),
                gvm_hosts_count (hosts));
 
   gvm_hosts_free (hosts);

Return to bug 268017

Lines 29-35 USE_GITHUB= yes Link Here

(-)b/security/openvas/Makefile (-3 / +2 lines)
29	GH_ACCOUNT= greenbone	29	GH_ACCOUNT= greenbone
30	GH_PROJECT= ${PORTNAME}-scanner	30	GH_PROJECT= ${PORTNAME}-scanner
31		31
32	USES= bison cmake gnome pkgconfig python:3.5+	32	USES= bison cmake gnome pkgconfig python:3.5+ ssl
33	USE_GNOME= glib20	33	USE_GNOME= glib20
34		34
35	USERS= gvm	35	USERS= gvm
Lines 38-48 GROUPS= ${USERS} Link Here
38	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
39		39
40	post-patch:	40	post-patch:
41	@${REINPLACE_CMD} -e 's\|g_pattern_match_string\|g_pattern_spec_match_string\|g' ${WRKSRC}/misc/strutils.c
42	.if ${OSVERSION} < 1301000	41	.if ${OSVERSION} < 1301000
43	@${REINPLACE_CMD} -e 's\|-Wunused-but-set-variable\|-Wunused-variable\|g' ${WRKSRC}/nasl/nasl_grammar.y	42	@${REINPLACE_CMD} -e 's\|-Wunused-but-set-variable\|-Wunused-variable\|g' ${WRKSRC}/nasl/nasl_grammar.y
44	.endif	43	.endif
45	@${REINPLACE_CMD} -e 's\|#include <bsd/unistd.h>\|\|g' ${WRKSRC}/src/attack.c ${WRKSRC}/src/nasl_plugins.c	44	@${REINPLACE_CMD} -e 's\|#include <bsd/unistd.h>\|\|g' ${WRKSRC}/src/nasl_plugins.c
46	@${REINPLACE_CMD} -e 's\|#include <bsd/unistd.h>\|#include <unistd.h>\|g' ${WRKSRC}//src/pluginload.c	45	@${REINPLACE_CMD} -e 's\|#include <bsd/unistd.h>\|#include <unistd.h>\|g' ${WRKSRC}//src/pluginload.c
47		46
48	post-install:	47	post-install:

Added Link Here

(-)b/security/openvas/files/patch-src_attack.c (-1 / +37 lines)
0	-	1	--- src/attack.c.orig 2022-07-18 09:07:38 UTC
		2	+++ src/attack.c
		3	@@ -40,7 +40,7 @@
		4	#include "utils.h"
		5
		6	#include <arpa/inet.h> /* for inet_ntoa() */
		7	-#include <bsd/unistd.h>
		8	+
		9	#include <errno.h> /* for errno() */
		10	#include <fcntl.h>
		11	#include <glib.h>
		12	@@ -53,6 +53,7 @@
		13	#include <gvm/util/nvticache.h> /* for nvticache_t */
		14	#include <pthread.h>
		15	#include <stdlib.h> /* for exit() */
		16	+#include <stdint.h> /* for intmax_t */
		17	#include <string.h> /* for strlen() */
		18	#include <sys/wait.h> /* for waitpid() */
		19	#include <unistd.h> /* for close() */
		20	@@ -1493,13 +1494,13 @@ stop:
		21
		22	gettimeofday (&now, NULL);
		23	if (test_alive_hosts_only)
		24	- g_message ("Vulnerability scan %s finished in %ld seconds: "
		25	+ g_message ("Vulnerability scan %s finished in %jd seconds: "
		26	"%d alive hosts of %d",
		27	- globals->scan_id, now.tv_sec - then.tv_sec,
		28	+ globals->scan_id, (intmax_t)(now.tv_sec - then.tv_sec),
		29	gvm_hosts_count (alive_hosts_list), gvm_hosts_count (hosts));
		30	else
		31	- g_message ("Vulnerability scan %s finished in %ld seconds: %d hosts",
		32	- globals->scan_id, now.tv_sec - then.tv_sec,
		33	+ g_message ("Vulnerability scan %s finished in %jd seconds: %d hosts",
		34	+ globals->scan_id, (intmax_t)(now.tv_sec - then.tv_sec),
		35	gvm_hosts_count (hosts));
		36
		37	gvm_hosts_free (hosts);