From 6527e3436ed096a036ba323d6da39a705cb6230f Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Thu, 28 Mar 2019 11:08:46 +0100
Subject: [PATCH] allow ipsec VTI selection

---
 net/frr/Makefile                                              | 3 +--
 net/frr/pkg-descr                                             | 4 ++++
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml   | 1 +
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml  | 2 ++
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml | 1 +
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml   | 1 +
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/net/frr/Makefile b/net/frr/Makefile
index a1b907552..924369699 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.8
-PLUGIN_REVISION=	2
+PLUGIN_VERSION=		1.9
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr5 ruby
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index 6525f9133..0c76976bd 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.9
+
+* Allow usage of VTI IPSec interfaces
+
 1.8
 
 * Add area range in OSPF config
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
index 739d30fc5..bafd567c5 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
@@ -53,6 +53,7 @@
                                 <default></default>
                                 <Required>N</Required>
                                 <multiple>N</multiple>
+                                <AllowDynamic>Y</AllowDynamic>
                                 <filters>
                                         <enable>/^(?!0).*$/</enable>
                                 </filters>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
index 637fde97b..f2e45072c 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
@@ -30,6 +30,7 @@
                 <Required>N</Required>
                 <multiple>Y</multiple>
                 <default></default>
+                <AllowDynamic>Y</AllowDynamic>
                 <filters>
                     <enable>/^(?!0).*$/</enable>
                 </filters>
@@ -110,6 +111,7 @@
                                  <Required>N</Required>
                                  <multiple>N</multiple>
                                  <default></default>
+                                 <AllowDynamic>Y</AllowDynamic>
                                  <filters>
                                          <enable>/^(?!0).*$/</enable>
                                  </filters>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml
index 78e6644cb..8b512d57e 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml
@@ -32,6 +32,7 @@
                                  <Required>N</Required>
                                  <multiple>N</multiple>
                                  <default></default>
+                                 <AllowDynamic>Y</AllowDynamic>
                                  <filters>
                                          <enable>/^(?!0).*$/</enable>
                                  </filters>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml
index 2b41734eb..8be5be59d 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml
@@ -23,6 +23,7 @@
                 <Required>N</Required>
                 <multiple>Y</multiple>
                 <default></default>
+                <AllowDynamic>Y</AllowDynamic>
                 <filters>
                     <enable>/^(?!0).*$/</enable>
                 </filters>