Github messages for voidlinux
 help / color / mirror / Atom feed
From: tsndqst <tsndqst@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] GNS3 and dynamips updates
Date: Sun, 08 Jan 2023 16:40:11 +0100	[thread overview]
Message-ID: <20230108154011.ATV_ypGQluH-F8fMCGiuRxGx9EqaggU67JvTD6tEvx4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41472@inbox.vuxu.org>

[-- 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() {

  parent reply	other threads:[~2023-01-08 15:40 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-05 16:04 [PR PATCH] " 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 [this message]
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
2023-03-03 14:34 ` tsndqst
2023-05-08 12:44 ` tsndqst
2023-05-08 12:44 ` tsndqst
2023-06-06 19:26 ` [PR PATCH] [Updated] " tsndqst
2023-06-06 19:26 ` tsndqst
2023-06-06 20:02 ` [PR PATCH] [Updated] " tsndqst
2023-06-10 19:24 ` tsndqst
2023-07-10  1:09 ` tsndqst
2023-08-09 20:56 ` tsndqst
2023-09-19 17:13 ` tsndqst
2023-10-14  0:45 ` tsndqst
2023-10-14  0:48 ` tsndqst
2023-10-23 23:31 ` tsndqst
2023-10-30 19:00 ` SpidFightFR
2023-10-30 19:01 ` SpidFightFR
2023-10-30 19:15 ` tsndqst
2023-11-24 20:15 ` Vaelatern
2023-11-25  3:21 ` [PR PATCH] [Updated] " tsndqst
2023-11-25  3:22 ` tsndqst
2023-11-27  5:50 ` Vaelatern
2023-11-27  5:51 ` [PR PATCH] [Merged]: " Vaelatern

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230108154011.ATV_ypGQluH-F8fMCGiuRxGx9EqaggU67JvTD6tEvx4@z \
    --to=tsndqst@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).