From cdd9111eb7ac60bd9bbe3a8c2f8403e3105f4b6d Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Mon, 7 Dec 2020 20:20:01 -0600 Subject: [PATCH 1/2] gns3-server: update to 2.2.17, adopt --- srcpkgs/gns3-server/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index e4eeb2de3af..6187c37e47b 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.10 -revision=2 +version=2.2.17 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl @@ -9,16 +9,17 @@ depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl python3-py-cpuinfo python3-distro python3-async-timeout dynamips" checkdepends="${depends}" short_desc="Graphical Network Simulator 3 - Server" -maintainer="Michael Aldridge " +maintainer="Tim Sandquist " license="GPL-3.0-or-later" homepage="https://gns3.com" distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz" -checksum=4388974043680e877533564cb5a2efe2ed215a59a13abcabb3ac29d9b92f86e0 +checksum=@476c23fc41c0f92c816557f56e8a8184009b4cf0477c4d94156d9ff06db9256b pre_build() { # relax requirements vsed -e 's|aiofiles.*|aiofiles>=0.4.0|' \ -e 's|aiohttp-cors.*|aiohttp-cors>=0.7.0|' \ + -e 's|aiohttp=.*|aiohttp>=3.6.2|' \ -e 's|jsonschema.*|jsonschema>=2.6.0|' \ -e 's|psutil.*|psutil>=5.6.7|' \ -e 's|py-cpuinfo.*|py-cpuinfo>=5.0.0|' -i requirements.txt From 6d8ac77cca9f8640dfd2834f451f442abdca5b34 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Mon, 7 Dec 2020 20:20:40 -0600 Subject: [PATCH 2/2] gns3-gui: update to 2.2.17, adopt --- srcpkgs/gns3-gui/template | 10 +++++----- srcpkgs/gns3-server/template | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index 0dff36e945d..f7f51364548 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.10 -revision=2 +version=2.2.17 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-psutil python3-jsonschema python3-sentry @@ -9,13 +9,13 @@ depends="python3-setuptools python3-psutil python3-jsonschema python3-sentry gns3-net-converter python3-distro" checkdepends="${depends}" short_desc="Graphical Network Simulator 3 - GUI" -maintainer="Michael Aldridge " +maintainer="Tim Sandquist " license="GPL-3.0-or-later" homepage="https://gns3.com" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" -checksum=0f04fe1b3b328bab5ee80755ea90e18e0d25828fbf4a644f3fbec29189f19bc8 +checksum=@2200216046969000e6f076707d2ea3938a0777dc82e3d940cc41dc26c7fd46b5 -pre_build() { +post_patch() { # relax requirements vsed -e 's|jsonschema.*|jsonschema>=2.6.0|' \ -e 's|psutil.*|psutil>=5.6.7|' -i requirements.txt diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index 6187c37e47b..96ae642279e 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -15,7 +15,7 @@ homepage="https://gns3.com" distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz" checksum=@476c23fc41c0f92c816557f56e8a8184009b4cf0477c4d94156d9ff06db9256b -pre_build() { +post_patch() { # relax requirements vsed -e 's|aiofiles.*|aiofiles>=0.4.0|' \ -e 's|aiohttp-cors.*|aiohttp-cors>=0.7.0|' \