* [PR PATCH] Gns3 2.2.44
@ 2023-11-21 0:03 Vaelatern
2023-11-21 0:19 ` Vaelatern
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Vaelatern @ 2023-11-21 0:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 437 bytes --]
There is a new pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages gns3-2.2.44
https://github.com/void-linux/void-packages/pull/47331
Gns3 2.2.44
#### Testing the changes
- I tested the changes in this PR: in progress
tested on x86_64-musl
Not yet tested in a cross build.
A patch file from https://github.com/void-linux/void-packages/pull/47331.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3-2.2.44-47331.patch --]
[-- Type: text/x-diff, Size: 5738 bytes --]
From 99a7c62a9532260c3f4bd25355ec0d78736af0d6 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Mon, 20 Nov 2023 19:03:01 -0500
Subject: [PATCH 1/2] gns3-gui: update to 2.2.44.
---
srcpkgs/gns3-gui/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 9397fbff2644e..1684756a33d11 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
# Template file for 'gns3-gui'
pkgname=gns3-gui
-version=2.2.35
-revision=2
+version=2.2.44
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-psutil python3-jsonschema
@@ -14,8 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://gns3.com"
changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=5dee30a6be10a4463d16c3cec516bf81717fc6f37f4f53386347d98de9a1f43b
-
+checksum=0ae6a9d7c951b8b06ec16b3c1af4dd84efd54109f4476cd9f4ead56c2afe332a
post_patch() {
# comment out requirements since versions are usually out of sync with Void packages
From 326b9f1fc5f6698aa786a08b09ab408193b9ad13 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Mon, 20 Nov 2023 19:03:55 -0500
Subject: [PATCH 2/2] gns3-server: update to 2.2.44.
---
srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
srcpkgs/gns3-server/template | 17 ++----
2 files changed, 5 insertions(+), 77 deletions(-)
delete mode 100644 srcpkgs/gns3-server/patches/importlib.patch
diff --git a/srcpkgs/gns3-server/patches/importlib.patch b/srcpkgs/gns3-server/patches/importlib.patch
deleted file mode 100644
index c3dbd98bc7661..0000000000000
--- a/srcpkgs/gns3-server/patches/importlib.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/gns3server/controller/__init__.py b/gns3server/controller/__init__.py
-index 5c5236b9..971e3452 100644
---- a/gns3server/controller/__init__.py
-+++ b/gns3server/controller/__init__.py
-@@ -22,7 +22,11 @@ import uuid
- import socket
- import shutil
- import aiohttp
--import importlib_resources
-+
-+try:
-+ from importlib import resources as importlib_resources
-+except ImportError:
-+ import importlib_resources
-
- from ..config import Config
- from .project import Project
-diff --git a/gns3server/controller/appliance_manager.py b/gns3server/controller/appliance_manager.py
-index d15fc69b..41b73104 100644
---- a/gns3server/controller/appliance_manager.py
-+++ b/gns3server/controller/appliance_manager.py
-@@ -21,9 +21,13 @@ import json
- import uuid
- import asyncio
- import aiohttp
--import importlib_resources
- import shutil
-
-+try:
-+ from importlib import resources as importlib_resources
-+except ImportError:
-+ import importlib_resources
-+
- from .appliance import Appliance
- from ..config import Config
- from ..utils.asyncio import locking
-diff --git a/gns3server/utils/get_resource.py b/gns3server/utils/get_resource.py
-index b4b599bd..f4054cd3 100644
---- a/gns3server/utils/get_resource.py
-+++ b/gns3server/utils/get_resource.py
-@@ -19,7 +19,11 @@ import atexit
- import logging
- import os
- import sys
--import importlib_resources
-+
-+try:
-+ from importlib import resources as importlib_resources
-+except ImportError:
-+ import importlib_resources
-
- from contextlib import ExitStack
- resource_manager = ExitStack()
-diff --git a/requirements.txt b/requirements.txt
-index 53f1200d..5eda661b 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -11,6 +11,6 @@ psutil==5.9.2
- async-timeout>=4.0.2,<4.1
- distro>=1.7.0
- py-cpuinfo>=9.0.0,<10.0
--importlib-resources>=1.3
-+importlib-resources>=1.3; python_version < '3.9'
- setuptools>=60.8.1; python_version >= '3.7'
- setuptools==59.6.0; python_version < '3.7' # v59.6.0 is the last version to support Python 3.6
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index d1bd0eed1ce45..c6b53dcb5c8fb 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,11 +1,12 @@
# Template file for 'gns3-server'
pkgname=gns3-server
-version=2.2.35
-revision=2
+version=2.2.44
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
+makedepends="busybox-static" # Pulls distro busybox static to embed
depends="python3-setuptools python3-jsonschema python3-aiohttp python3-aiohttp-cors
- python3-yarl python3-Jinja2 python3-psutil python3-aiofiles
+ python3-yarl python3-Jinja2 python3-psutil python3-aiofiles python3-platformdirs
python3-py-cpuinfo python3-distro python3-async-timeout dynamips"
checkdepends="${depends} python3-pytest python3-flake8 python3-pytest-timeout python3-pytest-aiohttp"
short_desc="Graphical Network Simulator 3 - Server"
@@ -14,15 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://gns3.com"
changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=2c20ddc968a24fd8a77c272071d35304bac0706266a3f9e643658555e634c489
-
-# The source archive contains statically linked artifacts for x86_64
-# glibc, since this is the only architecture supported by upstream, we
-# mirror that requirement here. The artifacts in questions are the C
-# modules that are used to drive additional virtualization backends
-# for gns3. For more information, see this ticket:
-# https://github.com/GNS3/gns3-server/issues/970
-archs="x86_64"
+checksum=d83b3e1611f3d2ad607c45a29dbdcab947846d9b7abd7f3eec2886cf0c39f811
post_patch() {
# comment out requirements since versions are usually out of sync with Void packages
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Gns3 2.2.44
2023-11-21 0:03 [PR PATCH] Gns3 2.2.44 Vaelatern
@ 2023-11-21 0:19 ` Vaelatern
2023-11-21 1:14 ` [PR PATCH] [Updated] " Vaelatern
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Vaelatern @ 2023-11-21 0:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/47331#issuecomment-1820015966
Comment:
ubridge is a possible dependency... I'm not certain gns3-server needs it, but it did for my setup.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Gns3 2.2.44
2023-11-21 0:03 [PR PATCH] Gns3 2.2.44 Vaelatern
2023-11-21 0:19 ` Vaelatern
@ 2023-11-21 1:14 ` Vaelatern
2023-11-21 1:14 ` Vaelatern
2023-11-27 5:51 ` [PR PATCH] [Closed]: " Vaelatern
3 siblings, 0 replies; 5+ messages in thread
From: Vaelatern @ 2023-11-21 1:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages gns3-2.2.44
https://github.com/void-linux/void-packages/pull/47331
Gns3 2.2.44
#### Testing the changes
- I tested the changes in this PR: in progress
tested on x86_64-musl
Not yet tested in a cross build.
A patch file from https://github.com/void-linux/void-packages/pull/47331.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3-2.2.44-47331.patch --]
[-- Type: text/x-diff, Size: 5868 bytes --]
From 99a7c62a9532260c3f4bd25355ec0d78736af0d6 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Mon, 20 Nov 2023 19:03:01 -0500
Subject: [PATCH 1/2] gns3-gui: update to 2.2.44.
---
srcpkgs/gns3-gui/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 9397fbff2644e..1684756a33d11 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
# Template file for 'gns3-gui'
pkgname=gns3-gui
-version=2.2.35
-revision=2
+version=2.2.44
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-psutil python3-jsonschema
@@ -14,8 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://gns3.com"
changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=5dee30a6be10a4463d16c3cec516bf81717fc6f37f4f53386347d98de9a1f43b
-
+checksum=0ae6a9d7c951b8b06ec16b3c1af4dd84efd54109f4476cd9f4ead56c2afe332a
post_patch() {
# comment out requirements since versions are usually out of sync with Void packages
From 2306dac9037703f04c7d87dd91682d6fc8c6db4f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Mon, 20 Nov 2023 19:03:55 -0500
Subject: [PATCH 2/2] gns3-server: update to 2.2.44.
---
srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
srcpkgs/gns3-server/template | 19 ++----
2 files changed, 6 insertions(+), 78 deletions(-)
delete mode 100644 srcpkgs/gns3-server/patches/importlib.patch
diff --git a/srcpkgs/gns3-server/patches/importlib.patch b/srcpkgs/gns3-server/patches/importlib.patch
deleted file mode 100644
index c3dbd98bc7661..0000000000000
--- a/srcpkgs/gns3-server/patches/importlib.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/gns3server/controller/__init__.py b/gns3server/controller/__init__.py
-index 5c5236b9..971e3452 100644
---- a/gns3server/controller/__init__.py
-+++ b/gns3server/controller/__init__.py
-@@ -22,7 +22,11 @@ import uuid
- import socket
- import shutil
- import aiohttp
--import importlib_resources
-+
-+try:
-+ from importlib import resources as importlib_resources
-+except ImportError:
-+ import importlib_resources
-
- from ..config import Config
- from .project import Project
-diff --git a/gns3server/controller/appliance_manager.py b/gns3server/controller/appliance_manager.py
-index d15fc69b..41b73104 100644
---- a/gns3server/controller/appliance_manager.py
-+++ b/gns3server/controller/appliance_manager.py
-@@ -21,9 +21,13 @@ import json
- import uuid
- import asyncio
- import aiohttp
--import importlib_resources
- import shutil
-
-+try:
-+ from importlib import resources as importlib_resources
-+except ImportError:
-+ import importlib_resources
-+
- from .appliance import Appliance
- from ..config import Config
- from ..utils.asyncio import locking
-diff --git a/gns3server/utils/get_resource.py b/gns3server/utils/get_resource.py
-index b4b599bd..f4054cd3 100644
---- a/gns3server/utils/get_resource.py
-+++ b/gns3server/utils/get_resource.py
-@@ -19,7 +19,11 @@ import atexit
- import logging
- import os
- import sys
--import importlib_resources
-+
-+try:
-+ from importlib import resources as importlib_resources
-+except ImportError:
-+ import importlib_resources
-
- from contextlib import ExitStack
- resource_manager = ExitStack()
-diff --git a/requirements.txt b/requirements.txt
-index 53f1200d..5eda661b 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -11,6 +11,6 @@ psutil==5.9.2
- async-timeout>=4.0.2,<4.1
- distro>=1.7.0
- py-cpuinfo>=9.0.0,<10.0
--importlib-resources>=1.3
-+importlib-resources>=1.3; python_version < '3.9'
- setuptools>=60.8.1; python_version >= '3.7'
- setuptools==59.6.0; python_version < '3.7' # v59.6.0 is the last version to support Python 3.6
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index d1bd0eed1ce45..f63e9e1e1eeaa 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,12 +1,13 @@
# Template file for 'gns3-server'
pkgname=gns3-server
-version=2.2.35
-revision=2
+version=2.2.44
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
+makedepends="busybox-static" # Pulls distro busybox static to embed
depends="python3-setuptools python3-jsonschema python3-aiohttp python3-aiohttp-cors
- python3-yarl python3-Jinja2 python3-psutil python3-aiofiles
- python3-py-cpuinfo python3-distro python3-async-timeout dynamips"
+ python3-yarl python3-Jinja2 python3-psutil python3-aiofiles python3-platformdirs
+ python3-py-cpuinfo python3-distro python3-async-timeout dynamips ubridge"
checkdepends="${depends} python3-pytest python3-flake8 python3-pytest-timeout python3-pytest-aiohttp"
short_desc="Graphical Network Simulator 3 - Server"
maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
@@ -14,15 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://gns3.com"
changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=2c20ddc968a24fd8a77c272071d35304bac0706266a3f9e643658555e634c489
-
-# The source archive contains statically linked artifacts for x86_64
-# glibc, since this is the only architecture supported by upstream, we
-# mirror that requirement here. The artifacts in questions are the C
-# modules that are used to drive additional virtualization backends
-# for gns3. For more information, see this ticket:
-# https://github.com/GNS3/gns3-server/issues/970
-archs="x86_64"
+checksum=d83b3e1611f3d2ad607c45a29dbdcab947846d9b7abd7f3eec2886cf0c39f811
post_patch() {
# comment out requirements since versions are usually out of sync with Void packages
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Gns3 2.2.44
2023-11-21 0:03 [PR PATCH] Gns3 2.2.44 Vaelatern
2023-11-21 0:19 ` Vaelatern
2023-11-21 1:14 ` [PR PATCH] [Updated] " Vaelatern
@ 2023-11-21 1:14 ` Vaelatern
2023-11-27 5:51 ` [PR PATCH] [Closed]: " Vaelatern
3 siblings, 0 replies; 5+ messages in thread
From: Vaelatern @ 2023-11-21 1:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/47331#issuecomment-1820015966
Comment:
ubridge is a possible dependency... I'm not certain gns3-server needs it, but it did for my setup.
EDIT: Marked as required in the readme. Added to deps.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: Gns3 2.2.44
2023-11-21 0:03 [PR PATCH] Gns3 2.2.44 Vaelatern
` (2 preceding siblings ...)
2023-11-21 1:14 ` Vaelatern
@ 2023-11-27 5:51 ` Vaelatern
3 siblings, 0 replies; 5+ messages in thread
From: Vaelatern @ 2023-11-27 5:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
There's a closed pull request on the void-packages repository
Gns3 2.2.44
https://github.com/void-linux/void-packages/pull/47331
Description:
#### Testing the changes
- I tested the changes in this PR: in progress
tested on x86_64-musl
Not yet tested in a cross build.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-27 5:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-21 0:03 [PR PATCH] Gns3 2.2.44 Vaelatern
2023-11-21 0:19 ` Vaelatern
2023-11-21 1:14 ` [PR PATCH] [Updated] " Vaelatern
2023-11-21 1:14 ` Vaelatern
2023-11-27 5:51 ` [PR PATCH] [Closed]: " Vaelatern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).