From ca754248bf601fc1b637e2eaeec9a61744aef5d0 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sat, 5 Sep 2020 10:17:39 +0200
Subject: [PATCH] net/frr: fix ospf6 router-id changes with frr7 (#2010)

---
 net/frr/Makefile                                            | 2 +-
 net/frr/pkg-descr                                           | 4 ++++
 .../opnsense/service/templates/OPNsense/Quagga/ospf6d.conf  | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/net/frr/Makefile b/net/frr/Makefile
index b15d06312..5b6b4037b 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.15
+PLUGIN_VERSION=		1.16
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr7 ruby
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index ffcad0a3a..53558e299 100644
--- a/net/frr/pkg-descr
+++ b/net/frr/pkg-descr
@@ -11,6 +11,10 @@ switching and routing, Internet access routers, and Internet peering.
 Plugin Changelog
 ================
 
+1.16
+
+* Fix templating for router IDs in OSPF3 daemon
+
 1.15
 
 * Disable eBGP policies introduced with FRR 7.4
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
index ec92113a0..607316523 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
@@ -39,6 +39,9 @@ interface {{ physical_interface(interface.interfacename) }}
 {% endif %}
 !
 router ospf6
+{% if helpers.exists('OPNsense.quagga.ospf6.routerid') and OPNsense.quagga.ospf6.routerid != '' %}
+ ospf6 router-id {{ OPNsense.quagga.ospf6.routerid }}
+{% endif %}
 {% if helpers.exists('OPNsense.quagga.ospf6.redistribute') and OPNsense.quagga.ospf6.redistribute != '' %}
 {% for line in OPNsense.quagga.ospf6.redistribute.split(',') %}
  redistribute {{ line }}
@@ -50,9 +53,6 @@ router ospf6
 {%     endif %}
 {%   endfor %}
 {% endif %}
-{% if helpers.exists('OPNsense.quagga.ospf6.routerid') and OPNsense.quagga.ospf6.routerid != '' %}
- router-id {{ OPNsense.quagga.ospf6.routerid }}
-{% endif %}
 !
 line vty
 !