From a63bd9e947a23c61a5d395415c49941becc29865 Mon Sep 17 00:00:00 2001 From: SpidFightFR Date: Sat, 21 Oct 2023 13:05:09 +0000 Subject: [PATCH] gns3-server: update to version 2.2.43. --- srcpkgs/gns3-server/patches/importlib.patch | 65 --------------------- srcpkgs/gns3-server/template | 9 +-- srcpkgs/python3-truststore/template | 19 ++++++ 3 files changed, 24 insertions(+), 69 deletions(-) delete mode 100644 srcpkgs/gns3-server/patches/importlib.patch create mode 100644 srcpkgs/python3-truststore/template 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..84c38b251c1a9 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.43 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" +makedepends="busybox-static qemu" 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-py-cpuinfo python3-distro python3-async-timeout dynamips python3-truststore python3-platformdirs" checkdepends="${depends} python3-pytest python3-flake8 python3-pytest-timeout python3-pytest-aiohttp" short_desc="Graphical Network Simulator 3 - Server" maintainer="Tim Sandquist " @@ -14,7 +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 +checksum=dd1a22837f1a982e4d897f3c01d88c40e719641c6316f3af0d7969217099cb7a # The source archive contains statically linked artifacts for x86_64 # glibc, since this is the only architecture supported by upstream, we diff --git a/srcpkgs/python3-truststore/template b/srcpkgs/python3-truststore/template new file mode 100644 index 0000000000000..10fddbb924aa5 --- /dev/null +++ b/srcpkgs/python3-truststore/template @@ -0,0 +1,19 @@ +# Template file for 'python3-truststore' +pkgname=python3-truststore +version=0.8.0 +revision=1 +build_style=python3-pep517 +makedepends="python3-flit_core" +depends="python3" +short_desc="Library to determine platform-specific system directories" +maintainer="SpidFightFR " +license="MIT" +homepage="https://platformdirs.rtfd.io/" +changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst" +distfiles="${PYPI_SITE}/t/truststore/truststore-${version}.tar.gz" +checksum=dc70da89634944a579bfeec70a7a4523c53ffdb3cf52d1bb4a431fda278ddb96 +make_check_pre="env PYTHONPATH=src" + +post_install() { + vlicense LICENSE +}