From 41f40201cb0bb14b2acc4cb893fc603768a888e7 Mon Sep 17 00:00:00 2001
From: Bernhard Ehlers <none@b-ehlers.de>
Date: Fri, 4 Mar 2022 10:08:34 +0100
Subject: [PATCH] FRR: Update to version 8.1.0

---
 appliances/frr.gns3a               | 14 ++++++++++++++
 packer/alpine-linux/alpine.json    |  4 ++--
 packer/alpine-linux/scripts/frr.sh |  2 +-
 packer/alpine-linux/scripts/gui.sh |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/appliances/frr.gns3a b/appliances/frr.gns3a
index c05e42c..a909c7a 100644
--- a/appliances/frr.gns3a
+++ b/appliances/frr.gns3a
@@ -22,6 +22,14 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "frr-8.1.0.qcow2",
+            "version": "8.1.0",
+            "md5sum": "836d6a207f63f99a4039378f2b0c6123",
+            "filesize": 54063616,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/frr-8.1.0.qcow2"
+        },
         {
             "filename": "frr-7.5.1.qcow2",
             "version": "7.5.1",
@@ -40,6 +48,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "8.1.0",
+            "images": {
+                "hda_disk_image": "frr-8.1.0.qcow2"
+            }
+        },
         {
             "name": "7.5.1",
             "images": {
diff --git a/packer/alpine-linux/alpine.json b/packer/alpine-linux/alpine.json
index 4f89ce4..8e4fad5 100644
--- a/packer/alpine-linux/alpine.json
+++ b/packer/alpine-linux/alpine.json
@@ -1,7 +1,7 @@
 {
     "variables": {
-        "iso_url": "http://dl-cdn.alpinelinux.org/alpine/v3.14/releases/x86_64/alpine-virt-3.14.0-x86_64.iso",
-        "iso_checksum": "d568c6c71bb1eee0f65cdf40088daf57032e24f1e3bd2cf8a813f80d2e9e4eab",
+        "iso_url": "https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/x86_64/alpine-virt-3.15.0-x86_64.iso",
+        "iso_checksum": "e97eaedb3bff39a081d1d7e67629d5c0e8fb39677d6a9dd1eaf2752e39061e02",
         "ui_mode": "cli",
         "vm_name": "alpine_cli.qcow2",
         "file_source": "README.rst",
diff --git a/packer/alpine-linux/scripts/frr.sh b/packer/alpine-linux/scripts/frr.sh
index 91b1a68..99fa142 100644
--- a/packer/alpine-linux/scripts/frr.sh
+++ b/packer/alpine-linux/scripts/frr.sh
@@ -1,5 +1,5 @@
 # add community repository
-sed -i 's/^#\(.*\/v.*\/community\)$/\1/' /etc/apk/repositories
+sed -i 's/^#\s*\(.*\/v.*\/community\)$/\1/' /etc/apk/repositories
 apk update
 
 # install packages
diff --git a/packer/alpine-linux/scripts/gui.sh b/packer/alpine-linux/scripts/gui.sh
index 0519a32..2b2c59a 100644
--- a/packer/alpine-linux/scripts/gui.sh
+++ b/packer/alpine-linux/scripts/gui.sh
@@ -1,5 +1,5 @@
 # add community repository
-sed -i 's/^#\(.*\/v.*\/community\)$/\1/' /etc/apk/repositories
+sed -i 's/^#\s*\(.*\/v.*\/community\)$/\1/' /etc/apk/repositories
 apk update
 
 # install packages