git: 0b5bc7659366 - main - security/py-notus-scanner: Update to 22.4.5

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Sun, 02 Apr 2023 22:57:04 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b5bc765936618a1c79da7273d98b1530f7dc01a

commit 0b5bc765936618a1c79da7273d98b1530f7dc01a
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-04-02 22:41:55 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2023-04-02 22:41:55 +0000

    security/py-notus-scanner: Update to 22.4.5
    
    - Fix issues with tests files installation path[1]
    
    ChangeLog at:   https://github.com/greenbone/notus-scanner/releases/tag/v22.4.5
    PR:             270542
    Reported by:    jcfyecrayz  _at_ liamekaens.com [1]
---
 security/py-notus-scanner/Makefile  |   6 +-
 security/py-notus-scanner/distinfo  |   6 +-
 security/py-notus-scanner/pkg-plist | 148 ++++++++++++++++++------------------
 3 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/security/py-notus-scanner/Makefile b/security/py-notus-scanner/Makefile
index 3b459639b39e..801b6a30aab0 100644
--- a/security/py-notus-scanner/Makefile
+++ b/security/py-notus-scanner/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	notus-scanner
-DISTVERSION=	22.4.1
+DISTVERSION=	22.4.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -35,10 +35,14 @@ GROUPS=		${USERS}
 USE_RC_SUBR=	${PORTNAME:S/-/_/}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
+post-extract:
+	${MV} ${WRKSRC}/tests ${WRKSRC}/notus/
+
 post-patch:
 	${REINPLACE_CMD} -i "" -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/notus/scanner/cli/parser.py
 	${REINPLACE_CMD} -i "" -e 's|/etc/openvas/gnupg|/var/lib/openvas/gnupg|g' \
 		${WRKSRC}/notus/scanner/loader/gpg_sha_verifier.py
+	${REINPLACE_CMD} '37d' ${WRKSRC}/pyproject.toml
 	@${RM} ${WRKSRC}/notus/scanner/cli/parser.py.orig
 	@${RM} ${WRKSRC}/notus/scanner/config.py.orig
 
diff --git a/security/py-notus-scanner/distinfo b/security/py-notus-scanner/distinfo
index f86d56e5fb2c..d0c567444eab 100644
--- a/security/py-notus-scanner/distinfo
+++ b/security/py-notus-scanner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661642311
-SHA256 (greenbone-notus-scanner-v22.4.1_GH0.tar.gz) = 2f575d4f310cfab06712f0b081bc6fc0c12bb83006a3a9a9ca271890e10fbf9a
-SIZE (greenbone-notus-scanner-v22.4.1_GH0.tar.gz) = 293410
+TIMESTAMP = 1680417913
+SHA256 (greenbone-notus-scanner-v22.4.5_GH0.tar.gz) = dfff80cb5254caf76701117260094f7d388c87ab00e5ce26298b67f02a0fc4bf
+SIZE (greenbone-notus-scanner-v22.4.5_GH0.tar.gz) = 319768
diff --git a/security/py-notus-scanner/pkg-plist b/security/py-notus-scanner/pkg-plist
index b411615950de..94283fd1fe72 100644
--- a/security/py-notus-scanner/pkg-plist
+++ b/security/py-notus-scanner/pkg-plist
@@ -100,80 +100,80 @@ bin/notus-subscriber
 %%PYTHON_SITELIBDIR%%/notus/scanner/tools/scanstart.py
 %%PYTHON_SITELIBDIR%%/notus/scanner/tools/subscriber.py
 %%PYTHON_SITELIBDIR%%/notus/scanner/utils.py
-%%PYTHON_SITELIBDIR%%/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/__pycache__/test_config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/__pycache__/test_config%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/__pycache__/test_verifier%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/__pycache__/test_verifier%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/cli/__init__.py
-%%PYTHON_SITELIBDIR%%/tests/cli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/cli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/cli/__pycache__/test_cli_parser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/cli/__pycache__/test_cli_parser%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/cli/test_cli_parser.py
-%%PYTHON_SITELIBDIR%%/tests/fakespecifier_os.notus
-%%PYTHON_SITELIBDIR%%/tests/loader/__init__.py
-%%PYTHON_SITELIBDIR%%/tests/loader/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/loader/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/loader/__pycache__/test_gpg%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/loader/__pycache__/test_gpg%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/loader/__pycache__/test_json%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/loader/__pycache__/test_json%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/loader/emptyos.notus
-%%PYTHON_SITELIBDIR%%/tests/loader/euleros_v2.0sp1.notus
-%%PYTHON_SITELIBDIR%%/tests/loader/invalid_package.notus
-%%PYTHON_SITELIBDIR%%/tests/loader/test_gpg.py
-%%PYTHON_SITELIBDIR%%/tests/loader/test_json.py
-%%PYTHON_SITELIBDIR%%/tests/messages/__init__.py
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/test_message%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/test_message%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/test_result%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/test_result%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/test_start%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/test_start%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/test_status%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/__pycache__/test_status%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/messages/test_message.py
-%%PYTHON_SITELIBDIR%%/tests/messages/test_result.py
-%%PYTHON_SITELIBDIR%%/tests/messages/test_start.py
-%%PYTHON_SITELIBDIR%%/tests/messages/test_status.py
-%%PYTHON_SITELIBDIR%%/tests/messaging/__init__.py
-%%PYTHON_SITELIBDIR%%/tests/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/messaging/__pycache__/test_mqtt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/messaging/__pycache__/test_mqtt%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/messaging/test_mqtt.py
-%%PYTHON_SITELIBDIR%%/tests/models/__init__.py
-%%PYTHON_SITELIBDIR%%/tests/models/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/__pycache__/test_advisory%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/__pycache__/test_advisory%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/__pycache__/test_vulnerability%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/__pycache__/test_vulnerability%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__init__.py
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/test_deb%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/test_deb%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/test_ebuild%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/test_ebuild%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/test_package%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/test_package%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/test_rpm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/__pycache__/test_rpm%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/tests/models/packages/gentoo_examples.txt
-%%PYTHON_SITELIBDIR%%/tests/models/packages/test_deb.py
-%%PYTHON_SITELIBDIR%%/tests/models/packages/test_ebuild.py
-%%PYTHON_SITELIBDIR%%/tests/models/packages/test_package.py
-%%PYTHON_SITELIBDIR%%/tests/models/packages/test_rpm.py
-%%PYTHON_SITELIBDIR%%/tests/models/test_advisory.py
-%%PYTHON_SITELIBDIR%%/tests/models/test_vulnerability.py
-%%PYTHON_SITELIBDIR%%/tests/test_config.py
-%%PYTHON_SITELIBDIR%%/tests/test_verifier.py
+%%PYTHON_SITELIBDIR%%/notus/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/test_config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/test_config%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/test_verifier%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/__pycache__/test_verifier%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/cli/__init__.py
+%%PYTHON_SITELIBDIR%%/notus/tests/cli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/cli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/cli/__pycache__/test_cli_parser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/cli/__pycache__/test_cli_parser%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/cli/test_cli_parser.py
+%%PYTHON_SITELIBDIR%%/notus/tests/fakespecifier_os.notus
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/__init__.py
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/test_gpg%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/test_gpg%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/test_json%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/__pycache__/test_json%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/emptyos.notus
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/euleros_v2.0sp1.notus
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/invalid_package.notus
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/test_gpg.py
+%%PYTHON_SITELIBDIR%%/notus/tests/loader/test_json.py
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__init__.py
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_message%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_message%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_result%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_result%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_start%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_start%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_status%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/__pycache__/test_status%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/test_message.py
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/test_result.py
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/test_start.py
+%%PYTHON_SITELIBDIR%%/notus/tests/messages/test_status.py
+%%PYTHON_SITELIBDIR%%/notus/tests/messaging/__init__.py
+%%PYTHON_SITELIBDIR%%/notus/tests/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messaging/__pycache__/test_mqtt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messaging/__pycache__/test_mqtt%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/messaging/test_mqtt.py
+%%PYTHON_SITELIBDIR%%/notus/tests/models/__init__.py
+%%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/test_advisory%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/test_advisory%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/test_vulnerability%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/__pycache__/test_vulnerability%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__init__.py
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_deb%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_deb%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_ebuild%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_ebuild%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_package%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_package%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_rpm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/__pycache__/test_rpm%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/gentoo_examples.txt
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/test_deb.py
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/test_ebuild.py
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/test_package.py
+%%PYTHON_SITELIBDIR%%/notus/tests/models/packages/test_rpm.py
+%%PYTHON_SITELIBDIR%%/notus/tests/models/test_advisory.py
+%%PYTHON_SITELIBDIR%%/notus/tests/models/test_vulnerability.py
+%%PYTHON_SITELIBDIR%%/notus/tests/test_config.py
+%%PYTHON_SITELIBDIR%%/notus/tests/test_verifier.py
 @dir(gvm,gvm,750) /var/run/notus-scanner
 @dir(gvm,gvm,750) /var/lib/openvas/plugins/notus/products
 @dir(gvm,gvm,750) /var/lib/openvas/plugins/notus