From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 197FF13835A for ; Tue, 14 Jul 2020 12:57:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C067EE087F; Tue, 14 Jul 2020 12:57:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C595E087F for ; Tue, 14 Jul 2020 12:57:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3409734F0A1 for ; Tue, 14 Jul 2020 12:57:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04D9A2DB for ; Tue, 14 Jul 2020 12:57:41 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1594731425.4df48af0910a92dfe03143ae3fe6e134c6968612.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ospd/, net-analyzer/ospd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/ospd/Manifest net-analyzer/ospd/files/ospd-2.0.0-socket-permission.patch net-analyzer/ospd/ospd-2.0.0-r1.ebuild X-VCS-Directories: net-analyzer/ospd/files/ net-analyzer/ospd/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 4df48af0910a92dfe03143ae3fe6e134c6968612 X-VCS-Branch: master Date: Tue, 14 Jul 2020 12:57:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4d0aef53-1458-43ce-82f3-0ecaf10208f7 X-Archives-Hash: 229d587fc05aa4798ecd7a5a80d2a169 commit: 4df48af0910a92dfe03143ae3fe6e134c6968612 Author: Jonas Licht fem tu-ilmenau de> AuthorDate: Mon Jun 29 15:28:16 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Jul 14 12:57:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df48af0 net-analyzer/ospd: drop old Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Jonas Licht fem.tu-ilmenau.de> Signed-off-by: Joonas Niilola gentoo.org> net-analyzer/ospd/Manifest | 1 - .../ospd/files/ospd-2.0.0-socket-permission.patch | 53 ---------------------- net-analyzer/ospd/ospd-2.0.0-r1.ebuild | 40 ---------------- 3 files changed, 94 deletions(-) diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest index e7ad4aee8cd..ff299eea6a3 100644 --- a/net-analyzer/ospd/Manifest +++ b/net-analyzer/ospd/Manifest @@ -1,2 +1 @@ -DIST ospd-2.0.0.tar.gz 81645 BLAKE2B 4c0c7af3caf274ea9e6a43790eb1e9d386ce42d9976e5e9625b49ffe12d8db2e613109458dcc59f322bc00aee39a4a89045caf302182474d1fab4ca1c4ff1bcf SHA512 971b4b57c39844ef08a0ae56d4bf87f0440c993960b5ad37516c622ad41eb2ab30fabb9d0a05fd043a9a1d98e446eaab9d5018cc1607fd711c533475f4703012 DIST ospd-2.0.1.tar.gz 87313 BLAKE2B cf527742246ceb5acaf69900d48f1800ef98153026fa6aae2661e4a3aafad6f69221fa7c7f34a222a0972cf5550a9543696b1e7a4368ef050574ca08f72f0978 SHA512 4aed0e1a22ea6c0db26977e7b0bde9c9c37890422f3480ad83ef23ad193b7ae3dd7352872c4fe377808d2a398317a4c1d38d7ab2ef5a0266c544e0ef55a0365a 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 b6adefd7b15..00000000000 --- 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 -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.0-r1.ebuild deleted file mode 100644 index d6eb8b8a8df..00000000000 --- a/net-analyzer/ospd/ospd-2.0.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -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="extras" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}]" - -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 - HTML_DOCS=( "${S}"/doc/. ) - fi - distutils-r1_python_compile -}