Merge pull request #964 from doktornotor/patch-10

3 files changed, 95 insertions, 56 deletions

diff --git a/config/siproxd/siproxd.xml b/config/siproxd/siproxd.xml
index 455fca9c..cca84138 100644
--- a/config/siproxd/siproxd.xml
+++ b/config/siproxd/siproxd.xml
@@ -4,15 +4,22 @@
 <packagegui>
 	<copyright>
 	<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
 /*
 	siproxd.xml
+	part of pfSense (https://www.pfSense.org/)
 	Copyright (C) 2006 Scott Ullrich
 	Copyright (C) 2010 Jim Pingle
+	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:
 
+
 	1. Redistributions of source code must retain the above copyright notice,
 	   this list of conditions and the following disclaimer.
 
@@ -20,6 +27,7 @@
 	   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
@@ -31,13 +39,11 @@
 	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>
 	<name>siproxdsettings</name>
-	<version>1.0.3</version>
+	<version>1.0.5</version>
 	<title>siproxd: Settings</title>
 	<include_file>/usr/local/pkg/siproxd.inc</include_file>
 	<aftersaveredirect>/pkg_edit.php?xml=siproxd.xml&amp;id=0</aftersaveredirect>
@@ -69,17 +75,14 @@
 	</tabs>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/siproxd/siproxdusers.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/siproxd/siproxd.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/siproxd/siproxd_registered_phones.php</item>
 	</additional_files_needed>
 	<fields>
@@ -104,7 +107,12 @@
 		<field>
 			<fielddescr>Listening port</fielddescr>
 			<fieldname>port</fieldname>
-			<description>Enter the port on which to listen for SIP traffic (default 5060). Do not change this unless you know what you're doing.</description>
+			<description>
+				<![CDATA[
+				Enter the port on which to listen for SIP traffic (default 5060).<br />
+				<strong> WARNING: Do not change this unless you know what you're doing.</strong>
+				]]>
+			</description>
 			<type>input</type>
 		</field>
 		<field>
@@ -174,13 +182,23 @@
 		<field>
 			<fielddescr>TCP inactivity timeout</fielddescr>
 			<fieldname>tcp_timeout</fieldname>
-			<description>Inactivity timeout (seconds). After that an idling TCP connection is disconnected. NOTE: Making this too short may cause multiple parallel registrations for the same phone. This timeout must be set larger than the used registration interval.</description>
+			<description>
+				<![CDATA[
+				Inactivity timeout (seconds). After that an idling TCP connection is disconnected.<br />
+				NOTE: Making this too short may cause multiple parallel registrations for the same phone. This timeout must be set larger than the used registration interval.
+				]]>
+			</description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>TCP Connect Timeout</fielddescr>
 			<fieldname>tcp_connect_timeout</fieldname>
-			<description>Defines How many msecs siproxd will wait for an successful connect when establishing an outgoing SIP signalling connection. This should be kept as short as possible as waiting for an TCP connection to establish is a BLOCKING operation - while waiting for a connect to succeed no SIP messages are processed (RTP is not affected).</description>
+			<description>
+				<![CDATA[
+				Defines How many msecs siproxd will wait for an successful connect when establishing an outgoing SIP signalling connection.<br />
+				This should be kept as short as possible as waiting for an TCP connection to establish is a BLOCKING operation - while waiting for a connect to succeed no SIP messages are processed (RTP is not affected).
+				]]>
+			</description>
 			<type>input</type>
 		</field>
 		<field>
@@ -218,14 +236,23 @@
 		<field>
 			<fielddescr>Expedited RTP Forwarding</fielddescr>
 			<fieldname>expeditedforwarding</fieldname>
-			<description>This service is designed to allow ISPs to offer a service with attributes similar to a "leased line". This service offers the ULTIMATE IN LOW LOSS, LOW LATENCY AND LOW JITTER by ensuring that there is always sufficient room in output queues for the contracted expedited forwarding traffic.
+			<description>
+				<![CDATA[
+				This service is designed to allow ISPs to offer a service with attributes similar to a "leased line".<br />
+				This service offers the ULTIMATE IN LOW LOSS, LOW LATENCY AND LOW JITTER by ensuring that there is always sufficient room in output queues for the contracted expedited forwarding traffic.
+				]]>
 			</description>
 			<type>checkbox</type>
 		</field>
 		<field>
 			<fielddescr>Expedited SIP Forwarding</fielddescr>
 			<fieldname>expeditedsipforwarding</fieldname>
-			<description>This service is designed to allow ISPs to offer a service with attributes similar to a "leased line". This service offers the ULTIMATE IN LOW LOSS, LOW LATENCY AND LOW JITTER by ensuring that there is always sufficient room in output queues for the contracted expedited forwarding traffic.</description>
+			<description>
+				<![CDATA[
+				This service is designed to allow ISPs to offer a service with attributes similar to a "leased line".<br />
+				This service offers the ULTIMATE IN LOW LOSS, LOW LATENCY AND LOW JITTER by ensuring that there is always sufficient room in output queues for the contracted expedited forwarding traffic.
+				]]>
+			</description>
 			<type>checkbox</type>
 		</field>
 		<field>
@@ -257,13 +284,23 @@
 		<field>
 			<fielddescr>Enable Fix Bogus Via Networks Plugin</fielddescr>
 			<fieldname>plugin_fix_bogus_via</fieldname>
-			<description>Incoming (from public network) SIP messages are checked for broken SIP Via headers. If the IP address in the latest Via Header is part of the list below, it will be replaced by the IP where the SIP message has been received from.</description>
+			<description>
+				<![CDATA[
+				Incoming (from public network) SIP messages are checked for broken SIP Via headers.<br />
+				If the IP address in the latest Via Header is part of the list below, it will be replaced by the IP where the SIP message has been received from.
+				]]>
+			</description>
 			<type>checkbox</type>
 		</field>
 		<field>
 			<fielddescr>Bogus Via Networks</fielddescr>
 			<fieldname>plugin_fix_bogus_via_networks</fieldname>
-			<description>Comma separated list of networks which should have their via headers rewritten. Example: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16</description>
+			<description>
+				<![CDATA[
+				Comma separated list of networks which should have their via headers rewritten.<br />
+				Example: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
+				]]>
+			</description>
 			<type>input</type>
 		</field>
 		<field>
@@ -325,7 +362,12 @@
 		<field>
 			<fielddescr>TCP Debug Port</fielddescr>
 			<fieldname>debug_port</fieldname>
-			<description>You may connect to this port from a remote machine and receive debug output. This allows better creation of debug output on embedded systems that do not have enough memory for large disk files. Port number 0 means this feature is disabled.</description>
+			<description>
+				<![CDATA[
+				You may connect to this port from a remote machine and receive debug output. This allows better creation of debug output on embedded systems that do not have enough memory for large disk files.<br />
+				NOTE: Port number 0 means this feature is disabled.
+				]]>
+			</description>
 			<type>input</type>
 		</field>
 	</fields>
diff --git a/config/siproxd/siproxdusers.xml b/config/siproxd/siproxdusers.xml
index 4ed4abc7..7a636a3b 100644
--- a/config/siproxd/siproxdusers.xml
+++ b/config/siproxd/siproxdusers.xml
@@ -2,51 +2,48 @@
 <!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
+	<copyright>
+	<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    authng.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2007 to whom it may belong
-    All rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
+	siproxdusers.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2006 Scott Ullrich
+	Copyright (C) 2010 Jim Pingle
+	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.
 
-     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.
 
-     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>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	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>siproxdusers</name>
-	<version>0.5.9</version>
+	<version>1.0.5</version>
 	<title>siproxd: Users</title>
 	<include_file>/usr/local/pkg/siproxd.inc</include_file>	
 	<tabs>
@@ -101,4 +98,4 @@
 	<custom_php_resync_config_command>
 	    sync_package_sipproxd_users();
 	</custom_php_resync_config_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index cf87ee58..f318ba5e 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -560,7 +560,7 @@
 		<build_pbi>
 			<port>net/siproxd</port>
 		</build_pbi>
-		<version>1.0.4</version>
+		<version>1.0.5</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<configurationfile>siproxd.xml</configurationfile>