From nobody Fri Oct 20 23:50:38 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 4SC1YV5Pl3z4yN0b; Fri, 20 Oct 2023 23:50:38 +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 4SC1YV4tPyz3QWk; Fri, 20 Oct 2023 23:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697845838; 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=yK/WOgdhmRJQXDl3qrE141nS0ACizL1/zkJacfihha4=; b=AmwXdiiFnftpKhdmHQ1pHungFtPxxQzwtbBac2d1NehHtpZ01e7TU6E5l31WtRSoSfCzMX 4StsUW4Ur3sMdNkBUalnBNG8Sk4YXj3vW61rwsnrJ+Oca4k7JTzj0yZqU6WrMA2eh9FY/s +a+MQn44tR66aT8Snl7MCZjyjwDYKMuJaT8KKR30H+B3zoFWTFOaEQWqvU2xumtmtuW4p+ tgsaWrM0ISg8mg0EdKUDQrdafUgMIKIvoDiXIqhmfXMWNl8GIBtt0CWfEDDRgWPhCuL/SJ dTrQ5exBqawJvA1Fo5JXYfBJaf0TfxAVbtx6RBuX/YgMUrzIhkMgQDSU5OAptQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697845838; a=rsa-sha256; cv=none; b=tVgbGlRW7+Tg4sg9OaiJu5yJs6qrpQBKuuuAGDkaLLV5/gbPHWo9yzt/P3rZywgmnZNymj 9H3Ztuh2yoYC8wtRCvVaKrBasygTEDfRJW7P/m1e81LsCpf8OttDstcCBewAbA+61nrkal Wlop0pKdVktMNqwBPB96XzMivADTUbOD0QEE7PgnLJsXYe8r10FNnSLdEAU34UIADih/W9 83qRzpiWEYMlNm09pLYAEL/0srx1XVDjaJkiLMj/A6ZTom7bTb/HGFAPmZGhYJYyqxk19f bjAGaNgh+61Y/GRzZosxx3XNoKwOaJRuGq3AimGlrwgY5wI+cabQu9ZLII+hdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697845838; 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=yK/WOgdhmRJQXDl3qrE141nS0ACizL1/zkJacfihha4=; b=judN9W7WXYyu8koq/dmyBxEKrcUo1z9n2HOS/8NC8V0bVOTId2s97Yg7VcI0FmlwIrr6sW xJH1WFfZYEj4d/mnL00MqT+cLSPxthYi1YyarPUgYJg3gw4bJs5NHcq6nnbUZchg1gjP4G aVTcr8j0NfKnVZl/6ruPqf2TQhuz+SRWZkFALfTr2SzqGuSURtDhYSmW+LtyDutiNaQoSQ CxpBRH7tfiDTRLzNm3iATYOeLXUPMKpSiXWyCv6V737jUsAUOQd5S6kWZu0zSG4kmlxKAw NZq93Q08CfibqtdaZPeEfxfUk/poOkcC8zNwm7wyFXNwz/86PWSAvPqxG9rfkg== 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 4SC1YV3xHvzsmq; Fri, 20 Oct 2023 23:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KNocqH015862; Fri, 20 Oct 2023 23:50:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KNocU0015859; Fri, 20 Oct 2023 23:50:38 GMT (envelope-from git) Date: Fri, 20 Oct 2023 23:50:38 GMT Message-Id: <202310202350.39KNocU0015859@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: bff9bc0e0037 - main - security/gvm: Update gvm-libs to 22.7.3 and openvas to 22.7.6 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: bff9bc0e00371f32ea06bed1f78e09ec4ccbe826 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=bff9bc0e00371f32ea06bed1f78e09ec4ccbe826 commit bff9bc0e00371f32ea06bed1f78e09ec4ccbe826 Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-10-20 23:49:47 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-10-20 23:50:29 +0000 security/gvm: Update gvm-libs to 22.7.3 and openvas to 22.7.6 - Bump PORTREVISION - Update security/py-python-gvm to 23.10.0 - Fix issues with config path of security/py-notus-scanner and security/py-greenbone-feed-sync [1] - Improve pkg-message.in from security/gvm [1] Reported by: Luciano Mannucci [1] --- databases/pg-gvm/Makefile | 1 + security/gsad/Makefile | 1 + security/gvm-libs/Makefile | 2 +- security/gvm-libs/distinfo | 6 +++--- security/gvm-libs/pkg-plist | 10 +++++----- security/gvm/Makefile | 1 + security/gvm/files/pkg-message.in | 6 +++--- security/gvmd/Makefile | 1 + security/openvas/Makefile | 2 +- security/openvas/distinfo | 6 +++--- security/openvas/pkg-plist | 4 ++-- security/py-greenbone-feed-sync/Makefile | 2 +- .../files/patch-greenbone-feed-sync_config.py | 7 ++++--- security/py-notus-scanner/Makefile | 1 + .../files/patch-notus-scanner-cli_parser.py | 13 ++++++++----- security/py-python-gvm/Makefile | 5 +++-- security/py-python-gvm/distinfo | 6 +++--- 17 files changed, 42 insertions(+), 32 deletions(-) diff --git a/databases/pg-gvm/Makefile b/databases/pg-gvm/Makefile index f7b76bda5d7c..f8edc9d82be7 100644 --- a/databases/pg-gvm/Makefile +++ b/databases/pg-gvm/Makefile @@ -1,6 +1,7 @@ PORTNAME= pg-gvm DISTVERSION= 22.6.1 DISTVERSIONPREFIX=v +PORTREVISION= 1 CATEGORIES= databases devel MAINTAINER= acm@FreeBSD.org diff --git a/security/gsad/Makefile b/security/gsad/Makefile index b071d3e32f86..b2931a4363b0 100644 --- a/security/gsad/Makefile +++ b/security/gsad/Makefile @@ -1,6 +1,7 @@ PORTNAME= gsad DISTVERSIONPREFIX= v DISTVERSION= 22.6.0 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= acm@FreeBSD.org diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile index 16be6138d866..5af1f1766dcc 100644 --- a/security/gvm-libs/Makefile +++ b/security/gvm-libs/Makefile @@ -1,6 +1,6 @@ PORTNAME= gvm DISTVERSIONPREFIX= v -DISTVERSION= 22.7.1 +DISTVERSION= 22.7.3 CATEGORIES= security PKGNAMESUFFIX= -libs diff --git a/security/gvm-libs/distinfo b/security/gvm-libs/distinfo index 9ce47deecc8a..13c053cbc31c 100644 --- a/security/gvm-libs/distinfo +++ b/security/gvm-libs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695258196 -SHA256 (greenbone-gvm-libs-v22.7.1_GH0.tar.gz) = e016e9d16a2cf2cdd0c8b928c2d52be1468962870f93a1b82e4af737480644b5 -SIZE (greenbone-gvm-libs-v22.7.1_GH0.tar.gz) = 309225 +TIMESTAMP = 1697841226 +SHA256 (greenbone-gvm-libs-v22.7.3_GH0.tar.gz) = af081e5cca0736063076246282a416fba016131f44f7407b2702ae7dfb96016d +SIZE (greenbone-gvm-libs-v22.7.3_GH0.tar.gz) = 309842 diff --git a/security/gvm-libs/pkg-plist b/security/gvm-libs/pkg-plist index f095afdcae1a..d6e29dcfb917 100644 --- a/security/gvm-libs/pkg-plist +++ b/security/gvm-libs/pkg-plist @@ -40,19 +40,19 @@ include/gvm/util/uuidutils.h include/gvm/util/xmlutils.h lib/libgvm_base.so lib/libgvm_base.so.22 -lib/libgvm_base.so.22.7.1 +lib/libgvm_base.so.22.7.3 lib/libgvm_boreas.so lib/libgvm_boreas.so.22 -lib/libgvm_boreas.so.22.7.1 +lib/libgvm_boreas.so.22.7.3 lib/libgvm_gmp.so lib/libgvm_gmp.so.22 -lib/libgvm_gmp.so.22.7.1 +lib/libgvm_gmp.so.22.7.3 lib/libgvm_osp.so lib/libgvm_osp.so.22 -lib/libgvm_osp.so.22.7.1 +lib/libgvm_osp.so.22.7.3 lib/libgvm_util.so lib/libgvm_util.so.22 -lib/libgvm_util.so.22.7.1 +lib/libgvm_util.so.22.7.3 libdata/pkgconfig/libgvm_base.pc libdata/pkgconfig/libgvm_boreas.pc libdata/pkgconfig/libgvm_gmp.pc diff --git a/security/gvm/Makefile b/security/gvm/Makefile index f3d65c9a0541..43dc6e55d07e 100644 --- a/security/gvm/Makefile +++ b/security/gvm/Makefile @@ -1,5 +1,6 @@ PORTNAME= gvm PORTVERSION= 22.9.0 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= acm@FreeBSD.org diff --git a/security/gvm/files/pkg-message.in b/security/gvm/files/pkg-message.in index 28cac7be226f..0911c6ce7785 100644 --- a/security/gvm/files/pkg-message.in +++ b/security/gvm/files/pkg-message.in @@ -26,7 +26,7 @@ Basic instructions for configure your gvm infraestruture are following: # echo "[notus-scanner]" > /usr/local/etc/gvm/notus-scanner.toml # echo 'mqtt-broker-address = "localhost"' >> /usr/local/etc/gvm/notus-scanner.toml # echo 'mqtt-broker-port = "1883"' >> /usr/local/etc/gvm/notus-scanner.toml - # echo 'products-directory = "/var/lib/openvas/plugins/notus/products"' >> /usr/local/etc/gvm/notus-scanner.toml + # echo 'products-directory = "/var/lib/notus/products"' >> /usr/local/etc/gvm/notus-scanner.toml # echo 'log-level = "INFO"' >> /usr/local/etc/gvm/notus-scanner.toml # echo "disable-hashsum-verification = false" >> /usr/local/etc/gvm/notus-scanner.toml @@ -37,8 +37,8 @@ Basic instructions for configure your gvm infraestruture are following: # pw groupmod redis -M gvm -5) security/gvmd uses PostgreSQL database. Generally, PostgreSQL must be - installed in the same server where security/gvmd is running: +5) security/gvmd uses PostgreSQL database (server and contrib). Generally, + PostgreSQL must be installed in the same server where security/gvmd is running: # su postgres # createuser -DRS gvm diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile index 59f681be8023..d08fb69af923 100644 --- a/security/gvmd/Makefile +++ b/security/gvmd/Makefile @@ -1,6 +1,7 @@ PORTNAME= gvmd DISTVERSION= 22.9.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= security MAINTAINER= acm@FreeBSD.org diff --git a/security/openvas/Makefile b/security/openvas/Makefile index d7c25436dd29..93e2b40529ba 100644 --- a/security/openvas/Makefile +++ b/security/openvas/Makefile @@ -1,5 +1,5 @@ PORTNAME= openvas -DISTVERSION= 22.7.5 +DISTVERSION= 22.7.6 DISTVERSIONPREFIX= v CATEGORIES= security diff --git a/security/openvas/distinfo b/security/openvas/distinfo index 61656f1b44f6..d93992e72b96 100644 --- a/security/openvas/distinfo +++ b/security/openvas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695269107 -SHA256 (greenbone-openvas-scanner-v22.7.5_GH0.tar.gz) = 7ac193c18097742ba8b7360802a10c3b3a9a9c742dbe788eaa34e6fcad1405b4 -SIZE (greenbone-openvas-scanner-v22.7.5_GH0.tar.gz) = 976268 +TIMESTAMP = 1697841533 +SHA256 (greenbone-openvas-scanner-v22.7.6_GH0.tar.gz) = dd69b79a0ca4f5d2a7186398530b9ef848599b1ad6fb90c506a74fbf02d84230 +SIZE (greenbone-openvas-scanner-v22.7.6_GH0.tar.gz) = 1027968 diff --git a/security/openvas/pkg-plist b/security/openvas/pkg-plist index 748a3b72dc38..701b681b3478 100644 --- a/security/openvas/pkg-plist +++ b/security/openvas/pkg-plist @@ -3,10 +3,10 @@ bin/openvas-nasl-lint @sample %%ETCDIR%%/openvas_log.conf.sample lib/libopenvas_misc.so lib/libopenvas_misc.so.22 -lib/libopenvas_misc.so.22.7.5 +lib/libopenvas_misc.so.22.7.6 lib/libopenvas_nasl.so lib/libopenvas_nasl.so.22 -lib/libopenvas_nasl.so.22.7.5 +lib/libopenvas_nasl.so.22.7.6 sbin/openvas share/man/man1/openvas-nasl-lint.1.gz share/man/man1/openvas-nasl.1.gz diff --git a/security/py-greenbone-feed-sync/Makefile b/security/py-greenbone-feed-sync/Makefile index 0493918b8342..658205e089fe 100644 --- a/security/py-greenbone-feed-sync/Makefile +++ b/security/py-greenbone-feed-sync/Makefile @@ -1,7 +1,7 @@ PORTNAME= greenbone-feed-sync DISTVERSION= 23.8.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py b/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py index b7736118da6d..f22b751f5c55 100644 --- a/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py +++ b/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py @@ -1,12 +1,13 @@ ---- greenbone/feed/sync/config.py 2023-09-21 01:01:53.391475000 -0500 -+++ greenbone/feed/sync/config.py 2023-09-21 01:02:58.557438000 -0500 +--- greenbone/feed/sync/config.py 2023-08-31 07:57:04.000000000 -0500 ++++ greenbone/feed/sync/config.py 2023-10-20 10:18:44.157521000 -0500 @@ -69,10 +69,10 @@ DEFAULT_GVMD_LOCK_FILE_PATH = "gvm/feed-update.lock" DEFAULT_OPENVAS_LOCK_FILE_PATH = "openvas/feed-update.lock" -DEFAULT_CONFIG_FILE = "/etc/gvm/greenbone-feed-sync.toml" +-DEFAULT_USER_CONFIG_FILE = "~/.config/greenbone-feed-sync.toml" +DEFAULT_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/greenbone-feed-sync.toml" - DEFAULT_USER_CONFIG_FILE = "~/.config/greenbone-feed-sync.toml" ++DEFAULT_USER_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/greenbone-feed-sync.toml" -DEFAULT_ENTERPRISE_KEY_PATH = "/etc/gvm/greenbone-enterprise-feed-key" +DEFAULT_ENTERPRISE_KEY_PATH = "%%LOCALBASE%%/etc/gvm/greenbone-enterprise-feed-key" diff --git a/security/py-notus-scanner/Makefile b/security/py-notus-scanner/Makefile index ac28d53f49d2..37022b698a85 100644 --- a/security/py-notus-scanner/Makefile +++ b/security/py-notus-scanner/Makefile @@ -1,6 +1,7 @@ PORTNAME= notus-scanner DISTVERSION= 22.6.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py b/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py index 5b9a28e1b67b..cc9c814cdd51 100644 --- a/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py +++ b/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py @@ -1,11 +1,14 @@ ---- notus/scanner/cli/parser.py 2022-07-31 23:45:49.051030000 -0500 -+++ notus/scanner/cli/parser.py 2022-07-31 23:46:07.662584000 -0500 -@@ -29,7 +29,7 @@ +--- notus/scanner/cli/parser.py 2023-08-30 03:14:56.000000000 -0500 ++++ notus/scanner/cli/parser.py 2023-10-20 18:26:27.530523000 -0500 +@@ -16,9 +16,8 @@ logger = logging.getLogger(__name__) -DEFAULT_CONFIG_FILE = "/etc/gvm/notus-scanner.toml" +-DEFAULT_USER_CONFIG_FILE = "~/.config/notus-scanner.toml" +- +DEFAULT_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/notus-scanner.toml" - DEFAULT_USER_CONFIG_FILE = "~/.config/notus-scanner.toml" - ++DEFAULT_USER_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/notus-scanner.toml" + def log_level(string: str) -> str: + """Check if provided string is a valid log level.""" diff --git a/security/py-python-gvm/Makefile b/security/py-python-gvm/Makefile index 514dfcc854fa..3d6dc7066687 100644 --- a/security/py-python-gvm/Makefile +++ b/security/py-python-gvm/Makefile @@ -1,5 +1,5 @@ PORTNAME= python-gvm -DISTVERSION= 23.5.1 +DISTVERSION= 23.10.0 DISTVERSIONPREFIX= v CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -27,7 +27,8 @@ post-extract: post-patch: ${REINPLACE_CMD} -i "" -e 's|/run/gvmd/|/var/run/gvmd/|g' \ ${WRKSRC}/gvm/connections.py - ${REINPLACE_CMD} '31d' ${WRKSRC}/pyproject.toml + ${REINPLACE_CMD} -e 's|, { include = "tests", format = "sdist" }||g' \ + ${WRKSRC}/pyproject.toml pre-configure: @cd ${WRKSRC} && poetry2setup > ${WRKSRC}/setup.py diff --git a/security/py-python-gvm/distinfo b/security/py-python-gvm/distinfo index 668f679af186..7723bb2b2fec 100644 --- a/security/py-python-gvm/distinfo +++ b/security/py-python-gvm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695319244 -SHA256 (greenbone-python-gvm-v23.5.1_GH0.tar.gz) = c0933d1fd0a1c04ca88d6dcf74646ef2fed4aa5bb44132b1f60679cf580e99a7 -SIZE (greenbone-python-gvm-v23.5.1_GH0.tar.gz) = 291456 +TIMESTAMP = 1697844480 +SHA256 (greenbone-python-gvm-v23.10.0_GH0.tar.gz) = 6d11c9b07790386bb16a8cce207a92ccfbaf9202b6dec2089bdd9b673ea6ef0c +SIZE (greenbone-python-gvm-v23.10.0_GH0.tar.gz) = 272387