Attachment #236970 for bug #266725

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




PORTNAME=	gvm
DISTVERSION=	22.4.0
DISTVERSIONPREFIX=	v
DISTVERSION=	22.4.0
CATEGORIES=	security
PKGNAMESUFFIX=	-libs

MAINTAINER=	acm@FreeBSD.org
COMMENT=	Libraries module for the GVM solution
WWW=		https://github.com/greenbone/gvm-libs

LICENSE=	GPLv2+

		libpaho-mqtt3a.so:net/libpaho-mqtt3
RUN_DEPENDS=	doxygen>0:devel/doxygen

USES=		cmake gnome pkgconfig
USE_GITHUB=	yes
GH_ACCOUNT=	greenbone
GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}

USES=		cmake gnome pkgconfig
USE_GNOME=	glib20 libxml2
USE_LDCONFIG=	yes





--- CMakeLists.txt.orig	2022-07-18 08:40:56 UTC
+++ CMakeLists.txt
@@ -136,7 +136,7 @@ if (SYSCONF_INSTALL_DIR)
 endif (SYSCONF_INSTALL_DIR)
 
 if (NOT SYSCONFDIR)

 endif (NOT SYSCONFDIR)
 
 if (NOT EXEC_PREFIX)
@@ -176,7 +176,7 @@ if (NOT DATADIR)
 endif (NOT DATADIR)
 
 if (NOT GVM_RUN_DIR)

+  set (GVM_RUN_DIR  "${LOCALSTATEDIR}/run/gvm")
 endif (NOT GVM_RUN_DIR)
 
 if (NOT GVM_SYSCONF_DIR)
@@ -185,7 +185,7 @@ endif (NOT GVM_SYSCONF_DIR)
 
 
 if (NOT REDIS_SOCKET_PATH)

 endif ()
 
 add_definitions (-DREDIS_SOCKET_PATH="${REDIS_SOCKET_PATH}")
@@ -208,7 +208,6 @@ set (
     -std=c11 \
     -Wall \
     -Wextra \
-    -Werror \
     -Wpedantic \
     -Wmissing-prototypes \
     -Wshadow \




--- boreas/alivedetection.c.orig	2022-07-18 08:40:56 UTC
+++ boreas/alivedetection.c
@@ -39,7 +39,12 @@
 #include <netinet/ip6.h>
 #include <netinet/ip_icmp.h>

 #include <pcap.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -290,8 +295,8 @@ scan (alive_test_t alive_test)
 
   gettimeofday (&end_time, NULL);
 
-  g_message ("Alive scan %s finished in %ld seconds: %d alive hosts of %d.",
-             scan_id, end_time.tv_sec - start_time.tv_sec,
+  g_message ("Alive scan %s finished in %lld seconds: %d alive hosts of %d.",
+             scan_id, (long long)(end_time.tv_sec - start_time.tv_sec),
              g_hash_table_size (scanner.hosts_data->alivehosts),
              number_of_targets);
   g_free (scan_id);




--- boreas/cli.c.orig	2022-09-30 08:26:50 UTC
+++ boreas/cli.c
@@ -162,8 +162,8 @@ run_cli_scan (scanner_t *scanner, alive_test_t alive_t
                                            scanner->hosts_data->alivehosts);
   gettimeofday (&end_time, NULL);
   if (scanner->print_results == 1)
-    printf ("Alive scan finished in %ld seconds: %d alive hosts of %d.\n",
-            end_time.tv_sec - start_time.tv_sec,
+    printf ("Alive scan finished in %lld seconds: %d alive hosts of %d.\n",
+            (long long)(end_time.tv_sec - start_time.tv_sec),
             number_of_targets - number_of_dead_hosts, number_of_targets);
 
   return error;

Return to bug 266725

Lines 1-11 Link Here

(-)b/security/gvm-libs/Makefile (-4 / +3 lines)
1	PORTNAME= gvm	1	PORTNAME= gvm
2	DISTVERSION= 22.4.0
3	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
		3	DISTVERSION= 22.4.0
4	CATEGORIES= security	4	CATEGORIES= security
5	PKGNAMESUFFIX= -libs	5	PKGNAMESUFFIX= -libs
6		6
7	MAINTAINER= acm@FreeBSD.org	7	MAINTAINER= acm@FreeBSD.org
8	COMMENT= libraries module for the GVM solution	8	COMMENT= Libraries module for the GVM solution
9	WWW= https://github.com/greenbone/gvm-libs	9	WWW= https://github.com/greenbone/gvm-libs
10		10
11	LICENSE= GPLv2+	11	LICENSE= GPLv2+
Lines 23-33 LIB_DEPENDS= libassuan.so:security/libassuan \ Link Here
23	libpaho-mqtt3a.so:net/libpaho-mqtt3	23	libpaho-mqtt3a.so:net/libpaho-mqtt3
24	RUN_DEPENDS= doxygen>0:devel/doxygen	24	RUN_DEPENDS= doxygen>0:devel/doxygen
25		25
		26	USES= cmake gnome pkgconfig
26	USE_GITHUB= yes	27	USE_GITHUB= yes
27	GH_ACCOUNT= greenbone	28	GH_ACCOUNT= greenbone
28	GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX}	29	GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX}
29
30	USES= cmake gnome pkgconfig
31	USE_GNOME= glib20 libxml2	30	USE_GNOME= glib20 libxml2
32	USE_LDCONFIG= yes	31	USE_LDCONFIG= yes
33		32

Lines 1-6 Link Here

(-)b/security/gvm-libs/files/patch-CMakeLists.txt (-6 / +14 lines)
1	--- CMakeLists.txt.orig 2021-10-11 09:38:23.000000000 -0500	1	--- CMakeLists.txt.orig 2022-07-18 08:40:56 UTC
2	+++ CMakeLists.txt 2021-11-04 10:31:40.191911000 -0500	2	+++ CMakeLists.txt
3	@@ -134,7 +134,7 @@	3	@@ -136,7 +136,7 @@ if (SYSCONF_INSTALL_DIR)
4	endif (SYSCONF_INSTALL_DIR)	4	endif (SYSCONF_INSTALL_DIR)
5		5
6	if (NOT SYSCONFDIR)	6	if (NOT SYSCONFDIR)
Lines 9-15 Link Here
9	endif (NOT SYSCONFDIR)	9	endif (NOT SYSCONFDIR)
10		10
11	if (NOT EXEC_PREFIX)	11	if (NOT EXEC_PREFIX)
12	@@ -174,7 +174,7 @@	12	@@ -176,7 +176,7 @@ if (NOT DATADIR)
13	endif (NOT DATADIR)	13	endif (NOT DATADIR)
14		14
15	if (NOT GVM_RUN_DIR)	15	if (NOT GVM_RUN_DIR)
Lines 17-24 Link Here
17	+ set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm")	17	+ set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm")
18	endif (NOT GVM_RUN_DIR)	18	endif (NOT GVM_RUN_DIR)
19		19
20	if (NOT GVM_PID_DIR)	20	if (NOT GVM_SYSCONF_DIR)
21	@@ -187,7 +187,7 @@	21	@@ -185,7 +185,7 @@ endif (NOT GVM_SYSCONF_DIR)
22		22
23		23
24	if (NOT REDIS_SOCKET_PATH)	24	if (NOT REDIS_SOCKET_PATH)
Lines 27-29 Link Here
27	endif ()	27	endif ()
28		28
29	add_definitions (-DREDIS_SOCKET_PATH="${REDIS_SOCKET_PATH}")	29	add_definitions (-DREDIS_SOCKET_PATH="${REDIS_SOCKET_PATH}")
		30	@@ -208,7 +208,6 @@ set (
		31	-std=c11 \
		32	-Wall \
		33	-Wextra \
		34	- -Werror \
		35	-Wpedantic \
		36	-Wmissing-prototypes \
		37	-Wshadow \

Lines 1-5 Link Here

(-)b/security/gvm-libs/files/patch-boreas_alivedetection.c (-2 / +13 lines)
1	--- boreas/alivedetection.c.orig 2020-12-30 23:49:07.498953000 -0500	1	--- boreas/alivedetection.c.orig 2022-07-18 08:40:56 UTC
2	+++ boreas/alivedetection.c 2020-12-30 23:50:37.570417000 -0500	2	+++ boreas/alivedetection.c
3	@@ -39,7 +39,12 @@	3	@@ -39,7 +39,12 @@
4	#include <netinet/ip6.h>	4	#include <netinet/ip6.h>
5	#include <netinet/ip_icmp.h>	5	#include <netinet/ip_icmp.h>
Lines 14-16 Link Here
14	#include <pcap.h>	14	#include <pcap.h>
15	#include <pthread.h>	15	#include <pthread.h>
16	#include <stdlib.h>	16	#include <stdlib.h>
		17	@@ -290,8 +295,8 @@ scan (alive_test_t alive_test)
		18
		19	gettimeofday (&end_time, NULL);
		20
		21	- g_message ("Alive scan %s finished in %ld seconds: %d alive hosts of %d.",
		22	- scan_id, end_time.tv_sec - start_time.tv_sec,
		23	+ g_message ("Alive scan %s finished in %lld seconds: %d alive hosts of %d.",
		24	+ scan_id, (long long)(end_time.tv_sec - start_time.tv_sec),
		25	g_hash_table_size (scanner.hosts_data->alivehosts),
		26	number_of_targets);
		27	g_free (scan_id);

Added Link Here

(-)b/security/gvm-libs/files/patch-boreas_cli.c (-1 / +13 lines)
0	-	1	--- boreas/cli.c.orig 2022-09-30 08:26:50 UTC
		2	+++ boreas/cli.c
		3	@@ -162,8 +162,8 @@ run_cli_scan (scanner_t *scanner, alive_test_t alive_t
		4	scanner->hosts_data->alivehosts);
		5	gettimeofday (&end_time, NULL);
		6	if (scanner->print_results == 1)
		7	- printf ("Alive scan finished in %ld seconds: %d alive hosts of %d.\n",
		8	- end_time.tv_sec - start_time.tv_sec,
		9	+ printf ("Alive scan finished in %lld seconds: %d alive hosts of %d.\n",
		10	+ (long long)(end_time.tv_sec - start_time.tv_sec),
		11	number_of_targets - number_of_dead_hosts, number_of_targets);
		12
		13	return error;