From 2d440844fac99a0a91e0fc3ee34f08eb52d3436f Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 17 Dec 2016 10:03:07 +0100 Subject: [PATCH 1/7] Allow quagga ospf stub, not so stub and totally stub areas (Feature #3303) --- .../files/usr/local/pkg/quagga_ospfd.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.xml b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.xml index 7bd4f3d81fe8..120811e66f54 100644 --- a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.xml +++ b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.xml @@ -117,8 +117,15 @@ Disable FIB updates (Routing table) updatefib - Disables the updating of the host routing table(turns into stub router). - checkbox + Disables the updating of the host routing table (turns into stub router). + select + none + + + + + + Redistribute connected subnets From 80ded086387f3657c8f8f322142fa1a119d02f5d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 17 Dec 2016 10:24:46 +0100 Subject: [PATCH 2/7] Allow quagga ospf stub, not so stub and totally stub areas (Feature #3303) --- .../files/usr/local/pkg/quagga_ospfd.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.inc b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.inc index 6b291d369bc8..509e6a0ff20f 100644 --- a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.inc +++ b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.inc @@ -181,8 +181,17 @@ function quagga_ospfd_install_conf() { if ($ospfd_conf['routerid']) { $conffile .= " ospf router-id {$ospfd_conf['routerid']}\n"; } - if ($ospfd_conf['updatefib']) { + /* In package versions <=0.6.15, this used to a checkbox handling stub areas only + * Leave the first check here + */ + if ($ospfd_conf['updatefib'] == "on" ) { $conffile .= " area {$ospfd_conf['area']} stub\n"; + } elseif ($ospfd_conf['updatefib'] == "stub") { + $conffile .= " area {$ospfd_conf['area']} stub\n"; + } elseif ($ospfd_conf['updatefib'] == "nosum") { + $conffile .= " area {$ospfd_conf['area']} stub no-summary\n"; + } elseif ($ospfd_conf['updatefib'] == "nssa") { + $conffile .= " area {$ospfd_conf['area']} nssa\n"; } if ($ospfd_conf['logging'] && $ospfd_conf['adjacencylog']) { $conffile .= " log-adjacency-changes detail\n"; From 009a00542752756be83b102ade8b526eb167aa0a Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 17 Dec 2016 10:25:39 +0100 Subject: [PATCH 3/7] Bump port version --- net/pfSense-pkg-Quagga_OSPF/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/pfSense-pkg-Quagga_OSPF/Makefile b/net/pfSense-pkg-Quagga_OSPF/Makefile index e39c6a759a65..57e4cd753623 100644 --- a/net/pfSense-pkg-Quagga_OSPF/Makefile +++ b/net/pfSense-pkg-Quagga_OSPF/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pfSense-pkg-Quagga_OSPF -PORTVERSION= 0.6.15 +PORTVERSION= 0.6.16 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty From ddaf7109821456f344a0af9f96ad6df372e62f48 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 17 Dec 2016 10:46:16 +0100 Subject: [PATCH 4/7] Reword description, conflicts should be handled by pkg now. --- net/pfSense-pkg-Quagga_OSPF/pkg-descr | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/pfSense-pkg-Quagga_OSPF/pkg-descr b/net/pfSense-pkg-Quagga_OSPF/pkg-descr index 0cf8610d6ab9..858fe3a90c01 100644 --- a/net/pfSense-pkg-Quagga_OSPF/pkg-descr +++ b/net/pfSense-pkg-Quagga_OSPF/pkg-descr @@ -1,3 +1,2 @@ -OSPF routing protocol using Quagga.
- WARNING! Installs files to the same place as - OpenBGPD. Installing both will break things. +OSPF routing protocol using Quagga. +Conflicts with OpenBGPD; both packages cannot be installed at the same time. From 6c07db058d095e30f73e8acea60879c798bb2f14 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 17 Dec 2016 10:47:20 +0100 Subject: [PATCH 5/7] Reword description, conflicts should be handled by pkg now. --- .../files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml index 79fea9e69f4e..96b4321ad181 100644 --- a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml +++ b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml @@ -4,7 +4,7 @@ Quagga OSPF Quagga_OSPF + <strong>Conflicts with OpenBGPD; both packages cannot be installed at the same time.</strong>]]> %%PKGVERSION%% quagga_ospfd.xml From ed6fbb7a00cf72289e765b2c2a380b4dad275db7 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 17 Dec 2016 10:50:09 +0100 Subject: [PATCH 6/7] Remove some copy-paste nonsense, these files are not shipped with the package --- .../files/etc/inc/priv/quagga_ospfd.priv.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/pfSense-pkg-Quagga_OSPF/files/etc/inc/priv/quagga_ospfd.priv.inc b/net/pfSense-pkg-Quagga_OSPF/files/etc/inc/priv/quagga_ospfd.priv.inc index f0c8c02bdf38..885b04262921 100644 --- a/net/pfSense-pkg-Quagga_OSPF/files/etc/inc/priv/quagga_ospfd.priv.inc +++ b/net/pfSense-pkg-Quagga_OSPF/files/etc/inc/priv/quagga_ospfd.priv.inc @@ -3,7 +3,7 @@ * quagga_ospfd.priv.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2015 Rubicon Communications, LLC (Netgate) + * Copyright (c) 2015-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,14 +29,10 @@ $priv_list['page-services-quagga']['match'] = array(); $priv_list['page-services-quagga']['match'][] = "pkg.php?xml=quagga_ospfd.xml*"; $priv_list['page-services-quagga']['match'][] = "pkg.php?xml=quagga_ospfd_interfaces.xml*"; $priv_list['page-services-quagga']['match'][] = "pkg.php?xml=quagga_ospfd_raw.xml*"; -$priv_list['page-services-quagga']['match'][] = "pkg.php?xml=bind_views.xml*"; -$priv_list['page-services-quagga']['match'][] = "pkg.php?xml=bind_zones.xml*"; $priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=quagga_ospfd.xml*"; $priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=quagga_ospfd_interfaces.xml*"; $priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=quagga_ospfd_raw.xml*"; -$priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=bind_views.xml*"; -$priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=bind_zones.xml*"; $priv_list['page-services-quagga']['match'][] = "status_ospfd.php*"; From a9bf9f15781c6d8e84a27c6cdd81325384b75a05 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 19 Dec 2016 12:24:57 +0100 Subject: [PATCH 7/7] Fix option value --- .../files/usr/local/pkg/quagga_ospfd.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.xml b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.xml index 120811e66f54..6fc1ff7375fe 100644 --- a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.xml +++ b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.xml @@ -123,7 +123,7 @@ - +