wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-16 14:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gns3-server: update to 2.2.44.1.

Browse source
This commit is contained in:
Tim Sandquist 2023-01-04 08:55:16 -06:00 • committed by Toyam Cox
parent c1e51cecd6
commit dcb04e0305
2 changed files with 10 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
srcpkgs/gns3-server/patches/importlib.patch
View file

@ -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

23
srcpkgs/gns3-server/template
View file

@ -1,12 +1,13 @@
# Template file for 'gns3-server'
pkgname=gns3-server
version=2.2.35
revision=2
version=2.2.44.1
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,17 +15,13 @@ 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=96a85d73db795282b3b732e1b6a5f592145c4a1cf93fa23f966dbe34d5d91a67
post_patch() {
# comment out requirements since versions are usually out of sync with Void packages
vsed -e 's|^|#|' -i requirements.txt
# pre-populate docker resource directory with static busybox binary
if [ "$CROSS_BUILD" ]; then
cp ${XBPS_CROSS_BASE}/bin/busybox.static gns3server/compute/docker/resources/bin/busybox
fi
}