From dfcb4cb13882e95e7009a2acd3c5ebbd01e5c67b Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Tue, 23 Sep 2025 14:29:44 +0200
Subject: [PATCH] net/frr: Remove faulty standard area type, adjust helptext to
 reflect reality (#4951)

* net/frr: Remove faulty standard area type, adjust helptext to reflect reality

* Change default too
---
 net/frr/Makefile                                               | 1 +
 .../controllers/OPNsense/Quagga/forms/dialogEditOSPFArea.xml   | 2 +-
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml   | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/frr/Makefile b/net/frr/Makefile
index 63a0a654c..2d077e7a1 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		frr
 PLUGIN_VERSION=		1.47
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr10-pythontools
 PLUGIN_MAINTAINER=	ad@opnsense.org
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFArea.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFArea.xml
index a027c2187..bd1170545 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFArea.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFArea.xml
@@ -13,7 +13,7 @@
         <id>area.id</id>
         <label>Area ID</label>
         <type>text</type>
-        <help>Enter area ID in dotted (e.g. 0.0.0.1) format.</help>
+        <help>Enter area ID in dotted (e.g. 0.0.0.1) format. You only need to define areas that are not normal. All areas defined in the network or interface tab will automatically be normal, unless explicitely overwritten here with a different area type.</help>
     </field>
     <field>
         <id>area.type</id>
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 6e59b8881..4ea5b86a7 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
@@ -63,9 +63,8 @@
                 </id>
                 <type type="OptionField">
                     <Required>Y</Required>
-                    <Default>standard</Default>
+                    <Default>stub</Default>
                     <OptionValues>
-                        <standard>standard</standard>
                         <stub>stub</stub>
                         <stub-no-summary value="stub no-summary">stub no-summary</stub-no-summary>
                         <nssa>nssa</nssa>