gentoo resync : 25.08.2020

3 files changed, 4 insertions, 63 deletions

diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
index a95d5eafb964..62a1b1776c3e 100644
--- a/net-analyzer/ospd/Manifest
+++ b/net-analyzer/ospd/Manifest
@@ -1,4 +1,3 @@
-AUX ospd-2.0.0-socket-permission.patch 1717 BLAKE2B 82a1298fb20c472c1426b6f4a9525d80c940ea56d7c2d4c570e822c8097793279af01df46f45469ad336a2cdf4e0c719c082f2f3bcd3cedac1eb5a0f16a75350 SHA512 7c8acdf310703a3a7442e00b11697f19d280d870a513234eb26277f7f30c8b00ce26750379ca047175bc05757f593ce1a99782ec22b4424fb6c47abad616f1ee
-DIST ospd-2.0.0.tar.gz 81645 BLAKE2B 4c0c7af3caf274ea9e6a43790eb1e9d386ce42d9976e5e9625b49ffe12d8db2e613109458dcc59f322bc00aee39a4a89045caf302182474d1fab4ca1c4ff1bcf SHA512 971b4b57c39844ef08a0ae56d4bf87f0440c993960b5ad37516c622ad41eb2ab30fabb9d0a05fd043a9a1d98e446eaab9d5018cc1607fd711c533475f4703012
-EBUILD ospd-2.0.0-r1.ebuild 928 BLAKE2B 61dcb2ce267b7f78e20a1f51bca6cc95c5499f653b9daae348b461359c09f35812fd0a6546944f84d787409d86b854503d0a5a289bf36c67b16764181bd9de83 SHA512 661920a439554de11abe8d11e9d99360b74274db2bf3701a0f5cd430a1abdfd6fc2e3a9521880a62e3a9c56dd268f89ae940dde801d1f6b4214f7a5947178b56
+DIST ospd-2.0.1.tar.gz 87313 BLAKE2B cf527742246ceb5acaf69900d48f1800ef98153026fa6aae2661e4a3aafad6f69221fa7c7f34a222a0972cf5550a9543696b1e7a4368ef050574ca08f72f0978 SHA512 4aed0e1a22ea6c0db26977e7b0bde9c9c37890422f3480ad83ef23ad193b7ae3dd7352872c4fe377808d2a398317a4c1d38d7ab2ef5a0266c544e0ef55a0365a
+EBUILD ospd-2.0.1.ebuild 793 BLAKE2B 81698553571e93f56f72d3c97d15c879dc8bd28e39282b7d346c445623743a7302ea3d601cb69e5aefe7e2716490e8aabf919ea8d9995ab114efd78e6d654dfb SHA512 d2e5f6d387f29ee76a8172867e14507d0d43629f9b2a972c832bd606183e5d8cfbbea7fa9a85f3eebc9e578ea644ecace5a4ef60036cdefa9254dc61f67fe6e2
 MISC metadata.xml 871 BLAKE2B 6f143ae78bda1d5880f975d8c722fd00da73bf048647e87ff28a7d131f98bf728fbc0d7f15a4bf58e0910ff33c5e14eccc94df930e8813ff7c1c6bb47aaaada2 SHA512 288d246b941a2ad7056548be377ac972ad9a62da9ac7f0557b6d4d8ecad0fe5c3d9f7163a6d8c68ded91cb1896eb92c6054703df8ebccb09f489e468af56e159
diff --git a/net-analyzer/ospd/files/ospd-2.0.0-socket-permission.patch b/net-analyzer/ospd/files/ospd-2.0.0-socket-permission.patch
deleted file mode 100644
index b6adefd7b15b..000000000000
--- a/net-analyzer/ospd/files/ospd-2.0.0-socket-permission.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8f359bb07901a18609974d5f3e587b8fe8c36177 Mon Sep 17 00:00:00 2001
-From: Juan Jose Nicola <juan.nicola@greenbone.net>
-Date: Wed, 16 Oct 2019 11:45:30 +0200
-Subject: [PATCH] Fix set permission on unix socket. It was trying to set the
- permissions on the unix socket before creating it.
-
----
- CHANGELOG.md   | 7 +++++++
- ospd/server.py | 6 +++---
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 56cb80f..0f173cb 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
- 
- The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- 
-+## [2.0.1] (unreleased)
-+
-+### Fixed
-+- Fix set permission in unix socket. [#157](https://github.com/greenbone/ospd/pull/157)
-+
-+[2.0.1]: https://github.com/greenbone/ospd/compare/v2.0.0...ospd-2.0
-+
- ## [2.0.0] (2019-10-11)
- 
- ### Added
-diff --git a/ospd/server.py b/ospd/server.py
-index 5523de3..9356abf 100644
---- a/ospd/server.py
-+++ b/ospd/server.py
-@@ -202,9 +202,6 @@ def start(self, stream_callback: StreamCallbackType):
-         self._cleanup_socket()
-         self._create_parent_dirs()
- 
--        if self.socket_path.exists():
--            os.chmod(str(self.socket_path), self.socket_mode)
--
-         try:
-             self.stream_callback = stream_callback
-             self.server = ThreadedUnixSocketServer(self, str(self.socket_path))
-@@ -217,6 +214,9 @@ def start(self, stream_callback: StreamCallbackType):
-                 )
-             )
- 
-+        if self.socket_path.exists():
-+            self.socket_path.chmod(self.socket_mode)
-+
-     def close(self):
-         super().close()
-         self._cleanup_socket()
diff --git a/net-analyzer/ospd/ospd-2.0.0-r1.ebuild b/net-analyzer/ospd/ospd-2.0.1.ebuild
index d6eb8b8a8dff..67790c9260cd 100644
--- a/net-analyzer/ospd/ospd-2.0.0-r1.ebuild
+++ b/net-analyzer/ospd/ospd-2.0.1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
 DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM"
@@ -24,11 +24,6 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}"
 
-PATCHES=(
-	# fixes socket permissions see https://github.com/greenbone/ospd-openvas/issues/170
-	"${FILESDIR}/${P}-socket-permission.patch"
-)
-
 distutils_enable_tests unittest
 
 python_compile() {