[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ospd/files/, net-analyzer/ospd/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ospd/files/, net-analyzer/ospd/

[Joonas Niilola]

commit:     4da8940239f87db5652e4ffe54ba6e4dad4bbaf8
Author:     Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Wed Mar 25 22:06:50 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 14:00:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da89402

net-analyzer/ospd: add python target and socket permission fix

Closes: https://bugs.gentoo.org/714766
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Closes: https://github.com/gentoo/gentoo/pull/15119
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../ospd/files/ospd-2.0.0-socket-permission.patch  | 53 ++++++++++++++++++++++
 .../{ospd-2.0.0.ebuild => ospd-2.0.0-r1.ebuild}    |  9 +++-
 2 files changed, 61 insertions(+), 1 deletion(-)

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
new file mode 100644
index 00000000000..b6adefd7b15
--- /dev/null
+++ b/net-analyzer/ospd/files/ospd-2.0.0-socket-permission.patch
@@ -0,0 +1,53 @@
+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.ebuild b/net-analyzer/ospd/ospd-2.0.0-r1.ebuild
similarity index 77%
rename from net-analyzer/ospd/ospd-2.0.0.ebuild
rename to net-analyzer/ospd/ospd-2.0.0-r1.ebuild
index de47046f6fc..d6eb8b8a8df 100644
--- a/net-analyzer/ospd/ospd-2.0.0.ebuild
+++ b/net-analyzer/ospd/ospd-2.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -24,6 +24,13 @@ 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() {
 	if use extras; then
 		bash "${S}"/doc/generate || die