diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | 0001-changing-busybox-udhcpc-script-path.patch | 8 | ||||
| -rw-r--r-- | 6e66b26b88708d61dd3d90ea5836fe27d7709d2a.patch | 22 | ||||
| -rw-r--r-- | gns3-server.spec | 13 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 38 insertions, 8 deletions
@@ -1 +1,2 @@ /gns3-server-2.2.49.tar.gz +/gns3-server-2.2.50.tar.gz diff --git a/0001-changing-busybox-udhcpc-script-path.patch b/0001-changing-busybox-udhcpc-script-path.patch index e112487..e5dea19 100644 --- a/0001-changing-busybox-udhcpc-script-path.patch +++ b/0001-changing-busybox-udhcpc-script-path.patch @@ -11,10 +11,10 @@ diff --git a/gns3server/compute/docker/resources/init.sh b/gns3server/compute/do index 8040d02..987a03b 100755 --- a/gns3server/compute/docker/resources/init.sh +++ b/gns3server/compute/docker/resources/init.sh -@@ -26,6 +26,9 @@ PATH=/gns3/bin:/tmp/gns3/bin:/sbin - if [ ! -d /tmp/gns3/bin ]; then - busybox mkdir -p /tmp/gns3/bin - /gns3/bin/busybox --install -s /tmp/gns3/bin +@@ -29,6 +29,9 @@ if [ ! -d /tmp/gns3/bin ]; then + do + ln -s /gns3/bin/busybox "/tmp/gns3/bin/$applet" + done + rm /tmp/gns3/bin/udhcpc + echo -e '#!/bin/sh\n/gns3/bin/busybox udhcpc -s /gns3/etc/udhcpc/default.script' > /tmp/gns3/bin/udhcpc + chmod 777 /tmp/gns3/bin/udhcpc diff --git a/6e66b26b88708d61dd3d90ea5836fe27d7709d2a.patch b/6e66b26b88708d61dd3d90ea5836fe27d7709d2a.patch new file mode 100644 index 0000000..cdf9ae9 --- /dev/null +++ b/6e66b26b88708d61dd3d90ea5836fe27d7709d2a.patch @@ -0,0 +1,22 @@ +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 4f99222..2ddd46e 100644 --- a/gns3-server.spec +++ b/gns3-server.spec @@ -5,7 +5,7 @@ %global __requires_exclude_from ^%{python3_sitelib}/gns3server/compute/docker/resources/.*$ Name: gns3-server -Version: 2.2.49 +Version: 2.2.50 Release: 2%{?dist} Summary: Graphical Network Simulator 3 @@ -15,6 +15,7 @@ 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 @@ -27,7 +28,7 @@ BuildRequires: python3-sphinx BuildRequires: make Requires(post): edk2-ovmf -Recommends: docker busybox +Recommends: docker busybox util-linux-script Recommends: qemu-kvm Requires: ubridge >= 0.9.14 Requires: cpulimit @@ -56,7 +57,7 @@ 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/aiofiles>=24.1.0,<25.0/aiofiles>=0.7/' requirements.txt -sed -i -r 's/aiohttp>=3.9.5,<3.10/aiohttp>=3.9.3/' requirements.txt +sed -i -r 's/aiohttp>=3.10.3,<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 @@ -131,6 +132,12 @@ cp -fp %{_datadir}/edk2/ovmf/OVMF_VARS.fd %{python3_sitelib}/gns3server/disks/OV %systemd_postun_with_restart gns3.service %changelog +* Thu Oct 24 2024 Alexey Kurov <nucleo@fedoraproject.org> - 2.2.50-2 +- Backport init.sh fix + +* Mon Oct 21 2024 Alexey Kurov <nucleo@fedoraproject.org> - 2.2.50-1 +- Update to 2.2.50 + * Mon Aug 26 2024 Alexey Kurov <nucleo@fedoraproject.org> - 2.2.49-2 - lower aiohttp requirements @@ -1 +1 @@ -041284e303c64c4849e9487b35c70f83 gns3-server-2.2.49.tar.gz +a26bd4b55043938de4551085c28d417b gns3-server-2.2.50.tar.gz |