From b0a0e315520d7f2b584325f87e35f7577da8a6a4 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 28 Feb 2022 20:32:26 -0600
Subject: [PATCH 1/2] gns3-server: update to 2.2.31.

---
 srcpkgs/gns3-server/patches/requirements.patch | 17 ++++++++++-------
 srcpkgs/gns3-server/template                   |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index 1c61d2dd6ae1..4cfa85b16ba2 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -1,18 +1,21 @@
 diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,9 +1,8 @@
+@@ -1,12 +1,11 @@
 -jsonschema==3.2.0
 +jsonschema>=3.2.0
 -aiohttp==3.7.4.post0
 +aiohttp>=3.7.4
  aiohttp-cors==0.7.0
--aiofiles==0.7.0
-+aiofiles>=0.8.0
--Jinja2==3.0.1
-+Jinja2>=3.0.1
--sentry-sdk==1.3.1
--psutil==5.8.0
+ aiofiles==0.8.0
+-Jinja2==3.0.3
++Jinja2>=3.0.3
+-sentry-sdk==1.5.4
+-psutil==5.9.0
 +psutil>=5.9.0
  async-timeout==3.0.1
  distro==1.6.0
+ py-cpuinfo==8.0.0
+-setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
++setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+ setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 1845cc2e3fcf..038457a27a3b 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.29
-revision=2
+version=2.2.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl
@@ -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=34237771bb743ac9142569e67284123b6090f78cfd802a729e2f11b9d5d48929
+checksum=10a530866a156cea6b544be9b557f61ca0baa7e58c3064d79a1d523b70301edc
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From 38e8c6ae25a0f971a464af8e8ce71fde1cb7b345 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 28 Feb 2022 20:32:36 -0600
Subject: [PATCH 2/2] gns3-gui: update to 2.2.31.

---
 srcpkgs/gns3-gui/patches/requirements.patch | 9 ++++++---
 srcpkgs/gns3-gui/template                   | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch
index d594ea77de5b..ab3d55dea830 100644
--- a/srcpkgs/gns3-gui/patches/requirements.patch
+++ b/srcpkgs/gns3-gui/patches/requirements.patch
@@ -1,10 +1,13 @@
 diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,4 +1,3 @@
+@@ -1,6 +1,5 @@
 -jsonschema==3.2.0
 +jsonschema>=3.2.0
--sentry-sdk==1.3.1
--psutil==5.8.0
+-sentry-sdk==1.5.4
+-psutil==5.9.0
 +psutil>=5.9.0
  distro==1.6.0
+-setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
++setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+ setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index a4d9d410e3fc..175eab41080c 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.29
-revision=2
+version=2.2.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
@@ -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=5b9b6db1917af66d0e4bf32c41ff17d6a03a487a2a870d18b04e68e7b572bf28
+checksum=7b6f041f88a63dc44e33680ea489556abc7d96d1c3d4bb5d85dd15b15db6d036
 
 post_install() {
 	vinstall gns3-gui.desktop 644 usr/share/applications