openvas: 11.0.1 bump

2026-05-05 11:00:48 +02:00 · 2020-05-14 21:10:57 +08:00 · 2020-05-14 21:10:57 +08:00 · 8f4f5cd70d
commit 8f4f5cd70d
parent 84e292ed83
20 changed files with 531 additions and 19 deletions
--- a/dev-python/python-gvm/Manifest
+++ b/dev-python/python-gvm/Manifest
@ -1 +1,2 @@
 DIST python-gvm-1.1.0.tar.gz 101700 BLAKE2B 53c0e2f443c8315e32e21910bc7387e396ac6ec45d9b0c380ba0a33c0ce0b1e872df978e9969dd21a893770555d0ca37e6e91e5c77000e23f6646b074266f980 SHA512 595753a5ff31080767891e72d23211f78088011ffe3713b5ad17477207b665e64520035c01e4e536b8e26113f93c8cf7eea0cfab84b2823ce4f38890c5549019
+DIST python-gvm-1.5.0.tar.gz 120806 BLAKE2B abf7735d79cea0119d86bf96af7bede61993bc685e35aabd58dd3314a2f2896463d7a5539045d56a6b456ba9de772c3cedf040a0ce6aed19244b188343067d99 SHA512 a3439260a7d49949635ae9f62fa5347041fe448a083c05eaf094e87341fdfbe4316112f4aede4905bc38e96ff62e56f4723b06733cfbbe27823dcb2fd4c60d8e
--- a/dev-python/python-gvm/files/1.5.0-notests.patch
+++ b/dev-python/python-gvm/files/1.5.0-notests.patch
@ -0,0 +1,21 @@
+--- a/setup.py.orig	2020-05-12 16:02:44.412092000 +0800
+++ b/setup.py	2020-05-14 18:54:56.272896810 +0800
+@@ -6,17 +6,7 @@
+  'gvm.protocols',
+  'gvm.protocols.gmpv7',
+  'gvm.protocols.gmpv8',
+- 'gvm.protocols.gmpv9',
+- 'tests',
+- 'tests.connections',
+- 'tests.protocols',
+- 'tests.protocols.gmp',
+- 'tests.protocols.gmpv7',
+- 'tests.protocols.gmpv8',
+- 'tests.protocols.gmpv9',
+- 'tests.protocols.osp',
+- 'tests.transforms',
+- 'tests.utils']
+ 'gvm.protocols.gmpv9']
+ 
+ package_data = \
+ {'': ['*']}
--- a/dev-python/python-gvm/python-gvm-1.5.0.ebuild
+++ b/dev-python/python-gvm/python-gvm-1.5.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to communicate with remote servers over GMP or OSP"
+HOMEPAGE="https://github.com/greenbone/python-gvm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+LICENSE="GPL-3+"
+SLOT=0
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
+	"
+
+PATCHES=( "${FILESDIR}/${PV}-notests.patch" )
+
+#src_prepare(){
+#	rm -r tests
+#	eapply_user
+#}
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@ -1,4 +1,4 @@
-DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2
-DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8
 DIST greenbone-security-assistant-9.0.0.tar.gz 1807537 BLAKE2B 00690e4f6dd1078a79c9309e19c751a6f31b856a2de762e0f1d0e8ce8601c82351b059a8995a9051a6fc1061d3ae9bf27c49fcaef6e76d3837f308eef06bf79f SHA512 5f2b955408e0231b96f4b2415df0c76e9003079acd65b9e1c771082999540121ff92a8c17d9529362be8f7fc632d91bd3f48854a5a2d9632efe10fb354361d8e
+DIST greenbone-security-assistant-9.0.1.tar.gz 1936391 BLAKE2B 22b9020a97e79b31555d66826740ca49d1eba5d55324f0e80349dc571a7b45bcf2c6403ac311e78f742c51900921f3e61ef0740f11fd794069242e2ab21b1c3e SHA512 688bde97722f31416406e43230253c05dc8d05eb9fea6d8fd084ec4e748b67bab238f78cc11534e4fc948d911e468d43b5be0b224f17959db5e59faae7f5d086
 DIST gsa-9.0.0-node_modules.tar.gz 43618847 BLAKE2B 6fe4da525d8e870ad7982bdbd3c470a0b352f31fe8d150355e415bc0c3659adeec5be6a61b61ec91a4243f4911e5977e0fb347dd6d973e7adf910c46825fefd8 SHA512 f9254d897fc295a7fa277d1f8abc92e560b4d5a3c8cbb96ae50cedea7207e3d1744be59aa8a647568673f2e426a242d7679385cb02e7372b318bd0eb67d30f43
+DIST gsa-node-modules-9.0.1.tar 228392960 BLAKE2B 182d203dfa758377546e8f092d03a9dd02a0a933f289dbc7c82bf27671d65f2331ca9f8e0eaa2e47ac398eb759bd0704585750962486e69ac9a3fe33870eaa51 SHA512 f69ffde9c9af23ccadc8b9e534061072bc0b4a5702a9da572eeee36a7f9103a9b06296d7ba11215c1787afac7cd8d3a6dd3edf8d85b0f4267cf8ef296e0bf97c
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r3.ebuild
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r3.ebuild
@ -13,7 +13,8 @@ MY_NODE_N="node_modules"
 DESCRIPTION="Greenbone Security Assistant"
 HOMEPAGE="https://www.greenbone.net/en/"
 SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	 https://github.com/greenbone/gsa/releases/download/v8.0.1/gsa-node-modules-8.0.1.tar.gz -> ${P}-${MY_NODE_N}.tar.gz"
+	https://github.com/greenbone/gsa/releases/download/v9.0.1/gsa-node-modules-9.0.1.tar.gz -> gsa-node-modules-9.0.1.tar"
+#	 https://dev.pentoo.ch/~blshkv/distfiles/gsa-${PV}-${MY_NODE_N}.tar.gz"

 SLOT="0"
 LICENSE="GPL-2+"
@ -25,12 +26,13 @@ DEPEND="
 	dev-libs/libxslt
 	>=net-analyzer/gvm-libs-10.0.1
 	net-libs/gnutls:=
-	net-libs/libmicrohttpd[messages]"
+	net-libs/libmicrohttpd"
+#[messages]"

 RDEPEND="
 	${DEPEND}
 	!~net-analyzer/greenbone-security-assistant-7.0.3
-	>=net-analyzer/openvas-scanner-6.0.1
+	>=net-analyzer/openvas-scanner-7.0.0
 	>=net-analyzer/gvmd-8.0.1"

 BDEPEND="
@ -50,17 +52,17 @@ MY_NODE_DIR="${S}/${MY_PN}/"

 PATCHES=(
 	# QA fix for 8.0.0.
-	"${FILESDIR}/${P}-pid.patch"
+#	"${FILESDIR}/${PN}-8.0.1-pid.patch"
 	# Disable yarn-fetch during compile.
-	"${FILESDIR}/${P}-node.patch"
+	"${FILESDIR}/${PN}-8.0.1-node.patch"
 	# Fix react-env path for react.js.
-	"${FILESDIR}/${P}-reactjs.patch"
+	"${FILESDIR}/${PN}-9.0.0-reactjs.patch"
 	# Remove ugly uninstall-snippet that causes failing re-emerge.
-	"${FILESDIR}/${P}-uninstall-snippet.patch"
+	"${FILESDIR}/${PN}-8.0.1-uninstall-snippet.patch"
 	# Remove unnecessary install paths/files.
-	"${FILESDIR}/${P}-cmakelist.patch"
+	"${FILESDIR}/${PN}-8.0.1-cmakelist.patch"
 	# Install exec. to /usr/bin instead of /usr/sbin
-	"${FILESDIR}/${P}-sbin.patch"
+	"${FILESDIR}/${PN}-8.0.1-sbin.patch"
 )

 src_prepare() {
@ -69,6 +71,7 @@ src_prepare() {
 	mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
 	# Update .yarnrc accordingly.
 	echo "--modules-folder ${MY_NODE_DIR}" >> "${S}/${MY_PN}/.yarnrc" || die "echo failed"
+	echo "SKIP_PREFLIGHT_CHECK=true" >> "${S}/${MY_PN}/.env" || die "echo with SKIP failed"
 	# QA-Fix | Remove !CLANG doxygen warnings for 8.0.1
 	if use extras; then
 		if ! tc-is-clang; then
--- a/net-analyzer/gvm-libs/Manifest
+++ b/net-analyzer/gvm-libs/Manifest
@ -1 +1,2 @@
 DIST gvm-libs-11.0.0.tar.gz 207205 BLAKE2B 026b999a48ad524df9305d219dd29f5deb71affb3f5d338ad1178924aa701f2fe698ee4009f4b5a6973de6e590a870871b3b708a2531aaba6e05755cd7f00f97 SHA512 ff981b4ca37b425a8d1f491e90bd1cef4701033886f9fd47dad34540b36fa275d4af8b176e63a07405cc1f29137851b96a6ce80c46ed92f809b089fb0cd928af
+DIST gvm-libs-11.0.1.tar.gz 213553 BLAKE2B b7c8ffeca8682fcfe68afe0992632fac18a01fc9b0016fcbaf27c0340b5150337784caac2368a22789073714808ce2c0471efde668e6911dcd0cfceaf862b671 SHA512 159acbe8e24f172398a6396988b87676a214fa15c2985e67845dcad1ebcb92ba5e2a19cee2994dc7cd0cac706992e81e8c6a793e99216aaac87a91c1c72c9a46
--- a/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild
+++ b/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild
@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils flag-o-matic toolchain-funcs user
+
+DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras ldap radius"
+
+DEPEND="
+	app-crypt/gpgme:=
+	dev-libs/hiredis
+	dev-libs/libgcrypt:=
+	dev-perl/UUID
+	net-libs/gnutls:=
+	net-libs/libssh:=
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	radius? ( net-dialup/freeradius-client )"
+
+RDEPEND="
+	${DEPEND}
+	!net-analyzer/openvas-libraries"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	extras? ( app-doc/doxygen[dot]
+		  app-doc/xmltoman
+		  app-text/htmldoc
+		  dev-perl/CGI
+		  dev-perl/SQL-Translator
+	)"
+
+#PATCHES=(
+	# Creating pid on build time instead of relying daemon!
+	# QA fix for 10.0.1.
+#	"${FILESDIR}/${P}-pid.patch"
+#	"${FILESDIR}/${PN}-11.0.0-gnutls.patch"
+#)
+
+pkg_setup() {
+	enewgroup gvm 495
+	enewuser gvm 495 -1 /var/lib/gvm gvm
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# QA-Fix | Remove doxygen warnings for !CLANG
+	if use extras; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
+		$(usex radius -DBUILD_WITHOUT_RADIUS=0 -DBUILD_WITHOUT_RADIUS=1)
+	)
+	# Add release hardening flags for 10.0.1
+#	append-cflags -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
+#	append-ldflags -Wl,-z,relro -Wl,-z,now
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use extras; then
+		cmake-utils_src_make -C "${BUILD_DIR}" doc
+		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+	fi
+	cmake-utils_src_make rebuild_cache
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/gvm
+	fowners -R gvm:gvm /var/lib/gvm
+}
--- a/net-analyzer/gvm-tools/Manifest
+++ b/net-analyzer/gvm-tools/Manifest
@ -1 +1,2 @@
 DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504be910266d6dac113caff1da096bc6072649ddc456b3348e1aba79c9b7e147ba019a70e4163267c474850019a076e SHA512 0adf7e06b1208c91fbc02dab42593280c95f6572e27d96d6f8777d710747a9e427c79678d9aef785b7ecd6d4fd30e79a1c063fe4256025ac0616c1d242f45025
+DIST gvm-tools-2.1.0.tar.gz 128144 BLAKE2B d9dd1857446912bd26a0b5efa38cc34c77bfe9959aaa9ab42ea8518ef9231e5877317319ac8e924b14a5382c80cb00c70d0413635506355eb111b84b5715bf4e SHA512 80933ab8303c1ff77451a9fafd9331b6a0b4c3ae40c4ea318171b6b9e969fb6f20c6970d021a14db1bf8ff816c7f779e2eb750bf84f9093055273f58ad04cda2
--- a/net-analyzer/gvm-tools/files/setup.py
+++ b/net-analyzer/gvm-tools/files/setup.py
@ -0,0 +1,66 @@
+# Copyright (C) 2017-2019 Greenbone Networks GmbH
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# pylint: disable=invalid-name
+import os
+import sys
+
+from setuptools import setup, find_packages
+
+sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
+
+version = __import__('gvmtools').get_version()
+
+with open('README.md', 'r') as f:
+    long_description = f.read()
+
+setup(
+    name='gvm-tools',
+    version=version,
+    author='Greenbone Networks GmbH',
+    author_email='info@greenbone.net',
+    description='Tools to control a GSM/GVM over GMP or OSP',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    url='https://github.com/greenbone/gvm-tools',
+    packages=find_packages(),
+    entry_points={
+        'console_scripts': [
+            'gvm-pyshell=gvmtools.pyshell:main',
+            'gvm-cli=gvmtools.cli:main',
+            'gvm-script=gvmtools.script:main',
+        ],
+    },
+    install_requires=[
+        'python-gvm',
+    ],
+    python_requires='>=3.5',
+    classifiers=[
+        # Full list: https://pypi.org/pypi?%3Aaction=list_classifiers
+        'Development Status :: 5 - Production/Stable',
+        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Intended Audience :: System Administrators',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Operating System :: OS Independent',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
+)
--- a/net-analyzer/gvm-tools/gvm-tools-2.1.0.ebuild
+++ b/net-analyzer/gvm-tools/gvm-tools-2.1.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/python-gvm[${PYTHON_USEDEP}]
+	!net-analyzer/openvas-cli"
+
+DEPEND="
+	${RDEPEND}"
+
+src_prepare() {
+	cp "${FILESDIR}/setup.py" .
+	distutils-r1_python_prepare_all
+	# Exlude tests & correct FHS/Gentoo policy paths
+	sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" "$S"/setup.py || die
+	sed -i -e "s*''*'/usr/share/doc/${P}'*g" "$S"/setup.py || die
+}
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@ -1 +1,2 @@
 DIST gvmd-9.0.0.tar.gz 1425724 BLAKE2B f44c14a660f2ee9986e5873011233a423565acfdaea479ac6749998da997343a97dabec0355d618fd9032b65871737ba0407525b8d2b49e88aaa58523b633cae SHA512 99faf4b4a9e0baf7993769efb30ef39e09d76173416b44baa1b0849c7b68bd07cd9f82404832136a3e1b37769c7d5e77e5da54275ff75fffc2e6e6fa7a8b9dac
+DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras"
+
+DEPEND="dev-libs/libgcrypt:0=
+	dev-libs/libical
+	>=net-analyzer/gvm-libs-11.0.0
+	net-libs/gnutls:=[tools]
+	dev-db/postgresql:*[uuid]
+	extras?	( app-text/xmlstarlet
+		dev-texlive/texlive-latexextra
+	)"
+
+RDEPEND="
+	${DEPEND}
+	!net-analyzer/openvas-manager
+	>=net-analyzer/openvas-scanner-7.0.0
+	!~net-analyzer/openvas-9.0.0"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	extras? ( app-doc/doxygen[dot]
+		  app-doc/xmltoman
+		  app-text/htmldoc
+		  dev-libs/libxslt
+	)"
+
+PATCHES=(
+	# Install exec. to /usr/bin instead of /usr/sbin
+	"${FILESDIR}/${PN}-9.0.0-sbin.patch"
+	# Fix permissions for user gvm.
+	"${FILESDIR}/${PN}-9.0.0-tmplock.patch"
+	#https://github.com/greenbone/gsa/issues/1258
+#	"${FILESDIR}/${P}-git.patch"
+)
+
+src_prepare() {
+#	sed -i -e "s|/tmp/ospd.sock|/var/run/ospd/ospd.sock|g" "$S"/src/manage_sql.c || die
+
+	cmake-utils_src_prepare
+	# QA-Fix | Use correct FHS/Gentoo policy paths for 8.0.1
+	sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die
+	sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die
+	# QA-Fix | Remove !CLANG Doxygen warnings for 8.0.1
+	if use extras; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
+	)
+	# Add release hardening flags for 8.0.1
+	append-cflags -Wno-nonnull -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
+	append-ldflags -Wl,-z,relro -Wl,-z,now
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use extras; then
+		cmake-utils_src_make -C "${BUILD_DIR}" doc
+		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+	fi
+	cmake-utils_src_make rebuild_cache
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodir /etc/gvm
+	insinto /etc/gvm
+	doins -r "${FILESDIR}"/*sync*
+
+	dodir /etc/gvm/sysconfig
+	insinto /etc/gvm/sysconfig
+	doins "${FILESDIR}/${PN}-daemon9.conf"
+
+	exeinto /etc/gvm
+	doexe "${FILESDIR}"/gvmd-startpre.sh
+
+	fowners -R gvm:gvm /etc/gvm
+
+	newinitd "${FILESDIR}/${PN}.init9" "${PN}"
+	newconfd "${FILESDIR}/${PN}-daemon9.conf" "${PN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/gvm/gvmd
+	fowners -R gvm:gvm /var/lib/gvm
+}
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@ -1 +1,2 @@
 DIST openvas-scanner-7.0.0.tar.gz 428304 BLAKE2B fa0a21127edd2223dbbf533b6c188729a1b6de4977e5667fbc1a45b2c426045cdc73eb58d05df24b8b39d0e47fb445fa704bd1b827bb5ea6403fdb83c6b01fd9 SHA512 ce3e78ce5e1575c5c37b6c2aa77ec8955754029832bafb3fcedd75b48dff309906a97bac052d206f6e93e9e72b8461a131558e849f70b3afce6280a7b06924d1
+DIST openvas-scanner-7.0.1.tar.gz 429012 BLAKE2B 13fd0fef2ce88f6789da9f00e8f35329e915ebc74a29b3bd52af93c6b70292d055fa1159aec4041d79a785971a583eb514e8700d1d38a76775446e40af9b2fac SHA512 201ea02b25bf247320437ae5c82bdc95db981cc6bd99fdece9403573434db122cdc8db7b82a08cba34b6d67d5794b2364f798847c79b421495666adc95a02571
--- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_PN="openvas"
+
+DESCRIPTION="Open Vulnerability Assessment Scanner"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/gpgme:=
+	dev-db/redis
+	dev-libs/libgcrypt:=
+	dev-libs/libksba
+	>=net-analyzer/gvm-libs-11.0.0
+	net-analyzer/net-snmp
+	net-libs/gnutls:=
+	net-libs/libpcap
+	net-libs/libssh:="
+
+RDEPEND="${DEPEND}
+	!net-analyzer/openvas
+	!net-analyzer/openvas-tools"
+
+BDEPEND="sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+	)
+	# Add release hardening flags for 6.0.1
+#	append-cflags -Wno-format-truncation -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
+#	append-ldflags -Wl,-z,relro -Wl,-z,now
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodir /etc/${MY_PN}
+	insinto /etc/${MY_PN}
+	doins "${FILESDIR}/${MY_PN}.conf"
+}
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@ -1 +1,2 @@
 DIST ospd-openvas-1.0.0.tar.gz 49725 BLAKE2B 230df2f572f345b9ed398e2af120a2fecee87f9f8d8d3c072ca314960f34f7329fe22b002ba0971ba6dc14cd3ca4543120653f89b3085a0f8a932fbeb6ef2682 SHA512 2b2e4f38843265a018a58b7fbd2fde0449d4f6cf3c5c1b7bec02d8390ab257020304f5be1bf2a77f7d28a04f4d1da611fc9b3066bef370dd686dfb8684fce534
+DIST ospd-openvas-1.0.1.tar.gz 50455 BLAKE2B 06a4cdcc2f51351215fffa5517cb2cae620b9b7ffded738d3c63bda11fa8572fe93e0b5fc1c8c9a1bd27cbea65641b0586c329d1d05a022e1fba79c8782d091c SHA512 bdcdb1a8bc08fc27f1a85846ad944b3764a67c153cd75ffa607f69e0c07f223aa0e0965ee081e2398d4d47fc6faf1fd6fad90e6bc724952a0679de783dd2cc87
--- a/net-analyzer/ospd-openvas/files/ospd.conf
+++ b/net-analyzer/ospd-openvas/files/ospd.conf
@ -1,10 +1,6 @@
 [OSPD - openvas]
-
-#required by gvmd
-unix_socket = /tmp/ospd.sock
-
-#socket_mode = 0o770
-#unix_socket = /run/ospd/ospd-openvas.pid
-
 log_level = DEBUG
+socket_mode = 0o777
+unix_socket = /tmp/ospd.sock
+#log_file = <install-prefix>/var/log/gvm/openvas.log
 log_file = /var/log/gvm/ospd-openvas.log
--- a/net-analyzer/ospd-openvas/ospd-openvas-1.0.1.ebuild
+++ b/net-analyzer/ospd-openvas/ospd-openvas-1.0.1.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="OSP server implementation to allow GVM to remotely control an OpenVAS Scanner"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/ospd-2.0
+	>=dev-python/redis-py-3.0.1[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+
+	dodir /etc/openvas
+	insinto /etc/openvas
+
+	doins "${FILESDIR}"/redis.conf.example
+	doins "${FILESDIR}/ospd.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+}
--- a/net-analyzer/ospd/Manifest
+++ b/net-analyzer/ospd/Manifest
@ -1 +1,2 @@
 DIST ospd-2.0.0.tar.gz 81645 BLAKE2B 4c0c7af3caf274ea9e6a43790eb1e9d386ce42d9976e5e9625b49ffe12d8db2e613109458dcc59f322bc00aee39a4a89045caf302182474d1fab4ca1c4ff1bcf SHA512 971b4b57c39844ef08a0ae56d4bf87f0440c993960b5ad37516c622ad41eb2ab30fabb9d0a05fd043a9a1d98e446eaab9d5018cc1607fd711c533475f4703012
+DIST ospd-2.0.1.tar.gz 87313 BLAKE2B cf527742246ceb5acaf69900d48f1800ef98153026fa6aae2661e4a3aafad6f69221fa7c7f34a222a0972cf5550a9543696b1e7a4368ef050574ca08f72f0978 SHA512 4aed0e1a22ea6c0db26977e7b0bde9c9c37890422f3480ad83ef23ad193b7ae3dd7352872c4fe377808d2a398317a4c1d38d7ab2ef5a0266c544e0ef55a0365a
--- a/net-analyzer/ospd/ospd-2.0.1.ebuild
+++ b/net-analyzer/ospd/ospd-2.0.1.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/ospd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="docs"
+
+RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+#PATCHES=( "${FILESDIR}/"8f359bb07901a18609974d5f3e587b8fe8c36177.patch )
+
+python_compile() {
+	if use docs; then
+		bash "${S}"/doc/generate || die
+		HTML_DOCS=( "${S}"/doc/. )
+	fi
+	distutils-r1_python_compile
+}
--- a/profiles/pentoo/base/package.accept_keywords/net-analyzer
+++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer
@ -64,7 +64,7 @@ net-analyzer/gvm-tools

 ~dev-perl/SQL-Translator-0.110.230
 ~dev-perl/Package-Variant-1.3.2
-~sys-apps/yarn-1.17.3
+=sys-apps/yarn-1.22*

 ### Gentoo (unverified) ###