Re: [PR PATCH] [Updated] GNS3 2.2.23

[tsndqst <tsndqst@users.noreply.github.com>]

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

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

https://github.com/tsndqst/void-packages gns3-2.2.23
https://github.com/void-linux/void-packages/pull/32432

GNS3 2.2.23
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] 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-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From 0eac1a8a0d52b3abb0185be210f6f0b9ca1ebd47 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 9 Aug 2021 15:46:43 -0500
Subject: [PATCH 1/4] python3-sentry: update to 1.1.0.

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

diff --git a/srcpkgs/python3-sentry/template b/srcpkgs/python3-sentry/template
index c2056965cad9..186671f0b7eb 100644
--- a/srcpkgs/python3-sentry/template
+++ b/srcpkgs/python3-sentry/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-sentry'
 pkgname=python3-sentry
-version=1.0.0
+version=1.1.0
 revision=1
 wrksrc="sentry-python-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
 license="BSD-2-Clause"
 homepage="https://github.com/getsentry/sentry-python"
 distfiles="https://github.com/getsentry/sentry-python/archive/${version}.tar.gz"
-checksum=@514331143990028b4cecf9f8e4ff5dfe4c0dddd0dcb206b28b7fba22ada6cece
+checksum=78a8ca3651976a46a64793c09942f2023984156bd402b53991dd3d8430cabee8
 
 do_check() {
 	cd build/lib

From e90e506abc10cb6819661160da4c76e47481b4b7 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 9 Aug 2021 15:46:50 -0500
Subject: [PATCH 2/4] python3-py-cpuinfo: update to 8.0.0.

---
 srcpkgs/python3-py-cpuinfo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-py-cpuinfo/template b/srcpkgs/python3-py-cpuinfo/template
index 6f5d469db551..f3cba9fbf044 100644
--- a/srcpkgs/python3-py-cpuinfo/template
+++ b/srcpkgs/python3-py-cpuinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-py-cpuinfo'
 pkgname=python3-py-cpuinfo
-version=6.0.0
-revision=2
+version=8.0.0
+revision=1
 wrksrc="py-cpuinfo-${version}"
 build_style=python3-module
 hostmakedepends=python3-setuptools
@@ -10,7 +10,7 @@ maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
 license="MIT"
 homepage="https://github.com/workhorsy/py-cpuinfo"
 distfiles="${PYPI_SITE}/p/py-cpuinfo/py-cpuinfo-${version}.tar.gz"
-checksum=7ffb31dea845b9f359b99bd5f7eea72dc70f852e0e34547d261a630f2b8c9c61
+checksum=5f269be0e08e33fd959de96b34cd4aeeeacac014dd8305f70eb28d06de2345c5
 
 post_install() {
 	vlicense LICENSE

From d6144c32cb52f95ec46908ae97519d614dbba397 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 9 Aug 2021 15:47:00 -0500
Subject: [PATCH 3/4] gns3-gui: update to 2.2.23.

---
 srcpkgs/gns3-gui/patches/requirements.patch | 10 ++++++++++
 srcpkgs/gns3-gui/template                   |  9 ++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/gns3-gui/patches/requirements.patch

diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch
new file mode 100644
index 000000000000..8feecd3d1d46
--- /dev/null
+++ b/srcpkgs/gns3-gui/patches/requirements.patch
@@ -0,0 +1,10 @@
+diff --git a/requirements.txt b/requirements.txt
+index 21f99792..ec35c74c 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,4 +1,4 @@
+ jsonschema==3.2.0
+ sentry-sdk==1.1.0
+ psutil==5.8.0
+-distro==1.5.0
++distro>=1.5.0
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index a82996e790ce..3c884d333fc5 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.21
+version=2.2.23
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,12 +13,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=@58b12add3fa29a095f14bbf4c61f54f41fdee45c8ca490c651d9ccb37b9884fe
-
-post_patch() {
-	# relax requirements
-	vsed -e 's|jsonschema.*|jsonschema>=2.6.0|' -i requirements.txt
-}
+checksum=60347f84b48bdd7dc6125469a7f82d5ef67bf061e85a554aa2b97795d45d40a8
 
 do_check() {
 	# uses tox, broken

From 25df126b8f8fd20783269418d4f7ac623941381c Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 9 Aug 2021 15:46:56 -0500
Subject: [PATCH 4/4] gns3-server: update to 2.2.23.

---
 srcpkgs/gns3-server/patches/requirements.patch | 18 ++++++++++++++++++
 srcpkgs/gns3-server/template                   | 11 ++---------
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/gns3-server/patches/requirements.patch

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
new file mode 100644
index 000000000000..03f001133134
--- /dev/null
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -0,0 +1,18 @@
+diff --git a/requirements.txt b/requirements.txt
+index c517efbe..15c67d2d 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,10 +1,10 @@
+ jsonschema==3.2.0
+-aiohttp==3.7.4.post0
++aiohttp>=3.7.4
+ aiohttp-cors==0.7.0
+ aiofiles==0.7.0
+-Jinja2==3.0.1
++Jinja2<3.0.0
+ sentry-sdk==1.1.0
+ psutil==5.8.0
+ async-timeout==3.0.1
+-distro==1.5.0
++distro>=1.5.0
+ py-cpuinfo==8.0.0
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 02ae7b2ef438..5c440ee7e05b 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.21
+version=2.2.23
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,16 +13,9 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=@9f3d7f4caf6cd420049a62ae9d7579f29b0e3805f1a50913ae9111ab6752bdb0
+checksum=0ed75a0d4438ef5cc07cccbccb79a60e6982f615981a58a2dde5082773203575
 make_check=no
 
-post_patch() {
-	# relax requirements
-	vsed -e 's|aiofiles.*|aiofiles>=0.4.0|' \
-		-e 's|aiohttp=.*|aiohttp>=3.7.4|' \
-		-e 's|jsonschema.*|jsonschema>=2.6.0|' \
-		-e 's|py-cpuinfo.*|py-cpuinfo>=5.8.0|' -i requirements.txt
-}
 post_install() {
 	# remove tests directory polluting site-packages
 	rm -rf -- ${DESTDIR}/usr/lib/python*/site-packages/tests