automatic import of gns3-server

4 files changed, 10 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index d77fb35..2a76ab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gns3-server-2.2.49.tar.gz
 /gns3-server-2.2.50.tar.gz
+/gns3-server-2.2.51.tar.gz
diff --git a/6e66b26b88708d61dd3d90ea5836fe27d7709d2a.patch b/6e66b26b88708d61dd3d90ea5836fe27d7709d2a.patch
deleted file mode 100644
index cdf9ae9..0000000
--- a/6e66b26b88708d61dd3d90ea5836fe27d7709d2a.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6e66b26b88708d61dd3d90ea5836fe27d7709d2a Mon Sep 17 00:00:00 2001
-From: grossmj <grossmj@gns3.net>
-Date: Tue, 22 Oct 2024 12:18:28 +1000
-Subject: [PATCH] Fix errors in init.sh. Fixes #2431
-
----
- gns3server/compute/docker/resources/init.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gns3server/compute/docker/resources/init.sh b/gns3server/compute/docker/resources/init.sh
-index 9811bdebd..05c6ee2e0 100755
---- a/gns3server/compute/docker/resources/init.sh
-+++ b/gns3server/compute/docker/resources/init.sh
-@@ -25,7 +25,7 @@ PATH=/gns3/bin:/tmp/gns3/bin:/sbin:$PATH
- # bootstrap busybox commands
- if [ ! -d /tmp/gns3/bin ]; then
- 	busybox mkdir -p /tmp/gns3/bin
--	for applet in `busybox --list-full`
-+	for applet in `busybox --list`
- 	do
- 	  ln -s /gns3/bin/busybox "/tmp/gns3/bin/$applet"
- 	done
diff --git a/gns3-server.spec b/gns3-server.spec
index 2ddd46e..7133d84 100644
--- a/gns3-server.spec
+++ b/gns3-server.spec
@@ -5,8 +5,8 @@
 %global __requires_exclude_from ^%{python3_sitelib}/gns3server/compute/docker/resources/.*$
 
 Name:           gns3-server
-Version:        2.2.50
-Release:        2%{?dist}
+Version:        2.2.51
+Release:        1%{?dist}
 Summary:        Graphical Network Simulator 3
 
 # Automatically converted from old format: GPLv3 - review is highly recommended.
@@ -15,7 +15,6 @@ URL:            http://gns3.com
 Source0:        https://github.com/GNS3/gns3-server/archive/v%{git_tag}/%{name}-%{git_tag}.tar.gz
 Source1:        gns3.service
 Patch0:         0001-changing-busybox-udhcpc-script-path.patch
-Patch1:         https://github.com/GNS3/gns3-server/commit/6e66b26b88708d61dd3d90ea5836fe27d7709d2a.patch
 
 BuildArch:      noarch
 
@@ -55,15 +54,16 @@ Requires: %{name} = %{version}-%{release}
 # Relax requirements
 sed -i -r 's/==/>=/g' requirements.txt
 sed -i -r 's/distro>=1.9.*/distro>=1.5.0/' requirements.txt
-sed -i -r 's/psutil>=6.0.0/psutil>=5.8.0/' requirements.txt
+sed -i -r 's/psutil>=6.1.0/psutil>=5.8.0/' requirements.txt
 sed -i -r 's/aiofiles>=24.1.0,<25.0/aiofiles>=0.7/' requirements.txt
-sed -i -r 's/aiohttp>=3.10.3,<3.11/aiohttp>=3.9.3/' requirements.txt
+sed -i -r 's/aiohttp>=3.10.10,<3.11/aiohttp>=3.9.3/' requirements.txt
 sed -i -r 's/Jinja2>=3.1.4,<3.2/jinja2>=2.11.3/' requirements.txt
 sed -i -r 's/jsonschema>=4.23,<4.24/jsonschema>=3.2.0/' requirements.txt
 sed -i -r 's/py-cpuinfo>=9.0.0,<10.0/py-cpuinfo>=8.0.0/' requirements.txt
 sed -i -r 's/async-timeout>=4.0.3,<4.1/async-timeout>=4.0.2/' requirements.txt
 sed -i -r 's/sentry-sdk.*//g' requirements.txt
 sed -i -r 's/truststore.*//g' requirements.txt
+sed -i -r 's/setuptools>=61.0/setuptools>=53.0/' setup.py
 
 %build
 %py3_build
@@ -132,6 +132,9 @@ cp -fp %{_datadir}/edk2/ovmf/OVMF_VARS.fd %{python3_sitelib}/gns3server/disks/OV
 %systemd_postun_with_restart gns3.service
 
 %changelog
+* Thu Nov  7 2024 Alexey Kurov <nucleo@fedoraproject.org> - 2.2.51-1
+- Update to 2.2.51
+
 * Thu Oct 24 2024 Alexey Kurov <nucleo@fedoraproject.org> - 2.2.50-2
 - Backport init.sh fix
 
diff --git a/sources b/sources
index b172e7f..84be9e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a26bd4b55043938de4551085c28d417b  gns3-server-2.2.50.tar.gz
+d610a481a18be00fcac1cdec0adc7572  gns3-server-2.2.51.tar.gz