* [gentoo-commits] repo/gentoo:master commit in: net-misc/gns3-server/, net-misc/gns3-server/files/
@ 2019-07-16 12:12 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2019-07-16 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 07d8f4de75667c5dd4e8cda8be5d2e46f2b39544
Author: Gino McCarty <onigino <AT> protonmail <DOT> com>
AuthorDate: Tue Jul 16 05:59:30 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 12:12:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d8f4de
net-misc/gns3-server: Drop older versions
Signed-off-by: Gino McCarty <onigino <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11805
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-misc/gns3-server/Manifest | 1 -
.../files/gns3-server-2.1.3-typing.patch | 9 ----
net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild | 59 ----------------------
3 files changed, 69 deletions(-)
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index a8eab6d583a..cd72eb35b74 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,2 +1 @@
DIST gns3-server-2.1.21.tar.gz 1713993 BLAKE2B 719306e05fd86b22b7413a60eb6fccc0d16a25cc3a34850344124433d0871bce5e85b195386615c1eaebf083295775de4031eee93c477bb8bd07078b839b2ee1 SHA512 3aeb7609f0fad3cf239a4de24affb124b5bed4a3af78c6a6e287a1b771e206c476849a04cf4ab731ce4923ca072d66928068fec5720bc0eb81d6819ed63f71c8
-DIST gns3-server-2.1.3.tar.gz 1658657 BLAKE2B 4ce83aceff8f70f93032b2baafb0dd5c94062b8c431a73b9a83401266ae77f18a4e318651ecd05b789b71c512fc3549d0d1fb95b26fe1fdd23b2953b3367f04c SHA512 df6a98943f893f3d10c16b2a4242869a1407adad56e6c127e6525fe49acefbac9329bf76bc2b16904997985843fdb2b94d03c58f658034ec44763e6d69f7ddaf
diff --git a/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch b/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch
deleted file mode 100644
index 99b32df27ad..00000000000
--- a/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -6,5 +6,5 @@
- raven>=5.23.0
- psutil>=3.0.0
- zipstream>=1.1.4
--typing>=3.5.3.0 # Otherwise yarl fails with python 3.4
-+typing>=3.5.3.0;python_version<"3.5" # Otherwise yarl fails with python 3.4
- prompt-toolkit
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
deleted file mode 100644
index f1d6d0ec699..00000000000
--- a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
- >=app-emulation/dynamips-0.2.12
- >=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}]
- <dev-python/aiohttp-cors-0.6[${PYTHON_USEDEP}]
- >=dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}]
- >=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
- >=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
- dev-python/prompt_toolkit[${PYTHON_USEDEP}]
- >=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
- >=net-misc/ubridge-0.9.14
- >=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
- >=dev-python/yarl-0.11[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# https://github.com/GNS3/gns3-server/pull/1368
-PATCHES=( "${FILESDIR}/${P}-typing.patch" )
-
-src_prepare() {
- default
-
- # Package installs 'tests' package which is forbidden
- rm -rf tests || die
-}
-
-pkg_postinst() {
- elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
- elog ""
- elog "The following is a list of packages that can be added:"
- elog "app-emulation/qemu, app-emulation/virtualbox"
- elog "app-emulation/docker and net-analyzer/wireshark"
- elog ""
- elog "The following packages are currently unsupported:"
- elog "iouyap and vpcs"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/gns3-server/, net-misc/gns3-server/files/
@ 2020-05-24 22:40 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2020-05-24 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 3e6f81303185dde8d59a9696b978b12f4196af40
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 22:33:53 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 24 22:33:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6f8130
net-misc/gns3-gui: bump to version 2.2.8
* Fix all the crazy dep changes
* Add upstream patch to remove dev-python/raven dep
* Takeover maintainership
* Only support py3.7 and py3.8 to minimize conditionals
Closes: https://bugs.gentoo.org/688016
Closes: https://bugs.gentoo.org/712964
Closes: https://bugs.gentoo.org/714840
Closes: https://bugs.gentoo.org/718444
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-misc/gns3-server/Manifest | 1 +
.../gns3-server/files/gns3-server-rmraven.patch | 194 +++++++++++++++++++++
net-misc/gns3-server/gns3-server-2.2.8.ebuild | 71 ++++++++
net-misc/gns3-server/metadata.xml | 8 +-
4 files changed, 268 insertions(+), 6 deletions(-)
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index cd72eb35b74..0ce776a9a16 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1 +1,2 @@
DIST gns3-server-2.1.21.tar.gz 1713993 BLAKE2B 719306e05fd86b22b7413a60eb6fccc0d16a25cc3a34850344124433d0871bce5e85b195386615c1eaebf083295775de4031eee93c477bb8bd07078b839b2ee1 SHA512 3aeb7609f0fad3cf239a4de24affb124b5bed4a3af78c6a6e287a1b771e206c476849a04cf4ab731ce4923ca072d66928068fec5720bc0eb81d6819ed63f71c8
+DIST gns3-server-2.2.8.tar.gz 11248484 BLAKE2B 14843a86c0348b92e9c54af5c966f46249f72ef9aa74fc8cda27f3209d00d2e129df98c75f301d8fe2046fb1c04f3e24e163adbead787fed2c1d364c50228902 SHA512 3394d368c986ce8378739bdbc15359c46bdf787a38e18bae9035653dd6dc6683973bf1b7952137189f57fd83074f3d5ea6040f5d7a1d0503f6cf21d2835cd693
diff --git a/net-misc/gns3-server/files/gns3-server-rmraven.patch b/net-misc/gns3-server/files/gns3-server-rmraven.patch
new file mode 100644
index 00000000000..612a16aecae
--- /dev/null
+++ b/net-misc/gns3-server/files/gns3-server-rmraven.patch
@@ -0,0 +1,194 @@
+From c63aad8eca00bca2ec48fcb667bbdfd80a22a7ab Mon Sep 17 00:00:00 2001
+From: grossmj <grossmj@gns3.net>
+Date: Tue, 19 May 2020 15:48:53 +0930
+Subject: [PATCH] Replace Raven by Sentry SDK. Fixes
+ https://github.com/GNS3/gns3-server/issues/1758
+
+---
+ gns3server/crash_report.py | 93 ++++++++++++++++++++------------------
+ gns3server/web/route.py | 2 +-
+ requirements.txt | 3 +-
+ 3 files changed, 53 insertions(+), 45 deletions(-)
+
+diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py
+index 87e22a213..7f92d38e6 100644
+--- a/gns3server/crash_report.py
++++ b/gns3server/crash_report.py
+@@ -15,22 +15,21 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++try:
++ import sentry_sdk
++ from sentry_sdk.integrations.aiohttp import AioHttpIntegration
++ SENTRY_SDK_AVAILABLE = True
++except ImportError:
++ # Sentry SDK is not installed with deb package in order to simplify packaging
++ SENTRY_SDK_AVAILABLE = False
++
+ import os
+ import sys
+ import struct
+-import aiohttp
+ import platform
+ import locale
+ import distro
+
+-try:
+- import raven
+- from raven.transport.http import HTTPTransport
+- RAVEN_AVAILABLE = True
+-except ImportError:
+- # raven is not installed with deb package in order to simplify packaging
+- RAVEN_AVAILABLE = False
+-
+ from .version import __version__, __version_info__
+ from .config import Config
+ from .utils.get_resource import get_resource
+@@ -59,48 +58,45 @@ class CrashReport:
+ """
+
+ DSN = "https://dbfb677c73304b1286aef33dfbb749c6:93b9a937d4884426a1b15f37536fcd94@o19455.ingest.sentry.io/38482"
+- if hasattr(sys, "frozen"):
+- cacert = get_resource("cacert.pem")
+- if cacert is not None and os.path.isfile(cacert):
+- DSN += "?ca_certs={}".format(cacert)
+- else:
+- log.warning("The SSL certificate bundle file '{}' could not be found".format(cacert))
+ _instance = None
+
+ def __init__(self):
+- self._client = None
+
+- # We don't want sentry making noise if an error is catched when you don't have internet
++ # We don't want sentry making noise if an error is caught when you don't have internet
+ sentry_errors = logging.getLogger('sentry.errors')
+ sentry_errors.disabled = True
+
+ sentry_uncaught = logging.getLogger('sentry.errors.uncaught')
+ sentry_uncaught.disabled = True
+
+- def capture_exception(self, request=None):
+- if not RAVEN_AVAILABLE:
+- return
+- if os.path.exists(".git"):
+- log.warning("A .git directory exist crash report is turn off for developers")
+- return
+- server_config = Config.instance().get_section_config("Server")
+- if server_config.getboolean("report_errors"):
+- if self._client is None:
+- self._client = raven.Client(CrashReport.DSN, release=__version__, raise_send_errors=True, transport=HTTPTransport)
+- if request is not None:
+- self._client.http_context({
+- "method": request.method,
+- "url": request.path,
+- "data": request.json,
+- })
+-
+- context = {
++ if SENTRY_SDK_AVAILABLE:
++ cacert = None
++ if hasattr(sys, "frozen"):
++ cacert_resource = get_resource("cacert.pem")
++ if cacert_resource is not None and os.path.isfile(cacert_resource):
++ cacert = cacert_resource
++ else:
++ log.error("The SSL certificate bundle file '{}' could not be found".format(cacert_resource))
++
++ sentry_sdk.init(dsn=CrashReport.DSN,
++ release=__version__,
++ ca_certs=cacert,
++ integrations=[AioHttpIntegration()])
++
++ tags = {
+ "os:name": platform.system(),
+ "os:release": platform.release(),
+ "os:win_32": " ".join(platform.win32_ver()),
+ "os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]),
+ "os:linux": " ".join(distro.linux_distribution()),
+- "aiohttp:version": aiohttp.__version__,
++
++ }
++
++ with sentry_sdk.configure_scope() as scope:
++ for key, value in tags.items():
++ scope.set_tag(key, value)
++
++ extra_context = {
+ "python:version": "{}.{}.{}".format(sys.version_info[0],
+ sys.version_info[1],
+ sys.version_info[2]),
+@@ -113,8 +109,8 @@ def capture_exception(self, request=None):
+ # add locale information
+ try:
+ language, encoding = locale.getlocale()
+- context["locale:language"] = language
+- context["locale:encoding"] = encoding
++ extra_context["locale:language"] = language
++ extra_context["locale:encoding"] = encoding
+ except ValueError:
+ pass
+
+@@ -124,17 +120,28 @@ def capture_exception(self, request=None):
+ if os.path.isfile(gns3vm_version):
+ try:
+ with open(gns3vm_version) as fd:
+- context["gns3vm:version"] = fd.readline().strip()
++ extra_context["gns3vm:version"] = fd.readline().strip()
+ except OSError:
+ pass
+
+- self._client.tags_context(context)
++ with sentry_sdk.configure_scope() as scope:
++ for key, value in extra_context.items():
++ scope.set_extra(key, value)
++
++ def capture_exception(self):
++ if not SENTRY_SDK_AVAILABLE:
++ return
++ if os.path.exists(".git"):
++ log.warning(".git directory detected, crash reporting is turned off for developers.")
++ return
++ server_config = Config.instance().get_section_config("Server")
++ if server_config.getboolean("report_errors"):
++
+ try:
+- report = self._client.captureException()
++ sentry_sdk.capture_exception()
++ log.info("Crash report sent with event ID: {}".format(sentry_sdk.last_event_id()))
+ except Exception as e:
+ log.error("Can't send crash report to Sentry: {}".format(e))
+- return
+- log.info("Crash report sent with event ID: {}".format(self._client.get_ident(report)))
+
+ @classmethod
+ def instance(cls):
+diff --git a/gns3server/web/route.py b/gns3server/web/route.py
+index d1275250d..c70dbbc3a 100644
+--- a/gns3server/web/route.py
++++ b/gns3server/web/route.py
+@@ -242,7 +242,7 @@ async def control_schema(request):
+ log.error("Uncaught exception detected: {type}".format(type=type(e)), exc_info=1)
+ response = Response(request=request, route=route)
+ response.set_status(500)
+- CrashReport.instance().capture_exception(request)
++ CrashReport.instance().capture_exception()
+ exc_type, exc_value, exc_tb = sys.exc_info()
+ lines = traceback.format_exception(exc_type, exc_value, exc_tb)
+ if api_version is not None:
+diff --git a/requirements.txt b/requirements.txt
+index 57fbb7938..0af9e0d68 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -4,9 +4,10 @@ jsonschema==2.6.0; python_version < '3.8' # pyup: ignore
+ aiohttp==3.6.2
+ aiohttp-cors==0.7.0
+ aiofiles==0.4.0
++aiocontextvars==0.2.2
+ async_generator>=1.10
+ Jinja2>=2.7.3
+-raven>=5.23.0
++sentry-sdk>=0.14.4
+ psutil==5.6.6
+ async-timeout==3.0.1
+ distro>=1.3.0
diff --git a/net-misc/gns3-server/gns3-server-2.2.8.ebuild b/net-misc/gns3-server/gns3-server-2.2.8.ebuild
new file mode 100644
index 00000000000..ed01d69a265
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.2.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="https://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=app-emulation/dynamips-0.2.18
+ >=dev-python/aiofiles-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-cors-0.7.0-r1[${PYTHON_USEDEP}]
+ >=dev-python/async_generator-1.10[${PYTHON_USEDEP}]
+ >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/jsonschema-3.2.0:=[${PYTHON_USEDEP}]' 'python3_8')
+ $(python_gen_cond_dep '<=dev-python/jsonschema-2.6.0:=[${PYTHON_USEDEP}]' 'python3_7')
+ >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+ dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+ >=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
+ >=net-misc/ubridge-0.9.14
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/gns3-server-rmraven.patch" )
+
+src_prepare() {
+ default
+
+ # newer psutils is fine
+ sed -i -e '/psutil==5.6.6/d' requirements.txt || die "fixing requirements failed"
+
+ # We don't support <py3.7
+ sed -i -e '/aiocontextvars==0.2.2/d' requirements.txt || die "fixing requirements failed"
+ sed -i -e '/yarl==1.3.0/d' requirements.txt || die "fixing requirements failed 2"
+
+ #Remove Pre-built busybox binary
+ rm gns3server/compute/docker/resources/bin/busybox || die
+
+ # Package installs 'tests' package which is forbidden
+ rm -rf tests || die
+ eapply_user
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
+ ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
+}
+
+pkg_postinst() {
+ elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+ elog ""
+ elog "The following is a list of packages that can be added:"
+ elog "app-emulation/qemu, app-emulation/virtualbox"
+ elog "app-emulation/docker and net-analyzer/wireshark"
+ elog ""
+ elog "The following packages are currently unsupported:"
+ elog "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index e4aa7df0de5..09439c8762b 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/metadata.xml
@@ -2,12 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>onigino@protonmail.com</email>
- <name>Gino McCarty</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <email>bman@gentoo.org</email>
+ <name>Aaron Bauman</name>
</maintainer>
<upstream>
<remote-id type="sourceforge">gns-3</remote-id>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/gns3-server/, net-misc/gns3-server/files/
@ 2021-10-22 2:21 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2021-10-22 2:21 UTC (permalink / raw
To: gentoo-commits
commit: e6b37b319873d9b4f65597ff6df45be74f294ea8
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Oct 21 15:55:27 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 22 02:20:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b37b31
net-misc/gns3-server: remove old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22658
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
net-misc/gns3-server/Manifest | 1 -
.../files/gns3-server-2.2.24-Fix-tests.patch | 73 ---------------------
net-misc/gns3-server/gns3-server-2.2.24.ebuild | 76 ----------------------
3 files changed, 150 deletions(-)
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 5a164aac318..60149d0c725 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,3 +1,2 @@
-DIST gns3-server-2.2.24.tar.gz 9057352 BLAKE2B cc49127afa9b3422f25ec2d10e53b7cedc59a4b872394d7b7c47ac34e6859fd5f22547277f351ba75b6520a0881b2ebbda6ba932af31108f070c2ccd92574020 SHA512 22a4394f645b5909e75b07d63164ad4fa362f78d69c6f30e8e2daf15bc910c238e8cd983a9f1cb3c1045a0722f9a1c260002b4afe8fb5915033b3ddb20814a17
DIST gns3-server-2.2.25.tar.gz 10229566 BLAKE2B 73827940698335dcf9ef6d4b6c4c88b162852ec493f8ea05eebbdca20df3c84e4f5ee2ac218ed72755350df2f0e27cfc6cbd34b541e9e5bc0eada2fcb8e266ac SHA512 c7fa163eedc064fd266100658d7d2084ab0c542280d6689938a06943534df320f905c0e46175580bd3792218369936c55f9e135a12577f8a4b7eb86ac8fe9739
DIST gns3-server-2.2.26.tar.gz 10230386 BLAKE2B 9b9de96cc22aeb1da92a48c9c04a0bf0271f3e47909bf09de76f357d727a4dfc2aa8181c47713192a9c88e55497ca3d8577f34635bf1f2f353387008c1bd13b7 SHA512 80a3e2939374b7a8f7e961f565b16d8a7575414793a3772235b41eadc184d02543ddae18122e90a2602ca51ce24513e1add17b1e7732f44c108daf3d6bc9dc7a
diff --git a/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch b/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch
deleted file mode 100644
index 3d0556ab4a1..00000000000
--- a/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 4eb8491cfa61310066395f078009ccc822488eb8 Mon Sep 17 00:00:00 2001
-From: grossmj <grossmj@gns3.net>
-Date: Wed, 1 Sep 2021 19:31:37 +0930
-Subject: [PATCH] Fix tests. Fixes #1950
-
----
- tests/compute/qemu/test_qemu_manager.py | 1 -
- tests/compute/qemu/test_qemu_vm.py | 12 ++++++------
- tests/compute/test_manager.py | 2 +-
- 3 files changed, 7 insertions(+), 8 deletions(-)
-
---- a/tests/compute/qemu/test_qemu_manager.py
-+++ b/tests/compute/qemu/test_qemu_manager.py
-@@ -71,7 +71,6 @@ async def test_binary_list(monkeypatch, tmpdir):
- assert {"path": os.path.join(os.environ["PATH"], "qemu-kvm"), "version": version} in qemus
- assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x42"), "version": version} in qemus
- assert {"path": os.path.join(os.environ["PATH"], "hello"), "version": version} not in qemus
-- assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x86_64-spice"), "version": version} not in qemus
-
- qemus = await Qemu.binary_list(["x86"])
-
---- a/tests/compute/qemu/test_qemu_vm.py
-+++ b/tests/compute/qemu/test_qemu_vm.py
-@@ -818,21 +818,21 @@ def test_options(linux_platform, vm):
- assert vm.kvm is False
-
- vm.options = "-no-kvm"
-- assert vm.options == "-no-kvm"
-+ assert vm.options == "-machine accel=tcg"
-
- vm.options = "-enable-kvm"
-- assert vm.options == "-enable-kvm"
-+ assert vm.options == "-machine accel=kvm"
-
- vm.options = "-icount 12"
-- assert vm.options == "-no-kvm -icount 12"
-+ assert vm.options == "-icount 12"
-
- vm.options = "-icount 12 -no-kvm"
-- assert vm.options == "-icount 12 -no-kvm"
-+ assert vm.options == "-icount 12 -machine accel=tcg"
-
-
- def test_options_windows(windows_platform, vm):
- vm.options = "-no-kvm"
-- assert vm.options == ""
-+ assert vm.options == "-machine accel=tcg"
-
- vm.options = "-enable-kvm"
- assert vm.options == ""
-@@ -878,7 +878,7 @@ async def test_run_with_kvm_linux_options_no_kvm(linux_platform, vm):
-
- with patch("os.path.exists", return_value=True) as os_path:
- vm.manager.config.set("Qemu", "enable_kvm", True)
-- assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-no-kvm") is False
-+ assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-machine accel=tcg") is False
-
-
- async def test_run_with_kvm_not_x86(linux_platform, vm):
---- a/tests/compute/test_manager.py
-+++ b/tests/compute/test_manager.py
-@@ -190,7 +190,7 @@ def test_get_abs_image_recursive_ova(qemu, tmpdir, config):
- config.set_section_config("Server", {
- "images_path": str(tmpdir / "images1"),
- "local": False})
-- assert qemu.get_abs_image_path("test.ova/test1.bin") == path1
-+ assert qemu.get_abs_image_path("demo/test.ova/test1.bin") == path1
- assert qemu.get_abs_image_path("test.ova/test2.bin") == path2
- # Absolute path
- assert qemu.get_abs_image_path(str(path1)) == path1
---
-2.33.0
-
diff --git a/net-misc/gns3-server/gns3-server-2.2.24.ebuild b/net-misc/gns3-server/gns3-server-2.2.24.ebuild
deleted file mode 100644
index 78581b45154..00000000000
--- a/net-misc/gns3-server/gns3-server-2.2.24.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature systemd
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- app-emulation/dynamips
- >=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
- >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
- >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
- net-misc/ubridge
- sys-apps/busybox
-"
-BDEPEND="
- test? (
- dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-Fix-tests.patch )
-
-distutils_enable_tests pytest
-
-src_prepare() {
- default
-
- # newer python packages are fine
- sed -i -e 's/[<>=].*//' requirements.txt || die
-
- # Remove Pre-built busybox binary
- rm gns3server/compute/docker/resources/bin/busybox || die
-
- # add setuptools dependency, bug #809278
- echo setuptools >> requirements.txt || die
-}
-
-python_install() {
- distutils-r1_python_install
-
- systemd_dounit init/gns3.service.systemd
-
- mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
- ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
-}
-
-pkg_postinst() {
- elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
- elog ""
- optfeature "QEMU Support" "app-emulation/qemu"
- optfeature "Virtualbox Support" "app-emulation/virtualbox"
- optfeature "Docker Support" "app-emulation/docker"
- optfeature "Wireshark Support" "net-analyzer/wireshark"
- elog ""
- elog "The following packages are currently unsupported:"
- elog "iouyap and vpcs"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-22 2:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-22 2:21 [gentoo-commits] repo/gentoo:master commit in: net-misc/gns3-server/, net-misc/gns3-server/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2020-05-24 22:40 Aaron Bauman
2019-07-16 12:12 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox