Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] GNS3 and dynamips updates
@ 2023-01-05 16:04 tsndqst
  2023-01-05 17:01 ` [PR PATCH] [Updated] " tsndqst
                   ` (26 more replies)
  0 siblings, 27 replies; 28+ messages in thread
From: tsndqst @ 2023-01-05 16:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

There is a new pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
GNS3 update to 2.2.36
Dynamips update required for GNS3 2.2.36

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 6063 bytes --]

From 66ef59fac9ece621f293059c2f8c4f7b4bd7f432 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

---
 srcpkgs/dynamips/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..6c0d7fd74cea 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,6 +1,6 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
 archs="i686* x86_64*"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
 # Dynamips does processor instruction translation.  This is already
 # painfully slow on powerful x86 hardware and is unlikely to work

From 8247a62a95b7d91821dded2e50a5cb070df14e38 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                |  6 +-
 2 files changed, 3 insertions(+), 68 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..74baeb0088da 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,9 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools busybox-static"
 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"
@@ -14,7 +14,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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From 15363591e762a5b6e7c02cf20bea3d683fca36c8 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
@ 2023-01-05 17:01 ` tsndqst
  2023-01-05 17:10 ` tsndqst
                   ` (25 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-05 17:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
GNS3 update to 2.2.36
Dynamips update required for GNS3 2.2.36

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 6146 bytes --]

From 66ef59fac9ece621f293059c2f8c4f7b4bd7f432 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

---
 srcpkgs/dynamips/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..6c0d7fd74cea 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,6 +1,6 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
 archs="i686* x86_64*"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
 # Dynamips does processor instruction translation.  This is already
 # painfully slow on powerful x86 hardware and is unlikely to work

From 364cbe48e40baa06a889a8556f82b6f7ecdcbd28 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                |  8 ++-
 2 files changed, 5 insertions(+), 68 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..80f3361d08d3 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+# Skip test that fails in CI
+make_check_args="-k-test_subprocess_check_output"
+hostmakedepends="python3-setuptools busybox-static"
 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"
@@ -14,7 +16,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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From 5f3bf473b7077b35db0da1eaadcee6360bd737ee Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
  2023-01-05 17:01 ` [PR PATCH] [Updated] " tsndqst
@ 2023-01-05 17:10 ` tsndqst
  2023-01-05 17:16 ` tsndqst
                   ` (24 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-05 17:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
GNS3 update to 2.2.36
Dynamips update required for GNS3 2.2.36

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 6151 bytes --]

From 66ef59fac9ece621f293059c2f8c4f7b4bd7f432 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

---
 srcpkgs/dynamips/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..6c0d7fd74cea 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,6 +1,6 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
 archs="i686* x86_64*"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
 # Dynamips does processor instruction translation.  This is already
 # painfully slow on powerful x86 hardware and is unlikely to work

From 483936ee2aeb7007d2a467af14520c405ed3ea36 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                |  8 ++-
 2 files changed, 5 insertions(+), 68 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..fbb60bbc122b 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+# Skip test that fails in CI
+make_check_args="-k'not test_subprocess_check_output'"
+hostmakedepends="python3-setuptools busybox-static"
 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"
@@ -14,7 +16,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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From e5a836d1eed145ecd8aeaaae2510c5f68796aa88 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
  2023-01-05 17:01 ` [PR PATCH] [Updated] " tsndqst
  2023-01-05 17:10 ` tsndqst
@ 2023-01-05 17:16 ` tsndqst
  2023-01-05 22:48 ` [PR REVIEW] " CameronNemo
                   ` (23 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-05 17:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
GNS3 update to 2.2.36
Dynamips update required for GNS3 2.2.36

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 6063 bytes --]

From 66ef59fac9ece621f293059c2f8c4f7b4bd7f432 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

---
 srcpkgs/dynamips/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..6c0d7fd74cea 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,6 +1,6 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
 archs="i686* x86_64*"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
 # Dynamips does processor instruction translation.  This is already
 # painfully slow on powerful x86 hardware and is unlikely to work

From 3d1f24292b5fd1d6552bd9643eddf780fb5f8ea9 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                |  6 +-
 2 files changed, 3 insertions(+), 68 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..74baeb0088da 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,9 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools busybox-static"
 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"
@@ -14,7 +14,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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From d10391e8526f4683069b1fc476b22295313fa40b Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (2 preceding siblings ...)
  2023-01-05 17:16 ` tsndqst
@ 2023-01-05 22:48 ` CameronNemo
  2023-01-05 23:51 ` tsndqst
                   ` (22 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: CameronNemo @ 2023-01-05 22:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#discussion_r1062960407

Comment:
busybox-static? Why was this necessary to add? And does this mean gns3 can run on non-x86_64 arches? See note below, it is referring to busybox.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (3 preceding siblings ...)
  2023-01-05 22:48 ` [PR REVIEW] " CameronNemo
@ 2023-01-05 23:51 ` tsndqst
  2023-01-06 17:47 ` [PR PATCH] [Updated] " tsndqst
                   ` (21 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-05 23:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 365 bytes --]

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#discussion_r1062990086

Comment:
I think you're right @CameronNemo.   https://github.com/GNS3/gns3-server/issues/1890 includes the change to use a stock busybox to inject into Docker images.  I'll test it out on arm64 and see if I can get it working.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (4 preceding siblings ...)
  2023-01-05 23:51 ` tsndqst
@ 2023-01-06 17:47 ` tsndqst
  2023-01-06 17:57 ` tsndqst
                   ` (20 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-06 17:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
GNS3 update to 2.2.36
Dynamips update required for GNS3 2.2.36

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 6842 bytes --]

From 0b62a47a09c7d293b87a66f2278326c22d5ac58f Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

---
 srcpkgs/dynamips/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..16252270ddc3 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
-
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1

From 63f6b53c6b98a68ea2c4f390dd667b5401290b84 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                | 17 +++---
 2 files changed, 8 insertions(+), 74 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..ff0383d3db11 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From 9749b5cddeac0c1a3ff829a81b4f918330f89a38 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (5 preceding siblings ...)
  2023-01-06 17:47 ` [PR PATCH] [Updated] " tsndqst
@ 2023-01-06 17:57 ` tsndqst
  2023-01-06 18:00 ` CameronNemo
                   ` (19 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-06 17:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#issuecomment-1373959590

Comment:
I updated the templates to cross compile dynamips and gns3-server.  I tested it locally with aarch64 and they both worked.  I'll have to dig into the CI failures a bit when I have some time.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (6 preceding siblings ...)
  2023-01-06 17:57 ` tsndqst
@ 2023-01-06 18:00 ` CameronNemo
  2023-01-07  2:56 ` tsndqst
                   ` (18 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: CameronNemo @ 2023-01-06 18:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#issuecomment-1373962023

Comment:
Looks like, for dynamips, there is some binary being generated and invoked:

>/bin/sh: line 1: /builddir/dynamips-0.2.23/build/stable/rom2c: cannot execute binary file: Exec format error

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (7 preceding siblings ...)
  2023-01-06 18:00 ` CameronNemo
@ 2023-01-07  2:56 ` tsndqst
  2023-01-07  4:02 ` CameronNemo
                   ` (17 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-07  2:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 482 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#issuecomment-1374359611

Comment:
I was able to reproduce the problem on one of my x86_64 machines but I can't figure out what the difference is between the machine that can cross compile dynamips and the one that can't.  The host xbps-src runs on shouldn't affect the outcome but something is different between the two. Got any hints about how to track down the difference?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (8 preceding siblings ...)
  2023-01-07  2:56 ` tsndqst
@ 2023-01-07  4:02 ` CameronNemo
  2023-01-07 14:51 ` tsndqst
                   ` (16 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: CameronNemo @ 2023-01-07  4:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#issuecomment-1374370149

Comment:
Off hand I would say that zapping masterdir and clearing out any stale binpkgs would be good troubleshooting tactic.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (9 preceding siblings ...)
  2023-01-07  4:02 ` CameronNemo
@ 2023-01-07 14:51 ` tsndqst
  2023-01-07 15:37 ` tsndqst
                   ` (15 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-07 14:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#issuecomment-1374505144

Comment:
> Off hand I would say that zapping masterdir and clearing out any stale binpkgs would be good troubleshooting tactic.

I tried it on a fresh clone of `void-packages` and it still worked fine.  I'll keep digging.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (10 preceding siblings ...)
  2023-01-07 14:51 ` tsndqst
@ 2023-01-07 15:37 ` tsndqst
  2023-01-08 15:30 ` [PR PATCH] [Updated] " tsndqst
                   ` (14 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-07 15:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 614 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#issuecomment-1374518833

Comment:
I figured it out.  My main desktop where I initially tested this has `binfmt-support` installed and configured.  The laptop I tested after CI failed does not have it.  I installed and configured `binfmt-support` on my laptop and cross compiling worked.  I seems like making use of binfmts would make cross compiling easier but I'm not sure if adding the dependency is something the maintainers would want.  Maybe there's another way to handle this that I don't know about.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (11 preceding siblings ...)
  2023-01-07 15:37 ` tsndqst
@ 2023-01-08 15:30 ` tsndqst
  2023-01-08 15:37 ` tsndqst
                   ` (13 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-08 15:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
GNS3 update to 2.2.36
Dynamips update required for GNS3 2.2.36

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 7137 bytes --]

From 435b4b6c311fc09263de4a2f0ccb5a73121317f4 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..a8db4f767f72 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,8 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+if ! grep -c enabled /proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static; then
+       nocross="binfmt support not enabled"
+fi

From 7d617702fe9959f390e164f45ba8c55a1f42698c Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

Enable non-x86 platforms now that gns3-server uses a stock BusyBox for the Docker integration
---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                | 17 +++---
 2 files changed, 8 insertions(+), 74 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..ff0383d3db11 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From a713832bcc8c5bfd3d6f503432169ebc02caf3f8 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (12 preceding siblings ...)
  2023-01-08 15:30 ` [PR PATCH] [Updated] " tsndqst
@ 2023-01-08 15:37 ` tsndqst
  2023-01-08 15:40 ` tsndqst
                   ` (12 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-08 15:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
Upgrade dynamips and cross-compile when binfmt is enabled.
Upgrade gns3-server and enable more archictures since x86_64 busybox is no longer packaged with gns3-server.
Upgrade gns3-gui.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64 (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 7166 bytes --]

From 1af83d1e880408c1ba046a6c63a628519ca7ebb6 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..aaaeb98d8c82 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,10 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+_BINFMT_PATH=/proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static
+
+if ! grep -c enabled ${_BINFMT_PATH}; then
+	nocross="binfmt support not enabled"
+fi

From 4fc60505316a335b87113aff65388338771ded4a Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

Enable non-x86 platforms now that gns3-server uses a stock BusyBox for the Docker integration
---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                | 17 +++---
 2 files changed, 8 insertions(+), 74 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..ff0383d3db11 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From 1c07623533030178a885fe66cf230aa1eb4eda26 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (13 preceding siblings ...)
  2023-01-08 15:37 ` tsndqst
@ 2023-01-08 15:40 ` tsndqst
  2023-01-08 15:48 ` tsndqst
                   ` (11 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-08 15:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
Upgrade dynamips and cross-compile when binfmt is enabled.
Upgrade gns3-server and enable more archictures since x86_64 busybox is no longer packaged with gns3-server.
Upgrade gns3-gui.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64 (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 7166 bytes --]

From fb6d03f15a6ecc9258677f8901e85ce0cac45ae3 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..7d8636858725 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,10 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+_BINFMT_PATH=/proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static
+
+if ! grep -q enabled ${_BINFMT_PATH}; then
+	nocross="binfmt support not enabled"
+fi

From 4304498eccac0c397488a1740f368c29a9024a28 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

Enable non-x86 platforms now that gns3-server uses a stock BusyBox for the Docker integration
---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                | 17 +++---
 2 files changed, 8 insertions(+), 74 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..ff0383d3db11 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From 8bf7322dcbd5027498b818b6225dc8cf66a13b20 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (14 preceding siblings ...)
  2023-01-08 15:40 ` tsndqst
@ 2023-01-08 15:48 ` tsndqst
  2023-01-08 15:57 ` tsndqst
                   ` (10 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-08 15:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
Upgrade dynamips and cross-compile when binfmt is enabled.
Upgrade gns3-server and enable more archictures since x86_64 busybox is no longer packaged with gns3-server.
Upgrade gns3-gui.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64 (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 7072 bytes --]

From fb6d03f15a6ecc9258677f8901e85ce0cac45ae3 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..7d8636858725 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,10 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+_BINFMT_PATH=/proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static
+
+if ! grep -q enabled ${_BINFMT_PATH}; then
+	nocross="binfmt support not enabled"
+fi

From 3dcfcaff8b139b06f8d42f11a0d0b361b63d64b7 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                | 17 +++---
 2 files changed, 8 insertions(+), 74 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..ff0383d3db11 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From 28db292cc52395263b61cf55905a8ff5e5419aec Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (15 preceding siblings ...)
  2023-01-08 15:48 ` tsndqst
@ 2023-01-08 15:57 ` tsndqst
  2023-01-08 16:10 ` tsndqst
                   ` (9 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-08 15:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
Upgrade dynamips and cross-compile when binfmt is enabled.
Upgrade gns3-server and enable more archictures since x86_64 busybox is no longer packaged with gns3-server.
Upgrade gns3-gui.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64 (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 7084 bytes --]

From 3a4cf20a90d437db4031823018861629e1b448b5 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..6b26bfe0efc5 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,10 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+_BINFMT_PATH=/proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static
+
+if ! grep -q enabled ${_BINFMT_PATH} 2>/dev/null; then
+	nocross="binfmt support not enabled"
+fi

From 96a3083b0b5c0a04c74b8e6ef7b9fe6f36ac4ec3 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                | 17 +++---
 2 files changed, 8 insertions(+), 74 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..ff0383d3db11 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From 5615457717288c466cfadda0c601d5cf6cd3fe6b Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (16 preceding siblings ...)
  2023-01-08 15:57 ` tsndqst
@ 2023-01-08 16:10 ` tsndqst
  2023-01-08 16:13 ` tsndqst
                   ` (8 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-08 16:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
Upgrade dynamips and cross-compile when binfmt is enabled.
Upgrade gns3-server and enable more archictures since x86_64 busybox is no longer packaged with gns3-server.
Upgrade gns3-gui.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64 (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 7875 bytes --]

From 3a4cf20a90d437db4031823018861629e1b448b5 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/4] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..6b26bfe0efc5 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,10 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+_BINFMT_PATH=/proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static
+
+if ! grep -q enabled ${_BINFMT_PATH} 2>/dev/null; then
+	nocross="binfmt support not enabled"
+fi

From 96a3083b0b5c0a04c74b8e6ef7b9fe6f36ac4ec3 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/4] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                | 17 +++---
 2 files changed, 8 insertions(+), 74 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..ff0383d3db11 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From 5615457717288c466cfadda0c601d5cf6cd3fe6b Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/4] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

From 6026e2b4c381eee024cc0b8d32f98d0745b74fcf Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Sun, 8 Jan 2023 10:09:35 -0600
Subject: [PATCH 4/4] Skip flakey test

---
 srcpkgs/gns3-server/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index ff0383d3db11..9c6d68756d9c 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -4,6 +4,8 @@ version=2.2.36
 revision=1
 build_style=python3-module
 build_helper=qemu
+# Skip flakey test
+make_check_args="-k 'not test_subprocess_check_output'"
 hostmakedepends="python3-setuptools"
 makedepends="${hostmakedepends} busybox-static"
 depends="python3-setuptools python3-jsonschema python3-aiohttp python3-aiohttp-cors

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (17 preceding siblings ...)
  2023-01-08 16:10 ` tsndqst
@ 2023-01-08 16:13 ` tsndqst
  2023-01-08 16:33 ` leahneukirchen
                   ` (7 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-08 16:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
Upgrade dynamips and cross-compile when binfmt is enabled.
Upgrade gns3-server and enable more archictures since x86_64 busybox is no longer packaged with gns3-server.
Upgrade gns3-gui.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64 (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 7162 bytes --]

From 3a4cf20a90d437db4031823018861629e1b448b5 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..6b26bfe0efc5 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,10 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+_BINFMT_PATH=/proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static
+
+if ! grep -q enabled ${_BINFMT_PATH} 2>/dev/null; then
+	nocross="binfmt support not enabled"
+fi

From f3c904bc3b1b6df6b5a3641759cabc172af1e304 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 ---------------------
 srcpkgs/gns3-server/template                | 19 +++---
 2 files changed, 10 insertions(+), 74 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 c3dbd98bc766..000000000000
--- 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 e1b3c68ca2cd..9c6d68756d9c 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,13 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
+build_helper=qemu
+# Skip flakey test
+make_check_args="-k 'not test_subprocess_check_output'"
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +18,12 @@ 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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From 6111f597b13120dd46af2eed534c499c878e4807 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (18 preceding siblings ...)
  2023-01-08 16:13 ` tsndqst
@ 2023-01-08 16:33 ` leahneukirchen
  2023-01-25 15:00 ` tsndqst
                   ` (6 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: leahneukirchen @ 2023-01-08 16:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 815 bytes --]

There is an updated pull request by leahneukirchen against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
Upgrade dynamips and cross-compile when binfmt is enabled.
Upgrade gns3-server and enable more archictures since x86_64 busybox is no longer packaged with gns3-server.
Upgrade gns3-gui.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64 (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 7938 bytes --]

From 3a4cf20a90d437db4031823018861629e1b448b5 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..6b26bfe0efc5 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,10 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+_BINFMT_PATH=/proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static
+
+if ! grep -q enabled ${_BINFMT_PATH} 2>/dev/null; then
+	nocross="binfmt support not enabled"
+fi

From 2f5c085888c4a733cd65f16fdc6bcf1d68ea83c8 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.36.

---
 srcpkgs/gns3-server/patches/importlib.patch   | 65 -------------------
 .../test_subprocess_check_output.patch        | 11 ++++
 srcpkgs/gns3-server/template                  | 17 +++--
 3 files changed, 19 insertions(+), 74 deletions(-)
 delete mode 100644 srcpkgs/gns3-server/patches/importlib.patch
 create mode 100644 srcpkgs/gns3-server/patches/test_subprocess_check_output.patch

diff --git a/srcpkgs/gns3-server/patches/importlib.patch b/srcpkgs/gns3-server/patches/importlib.patch
deleted file mode 100644
index c3dbd98bc766..000000000000
--- 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/patches/test_subprocess_check_output.patch b/srcpkgs/gns3-server/patches/test_subprocess_check_output.patch
new file mode 100644
index 000000000000..cd3ac5ace5b3
--- /dev/null
+++ b/srcpkgs/gns3-server/patches/test_subprocess_check_output.patch
@@ -0,0 +1,11 @@
+index 9e66c124..e2c162cd 100644
+--- a/tests/utils/test_asyncio.py
++++ b/tests/utils/test_asyncio.py
+@@ -44,6 +44,7 @@ async def test_exception_wait_run_in_executor():
+ 
+ 
+ @pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
++@pytest.mark.skip(reason="Flakey test in VoidLinux CI")
+ async def test_subprocess_check_output(loop, tmpdir):
+ 
+     path = str(tmpdir / "test")
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index e1b3c68ca2cd..ff0383d3db11 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=37ad282a26c380818cabd69f99f5f9ae53548d6d672ab8587fa1cbfa5dbe7071
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From 3ef85218cf94d984312a68d421c393a3a79326eb Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.36.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..41925a996969 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=d8c92273f4a55b3b7a635d4c1621d64be4ee9f7501933e3f1486d06daa729481
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (19 preceding siblings ...)
  2023-01-08 16:33 ` leahneukirchen
@ 2023-01-25 15:00 ` tsndqst
  2023-01-25 15:14 ` tsndqst
                   ` (5 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-25 15:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 950 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
Upgrade dynamips and cross-compile when binfmt is enabled.
Upgrade gns3-server and enable more archictures since x86_64 busybox is no longer packaged with gns3-server.
Upgrade gns3-gui.

#### Testing the changes
- I tested the changes in this PR: **YES**
- I tested the `Ethernet Switch` on aarch64 which uses the dynamips hypervisor
- I tested Alpine Linux docker container on aarch64 as well.

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64 (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 7938 bytes --]

From 6e699772b0fb2f4d5370b568559d34b068efe3c2 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..6b26bfe0efc5 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,10 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+_BINFMT_PATH=/proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static
+
+if ! grep -q enabled ${_BINFMT_PATH} 2>/dev/null; then
+	nocross="binfmt support not enabled"
+fi

From 829a3b20ddf71db3beb0e3a9bd0ff9ecf684597b Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.37.

---
 srcpkgs/gns3-server/patches/importlib.patch   | 65 -------------------
 .../test_subprocess_check_output.patch        | 11 ++++
 srcpkgs/gns3-server/template                  | 17 +++--
 3 files changed, 19 insertions(+), 74 deletions(-)
 delete mode 100644 srcpkgs/gns3-server/patches/importlib.patch
 create mode 100644 srcpkgs/gns3-server/patches/test_subprocess_check_output.patch

diff --git a/srcpkgs/gns3-server/patches/importlib.patch b/srcpkgs/gns3-server/patches/importlib.patch
deleted file mode 100644
index c3dbd98bc766..000000000000
--- 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/patches/test_subprocess_check_output.patch b/srcpkgs/gns3-server/patches/test_subprocess_check_output.patch
new file mode 100644
index 000000000000..cd3ac5ace5b3
--- /dev/null
+++ b/srcpkgs/gns3-server/patches/test_subprocess_check_output.patch
@@ -0,0 +1,11 @@
+index 9e66c124..e2c162cd 100644
+--- a/tests/utils/test_asyncio.py
++++ b/tests/utils/test_asyncio.py
+@@ -44,6 +44,7 @@ async def test_exception_wait_run_in_executor():
+ 
+ 
+ @pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
++@pytest.mark.skip(reason="Flakey test in VoidLinux CI")
+ async def test_subprocess_check_output(loop, tmpdir):
+ 
+     path = str(tmpdir / "test")
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index e1b3c68ca2cd..7e63447aa20f 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.37
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=1cdad8dccd39c3c70e80d8ec2599d62df7020b97e7eecc8217208fa3146c73f7
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From 7aeb243516ac6414d15dec19ec19e2b74f62b8ef Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.37.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..7082e27d6109 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=bb191bb1e1adf8b37d88f9dccfa39916d3f3288d0517d1bfeefc54bf0c4f10fd
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (20 preceding siblings ...)
  2023-01-25 15:00 ` tsndqst
@ 2023-01-25 15:14 ` tsndqst
  2023-01-25 15:47 ` [PR REVIEW] " CameronNemo
                   ` (4 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-25 15:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#issuecomment-1403775643

Comment:
@CameronNemo can you re-review this?  GNS3 was updated since I created this PR so I bumped the version since the last time you looked at it.


^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (21 preceding siblings ...)
  2023-01-25 15:14 ` tsndqst
@ 2023-01-25 15:47 ` CameronNemo
  2023-01-25 16:19 ` tsndqst
                   ` (3 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: CameronNemo @ 2023-01-25 15:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#discussion_r1086812538

Comment:
Not sure what to say about this... seems a bit weird to me, personally...

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (22 preceding siblings ...)
  2023-01-25 15:47 ` [PR REVIEW] " CameronNemo
@ 2023-01-25 16:19 ` tsndqst
  2023-01-25 18:00 ` CameronNemo
                   ` (2 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-25 16:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#discussion_r1086853529

Comment:
binfmt support is not available in Github CI so we can't cross compile in Github but if binfmt is supported locally we can cross compile.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (23 preceding siblings ...)
  2023-01-25 16:19 ` tsndqst
@ 2023-01-25 18:00 ` CameronNemo
  2023-01-25 18:02 ` tsndqst
  2023-01-25 19:11 ` [PR PATCH] [Updated] " tsndqst
  26 siblings, 0 replies; 28+ messages in thread
From: CameronNemo @ 2023-01-25 18:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#discussion_r1086986061

Comment:
ok. Maybe add that context as a comment.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (24 preceding siblings ...)
  2023-01-25 18:00 ` CameronNemo
@ 2023-01-25 18:02 ` tsndqst
  2023-01-25 19:11 ` [PR PATCH] [Updated] " tsndqst
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-25 18:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/41472#discussion_r1086987544

Comment:
Good idea.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] GNS3 and dynamips updates
  2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
                   ` (25 preceding siblings ...)
  2023-01-25 18:02 ` tsndqst
@ 2023-01-25 19:11 ` tsndqst
  26 siblings, 0 replies; 28+ messages in thread
From: tsndqst @ 2023-01-25 19:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 950 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3_and_dynamips
https://github.com/void-linux/void-packages/pull/41472

GNS3 and dynamips updates
Upgrade dynamips and cross-compile when binfmt is enabled.
Upgrade gns3-server and enable more archictures since x86_64 busybox is no longer packaged with gns3-server.
Upgrade gns3-gui.

#### Testing the changes
- I tested the changes in this PR: **YES**
- I tested the `Ethernet Switch` on aarch64 which uses the dynamips hypervisor
- I tested Alpine Linux docker container on aarch64 as well.

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64 (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/41472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3_and_dynamips-41472.patch --]
[-- Type: text/x-diff, Size: 8058 bytes --]

From 2116222f3a6b05fec592909132739c7e5bb0fc83 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:54:59 -0600
Subject: [PATCH 1/3] dynamips: update to 0.2.23.

Enable cross-compiling when binfmt support is available.
---
 srcpkgs/dynamips/template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 864bd790ecd4..5f7c20572e02 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -1,9 +1,9 @@
 # Template file for 'dynamips'
 pkgname=dynamips
-version=0.2.21
+version=0.2.23
 revision=1
-archs="i686* x86_64*"
 build_style=cmake
+build_helper=qemu
 makedepends="elfutils-devel libpcap-devel"
 depends="iouyap"
 short_desc="Hardware emulation for Cisco IOS capable devices"
@@ -11,10 +11,12 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/GNS3/dynamips"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=08587589db2c3fc637e6345aebf4f9706825c12f45d9e2cf40d4189c604656d2
+checksum=503bbb52c03f91900ea8dbe8bd0b804b76e2e28d0b7242624e0d3c52dda441a1
 
-# Dynamips does processor instruction translation.  This is already
-# painfully slow on powerful x86 hardware and is unlikely to work
-# reliably on arm processors.
-#
-# So restrict to x86_64* and i686*
+# cross compile does not currently work without binfmt 
+# so `nocross` is used in environments like Github Actions
+_BINFMT_PATH=/proc/sys/fs/binfmt_misc/qemu-${XBPS_TARGET_QEMU_MACHINE}-static
+
+if ! grep -q enabled ${_BINFMT_PATH} 2>/dev/null; then
+	nocross="binfmt support not enabled"
+fi

From 01c86bcac267b8152fbf9ba761516f71b8eb60d5 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:16 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.37.

---
 srcpkgs/gns3-server/patches/importlib.patch   | 65 -------------------
 .../test_subprocess_check_output.patch        | 11 ++++
 srcpkgs/gns3-server/template                  | 17 +++--
 3 files changed, 19 insertions(+), 74 deletions(-)
 delete mode 100644 srcpkgs/gns3-server/patches/importlib.patch
 create mode 100644 srcpkgs/gns3-server/patches/test_subprocess_check_output.patch

diff --git a/srcpkgs/gns3-server/patches/importlib.patch b/srcpkgs/gns3-server/patches/importlib.patch
deleted file mode 100644
index c3dbd98bc766..000000000000
--- 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/patches/test_subprocess_check_output.patch b/srcpkgs/gns3-server/patches/test_subprocess_check_output.patch
new file mode 100644
index 000000000000..cd3ac5ace5b3
--- /dev/null
+++ b/srcpkgs/gns3-server/patches/test_subprocess_check_output.patch
@@ -0,0 +1,11 @@
+index 9e66c124..e2c162cd 100644
+--- a/tests/utils/test_asyncio.py
++++ b/tests/utils/test_asyncio.py
+@@ -44,6 +44,7 @@ async def test_exception_wait_run_in_executor():
+ 
+ 
+ @pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
++@pytest.mark.skip(reason="Flakey test in VoidLinux CI")
+ async def test_subprocess_check_output(loop, tmpdir):
+ 
+     path = str(tmpdir / "test")
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index e1b3c68ca2cd..7e63447aa20f 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,9 +1,11 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.35
+version=2.2.37
 revision=1
 build_style=python3-module
+build_helper=qemu
 hostmakedepends="python3-setuptools"
+makedepends="${hostmakedepends} busybox-static"
 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"
@@ -14,15 +16,12 @@ 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=1cdad8dccd39c3c70e80d8ec2599d62df7020b97e7eecc8217208fa3146c73f7
 
-# 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"
+# Prefix PATH with XBPS_CROSS_BASE bin directory so setup.py can find the correct busybox.static
+if [ "$CROSS_BUILD" ]; then
+	PATH="${XBPS_CROSS_BASE}/bin:$PATH"
+fi
 
 post_patch() {
 	# comment out requirements since versions are usually out of sync with Void packages

From a91df0ee4fe0e870ecebe29707214b0212196d01 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 4 Jan 2023 08:55:23 -0600
Subject: [PATCH 3/3] gns3-gui: update to 2.2.37.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a08c6d34214..7082e27d6109 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.35
+version=2.2.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +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=bb191bb1e1adf8b37d88f9dccfa39916d3f3288d0517d1bfeefc54bf0c4f10fd
 
 
 post_patch() {

^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2023-01-25 19:11 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-05 16:04 [PR PATCH] GNS3 and dynamips updates tsndqst
2023-01-05 17:01 ` [PR PATCH] [Updated] " tsndqst
2023-01-05 17:10 ` tsndqst
2023-01-05 17:16 ` tsndqst
2023-01-05 22:48 ` [PR REVIEW] " CameronNemo
2023-01-05 23:51 ` tsndqst
2023-01-06 17:47 ` [PR PATCH] [Updated] " tsndqst
2023-01-06 17:57 ` tsndqst
2023-01-06 18:00 ` CameronNemo
2023-01-07  2:56 ` tsndqst
2023-01-07  4:02 ` CameronNemo
2023-01-07 14:51 ` tsndqst
2023-01-07 15:37 ` tsndqst
2023-01-08 15:30 ` [PR PATCH] [Updated] " tsndqst
2023-01-08 15:37 ` tsndqst
2023-01-08 15:40 ` tsndqst
2023-01-08 15:48 ` tsndqst
2023-01-08 15:57 ` tsndqst
2023-01-08 16:10 ` tsndqst
2023-01-08 16:13 ` tsndqst
2023-01-08 16:33 ` leahneukirchen
2023-01-25 15:00 ` tsndqst
2023-01-25 15:14 ` tsndqst
2023-01-25 15:47 ` [PR REVIEW] " CameronNemo
2023-01-25 16:19 ` tsndqst
2023-01-25 18:00 ` CameronNemo
2023-01-25 18:02 ` tsndqst
2023-01-25 19:11 ` [PR PATCH] [Updated] " tsndqst

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).