summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--security/gvmd/Makefile3
-rw-r--r--security/gvmd/distinfo6
-rw-r--r--security/gvmd/files/patch-CMakeLists.txt13
-rw-r--r--security/gvmd/files/patch-src_manage.c13
-rw-r--r--security/gvmd/files/patch-src_manage_configs.c11
-rw-r--r--security/gvmd/files/patch-src_manage_port_lists.c11
-rw-r--r--security/gvmd/files/patch-src_manage_report_formats.c11
-rw-r--r--security/gvmd/files/patch-src_manage_sql.c37
-rw-r--r--security/gvmd/files/patch-src_manage_sql_report_formats.c13
-rw-r--r--security/gvmd/files/patch-src_utils.c13
-rw-r--r--security/gvmd/pkg-plist2
11 files changed, 17 insertions, 116 deletions
diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile
index e08ad5ce9652..9bae53d874e3 100644
--- a/security/gvmd/Makefile
+++ b/security/gvmd/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gvmd
-DISTVERSION= 22.4.0
+DISTVERSION= 22.4.2
DISTVERSIONPREFIX= v
-PORTREVISION= 3
CATEGORIES= security
MAINTAINER= acm@FreeBSD.org
diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo
index 412a519fe987..3e4c6ca3c264 100644
--- a/security/gvmd/distinfo
+++ b/security/gvmd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659310415
-SHA256 (greenbone-gvmd-v22.4.0_GH0.tar.gz) = 227e7ed383a5a51b1af54d8b848eaf101458bb64d3392bbc7ef56397c3474b69
-SIZE (greenbone-gvmd-v22.4.0_GH0.tar.gz) = 1024867
+TIMESTAMP = 1680418166
+SHA256 (greenbone-gvmd-v22.4.2_GH0.tar.gz) = 14c76641af72e48874a730c4792ad76199165bb0518f59742609590cd420719e
+SIZE (greenbone-gvmd-v22.4.2_GH0.tar.gz) = 1027009
diff --git a/security/gvmd/files/patch-CMakeLists.txt b/security/gvmd/files/patch-CMakeLists.txt
index eb62a6e33d5f..4fbf556cb694 100644
--- a/security/gvmd/files/patch-CMakeLists.txt
+++ b/security/gvmd/files/patch-CMakeLists.txt
@@ -1,14 +1,5 @@
---- CMakeLists.txt 2022-07-21 02:20:24.000000000 -0500
-+++ CMakeLists.txt 2022-07-31 19:24:14.544647000 -0500
-@@ -53,7 +53,7 @@
-
- # Set dev version if this is a development version and not a full release,
- # unset (put value 0 or delete line) before a full release and reset after.
--set (PROJECT_DEV_VERSION 1)
-+set (PROJECT_DEV_VERSION 0)
-
- # If PROJECT_DEV_VERSION is set, the version string will be set to:
- # "major.minor.patch~dev${PROJECT_DEV_VERSION}${GIT_REVISION}"
+--- CMakeLists.txt 2023-04-02 01:50:20.312770000 -0500
++++ CMakeLists.txt 2023-04-02 01:54:10.831990000 -0500
@@ -110,7 +110,7 @@
endif (SYSCONF_INSTALL_DIR)
diff --git a/security/gvmd/files/patch-src_manage.c b/security/gvmd/files/patch-src_manage.c
index 32cfdbfb5264..3513f6875597 100644
--- a/security/gvmd/files/patch-src_manage.c
+++ b/security/gvmd/files/patch-src_manage.c
@@ -1,5 +1,5 @@
---- src/manage.c 2022-07-21 02:20:24.000000000 -0500
-+++ src/manage.c 2022-10-30 17:41:24.914386000 -0500
+--- src/manage.c 2023-01-13 03:21:14.000000000 -0500
++++ src/manage.c 2023-04-02 01:55:55.631208000 -0500
@@ -76,6 +76,7 @@
#include <sys/file.h>
#include <sys/stat.h>
@@ -8,12 +8,3 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
-@@ -5952,7 +5953,7 @@
- int
- validate_username (const gchar * name)
- {
-- if (g_regex_match_simple ("^[[:alnum:]-_.]+$", name, 0, 0))
-+ if (g_regex_match_simple ("^[[:alnum:]_.-]+$", name, 0, 0))
- return 0;
- else
- return 1;
diff --git a/security/gvmd/files/patch-src_manage_configs.c b/security/gvmd/files/patch-src_manage_configs.c
deleted file mode 100644
index f60828fbdff3..000000000000
--- a/security/gvmd/files/patch-src_manage_configs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/manage_configs.c 2022-10-30 17:15:56.559846000 -0500
-+++ src/manage_configs.c 2022-10-30 17:17:03.298223000 -0500
-@@ -316,7 +316,7 @@
-
- split = g_regex_split_simple
- (/* Full-and-Fast--daba56c8-73ec-11df-a475-002264764cea.xml */
-- "^.*([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12}).xml$",
-+ "^.*([0-9a-f]{8})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{12}).xml$",
- path, 0, 0);
-
- if (split == NULL || g_strv_length (split) != 7)
diff --git a/security/gvmd/files/patch-src_manage_port_lists.c b/security/gvmd/files/patch-src_manage_port_lists.c
deleted file mode 100644
index 574d008a842d..000000000000
--- a/security/gvmd/files/patch-src_manage_port_lists.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/manage_port_lists.c 2022-10-30 17:18:04.068398000 -0500
-+++ src/manage_port_lists.c 2022-10-30 17:18:35.850793000 -0500
-@@ -252,7 +252,7 @@
-
- split = g_regex_split_simple
- (/* Full-and-Fast--daba56c8-73ec-11df-a475-002264764cea.xml */
-- "^.*([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12}).xml$",
-+ "^.*([0-9a-f]{8})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{12}).xml$",
- path, 0, 0);
-
- if (split == NULL || g_strv_length (split) != 7)
diff --git a/security/gvmd/files/patch-src_manage_report_formats.c b/security/gvmd/files/patch-src_manage_report_formats.c
deleted file mode 100644
index 9e8fb0af0756..000000000000
--- a/security/gvmd/files/patch-src_manage_report_formats.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/manage_report_formats.c 2022-10-30 17:19:27.476854000 -0500
-+++ src/manage_report_formats.c 2022-10-30 17:19:55.531658000 -0500
-@@ -612,7 +612,7 @@
-
- split = g_regex_split_simple
- (/* Full-and-Fast--daba56c8-73ec-11df-a475-002264764cea.xml */
-- "^.*([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12}).xml$",
-+ "^.*([0-9a-f]{8})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{12}).xml$",
- path, 0, 0);
-
- if (split == NULL || g_strv_length (split) != 7)
diff --git a/security/gvmd/files/patch-src_manage_sql.c b/security/gvmd/files/patch-src_manage_sql.c
index 343c997fa208..f6df57e53abc 100644
--- a/security/gvmd/files/patch-src_manage_sql.c
+++ b/security/gvmd/files/patch-src_manage_sql.c
@@ -1,5 +1,5 @@
---- src/manage_sql.c 2022-07-21 02:20:24.000000000 -0500
-+++ src/manage_sql.c 2022-10-30 17:32:08.342879000 -0500
+--- src/manage_sql.c 2023-01-13 03:21:14.000000000 -0500
++++ src/manage_sql.c 2023-04-02 02:07:02.924919000 -0500
@@ -54,7 +54,6 @@
#include <errno.h>
#include <glib/gstdio.h>
@@ -16,25 +16,16 @@
#include <gvm/util/fileutils.h>
#include <gvm/util/gpgmeutils.h>
#include <gvm/util/serverutils.h>
-@@ -6997,7 +6995,7 @@
-
- if (strcmp (name, "tp_sms_hostname") == 0)
- {
-- if (g_regex_match_simple ("^[0-9A-Za-z][0-9A-Za-z.-]*$",
-+ if (g_regex_match_simple ("^[0-9A-Za-z][0-9A-Za-z.\\-]*$",
- *data, 0, 0)
- == FALSE)
- {
@@ -9122,7 +9120,7 @@
g_debug (" HTTP_GET %s", url);
cmd = (gchar **) g_malloc (5 * sizeof (gchar *));
- cmd[0] = g_strdup ("/usr/bin/wget");
-+ cmd[0] = g_strdup ("%%LOCALBASE%%/bin/wget");
++ cmd[0] = g_strdup ("/usr/local/bin/wget");
cmd[1] = g_strdup ("-O");
cmd[2] = g_strdup ("-");
cmd[3] = g_strdup (url);
-@@ -15349,8 +15347,6 @@
+@@ -15366,8 +15364,6 @@
}
cleanup_iterator (&nvts);
@@ -43,23 +34,3 @@
}
/**
-@@ -49740,8 +49736,8 @@
- */
- languages_regex
- = g_regex_new ("^(Browser Language|"
-- "([a-z]{2,3})(_[A-Z]{2})?(@[[:alnum:]_-]+)?"
-- "(:([a-z]{2,3})(_[A-Z]{2})?(@[[:alnum:]_-]+)?)*)$",
-+ "([a-z]{2,3})(_[A-Z]{2})?(@[[:alnum:]_\\-]+)?"
-+ "(:([a-z]{2,3})(_[A-Z]{2})?(@[[:alnum:]_\\-]+)?)*)$",
- 0, 0, NULL);
- match = g_regex_match (languages_regex, value, 0, NULL);
- g_regex_unref (languages_regex);
-@@ -50309,7 +50305,7 @@
- if (strcmp (uuid, SETTING_UUID_LSC_DEB_MAINTAINER) == 0)
- {
- if (g_regex_match_simple
-- ("^([[:alnum:]-_]*@[[:alnum:]-_][[:alnum:]-_.]*)?$",
-+ ("^([[:alnum:]\\-_]*@[[:alnum:]\\-_][[:alnum:]\\-_.]*)?$",
- value, 0, 0) == FALSE)
- return 1;
- }
diff --git a/security/gvmd/files/patch-src_manage_sql_report_formats.c b/security/gvmd/files/patch-src_manage_sql_report_formats.c
index fe1784255a13..d84d7428a486 100644
--- a/security/gvmd/files/patch-src_manage_sql_report_formats.c
+++ b/security/gvmd/files/patch-src_manage_sql_report_formats.c
@@ -1,5 +1,5 @@
---- src/manage_sql_report_formats.c 2022-07-21 02:20:24.000000000 -0500
-+++ src/manage_sql_report_formats.c 2022-10-30 17:34:50.896890000 -0500
+--- src/manage_sql_report_formats.c 2023-01-13 03:21:14.000000000 -0500
++++ src/manage_sql_report_formats.c 2023-04-02 02:03:17.674866000 -0500
@@ -45,7 +45,6 @@
#include <unistd.h>
@@ -8,12 +8,3 @@
#include <gvm/util/uuidutils.h>
#include <gvm/util/fileutils.h>
-@@ -2472,7 +2471,7 @@
- case REPORT_FORMAT_PARAM_TYPE_REPORT_FORMAT_LIST:
- {
- if (g_regex_match_simple
-- ("^(?:[[:alnum:]-_]+)?(?:,(?:[[:alnum:]-_])+)*$", value, 0, 0)
-+ ("^(?:[[:alnum:]\\-_]+)?(?:,(?:[[:alnum:]\\-_])+)*$", value, 0, 0)
- == FALSE)
- return 1;
- else
diff --git a/security/gvmd/files/patch-src_utils.c b/security/gvmd/files/patch-src_utils.c
index f70964cbd5ce..ad546f90de50 100644
--- a/security/gvmd/files/patch-src_utils.c
+++ b/security/gvmd/files/patch-src_utils.c
@@ -1,5 +1,5 @@
---- src/utils.c 2022-07-21 02:20:24.000000000 -0500
-+++ src/utils.c 2022-10-30 17:36:49.935808000 -0500
+--- src/utils.c 2023-01-13 03:21:14.000000000 -0500
++++ src/utils.c 2023-04-02 02:05:00.969899000 -0500
@@ -34,7 +34,7 @@
/**
* @brief Needed for nanosleep.
@@ -9,12 +9,3 @@
#include "utils.h"
-@@ -339,7 +339,7 @@
- epoch_time = 0;
-
- if (regex == NULL)
-- regex = g_regex_new ("^([0-9]{4}-[0-9]{2}-[0-9]{2})"
-+ regex = g_regex_new ("^([0-9]{4}\\-[0-9]{2}\\-[0-9]{2})"
- "[T ]([0-9]{2}:[0-9]{2})"
- "(:[0-9]{2})?(?:\\.[0-9]+)?"
- "(Z|[+-][0-9]{2}:?[0-9]{2})?$",
diff --git a/security/gvmd/pkg-plist b/security/gvmd/pkg-plist
index 298bf2d2a0fe..37931dd865e4 100644
--- a/security/gvmd/pkg-plist
+++ b/security/gvmd/pkg-plist
@@ -3,7 +3,7 @@ bin/gvm-manage-certs
@sample etc/gvm/pwpolicy.conf.sample
lib/libgvm-pg-server.so
lib/libgvm-pg-server.so.22
-lib/libgvm-pg-server.so.22.4.0
+lib/libgvm-pg-server.so.22.4.2
sbin/greenbone-certdata-sync
sbin/greenbone-feed-sync
sbin/greenbone-scapdata-sync
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-05 22:06:04 +0000