security/py-ospd-openvas: update to 22.4.0

ChangeLog at:	https://github.com/greenbone/ospd-openvas/releases/tag/v22.4.0

5 files changed, 56 insertions, 71 deletions

diff --git a/security/py-ospd-openvas/Makefile b/security/py-ospd-openvas/Makefile
index 8614c3d7e50b..02557ea63f21 100644
--- a/security/py-ospd-openvas/Makefile
+++ b/security/py-ospd-openvas/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ospd-openvas
-DISTVERSION=	21.4.4
+DISTVERSION=	22.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
 #MASTER_SITES=	CHEESESHOP
@@ -11,6 +11,7 @@ COMMENT=	Scanner wrapper for OSP (Open Scanner Protocol)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry2setup>0:devel/py-poetry2setup@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
@@ -18,6 +19,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}deprecated>0:devel/py-deprecated@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}paho-mqtt>0:net/py-paho-mqtt@${PY_FLAVOR} \
 		openvas:security/openvas
 
 USE_GITHUB=	yes
@@ -35,10 +38,18 @@ GROUPS=		${USERS}
 USE_RC_SUBR=	${PORTNAME:S/-/_/}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
-post-extract:
-	@${CP} ${FILESDIR}/setup.py ${WRKSRC}
+post-patch:
+	${REINPLACE_CMD} -i "" '38d' ${WRKSRC}/pyproject.toml
+	${REINPLACE_CMD} -i "" -e 's|/etc/openvas/gnupg|/var/lib/openvas/gnupg|g' \
+		${WRKSRC}/ospd_openvas/gpg_sha_verifier.py
+	${REINPLACE_CMD} -i "" -e 's|/run/ospd|/var/run/ospd|g' \
+		${WRKSRC}/ospd/parser.py ${WRKSRC}/config/ospd-openvas.conf
+pre-configure:
+	@cd ${WRKSRC} && poetry2setup > ${WRKSRC}/setup.py
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gvm
+	@${INSTALL_DATA} ${WRKSRC}/config/ospd-openvas.conf ${STAGEDIR}${PREFIX}/etc/gvm/ospd-openvas.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/run/ospd
 
 .include <bsd.port.mk>
diff --git a/security/py-ospd-openvas/distinfo b/security/py-ospd-openvas/distinfo
index bafe81d47be3..c6b4bf778c26 100644
--- a/security/py-ospd-openvas/distinfo
+++ b/security/py-ospd-openvas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651533145
-SHA256 (greenbone-ospd-openvas-v21.4.4_GH0.tar.gz) = 81d6b498706586c13a08429922f8f194927bc32a60cbdb867ad533e93b67449d
-SIZE (greenbone-ospd-openvas-v21.4.4_GH0.tar.gz) = 173368
+TIMESTAMP = 1659313868
+SHA256 (greenbone-ospd-openvas-v22.4.0_GH0.tar.gz) = c8cc694490405dfc3af7bee7013aa7594ac579530890b27b2475f3d0fbcd1200
+SIZE (greenbone-ospd-openvas-v22.4.0_GH0.tar.gz) = 242560
diff --git a/security/py-ospd-openvas/files/ospd_openvas.in b/security/py-ospd-openvas/files/ospd_openvas.in
index caff9f459843..fdb24cb11455 100644
--- a/security/py-ospd-openvas/files/ospd_openvas.in
+++ b/security/py-ospd-openvas/files/ospd_openvas.in
@@ -23,7 +23,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_config="/usr/local/etc/gvm/ospd-openvas.conf"}
 : ${ospd_openvas_flags="--lock-file-dir /var/run/ospd --socket-mode 770 --unix-socket /var/run/ospd/ospd-openvas.sock"}
 : ${ospd_openvas_user="gvm"}
 
diff --git a/security/py-ospd-openvas/files/setup.py b/security/py-ospd-openvas/files/setup.py
deleted file mode 100644
index ea7960e7d3af..000000000000
--- a/security/py-ospd-openvas/files/setup.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014-2021 Greenbone Networks GmbH
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-from setuptools import setup, find_packages
-
-from ospd_openvas import __version__
-
-setup(
-    name='ospd-openvas',
-    version=__version__,
-    packages=find_packages(exclude=['tests*']),
-    url='https://github.com/greenbone/ospd-openvas',
-    author='Greenbone Networks GmbH',
-    author_email='info@greenbone.net',
-    license='AGPLv3+',
-    # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
-    classifiers=[
-        # How mature is this project? Common values are
-        # 3 - Alpha
-        # 4 - Beta
-        # 5 - Production/Stable
-        'Development Status :: 5 - Production/Stable',
-        # Indicate who your project is intended for
-        'Intended Audience :: Developers',
-        'Intended Audience :: System Administrators',
-        # Pick your license as you wish (should match "license" above)
-        'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
-        # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-    ],
-    python_requires='>=3.7',
-    install_requires=[
-        'ospd>=21.4.0',
-        'redis>=3.0.1',
-        'psutil',
-        'packaging',
-    ],
-    entry_points={'console_scripts': ['ospd-openvas=ospd_openvas.daemon:main']},
-    test_suite="tests",
-)
diff --git a/security/py-ospd-openvas/pkg-plist b/security/py-ospd-openvas/pkg-plist
index 8be59cab7478..d440dd2351cf 100644
--- a/security/py-ospd-openvas/pkg-plist
+++ b/security/py-ospd-openvas/pkg-plist
@@ -1,9 +1,8 @@
 bin/ospd-openvas
+@sample etc/gvm/ospd-openvas.conf.sample
 %%PYTHON_SITELIBDIR%%/ospd/__init__.py
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/cvss%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -22,8 +21,6 @@ bin/ospd-openvas
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/network%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/ospd%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/ospd%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd/__pycache__/ospd_ssh%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd/__pycache__/ospd_ssh%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/parser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/parser%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/protocol%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -42,7 +39,8 @@ bin/ospd-openvas
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/vts%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/xml%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/__pycache__/xml%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd/__version__.py
+%%PYTHON_SITELIBDIR%%/ospd/__pycache__/xmlvt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd/__pycache__/xmlvt%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__init__.py
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd/command/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -64,7 +62,6 @@ bin/ospd-openvas
 %%PYTHON_SITELIBDIR%%/ospd/misc.py
 %%PYTHON_SITELIBDIR%%/ospd/network.py
 %%PYTHON_SITELIBDIR%%/ospd/ospd.py
-%%PYTHON_SITELIBDIR%%/ospd/ospd_ssh.py
 %%PYTHON_SITELIBDIR%%/ospd/parser.py
 %%PYTHON_SITELIBDIR%%/ospd/protocol.py
 %%PYTHON_SITELIBDIR%%/ospd/resultlist.py
@@ -74,6 +71,7 @@ bin/ospd-openvas
 %%PYTHON_SITELIBDIR%%/ospd/vtfilter.py
 %%PYTHON_SITELIBDIR%%/ospd/vts.py
 %%PYTHON_SITELIBDIR%%/ospd/xml.py
+%%PYTHON_SITELIBDIR%%/ospd/xmlvt.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__init__.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -83,10 +81,18 @@ bin/ospd-openvas
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/daemon%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/dryrun%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/dryrun%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/feed%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/feed%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/gpg_sha_verifier%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/gpg_sha_verifier%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/notus%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/notus%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/openvas%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -98,10 +104,36 @@ bin/ospd-openvas
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__version__.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/daemon.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/db.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/dryrun.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/errors.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/feed.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/gpg_sha_verifier.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/lock.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__init__.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/message%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/message%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/result%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messages/__pycache__/result%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messages/message.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messages/result.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__init__.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/mqtt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/mqtt%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/publisher%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/publisher%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/subscriber%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/__pycache__/subscriber%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/mqtt.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/publisher.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/messaging/subscriber.py
+%%PYTHON_SITELIBDIR%%/ospd_openvas/notus.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/nvticache.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/openvas.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/preferencehandler.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/vthelper.py
 @dir(gvm,gvm,750) /var/run/ospd
+@dir etc/gvm