Merge pull request #963 from doktornotor/patch-9

1 files changed, 70 insertions, 59 deletions

diff --git a/config/openbgpd/openbgpd.xml b/config/openbgpd/openbgpd.xml
index e7d77786..83e0122c 100644
--- a/config/openbgpd/openbgpd.xml
+++ b/config/openbgpd/openbgpd.xml
@@ -2,78 +2,73 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
+	<copyright>
+	<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    openbgpd.xml
-    Copyright (C) 2007 Scott Ullrich (sullrich@gmail.com)
-    part of pfSense (http://www.pfSense.com)
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
+	openbgpd.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2007 Scott Ullrich (sullrich@gmail.com)
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+*/
+/* ====================================================================================== */
 /*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
 
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
 
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ====================================================================================== */
+	]]>
+	</copyright>
 	<name>OpenBGPD</name>
-	<version>1</version>
+	<version>0.9.3.4</version>
 	<title>Services: OpenBGPD</title>
 	<include_file>/usr/local/pkg/openbgpd.inc</include_file>
-  <service>
-    <name>bgpd</name>
-    <rcfile>bgpd.sh</rcfile>
-    <executable>bgpd</executable>
-	<description>OpenBSD BGP Daemon</description>
-  </service>	
+	<service>
+		<name>bgpd</name>
+		<rcfile>bgpd.sh</rcfile>
+		<executable>bgpd</executable>
+		<description>OpenBSD BGP Daemon</description>
+	</service>	
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/openbgpd/openbgpd_status.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/openbgpd/openbgpd_raw.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/openbgpd/openbgpd.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/openbgpd/openbgpd_groups.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/openbgpd/openbgpd_neighbors.xml</item>
 	</additional_files_needed>
 	<menu>
@@ -121,18 +116,24 @@
 		<field>
 			<fielddescr>Holdtime</fielddescr>
 			<fieldname>holdtime</fieldname>
-			<description>Set the holdtime in seconds.  The holdtime is reset to its initial value every time either a KEEPALIVE or an UPDATE message is received from the neighbor.  If the holdtime expires the session is dropped.  The default is 90 seconds.  Neighboring systems negotiate the holdtime used when the connection is established in the OPEN messages.  Each neighbor announces its configured hold- time; the smaller one is then agreed upon.</description>
+			<description>
+				<![CDATA[
+				Set the holdtime in seconds. The holdtime is reset to its initial value every time either a KEEPALIVE or an UPDATE message is received from the neighbor.<br />
+				If the holdtime expires the session is dropped. The default is 90 seconds. Neighboring systems negotiate the holdtime used when the connection is established in the OPEN messages.<br />
+				Each neighbor announces its configured hold- time; the smaller one is then agreed upon.
+				]]>
+			</description>
 			<type>input</type>
 		</field>
 
 		<field>
 			<fielddescr>fib-update</fielddescr>
 			<fieldname>fibupdate</fieldname>
-			<description>If set to no, do not update the Forwarding Information Base a.k.a. the kernel routing table.  The default is yes.</description>
+			<description>If set to no, do not update the Forwarding Information Base a.k.a. the kernel routing table. The default is yes.</description>
 			<type>select</type>
 			<options>
-			    <option><name>yes</name><value>yes</value></option>
-			    <option><name>no</name><value>no</value></option>
+				<option><name>yes</name><value>yes</value></option>
+				<option><name>no</name><value>no</value></option>
 			</options>
 		</field>
 		<field>
@@ -151,24 +152,34 @@
 		<field>
 			<fielddescr>CARP Status IP</fielddescr>
 			<fieldname>carpstatusip</fieldname>
-			<description>IP address used to determine the CARP status. When the VIP is in BACKUP status, bgpd will not be started. &lt;br/&gt;NOTE: On 2.1.x and before this requires changes to /etc/rc.carpmaster to start bgpd and /etc/rc.carpbackup to stop bgpd or it will not be fully effective. On pfSense 2.2.x and later, full support is automatic.</description>
+			<description>
+				<![CDATA[
+				IP address used to determine the CARP status. When the VIP is in BACKUP status, bgpd will not be started.<br />
+				NOTE: On 2.1.x and before this requires changes to /etc/rc.carpmaster to start bgpd and /etc/rc.carpbackup to stop bgpd or it will not be fully effective. On pfSense 2.2.x and later, full support is automatic.
+				]]>
+			</description>
 			<type>input</type>
 			<size>25</size>
 		</field>
 		<field>
 			<fielddescr>Networks</fielddescr>
 			<fieldname>network</fieldname>
-		    <type>rowhelper</type>
-		    <description></description>
-		    <rowhelper>
+			<type>rowhelper</type>
+			<description></description>
+			<rowhelper>
 				<rowhelperfield>
-				    <fielddescr>Announce the specified network as belonging to our AS.  If set to "(inet|inet6)connected", inet or inet6 routes to directly attached networks will be announced.  If set to "(inet|inet6) static", all inet or inet6 static routes will be announced.</fielddescr>
-				    <fieldname>networks</fieldname>
-				    <description>Network that you would like to advertise</description>
-				    <type>input</type>
-				    <size>45</size>
+					<fielddescr>
+						<![CDATA[
+						Announce the specified network as belonging to our AS. If set to "(inet|inet6)connected", inet or inet6 routes to directly attached networks will be announced.<br />
+						If set to "(inet|inet6) static", all inet or inet6 static routes will be announced.
+						]]>
+					</fielddescr>
+					<fieldname>networks</fieldname>
+					<description>Network that you would like to advertise</description>
+					<type>input</type>
+					<size>45</size>
 				</rowhelperfield>
-		    </rowhelper>
+			</rowhelper>
 		</field>
 	</fields>
 	<custom_php_deinstall_command>