1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

security/gvm: update to 21.4.3

The following ports part of security gvm were updated

security/gvmd: Update to 21.4.4
security/gvm-libs: Update to 21.4.3
security/openvas: Update to 21.4.3
security/py-ospd-openvas: Update to 21.4.3
security/py-ospd: Update to 21.4.4
security/greenbone-security-assistant: Update to 21.4.3
security/py-gvm-tools: Update to 21.10.0
security/py-python-gvm: Update to 21.10.0
This commit is contained in:
Jose Alonso Cardenas Marquez 2021-11-05 11:31:27 -05:00
parent 4143618d28
commit 77f5aa5d32
27 changed files with 134 additions and 104 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= greenbone-security-assistant
DISTVERSIONPREFIX= v
DISTVERSION= 21.4.2
DISTVERSION= 21.4.3
CATEGORIES= security
MASTER_SITES= LOCAL/acm/gsa/:yarn_cache
DISTFILES= ${PORTNAME}-cache${EXTRACT_SUFX}:yarn_cache
@ -10,8 +10,8 @@ COMMENT= Libraries module for the GVM solution
LICENSE= AGPLv3+
BUILD_DEPENDS= node:www/node \
yarn:www/yarn
BUILD_DEPENDS= node:www/node16 \
yarn:www/yarn-node16
LIB_DEPENDS= libgvm_base.so:security/gvm-libs \
libgnutls.so:security/gnutls \
libgcrypt.so:security/libgcrypt \

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1630801223
SHA256 (greenbone-security-assistant-cache.tar.gz) = 998f02274f7104678ba260f7e42d8bc269cb4e79a668660bae5fd39e084f585b
SIZE (greenbone-security-assistant-cache.tar.gz) = 61976509
SHA256 (greenbone-gsa-v21.4.2_GH0.tar.gz) = 16c8b70c6f68b73d6e2e487c2c0cb9b8490157d0d82cb12e13f5da4b2f3a96ca
SIZE (greenbone-gsa-v21.4.2_GH0.tar.gz) = 2678531
TIMESTAMP = 1636050519
SHA256 (greenbone-security-assistant-cache.tar.gz) = 3e54c1f845f64064f590a99b2229da8d72a638e210288890b1adb26ed6c41580
SIZE (greenbone-security-assistant-cache.tar.gz) = 61974237
SHA256 (greenbone-gsa-v21.4.3_GH0.tar.gz) = 7b30416fb76cfbec2f2e409706e0ebb40a123d197c8ff7d6c12b71f1572047a3
SIZE (greenbone-gsa-v21.4.3_GH0.tar.gz) = 2683994

View File

@ -1,5 +1,14 @@
--- gsad/CMakeLists.txt 2021-08-03 07:18:37.000000000 -0500
+++ gsad/CMakeLists.txt 2021-09-04 19:24:39.154779000 -0500
--- gsad/CMakeLists.txt 2021-10-12 07:16:06.000000000 -0500
+++ gsad/CMakeLists.txt 2021-11-04 16:33:45.783190000 -0500
@@ -61,7 +61,7 @@
endif (CLANG_FORMAT)
if (NOT SYSCONFDIR)
- set (SYSCONFDIR "/etc")
+ set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
endif (NOT SYSCONFDIR)
if (NOT EXEC_PREFIX)
@@ -96,7 +96,7 @@
set (GSAD_CONFIG_DIR "${SYSCONFDIR}/gvm/")

View File

@ -1,5 +1,5 @@
PORTNAME= gvm
DISTVERSION= 21.4.2
DISTVERSION= 21.4.3
DISTVERSIONPREFIX= v
CATEGORIES= security
PKGNAMESUFFIX= -libs

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1630799652
SHA256 (greenbone-gvm-libs-v21.4.2_GH0.tar.gz) = a868b25dd000a81c4a0962cff18726edc2fe14b3cdeb58669bcef4b6349c344a
SIZE (greenbone-gvm-libs-v21.4.2_GH0.tar.gz) = 296966
TIMESTAMP = 1635383872
SHA256 (greenbone-gvm-libs-v21.4.3_GH0.tar.gz) = 4d70e2c81ed23e60b9d4731aea65ea0712f34fa2154a4f28c4146c5e88397516
SIZE (greenbone-gvm-libs-v21.4.3_GH0.tar.gz) = 297761

View File

@ -1,29 +1,29 @@
--- CMakeLists.txt.orig 2020-08-12 04:56:00.000000000 -0500
+++ CMakeLists.txt 2021-01-03 17:25:26.973466000 -0500
@@ -155,7 +155,7 @@
endif (NOT LIBDIR)
--- CMakeLists.txt.orig 2021-10-11 09:38:23.000000000 -0500
+++ CMakeLists.txt 2021-11-04 10:31:40.191911000 -0500
@@ -134,7 +134,7 @@
endif (SYSCONF_INSTALL_DIR)
if (NOT LOCALSTATEDIR)
- set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var")
+ set (LOCALSTATEDIR "/var")
endif (NOT LOCALSTATEDIR)
if (NOT SYSCONFDIR)
- set (SYSCONFDIR "/etc")
+ set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
endif (NOT SYSCONFDIR)
if (NOT INCLUDEDIR)
@@ -167,7 +167,7 @@
if (NOT EXEC_PREFIX)
@@ -174,7 +174,7 @@
endif (NOT DATADIR)
if (NOT GVM_PID_DIR)
- set (GVM_PID_DIR "${LOCALSTATEDIR}/run")
+ set (GVM_PID_DIR "${LOCALSTATEDIR}/run/gvm")
endif (NOT GVM_PID_DIR)
if (NOT GVM_RUN_DIR)
- set (GVM_RUN_DIR "/run/gvm")
+ set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm")
endif (NOT GVM_RUN_DIR)
if (NOT GVM_SYSCONF_DIR)
@@ -176,7 +176,7 @@
if (NOT GVM_PID_DIR)
@@ -187,7 +187,7 @@
if (NOT REDIS_SOCKET_PATH)
- set (REDIS_SOCKET_PATH "/run/redis/redis.sock")
+ set (REDIS_SOCKET_PATH "/var/run/redis/redis.sock")
+ set (REDIS_SOCKET_PATH "${LOCALSTATEDIR}/run/redis/redis.sock")
endif ()
add_definitions (-DREDIS_SOCKET_PATH="${REDIS_SOCKET_PATH}")

View File

@ -1,5 +1,5 @@
--- base/hosts.c 2020-12-30 14:04:30.773110000 -0500
+++ base/hosts.c 2020-12-30 23:46:15.994709000 -0500
--- base/hosts.c 2021-10-11 09:38:23.000000000 -0500
+++ base/hosts.c 2021-10-27 21:07:36.955872000 -0500
@@ -34,11 +34,11 @@
#include <arpa/inet.h> /* for inet_pton, inet_ntop */
#include <assert.h> /* for assert */
@ -13,16 +13,16 @@
#include <string.h> /* for strchr, memcpy, memcmp, bzero, strcasecmp */
#include <sys/socket.h> /* for AF_INET, AF_INET6, sockaddr */
@@ -1068,7 +1068,7 @@
@@ -1092,7 +1092,7 @@
hosts->count -= duplicates;
hosts->removed += duplicates;
hosts->duplicated += duplicates;
hosts->current = 0;
- malloc_trim (0);
+ // malloc_trim (0);
}
/**
@@ -1263,7 +1263,7 @@
@@ -1287,7 +1287,7 @@
gvm_hosts_deduplicate (hosts);
g_strfreev (split);
@ -31,7 +31,7 @@
return hosts;
}
@@ -1410,8 +1410,8 @@
@@ -1467,8 +1467,8 @@
gvm_vhost_t *vhost;
new = gvm_host_new ();
@ -42,7 +42,7 @@
{
new->type = HOST_TYPE_IPV6;
memcpy (&new->addr6, ip6, sizeof (new->addr6));
@@ -1419,7 +1419,7 @@
@@ -1476,7 +1476,7 @@
else
{
new->type = HOST_TYPE_IPV4;
@ -51,3 +51,15 @@
}
vhost =
gvm_vhost_new (g_strdup (host->name), g_strdup ("Forward-DNS"));
@@ -2034,7 +2034,11 @@
ret->addr.s_addr = host->addr.s_addr;
break;
case HOST_TYPE_IPV6:
+#if defined (__FreeBSD__)
+ ret->addr6.__u6_addr = host->addr6.__u6_addr;
+#else
ret->addr6.__in6_u = host->addr6.__in6_u;
+#endif
break;
default:
g_free (ret);

View File

@ -38,19 +38,19 @@ include/gvm/util/uuidutils.h
include/gvm/util/xmlutils.h
lib/libgvm_base.so
lib/libgvm_base.so.21
lib/libgvm_base.so.21.4.2
lib/libgvm_base.so.21.4.3
lib/libgvm_boreas.so
lib/libgvm_boreas.so.21
lib/libgvm_boreas.so.21.4.2
lib/libgvm_boreas.so.21.4.3
lib/libgvm_gmp.so
lib/libgvm_gmp.so.21
lib/libgvm_gmp.so.21.4.2
lib/libgvm_gmp.so.21.4.3
lib/libgvm_osp.so
lib/libgvm_osp.so.21
lib/libgvm_osp.so.21.4.2
lib/libgvm_osp.so.21.4.3
lib/libgvm_util.so
lib/libgvm_util.so.21
lib/libgvm_util.so.21.4.2
lib/libgvm_util.so.21.4.3
libdata/pkgconfig/libgvm_base.pc
libdata/pkgconfig/libgvm_boreas.pc
libdata/pkgconfig/libgvm_gmp.pc

View File

@ -1,5 +1,5 @@
PORTNAME= gvm
PORTVERSION= 21.4.2
PORTVERSION= 21.4.3
CATEGORIES= security
MAINTAINER= acm@FreeBSD.org

View File

@ -1,5 +1,5 @@
PORTNAME= gvmd
DISTVERSION= 21.4.3
DISTVERSION= 21.4.4
DISTVERSIONPREFIX= v
CATEGORIES= security
@ -45,6 +45,7 @@ SHEBANG_FILES= tools/gvm-lsc-rpm-creator \
post-patch:
${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/manage_sql.c
${REINPLACE_CMD} -e 's|+660|660|g' ${WRKSRC}/tools/greenbone-feed-sync.in
post-install:
@${MKDIR} ${STAGEDIR}/var/lib/gvm/gvmd/gnupg

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1630799976
SHA256 (greenbone-gvmd-v21.4.3_GH0.tar.gz) = 3e69be5248695116d14820c09ed228c22f1422ee4b0f337ad22c2ee27dd74028
SIZE (greenbone-gvmd-v21.4.3_GH0.tar.gz) = 1026412
TIMESTAMP = 1635998903
SHA256 (greenbone-gvmd-v21.4.4_GH0.tar.gz) = 90809302c605744bdab4474f445f80523ce466fc02beed850b5f7b3f17de3cd3
SIZE (greenbone-gvmd-v21.4.4_GH0.tar.gz) = 1031202

View File

@ -19,7 +19,7 @@ rcvar=${name}_enable
load_rc_config $name
: ${gvmd_enable=NO}
: ${gmvd_flags="--osp-vt-update=/var/run/ospd/ospd.sock --unix-socket=/var/run/gvm/gvmd.sock"}
: ${gmvd_flags="--osp-vt-update=/var/run/ospd/ospd-openvas.sock --unix-socket=/var/run/gvm/gvmd.sock"}
command="%%PREFIX%%/sbin/gvmd"
command_args="${gmvd_flags}"

View File

@ -1,24 +1,33 @@
--- CMakeLists.txt 2020-08-11 10:05:36.000000000 -0500
+++ CMakeLists.txt 2021-01-04 19:48:05.978938000 -0500
@@ -132,7 +132,7 @@
endif (NOT LIBDIR)
--- CMakeLists.txt 2021-11-03 23:09:27.602060000 -0500
+++ CMakeLists.txt 2021-11-03 23:17:41.187707000 -0500
@@ -110,7 +110,7 @@
endif (SYSCONF_INSTALL_DIR)
if (NOT LOCALSTATEDIR)
- set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var")
+ set (LOCALSTATEDIR "/var")
endif (NOT LOCALSTATEDIR)
if (NOT SYSCONFDIR)
- set (SYSCONFDIR "/etc")
+ set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
endif (NOT SYSCONFDIR)
if (NOT DATADIR)
@@ -183,7 +183,7 @@
if (NOT EXEC_PREFIX)
@@ -181,7 +181,7 @@
set (GVM_CA_CERTIFICATE "${GVM_STATE_DIR}/CA/cacert.pem")
if (NOT GVM_RUN_DIR)
- set (GVM_RUN_DIR "${LOCALSTATEDIR}/run")
- set (GVM_RUN_DIR "/run/gvm")
+ set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm")
endif (NOT GVM_RUN_DIR)
if (NOT GVM_FEED_LOCK_PATH)
@@ -240,7 +240,7 @@
@@ -190,7 +190,7 @@
add_definitions (-DGVM_FEED_LOCK_PATH="${GVM_FEED_LOCK_PATH}")
if (NOT OPENVAS_DEFAULT_SOCKET)
- set (OPENVAS_DEFAULT_SOCKET "/run/ospd/ospd-openvas.sock")
+ set (OPENVAS_DEFAULT_SOCKET "${LOCALSTATEDIR}/run/ospd/ospd-openvas.sock")
endif (NOT OPENVAS_DEFAULT_SOCKET)
add_definitions (-DOPENVAS_DEFAULT_SOCKET="${OPENVAS_DEFAULT_SOCKET}")
@@ -238,7 +238,7 @@
configure_file (doc/Doxyfile_xml.in doc/Doxyfile_xml)
configure_file (doc/example-gvm-manage-certs.conf.in doc/example-gvm-manage-certs.conf @ONLY)
configure_file (VERSION.in VERSION)
@ -27,16 +36,16 @@
configure_file (src/schema_formats/XML/GMP.xml.in src/schema_formats/XML/GMP.xml @ONLY)
configure_file (tools/greenbone-feed-sync.in tools/greenbone-feed-sync @ONLY)
configure_file (tools/greenbone-scapdata-sync.in tools/greenbone-scapdata-sync @ONLY)
@@ -282,7 +282,7 @@
@@ -280,7 +280,7 @@
## Configs (e.g. systemd service file)
-add_subdirectory (config)
+# add_subdirectory (config)
+#add_subdirectory (config)
## Documentation
@@ -292,10 +292,11 @@
@@ -290,10 +290,10 @@
install (DIRECTORY DESTINATION ${GVMD_STATE_DIR})
@ -45,7 +54,6 @@
DESTINATION ${GVM_SYSCONF_DIR})
-install (FILES ${CMAKE_SOURCE_DIR}/src/pwpolicy.conf
+
+install (FILES ${CMAKE_SOURCE_DIR}/src/pwpolicy.conf.sample
DESTINATION ${GVM_SYSCONF_DIR})

View File

@ -3,7 +3,7 @@ bin/gvm-manage-certs
@sample etc/gvm/pwpolicy.conf.sample
lib/libgvm-pg-server.so
lib/libgvm-pg-server.so.21
lib/libgvm-pg-server.so.21.4.3
lib/libgvm-pg-server.so.21.4.4
sbin/greenbone-certdata-sync
sbin/greenbone-feed-sync
sbin/greenbone-scapdata-sync

View File

@ -1,5 +1,5 @@
PORTNAME= openvas
DISTVERSION= 21.4.2
DISTVERSION= 21.4.3
DISTVERSIONPREFIX= v
CATEGORIES= security

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1630800896
SHA256 (greenbone-openvas-scanner-v21.4.2_GH0.tar.gz) = 50e98a1926a8a60a0cb095c2aaa934f313758a9f9f561de590cda85268b9c37a
SIZE (greenbone-openvas-scanner-v21.4.2_GH0.tar.gz) = 452492
TIMESTAMP = 1635387094
SHA256 (greenbone-openvas-scanner-v21.4.3_GH0.tar.gz) = 67d4804c651455b38a6dbe95e52b206431ce9f3b4680f6ba598fd866e2558fa3
SIZE (greenbone-openvas-scanner-v21.4.3_GH0.tar.gz) = 454482

View File

@ -1,24 +1,24 @@
--- CMakeLists.txt 2020-08-11 07:00:25.000000000 -0500
+++ CMakeLists.txt 2021-01-04 19:19:49.997745000 -0500
@@ -148,7 +148,7 @@
endif (NOT LIBDIR)
--- CMakeLists.txt.orig 2021-10-11 10:37:50.000000000 -0500
+++ CMakeLists.txt 2021-10-27 21:54:45.470593000 -0500
@@ -113,7 +113,7 @@
endif (SYSCONF_INSTALL_DIR)
if (NOT LOCALSTATEDIR)
- set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var")
+ set (LOCALSTATEDIR "/var")
endif (NOT LOCALSTATEDIR)
if (NOT SYSCONFDIR)
- set (SYSCONFDIR "/etc")
+ set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
endif (NOT SYSCONFDIR)
if (NOT DATADIR)
@@ -156,7 +156,7 @@
if (NOT EXEC_PREFIX)
@@ -150,7 +150,7 @@
endif (NOT DATADIR)
if (NOT OPENVAS_RUN_DIR)
- set (OPENVAS_RUN_DIR "${LOCALSTATEDIR}/run")
+ set (OPENVAS_RUN_DIR "${LOCALSTATEDIR}/run/gvm")
- set (OPENVAS_RUN_DIR "/run/ospd")
+ set (OPENVAS_RUN_DIR "${LOCALSTATEDIR}/run/ospd")
endif (NOT OPENVAS_RUN_DIR)
if (NOT OPENVAS_FEED_LOCK_PATH)
@@ -204,7 +204,7 @@
set (OPENVAS_DATA_DIR "${DATADIR}/openvas")
@@ -199,7 +199,7 @@
configure_file (doc/openvas.8.in doc/openvas.8 @ONLY)
configure_file (VERSION.in VERSION @ONLY)
configure_file (tools/greenbone-nvt-sync.in tools/greenbone-nvt-sync @ONLY)
@ -27,7 +27,7 @@
## Testing
@@ -219,7 +219,7 @@
@@ -214,7 +214,7 @@
set (COVERAGE_FLAGS "--coverage")
endif (ENABLE_COVERAGE)

View File

@ -4,10 +4,10 @@ bin/openvas-nasl-lint
@sample %%ETCDIR%%/openvas_log.conf.sample
lib/libopenvas_misc.so
lib/libopenvas_misc.so.21
lib/libopenvas_misc.so.21.4.2
lib/libopenvas_misc.so.21.4.3
lib/libopenvas_nasl.so
lib/libopenvas_nasl.so.21
lib/libopenvas_nasl.so.21.4.2
lib/libopenvas_nasl.so.21.4.3
sbin/openvas
share/man/man1/openvas-nasl-lint.1.gz
share/man/man1/openvas-nasl.1.gz

View File

@ -1,5 +1,5 @@
PORTNAME= gvm-tools
DISTVERSION= 21.6.1
DISTVERSION= 21.10.0
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1624924783
SHA256 (gvm-tools-21.6.1.tar.gz) = 4e11982752a5830bea1e78e272a481f26a50e8d51d35981f8f500f6b3264e767
SIZE (gvm-tools-21.6.1.tar.gz) = 100084
TIMESTAMP = 1635551449
SHA256 (gvm-tools-21.10.0.tar.gz) = 413c55adee93f2eb300263eeda1a01e7a7b9b802b9cc80cd6d991b357d645566
SIZE (gvm-tools-21.10.0.tar.gz) = 100166

View File

@ -1,5 +1,5 @@
PORTNAME= ospd-openvas
DISTVERSION= 21.4.2
DISTVERSION= 21.4.3
DISTVERSIONPREFIX= v
CATEGORIES= security python
#MASTER_SITES= CHEESESHOP

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1630800865
SHA256 (greenbone-ospd-openvas-v21.4.2_GH0.tar.gz) = 0f796a9883374e2bbe4d11dfb7a26394e27cb78de59366a9cfd66a84b4f53f5c
SIZE (greenbone-ospd-openvas-v21.4.2_GH0.tar.gz) = 91040
TIMESTAMP = 1635389821
SHA256 (greenbone-ospd-openvas-v21.4.3_GH0.tar.gz) = e36884f3a4f1824d07e8cfff94e1eaf36c8c0162b4d6d9ae902ddb1ebd1be52d
SIZE (greenbone-ospd-openvas-v21.4.3_GH0.tar.gz) = 91272

View File

@ -24,7 +24,7 @@ export PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
: ${ospd_openvas_enable:=NO}
: ${ospd_openvas_pidfile="/var/run/ospd/ospd-openvas.pid"}
: ${ospd_openvas_config="/usr/local/etc/gvm/ospd.conf"}
: ${ospd_openvas_flags="--lock-file-dir /var/run/ospd --socket-mode 770 --unix-socket /var/run/ospd/ospd.sock"}
: ${ospd_openvas_flags="--lock-file-dir /var/run/ospd --socket-mode 770 --unix-socket /var/run/ospd/ospd-openvas.sock"}
: ${ospd_openvas_user="gvm"}
ospd_openvas_group="gvm"

View File

@ -1,5 +1,5 @@
PORTNAME= ospd
DISTVERSION= 21.4.3
DISTVERSION= 21.4.4
CATEGORIES= security net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1630802185
SHA256 (ospd-21.4.3.tar.gz) = 54f81cb618662b4c0bb8e2d1552b5e770206777c4bd1bfa05004f2cb05999789
SIZE (ospd-21.4.3.tar.gz) = 100437
TIMESTAMP = 1635389759
SHA256 (ospd-21.4.4.tar.gz) = 671cea59e63a7956a378f26275fc14693accacf90d91bddc76b914f48cbd6346
SIZE (ospd-21.4.4.tar.gz) = 100607

View File

@ -1,5 +1,5 @@
PORTNAME= python-gvm
DISTVERSION= 21.6.0
DISTVERSION= 21.10.0
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1624924083
SHA256 (python-gvm-21.6.0.tar.gz) = 667c2a6037a3eea3477a5d1b6ba036ee34d649fcefe4f221415caef923640c5c
SIZE (python-gvm-21.6.0.tar.gz) = 148870
TIMESTAMP = 1635551520
SHA256 (python-gvm-21.10.0.tar.gz) = 402b0edd0c2b905db9628c7a1d0f15dd5c492eac0f4c506e15ff5d928275c83c
SIZE (python-gvm-21.10.0.tar.gz) = 149049