From 3904fe81c9d994ebfeb7ff76d39ebbd312228cde Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 18 Mar 2015 14:03:09 -0400
Subject: Fix quagga carp plugin name and version bump.

---
 config/quagga_ospfd/quagga_ospfd.inc | 2 +-
 config/quagga_ospfd/quagga_ospfd.xml | 2 +-
 pkg_config.10.xml                    | 2 +-
 pkg_config.8.xml                     | 2 +-
 pkg_config.8.xml.amd64               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/quagga_ospfd/quagga_ospfd.inc b/config/quagga_ospfd/quagga_ospfd.inc
index 3b5c153d..140bac8a 100644
--- a/config/quagga_ospfd/quagga_ospfd.inc
+++ b/config/quagga_ospfd/quagga_ospfd.inc
@@ -422,7 +422,7 @@ function quagga_get_carp_status_by_ip($ipaddr) {
 	return $status;
 }
 
-function quagga_plugin_carp($pluginparams) {
+function quagga_ospfd_plugin_carp($pluginparams) {
 	global $config;
 	require_once("service-utils.inc");
 	// Called when a CARP interface changes state
diff --git a/config/quagga_ospfd/quagga_ospfd.xml b/config/quagga_ospfd/quagga_ospfd.xml
index 5de2e3f8..617b5da0 100644
--- a/config/quagga_ospfd/quagga_ospfd.xml
+++ b/config/quagga_ospfd/quagga_ospfd.xml
@@ -1,6 +1,6 @@
 <packagegui>
 	<name>quagga_ospfd</name>
-	<version>0.6.4</version>
+	<version>0.6.5</version>
 	<title>Services: Quagga OSPFd</title>
 	<include_file>/usr/local/pkg/quagga_ospfd.inc</include_file>
 	<aftersaveredirect>pkg_edit.php?xml=quagga_ospfd.xml&amp;id=0</aftersaveredirect>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index e3d7fde5..ac9ec716 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1188,7 +1188,7 @@
 		<name>Quagga OSPF</name>
 		<descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenBGPD. Installing both will break things.</descr>
 		<maintainer>jimp@pfsense.org</maintainer>
-		<version>0.99.22.3.1_2 v0.6.4</version>
+		<version>0.99.22.3.1_2 v0.6.5</version>
 		<category>Routing</category>
 		<status>BETA</status>
 		<depends_on_package_pbi>quagga-0.99.23.1_2-##ARCH##.pbi</depends_on_package_pbi>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 209deb0c..7fb1ae1b 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1630,7 +1630,7 @@
 		<name>Quagga OSPF</name>
 		<descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenBGPD. Installing both will break things.</descr>
 		<maintainer>jimp@pfsense.org</maintainer>
-		<version>0.99.22.3 v0.6.4</version>
+		<version>0.99.22.3 v0.6.5</version>
 		<category>Routing</category>
 		<status>BETA</status>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 448a30d5..b144997a 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1617,7 +1617,7 @@
 		<name>Quagga OSPF</name>
 		<descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenBGPD. Installing both will break things.</descr>
 		<maintainer>jimp@pfsense.org</maintainer>
-		<version>0.99.22.3 v0.6.4</version>
+		<version>0.99.22.3 v0.6.5</version>
 		<category>Routing</category>
 		<status>BETA</status>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-- 
cgit v1.2.3