1 |
commit: 9cda9319b481c907542049d6b89b2917f02e3e3f |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Thu Aug 26 13:14:51 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 1 12:03:26 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cda9319 |
7 |
|
8 |
net-misc/gns3-server: version bump (2.2.24) |
9 |
|
10 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://bugs.gentoo.org/809278 |
13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
14 |
|
15 |
net-misc/gns3-server/Manifest | 1 + |
16 |
.../files/gns3-server-2.2.24-Fix-tests.patch | 73 +++++++++++++++++++++ |
17 |
net-misc/gns3-server/gns3-server-2.2.24.ebuild | 76 ++++++++++++++++++++++ |
18 |
3 files changed, 150 insertions(+) |
19 |
|
20 |
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest |
21 |
index 9661f43132d..7218793a65b 100644 |
22 |
--- a/net-misc/gns3-server/Manifest |
23 |
+++ b/net-misc/gns3-server/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST gns3-server-2.2.21.tar.gz 9054117 BLAKE2B dbbbba4dfe8d084184d38750c67152b99ee286dae88d92c15f153077396cdb008214da89d9161516daef0fbde8de3ba30f6628b9d138799d9ed8c1bc21c17f29 SHA512 adb7b08c88525f8b292688cd31973a00723b8d7989399d861e629bf754408901c2b00c67d425aacd7c234d9bab5d46542024196a4b44066eb1dbf39cf3d521bb |
26 |
DIST gns3-server-2.2.22.tar.gz 9011028 BLAKE2B 910711cac6f649d8dd3f7a4d2a9aa77839c9dda9f4280e7079b86857c542907feaa1205b7060ce7cc8956a2fbd220d5393cda319f64ff17eeb5ce476922afccc SHA512 444f483e69a56ab82c053c042b8791711e2fc6b7c800d30c08f2221405418a5c78d780f0f959c80d56ce864230ae17b04639c74a6559c7f5abce65f9c808a282 |
27 |
+DIST gns3-server-2.2.24.tar.gz 9057352 BLAKE2B cc49127afa9b3422f25ec2d10e53b7cedc59a4b872394d7b7c47ac34e6859fd5f22547277f351ba75b6520a0881b2ebbda6ba932af31108f070c2ccd92574020 SHA512 22a4394f645b5909e75b07d63164ad4fa362f78d69c6f30e8e2daf15bc910c238e8cd983a9f1cb3c1045a0722f9a1c260002b4afe8fb5915033b3ddb20814a17 |
28 |
|
29 |
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 |
30 |
new file mode 100644 |
31 |
index 00000000000..3d0556ab4a1 |
32 |
--- /dev/null |
33 |
+++ b/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch |
34 |
@@ -0,0 +1,73 @@ |
35 |
+From 4eb8491cfa61310066395f078009ccc822488eb8 Mon Sep 17 00:00:00 2001 |
36 |
+From: grossmj <grossmj@××××.net> |
37 |
+Date: Wed, 1 Sep 2021 19:31:37 +0930 |
38 |
+Subject: [PATCH] Fix tests. Fixes #1950 |
39 |
+ |
40 |
+--- |
41 |
+ tests/compute/qemu/test_qemu_manager.py | 1 - |
42 |
+ tests/compute/qemu/test_qemu_vm.py | 12 ++++++------ |
43 |
+ tests/compute/test_manager.py | 2 +- |
44 |
+ 3 files changed, 7 insertions(+), 8 deletions(-) |
45 |
+ |
46 |
+--- a/tests/compute/qemu/test_qemu_manager.py |
47 |
++++ b/tests/compute/qemu/test_qemu_manager.py |
48 |
+@@ -71,7 +71,6 @@ async def test_binary_list(monkeypatch, tmpdir): |
49 |
+ assert {"path": os.path.join(os.environ["PATH"], "qemu-kvm"), "version": version} in qemus |
50 |
+ assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x42"), "version": version} in qemus |
51 |
+ assert {"path": os.path.join(os.environ["PATH"], "hello"), "version": version} not in qemus |
52 |
+- assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x86_64-spice"), "version": version} not in qemus |
53 |
+ |
54 |
+ qemus = await Qemu.binary_list(["x86"]) |
55 |
+ |
56 |
+--- a/tests/compute/qemu/test_qemu_vm.py |
57 |
++++ b/tests/compute/qemu/test_qemu_vm.py |
58 |
+@@ -818,21 +818,21 @@ def test_options(linux_platform, vm): |
59 |
+ assert vm.kvm is False |
60 |
+ |
61 |
+ vm.options = "-no-kvm" |
62 |
+- assert vm.options == "-no-kvm" |
63 |
++ assert vm.options == "-machine accel=tcg" |
64 |
+ |
65 |
+ vm.options = "-enable-kvm" |
66 |
+- assert vm.options == "-enable-kvm" |
67 |
++ assert vm.options == "-machine accel=kvm" |
68 |
+ |
69 |
+ vm.options = "-icount 12" |
70 |
+- assert vm.options == "-no-kvm -icount 12" |
71 |
++ assert vm.options == "-icount 12" |
72 |
+ |
73 |
+ vm.options = "-icount 12 -no-kvm" |
74 |
+- assert vm.options == "-icount 12 -no-kvm" |
75 |
++ assert vm.options == "-icount 12 -machine accel=tcg" |
76 |
+ |
77 |
+ |
78 |
+ def test_options_windows(windows_platform, vm): |
79 |
+ vm.options = "-no-kvm" |
80 |
+- assert vm.options == "" |
81 |
++ assert vm.options == "-machine accel=tcg" |
82 |
+ |
83 |
+ vm.options = "-enable-kvm" |
84 |
+ assert vm.options == "" |
85 |
+@@ -878,7 +878,7 @@ async def test_run_with_kvm_linux_options_no_kvm(linux_platform, vm): |
86 |
+ |
87 |
+ with patch("os.path.exists", return_value=True) as os_path: |
88 |
+ vm.manager.config.set("Qemu", "enable_kvm", True) |
89 |
+- assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-no-kvm") is False |
90 |
++ assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-machine accel=tcg") is False |
91 |
+ |
92 |
+ |
93 |
+ async def test_run_with_kvm_not_x86(linux_platform, vm): |
94 |
+--- a/tests/compute/test_manager.py |
95 |
++++ b/tests/compute/test_manager.py |
96 |
+@@ -190,7 +190,7 @@ def test_get_abs_image_recursive_ova(qemu, tmpdir, config): |
97 |
+ config.set_section_config("Server", { |
98 |
+ "images_path": str(tmpdir / "images1"), |
99 |
+ "local": False}) |
100 |
+- assert qemu.get_abs_image_path("test.ova/test1.bin") == path1 |
101 |
++ assert qemu.get_abs_image_path("demo/test.ova/test1.bin") == path1 |
102 |
+ assert qemu.get_abs_image_path("test.ova/test2.bin") == path2 |
103 |
+ # Absolute path |
104 |
+ assert qemu.get_abs_image_path(str(path1)) == path1 |
105 |
+-- |
106 |
+2.33.0 |
107 |
+ |
108 |
|
109 |
diff --git a/net-misc/gns3-server/gns3-server-2.2.24.ebuild b/net-misc/gns3-server/gns3-server-2.2.24.ebuild |
110 |
new file mode 100644 |
111 |
index 00000000000..78581b45154 |
112 |
--- /dev/null |
113 |
+++ b/net-misc/gns3-server/gns3-server-2.2.24.ebuild |
114 |
@@ -0,0 +1,76 @@ |
115 |
+# Copyright 1999-2021 Gentoo Authors |
116 |
+# Distributed under the terms of the GNU General Public License v2 |
117 |
+ |
118 |
+EAPI=8 |
119 |
+ |
120 |
+PYTHON_COMPAT=( python3_{8,9} ) |
121 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
122 |
+ |
123 |
+inherit distutils-r1 optfeature systemd |
124 |
+ |
125 |
+DESCRIPTION="GNS3 server to asynchronously manage emulators" |
126 |
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server" |
127 |
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
128 |
+ |
129 |
+LICENSE="GPL-3+" |
130 |
+SLOT="0" |
131 |
+KEYWORDS="~amd64 ~x86" |
132 |
+ |
133 |
+RDEPEND=" |
134 |
+ app-emulation/dynamips |
135 |
+ >=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}] |
136 |
+ >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] |
137 |
+ >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] |
138 |
+ >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}] |
139 |
+ >=dev-python/distro-1.6.0[${PYTHON_USEDEP}] |
140 |
+ >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}] |
141 |
+ >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] |
142 |
+ >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}] |
143 |
+ >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}] |
144 |
+ >=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}] |
145 |
+ net-misc/ubridge |
146 |
+ sys-apps/busybox |
147 |
+" |
148 |
+BDEPEND=" |
149 |
+ test? ( |
150 |
+ dev-python/pytest-aiohttp[${PYTHON_USEDEP}] |
151 |
+ ) |
152 |
+" |
153 |
+ |
154 |
+PATCHES=( "${FILESDIR}"/${P}-Fix-tests.patch ) |
155 |
+ |
156 |
+distutils_enable_tests pytest |
157 |
+ |
158 |
+src_prepare() { |
159 |
+ default |
160 |
+ |
161 |
+ # newer python packages are fine |
162 |
+ sed -i -e 's/[<>=].*//' requirements.txt || die |
163 |
+ |
164 |
+ # Remove Pre-built busybox binary |
165 |
+ rm gns3server/compute/docker/resources/bin/busybox || die |
166 |
+ |
167 |
+ # add setuptools dependency, bug #809278 |
168 |
+ echo setuptools >> requirements.txt || die |
169 |
+} |
170 |
+ |
171 |
+python_install() { |
172 |
+ distutils-r1_python_install |
173 |
+ |
174 |
+ systemd_dounit init/gns3.service.systemd |
175 |
+ |
176 |
+ mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die |
177 |
+ ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die |
178 |
+} |
179 |
+ |
180 |
+pkg_postinst() { |
181 |
+ elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality." |
182 |
+ elog "" |
183 |
+ optfeature "QEMU Support" "app-emulation/qemu" |
184 |
+ optfeature "Virtualbox Support" "app-emulation/virtualbox" |
185 |
+ optfeature "Docker Support" "app-emulation/docker" |
186 |
+ optfeature "Wireshark Support" "net-analyzer/wireshark" |
187 |
+ elog "" |
188 |
+ elog "The following packages are currently unsupported:" |
189 |
+ elog "iouyap and vpcs" |
190 |
+} |