From nobody Sun Apr 02 22:57:00 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PqTtN5LyGz437ns; Sun, 2 Apr 2023 22:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PqTtN4nryz3mGs; Sun, 2 Apr 2023 22:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680476220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wDpqpaPyo38rCovpR/Yh2jzLlcVrudNZ6XAGmsFZ61o=; b=H+Ujl6b17LYsR+fPOfGIUg+6XU/MA2/mLzXUrFHB6zf2mbD1aaYDudBffBHqoxeFwXmsiZ O47GNio3KZYeuX0C15pXZ/XPSSj1HnPxfKh0QKv2FxRklK1Ej+MVPk4iHxdLTMeaL5+/Zv /LdnI8dO7IJUtIL1lw3mJO1OyuYXM16Yrcth7E+xoIH42d1HUjHUMU7vD20CAiiSMbXwfi lpxlMwJ4Q0lrN7h7AouiOARgLnO0JKZa8kTWPywJs02vFDnD+WkaceI+nELLf7RlsXEOoX cpiSDpRh5jD3CABiMCUCz5iWed63BVTXRb8JtaJ+V4FDb9ArEcPH3CXSArOc/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680476220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wDpqpaPyo38rCovpR/Yh2jzLlcVrudNZ6XAGmsFZ61o=; b=mJRt1EQEl0WUefZPEAf5KXEIKPXS+xx/gOlZa6eaYospkc2DJWQ5yuVeze+QD6EWhtzF2m XKJ/hEraoPKz/io3YLzxqjwq0+Hyb2vPLM8Gb3dX/V1z/gzq8In4DVKeb5+h6NnY1+4kd0 hNzSfpOjf34dC5/93/KIK7JlZV+f6MaSlZoK4m/uLg4KtgKVI4M0YVUyulUVjBcHDcYVxh ACVMAf2J7OPMpkP1sVnhIJyUs8JC4xrRWfvjKEGNTWEhTYE1WLUwYy1AgeB1bwOW36BLtQ peEm+42R4faUYmka/Xh3CIdUdEU9moHgYt+sAxsakdb2tYSjJDMHIXy605s7cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680476220; a=rsa-sha256; cv=none; b=lGCjqQMNG/wa12tdTuywEuxUdJLX1ukToiSRQ4mcuDDo90jyJJDL8TgNj+j/GFh4IT07b2 u+2YCyUENiwgJC4ZJ9Y+yotlLfSkpR/qOkNWL24bclU7Y/uqLxW7LyBAxh3W9hAag4lwe4 Hia0+thegOVl8ItNln3plcwp87eCOQLar7OwKhbM+7AUHGAz60l3GpeRA8MW8IHCaCsVID PUJ4Q2v+FZ/TxAhBsUjOdk0CVMa43mP6C96elY3XzN2KEGvgeO6DpOEBirKTS9q6ngn+bK mspej/Us205iSJ19wlSbVsNZHfv3/BRP9GsZKMAsyxuMO0as2eowNjt2XHg+mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqTtN3vF9zbVT; Sun, 2 Apr 2023 22:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 332Mv0f4005956; Sun, 2 Apr 2023 22:57:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332Mv0x2005955; Sun, 2 Apr 2023 22:57:00 GMT (envelope-from git) Date: Sun, 2 Apr 2023 22:57:00 GMT Message-Id: <202304022257.332Mv0x2005955@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 1af9c01de5d2 - main - security/gvmd: update to 22.4.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1af9c01de5d227d9e83f92791c909b7d3b76b03a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=1af9c01de5d227d9e83f92791c909b7d3b76b03a commit 1af9c01de5d227d9e83f92791c909b7d3b76b03a Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-04-02 22:30:26 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-04-02 22:30:26 +0000 security/gvmd: update to 22.4.2 - Remove obsolete patch files ChangeLog at: https://github.com/greenbone/gvmd/releases/tag/v22.4.2 --- security/gvmd/Makefile | 3 +- security/gvmd/distinfo | 6 ++-- security/gvmd/files/patch-CMakeLists.txt | 13 ++------ security/gvmd/files/patch-src_manage.c | 13 ++------ security/gvmd/files/patch-src_manage_configs.c | 11 ------- security/gvmd/files/patch-src_manage_port_lists.c | 11 ------- .../gvmd/files/patch-src_manage_report_formats.c | 11 ------- security/gvmd/files/patch-src_manage_sql.c | 37 +++------------------- .../files/patch-src_manage_sql_report_formats.c | 13 ++------ security/gvmd/files/patch-src_utils.c | 13 ++------ security/gvmd/pkg-plist | 2 +- 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 #include @@ -8,12 +8,3 @@ #include #include #include -@@ -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 #include @@ -16,25 +16,16 @@ #include #include #include -@@ -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 @@ -8,12 +8,3 @@ #include #include -@@ -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