Merge https://github.com/pfsense/pfsense-packages

Conflicts: pkg_config.10.xml pkg_config.8.xml pkg_config.8.xml.amd64
author: Stephane Lapie <stephane.lapie@asahinet.com> 2014-06-23 23:41:59 +0900
committer: Stephane Lapie <stephane.lapie@asahinet.com> 2014-06-23 23:41:59 +0900
commit: ec079fc18a1289be2676fa57c15829b20cb4a912 (patch)
tree: 658ebfeb07d9ead4fb5c8d86d723a94819d02511
parent: ab69db91000fd3d83bf86811ede117062f57f438 (diff)
parent: 5b4c84c4ecc9a6eded4ce3443a665eae2c8a43f9 (diff)
download: pfsense-packages-ec079fc18a1289be2676fa57c15829b20cb4a912.tar.gz
pfsense-packages-ec079fc18a1289be2676fa57c15829b20cb4a912.tar.bz2
pfsense-packages-ec079fc18a1289be2676fa57c15829b20cb4a912.zip
111 files changed, 532 insertions, 417 deletions
diff --git a/config/blinkled/blinkled.inc b/config/blinkled/blinkled.inc
index 25403232..ffbc79b2 100644
--- a/config/blinkled/blinkled.inc
+++ b/config/blinkled/blinkled.inc
@@ -39,7 +39,7 @@ function blinkled_stop() {
 	mwexec("/usr/bin/killall -9 blinkled");
 }
 
-function validate_form_blinkled($post, $input_errors) {
+function validate_form_blinkled($post, &$input_errors) {
 	/* Make sure both aren't using the same interface */
 	if (($post['iface_led2']) && ($post['iface_led3']) && 
 	    (($post['enable_led2']) && ($post['enable_led3'])) &&
diff --git a/config/blinkled/blinkled.xml b/config/blinkled/blinkled.xml
index fb0965c9..aa0c53e8 100644
--- a/config/blinkled/blinkled.xml
+++ b/config/blinkled/blinkled.xml
@@ -56,7 +56,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		validate_form_blinkled($_POST, &amp;$input_errors);
+		validate_form_blinkled($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		sync_package_blinkled();
diff --git a/config/dansguardian/dansguardian.xml b/config/dansguardian/dansguardian.xml
index 55860775..2f87259b 100644
--- a/config/dansguardian/dansguardian.xml
+++ b/config/dansguardian/dansguardian.xml
@@ -377,7 +377,7 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
diff --git a/config/dansguardian/dansguardian_antivirus_acl.xml b/config/dansguardian/dansguardian_antivirus_acl.xml
index 563d3f13..95876032 100755
--- a/config/dansguardian/dansguardian_antivirus_acl.xml
+++ b/config/dansguardian/dansguardian_antivirus_acl.xml
@@ -231,9 +231,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_blacklist.xml b/config/dansguardian/dansguardian_blacklist.xml
index e9cba862..c33b46f2 100644
--- a/config/dansguardian/dansguardian_blacklist.xml
+++ b/config/dansguardian/dansguardian_blacklist.xml
@@ -163,7 +163,7 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
diff --git a/config/dansguardian/dansguardian_config.xml b/config/dansguardian/dansguardian_config.xml
index 342b52d7..399dec73 100644
--- a/config/dansguardian/dansguardian_config.xml
+++ b/config/dansguardian/dansguardian_config.xml
@@ -306,7 +306,7 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
diff --git a/config/dansguardian/dansguardian_content_acl.xml b/config/dansguardian/dansguardian_content_acl.xml
index 8a1866af..cf5777e0 100755
--- a/config/dansguardian/dansguardian_content_acl.xml
+++ b/config/dansguardian/dansguardian_content_acl.xml
@@ -199,9 +199,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_file_acl.xml b/config/dansguardian/dansguardian_file_acl.xml
index ed4866c6..0aa01e0e 100755
--- a/config/dansguardian/dansguardian_file_acl.xml
+++ b/config/dansguardian/dansguardian_file_acl.xml
@@ -239,9 +239,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_groups.xml b/config/dansguardian/dansguardian_groups.xml
index aaa9bcd6..7d62d345 100755
--- a/config/dansguardian/dansguardian_groups.xml
+++ b/config/dansguardian/dansguardian_groups.xml
@@ -450,9 +450,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_header_acl.xml b/config/dansguardian/dansguardian_header_acl.xml
index 9ddb0c23..346ebf1a 100755
--- a/config/dansguardian/dansguardian_header_acl.xml
+++ b/config/dansguardian/dansguardian_header_acl.xml
@@ -219,9 +219,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_ldap.xml b/config/dansguardian/dansguardian_ldap.xml
index 4c2b60f7..5876bc65 100755
--- a/config/dansguardian/dansguardian_ldap.xml
+++ b/config/dansguardian/dansguardian_ldap.xml
@@ -164,9 +164,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_limits.xml b/config/dansguardian/dansguardian_limits.xml
index 2c147f1b..12bc98fa 100644
--- a/config/dansguardian/dansguardian_limits.xml
+++ b/config/dansguardian/dansguardian_limits.xml
@@ -173,7 +173,7 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
diff --git a/config/dansguardian/dansguardian_log.xml b/config/dansguardian/dansguardian_log.xml
index 97cd5b0b..326abf85 100644
--- a/config/dansguardian/dansguardian_log.xml
+++ b/config/dansguardian/dansguardian_log.xml
@@ -246,7 +246,7 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
diff --git a/config/dansguardian/dansguardian_phrase_acl.xml b/config/dansguardian/dansguardian_phrase_acl.xml
index c32f7720..c979022c 100755
--- a/config/dansguardian/dansguardian_phrase_acl.xml
+++ b/config/dansguardian/dansguardian_phrase_acl.xml
@@ -262,9 +262,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_pics_acl.xml b/config/dansguardian/dansguardian_pics_acl.xml
index c2f4b52c..7c192bc7 100644
--- a/config/dansguardian/dansguardian_pics_acl.xml
+++ b/config/dansguardian/dansguardian_pics_acl.xml
@@ -196,7 +196,7 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
diff --git a/config/dansguardian/dansguardian_search_acl.xml b/config/dansguardian/dansguardian_search_acl.xml
index 9f9cfa49..71b0df7d 100755
--- a/config/dansguardian/dansguardian_search_acl.xml
+++ b/config/dansguardian/dansguardian_search_acl.xml
@@ -256,9 +256,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_site_acl.xml b/config/dansguardian/dansguardian_site_acl.xml
index 7804d9f6..bc386e7a 100755
--- a/config/dansguardian/dansguardian_site_acl.xml
+++ b/config/dansguardian/dansguardian_site_acl.xml
@@ -292,9 +292,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_sync.xml b/config/dansguardian/dansguardian_sync.xml
index 9401253c..11c13b87 100755
--- a/config/dansguardian/dansguardian_sync.xml
+++ b/config/dansguardian/dansguardian_sync.xml
@@ -158,7 +158,7 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
diff --git a/config/dansguardian/dansguardian_url_acl.xml b/config/dansguardian/dansguardian_url_acl.xml
index 8adf46c0..8f266489 100755
--- a/config/dansguardian/dansguardian_url_acl.xml
+++ b/config/dansguardian/dansguardian_url_acl.xml
@@ -343,9 +343,9 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
 	</custom_php_resync_config_command>	
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/dansguardian/dansguardian_users_footer.template b/config/dansguardian/dansguardian_users_footer.template
index 1288b919..1d1f054e 100644
--- a/config/dansguardian/dansguardian_users_footer.template
+++ b/config/dansguardian/dansguardian_users_footer.template
@@ -6,7 +6,7 @@
 		dansguardian_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		dansguardian_validate_input($_POST, &amp;$input_errors);
+		dansguardian_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_dansguardian();
diff --git a/config/haproxy-devel/haproxy_listeners_edit.php b/config/haproxy-devel/haproxy_listeners_edit.php
index 6731731d..78423f6d 100644
--- a/config/haproxy-devel/haproxy_listeners_edit.php
+++ b/config/haproxy-devel/haproxy_listeners_edit.php
@@ -144,7 +144,11 @@ if ($_POST) {
 		$reqdfieldsn = explode(",", "Name");
 	}
 	
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+	$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+	if ($pf_version < 2.1)
+		$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+	else
+		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['name']))
 		$input_errors[] = "The field 'Name' contains invalid characters.";
diff --git a/config/haproxy-devel/haproxy_pool_edit.php b/config/haproxy-devel/haproxy_pool_edit.php
index 49eb4271..cabc6e52 100644
--- a/config/haproxy-devel/haproxy_pool_edit.php
+++ b/config/haproxy-devel/haproxy_pool_edit.php
@@ -128,16 +128,27 @@ if ($_POST) {
 	
 	$reqdfields = explode(" ", "name");
 	$reqdfieldsn = explode(",", "Name");		
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+
+	$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+	if ($pf_version < 2.1)
+		$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+	else
+		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	if ($_POST['stats_enabled']) {
 		$reqdfields = explode(" ", "name stats_uri");
 		$reqdfieldsn = explode(",", "Name,Stats Uri");		
-		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+		if ($pf_version < 2.1)
+			$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+		else
+			do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 		if ($_POST['stats_username']) {
 			$reqdfields = explode(" ", "stats_password stats_realm");
 			$reqdfieldsn = explode(",", "Stats Password,Stats Realm");		
-			do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+			if ($pf_version < 2.1)
+				$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+			else
+				do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 		}
 	}
 	
diff --git a/config/haproxy-stable/haproxy_global.php b/config/haproxy-stable/haproxy_global.php
index c8b05d52..47c8d1ec 100755
--- a/config/haproxy-stable/haproxy_global.php
+++ b/config/haproxy-stable/haproxy_global.php
@@ -56,7 +56,11 @@ if ($_POST) {
 			$reqdfieldsn = explode(",", "Maximum connections");		
 		}
 
-		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+		$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+		if ($pf_version < 2.1)
+			$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+		else
+			do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 		if ($_POST['maxconn'] && (!is_numeric($_POST['maxconn']))) 
 			$input_errors[] = "The maximum number of connections should be numeric.";
diff --git a/config/haproxy-stable/haproxy_listeners_edit.php b/config/haproxy-stable/haproxy_listeners_edit.php
index e9c6187c..3c698d4e 100755
--- a/config/haproxy-stable/haproxy_listeners_edit.php
+++ b/config/haproxy-stable/haproxy_listeners_edit.php
@@ -113,12 +113,20 @@ if ($_POST) {
 		$reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout");		
 	}
 	
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+	$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+	if ($pf_version < 2.1)
+		$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+	else
+		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	$reqdfields = explode(" ", "name type port max_connections client_timeout");
 	$reqdfieldsn = explode(",", "Name,Type,Port,Max connections,Client timeout");
 	
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+	$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+	if ($pf_version < 2.1)
+		$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+	else
+		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['name']))
 		$input_errors[] = "The field 'Name' contains invalid characters.";
diff --git a/config/haproxy-stable/haproxy_pool_edit.php b/config/haproxy-stable/haproxy_pool_edit.php
index 1e9958eb..51eb4e28 100755
--- a/config/haproxy-stable/haproxy_pool_edit.php
+++ b/config/haproxy-stable/haproxy_pool_edit.php
@@ -72,7 +72,11 @@ if ($_POST) {
 	$reqdfields = explode(" ", "name");
 	$reqdfieldsn = explode(",", "Name");		
 
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+	$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+	if ($pf_version < 2.1)
+		$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+	else
+		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['name']))
 		$input_errors[] = "The field 'Name' contains invalid characters.";
diff --git a/config/mailscanner/mailscanner.xml b/config/mailscanner/mailscanner.xml
index a7115a5c..62f318cb 100644
--- a/config/mailscanner/mailscanner.xml
+++ b/config/mailscanner/mailscanner.xml
@@ -347,7 +347,7 @@
 		mailscanner_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		mailscanner_validate_input($_POST, &amp;$input_errors);
+		mailscanner_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_mailscanner();
diff --git a/config/mailscanner/mailscanner_alerts.xml b/config/mailscanner/mailscanner_alerts.xml
index 9d80bae6..ddc1112b 100644
--- a/config/mailscanner/mailscanner_alerts.xml
+++ b/config/mailscanner/mailscanner_alerts.xml
@@ -150,7 +150,7 @@
 		mailscanner_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		mailscanner_validate_input($_POST, &amp;$input_errors);
+		mailscanner_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_mailscanner();
diff --git a/config/mailscanner/mailscanner_antispam.xml b/config/mailscanner/mailscanner_antispam.xml
index 26295059..2902f36d 100644
--- a/config/mailscanner/mailscanner_antispam.xml
+++ b/config/mailscanner/mailscanner_antispam.xml
@@ -445,7 +445,7 @@
 		mailscanner_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		mailscanner_validate_input($_POST, &amp;$input_errors);
+		mailscanner_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_mailscanner();
diff --git a/config/mailscanner/mailscanner_antivirus.xml b/config/mailscanner/mailscanner_antivirus.xml
index 590a61f6..a6b08f8c 100644
--- a/config/mailscanner/mailscanner_antivirus.xml
+++ b/config/mailscanner/mailscanner_antivirus.xml
@@ -181,7 +181,7 @@
 		mailscanner_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		mailscanner_validate_input($_POST, &amp;$input_errors);
+		mailscanner_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_mailscanner();
diff --git a/config/mailscanner/mailscanner_attachments.xml b/config/mailscanner/mailscanner_attachments.xml
index e89fbd46..bcd14163 100644
--- a/config/mailscanner/mailscanner_attachments.xml
+++ b/config/mailscanner/mailscanner_attachments.xml
@@ -212,7 +212,7 @@
 		mailscanner_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		mailscanner_validate_input($_POST, &amp;$input_errors);
+		mailscanner_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_mailscanner();
diff --git a/config/mailscanner/mailscanner_content.xml b/config/mailscanner/mailscanner_content.xml
index 07342dce..1efe84f5 100644
--- a/config/mailscanner/mailscanner_content.xml
+++ b/config/mailscanner/mailscanner_content.xml
@@ -234,7 +234,7 @@
 		mailscanner_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		mailscanner_validate_input($_POST, &amp;$input_errors);
+		mailscanner_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_mailscanner();
diff --git a/config/mailscanner/mailscanner_report.xml b/config/mailscanner/mailscanner_report.xml
index e12ed341..2e0ca449 100644
--- a/config/mailscanner/mailscanner_report.xml
+++ b/config/mailscanner/mailscanner_report.xml
@@ -524,7 +524,7 @@
 		mailscanner_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		mailscanner_validate_input($_POST, &amp;$input_errors);
+		mailscanner_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_mailscanner();
diff --git a/config/mailscanner/mailscanner_sync.xml b/config/mailscanner/mailscanner_sync.xml
index 46f7dbfe..2bcca7d0 100644
--- a/config/mailscanner/mailscanner_sync.xml
+++ b/config/mailscanner/mailscanner_sync.xml
@@ -151,7 +151,7 @@
 		mailscanner_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		mailscanner_validate_input($_POST, &amp;$input_errors);
+		mailscanner_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_mailscanner();
diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php
index 8d002397..086c2a52 100755
--- a/config/openvpn-client-export/vpn_openvpn_export.php
+++ b/config/openvpn-client-export/vpn_openvpn_export.php
@@ -131,10 +131,14 @@ if (!empty($act)) {
 	else
 		$nokeys = false;
 
-	if (empty($_GET['useaddr'])) {
+	$useaddr = '';
+	if (isset($_GET['useaddr']) && !empty($_GET['useaddr']))
+		$useaddr = trim($_GET['useaddr']);
+
+	if (!(is_ipaddr($useaddr) || is_hostname($useaddr) ||
+	    in_array($useaddr, array("serveraddr", "servermagic", "servermagichost", "serverhostname"))))
 		$input_errors[] = "You need to specify an IP or hostname.";
-	} else
-		$useaddr = $_GET['useaddr'];
+
 	$advancedoptions = $_GET['advancedoptions'];
 	$openvpnmanager = $_GET['openvpnmanager'];
 
diff --git a/config/pf-blocker/pfblocker.php b/config/pf-blocker/pfblocker.php
index 17fb10e7..50214142 100644
--- a/config/pf-blocker/pfblocker.php
+++ b/config/pf-blocker/pfblocker.php
@@ -249,7 +249,7 @@ $xml= <<<EOF
 		pfblocker_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		pfblocker_validate_input(\$_POST, &amp;\$input_errors);
+		pfblocker_validate_input(\$_POST, \$input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_pfblocker();
diff --git a/config/pf-blocker/pfblocker.xml b/config/pf-blocker/pfblocker.xml
index 44658bcb..ffc138f5 100755
--- a/config/pf-blocker/pfblocker.xml
+++ b/config/pf-blocker/pfblocker.xml
@@ -241,7 +241,7 @@
 		pfblocker_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		pfblocker_validate_input($_POST, &amp;$input_errors);
+		pfblocker_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_pfblocker();
diff --git a/config/pf-blocker/pfblocker_lists.xml b/config/pf-blocker/pfblocker_lists.xml
index f1798d36..50782ea1 100755
--- a/config/pf-blocker/pfblocker_lists.xml
+++ b/config/pf-blocker/pfblocker_lists.xml
@@ -246,7 +246,7 @@
 		pfblocker_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		pfblocker_validate_input($_POST, &amp;$input_errors);
+		pfblocker_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_pfblocker();
diff --git a/config/pf-blocker/pfblocker_sync.xml b/config/pf-blocker/pfblocker_sync.xml
index e2e19567..67b49db1 100644
--- a/config/pf-blocker/pfblocker_sync.xml
+++ b/config/pf-blocker/pfblocker_sync.xml
@@ -138,7 +138,7 @@
 		pfblocker_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		pfblocker_validate_input($_POST, &amp;$input_errors);
+		pfblocker_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_pfblocker();
diff --git a/config/pf-blocker/pfblocker_topspammers.xml b/config/pf-blocker/pfblocker_topspammers.xml
index 2536cf80..e7d95e21 100644
--- a/config/pf-blocker/pfblocker_topspammers.xml
+++ b/config/pf-blocker/pfblocker_topspammers.xml
@@ -158,7 +158,7 @@
 		pfblocker_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		pfblocker_validate_input($_POST, &amp;$input_errors);
+		pfblocker_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_pfblocker();
diff --git a/config/postfix/postfix.xml b/config/postfix/postfix.xml
index 59e58f41..46233828 100644
--- a/config/postfix/postfix.xml
+++ b/config/postfix/postfix.xml
@@ -354,7 +354,7 @@
 		postfix_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		postfix_validate_input($_POST, &amp;$input_errors);
+		postfix_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_postfix();
diff --git a/config/postfix/postfix_acl.xml b/config/postfix/postfix_acl.xml
index d704c189..60b23a22 100644
--- a/config/postfix/postfix_acl.xml
+++ b/config/postfix/postfix_acl.xml
@@ -221,7 +221,7 @@
 		postfix_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		postfix_validate_input($_POST, &amp;$input_errors);
+		postfix_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_postfix();
diff --git a/config/postfix/postfix_antispam.xml b/config/postfix/postfix_antispam.xml
index 94f52f35..6c3f5911 100644
--- a/config/postfix/postfix_antispam.xml
+++ b/config/postfix/postfix_antispam.xml
@@ -279,7 +279,7 @@
 		postfix_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		postfix_validate_input($_POST, &amp;$input_errors);
+		postfix_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_postfix();
diff --git a/config/postfix/postfix_domains.xml b/config/postfix/postfix_domains.xml
index 23d80e12..539ef60e 100644
--- a/config/postfix/postfix_domains.xml
+++ b/config/postfix/postfix_domains.xml
@@ -137,7 +137,7 @@
 		postfix_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		postfix_validate_input($_POST, &amp;$input_errors);
+		postfix_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_postfix();
diff --git a/config/postfix/postfix_recipients.xml b/config/postfix/postfix_recipients.xml
index 2b07bae8..d8f9707e 100644
--- a/config/postfix/postfix_recipients.xml
+++ b/config/postfix/postfix_recipients.xml
@@ -192,7 +192,7 @@
 		postfix_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		postfix_validate_input($_POST, &amp;$input_errors);
+		postfix_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_postfix();
diff --git a/config/postfix/postfix_sync.xml b/config/postfix/postfix_sync.xml
index 88617fbf..97a88e2c 100644
--- a/config/postfix/postfix_sync.xml
+++ b/config/postfix/postfix_sync.xml
@@ -193,7 +193,7 @@
 		postfix_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		postfix_validate_input($_POST, &amp;$input_errors);
+		postfix_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_postfix();
diff --git a/config/sarg/sarg.xml b/config/sarg/sarg.xml
index a0162e3b..9266d211 100644
--- a/config/sarg/sarg.xml
+++ b/config/sarg/sarg.xml
@@ -363,7 +363,7 @@
 		sarg_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		sarg_validate_input($_POST, &amp;$input_errors);
+		sarg_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_sarg();
diff --git a/config/sarg/sarg_schedule.xml b/config/sarg/sarg_schedule.xml
index 07e24d5c..6080e530 100644
--- a/config/sarg/sarg_schedule.xml
+++ b/config/sarg/sarg_schedule.xml
@@ -216,7 +216,7 @@
 	<custom_php_command_before_form>
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		sarg_validate_input($_POST, &amp;$input_errors);
+		sarg_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_delete_php_command>
 		sync_package_sarg();
diff --git a/config/sarg/sarg_sync.xml b/config/sarg/sarg_sync.xml
index 6cff7b6d..354d9991 100755
--- a/config/sarg/sarg_sync.xml
+++ b/config/sarg/sarg_sync.xml
@@ -138,7 +138,7 @@
 		sarg_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		sarg_validate_input($_POST, &amp;$input_errors);
+		sarg_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sarg_resync();
diff --git a/config/sarg/sarg_users.xml b/config/sarg/sarg_users.xml
index d038e5b3..39387007 100644
--- a/config/sarg/sarg_users.xml
+++ b/config/sarg/sarg_users.xml
@@ -211,7 +211,7 @@
 	<custom_php_deinstall_command>
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		sarg_validate_input($_POST, &amp;$input_errors);
+		sarg_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
 		sync_package_sarg();
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index c0c5756c..47274e77 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -54,7 +54,7 @@ if (empty($snort_version))
 	$snort_version = "2.9.6.0";
 
 /* Used to indicate latest version of this include file has been loaded */
-$pfSense_snort_version = "3.0.8";
+$pfSense_snort_version = "3.0.13";
 
 /* get installed package version for display */
 $snort_package_version = "Snort {$config['installedpackages']['package'][get_pkg_id("snort")]['version']}";
diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index ca99accf..977db98a 100755
--- a/config/snort/snort.xml
+++ b/config/snort/snort.xml
@@ -47,7 +47,7 @@
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>Snort</name>
 	<version>2.9.6.0</version>
-	<title>Services:2.9.6.0 pkg v3.0.8</title>
+	<title>Services:2.9.6.0 pkg v3.0.13</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
@@ -269,7 +269,7 @@
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
 		<![CDATA[
-		if ($GLOBALS['pfSense_snort_version'] == "3.0.8")
+		if ($GLOBALS['pfSense_snort_version'] == "3.0.13")
 		sync_snort_package_config();
 		]]>
 	</custom_php_resync_config_command>
diff --git a/config/snort/snort_import_aliases.php b/config/snort/snort_import_aliases.php
index 80b3bb1d..ba71c9bf 100644
--- a/config/snort/snort_import_aliases.php
+++ b/config/snort/snort_import_aliases.php
@@ -32,13 +32,13 @@ require_once("functions.inc");
 require_once("/usr/local/pkg/snort/snort.inc");
 
 // Retrieve any passed QUERY STRING or POST variables
-if (isset($_POST['id']))
+if (isset($_POST['id']) && is_numericint($_POST['id']))
 	$id = $_POST['id'];
 elseif (isset($_GET['id']) && is_numericint($_GET['id']))
 	$id = htmlspecialchars($_GET['id']);
 
 if (isset($_POST['eng']))
-	$eng = $_POST['eng'];
+	$eng = htmlspecialchars($_POST['eng']);
 elseif (isset($_GET['eng']))
 	$eng = htmlspecialchars($_GET['eng']);
 
diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php
index 986bfc38..ec4d9116 100644
--- a/config/snort/snort_interfaces_suppress_edit.php
+++ b/config/snort/snort_interfaces_suppress_edit.php
@@ -90,7 +90,12 @@ if ($_POST['save']) {
 
 	$reqdfields = explode(" ", "name");
 	$reqdfieldsn = array("Name");
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+
+	$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+	if ($pf_version < 2.1)
+		$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+	else
+		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	if(strtolower($_POST['name']) == "defaultwhitelist")
 		$input_errors[] = "Whitelist file names may not be named defaultwhitelist.";
diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php
index d483ba47..d524e9f3 100644
--- a/config/snort/snort_migrate_config.php
+++ b/config/snort/snort_migrate_config.php
@@ -365,7 +365,7 @@ unset($r);
 
 // Write out the new configuration to disk if we changed anything
 if ($updated_cfg) {
-	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.8";
+	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.13";
 	log_error("[Snort] Saving configuration settings in new format...");
 	write_config("Snort pkg: migrate existing settings to new format as part of package upgrade.");
 	log_error("[Snort] Settings successfully migrated to new configuration format...");
diff --git a/config/snort/snort_passlist_edit.php b/config/snort/snort_passlist_edit.php
index 3be776f4..f501e0fc 100644
--- a/config/snort/snort_passlist_edit.php
+++ b/config/snort/snort_passlist_edit.php
@@ -112,7 +112,12 @@ if ($_POST['save']) {
 	/* input validation */
 	$reqdfields = explode(" ", "name");
 	$reqdfieldsn = explode(",", "Name");
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+
+	$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+	if ($pf_version < 2.1)
+		$input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;');
+	else
+		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	if(strtolower($_POST['name']) == "defaultpasslist")
 		$input_errors[] = gettext("Pass List file names may not be named defaultpasslist.");
diff --git a/config/snort/snort_post_install.php b/config/snort/snort_post_install.php
index 8d3c427d..6b645df5 100644
--- a/config/snort/snort_post_install.php
+++ b/config/snort/snort_post_install.php
@@ -1494,7 +1494,7 @@ if (stristr($config['widgets']['sequence'], "snort_alerts-container") === FALSE)
 	$config['widgets']['sequence'] .= ",{$snort_widget_container}";
 
 /* Update Snort package version in configuration */
-$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.8";
+$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.13";
 write_config("Snort pkg: post-install configuration saved.");
 
 /* Done with post-install, so clear flag */
diff --git a/config/snort/snort_rules_flowbits.php b/config/snort/snort_rules_flowbits.php
index daf1c4ef..d7c18a9d 100644
--- a/config/snort/snort_rules_flowbits.php
+++ b/config/snort/snort_rules_flowbits.php
@@ -53,7 +53,7 @@ if (is_null($id)) {
 
 // Set who called us so we can return to the correct page with
 // the RETURN ('cancel') button.
-if ($_POST['referrer'])
+if (isset($_POST['referrer']) && strpos($_POST['referrer'], '://'.$_SERVER['SERVER_NAME'].'/') !== FALSE)
 	$referrer = $_POST['referrer'];
 else
 	$referrer = $_SERVER['HTTP_REFERER'];
diff --git a/config/snort/snort_select_alias.php b/config/snort/snort_select_alias.php
index c632b388..de504b7f 100644
--- a/config/snort/snort_select_alias.php
+++ b/config/snort/snort_select_alias.php
@@ -47,29 +47,31 @@ else
 
 // Retrieve any passed QUERY STRING or POST variables
 if (isset($_POST['type']))
-	$type = $_POST['type'];
+	$type = htmlspecialchars($_POST['type']);
 elseif (isset($_GET['type']))
 	$type = htmlspecialchars($_GET['type']);
 
 if (isset($_POST['varname']))
-	$varname = $_POST['varname'];
+	$varname = htmlspecialchars($_POST['varname']);
 elseif (isset($_GET['varname']))
 	$varname = htmlspecialchars($_GET['varname']);
 
 if (isset($_POST['multi_ip']))
-	$multi_ip = $_POST['multi_ip'];
+	$multi_ip = htmlspecialchars($_POST['multi_ip']);
 elseif (isset($_GET['multi_ip']))
 	$multi_ip = htmlspecialchars($_GET['multi_ip']);
 
-if (isset($_POST['returl']))
+if (isset($_POST['returl']) && substr($_POST['returl'], 0, 1) == '/')
 	$referrer = urldecode($_POST['returl']);
-elseif (isset($_GET['returl']))
+elseif (isset($_GET['returl']) && substr($_GET['returl'], 0, 1) == '/')
 	$referrer = urldecode($_GET['returl']);
+else
+	$referrer = $_SERVER['HTTP_REFERER'];
 
 // Make sure we have a valid VARIABLE name
 // and ALIAS TYPE, or else bail out.
 if (is_null($type) || is_null($varname)) {
-	header("Location: http://{$referrer}?{$querystr}");
+	header("Location: {$referrer}?{$querystr}");
 	exit;
 }
 
@@ -132,8 +134,8 @@ include("head.inc");
 <input type="hidden" name="varname" value="<?=$varname;?>"/>
 <input type="hidden" name="type" value="<?=$type;?>"/>
 <input type="hidden" name="multi_ip" value="<?=$multi_ip;?>"/>
-<input type="hidden" name="returl" value="<?=$referrer;?>"/>
-<input type="hidden" name="org_querystr" value="<?=$querystr;?>"/>
+<input type="hidden" name="returl" value="<?=htmlspecialchars($referrer);?>"/>
+<input type="hidden" name="org_querystr" value="<?=htmlspecialchars($querystr);?>"/>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <div id="boxarea">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/config/squid-head/squid.inc b/config/squid-head/squid.inc
index a735b33e..b647392c 100644
--- a/config/squid-head/squid.inc
+++ b/config/squid-head/squid.inc
@@ -112,7 +112,7 @@ function squid_deinstall_command() {
 	mwexec('rm -rf ' . SQUID_CACHEDIR);
 }
 
-function squid_before_form_general($pkg) {
+function squid_before_form_general(&$pkg) {
 	$values = get_dir(SQUID_CONFBASE . '/errors/');
 	// Get rid of '..' and '.'
 	array_shift($values);
@@ -133,7 +133,7 @@ function squid_before_form_general($pkg) {
 		$field['options']['option'][] = array('name' => $names[$i], 'value' => $values[$i]);
 }
 
-function squid_validate_general($post, $input_errors) {
+function squid_validate_general($post, &$input_errors) {
 	$icp_port = trim($post['icp_port']);
 	if (!empty($icp_port) && !is_port($icp_port))
 		$input_errors[] = 'You must enter a valid port number in the \'ICP port\' field';
@@ -143,7 +143,7 @@ function squid_validate_general($post, $input_errors) {
 		$input_errors[] = 'You must enter a valid number for the \'Redirect children\' field';
 }
 
-function squid_validate_upstream($post, $input_errors) {
+function squid_validate_upstream($post, &$input_errors) {
 	if ($post['proxy_forwarding'] == 'on') {
 		$addr = trim($post['proxy_addr']);
 		if (empty($addr))
@@ -165,7 +165,7 @@ function squid_validate_upstream($post, $input_errors) {
 	}
 }
 
-function squid_validate_cache($post, $input_errors) {
+function squid_validate_cache($post, &$input_errors) {
 	$num_fields = array(	'harddisk_cache_size' => 'Hard disk cache size',
 				'memory_cache_size' => 'Memory cache size',
 				'maximum_object_size' => 'Maximum object size',
@@ -187,7 +187,7 @@ function squid_validate_cache($post, $input_errors) {
 	}
 }
 
-function squid_validate_nac($post, $input_errors) {
+function squid_validate_nac($post, &$input_errors) {
 	$allowed_subnets = explode(',', trim($post['allowed_subnets']));
 	foreach ($allowed_subnets as $subnet) {
 		$subnet = trim($subnet);
@@ -222,7 +222,7 @@ function squid_validate_nac($post, $input_errors) {
 	}
 }
 
-function squid_validate_traffic($post, $input_errors) {
+function squid_validate_traffic($post, &$input_errors) {
 	$num_fields = array(
 		'max_download_size' => 'Maximum download size',
 		'max_upload_size' => 'Maximum upload size',
@@ -239,7 +239,7 @@ function squid_validate_traffic($post, $input_errors) {
 	}
 }
 
-function squid_validate_auth($post, $input_errors) {
+function squid_validate_auth($post, &$input_errors) {
 	$num_fields = array(	array('auth_processes', 'Authentication processes', 1),
 				array('auth_ttl', 'Authentication TTL', 0),
 	);
diff --git a/config/squid-head/squid.xml b/config/squid-head/squid.xml
index 6657e3af..4db431fc 100644
--- a/config/squid-head/squid.xml
+++ b/config/squid-head/squid.xml
@@ -198,10 +198,10 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_general($_POST, &amp;$input_errors);
+		squid_validate_general($_POST, $input_errors);
 	</custom_php_validation_command>
 <custom_php_resync_config_command>
 	squid_resync();
diff --git a/config/squid-head/squid_auth.xml b/config/squid-head/squid_auth.xml
index 15910f97..ded7b516 100644
--- a/config/squid-head/squid_auth.xml
+++ b/config/squid-head/squid_auth.xml
@@ -188,7 +188,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_auth($_POST, &amp;$input_errors);
+		squid_validate_auth($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_after_form_command>
 		squid_print_javascript_auth2();
diff --git a/config/squid-head/squid_cache.xml b/config/squid-head/squid_cache.xml
index 3fe0475f..6bce3d6f 100644
--- a/config/squid-head/squid_cache.xml
+++ b/config/squid-head/squid_cache.xml
@@ -172,7 +172,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_cache($_POST, &amp;$input_errors);
+		squid_validate_cache($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid-head/squid_nac.xml b/config/squid-head/squid_nac.xml
index db49a1ba..00de75e2 100644
--- a/config/squid-head/squid_nac.xml
+++ b/config/squid-head/squid_nac.xml
@@ -139,7 +139,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_nac($_POST, &amp;$input_errors);
+		squid_validate_nac($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid-head/squid_traffic.xml b/config/squid-head/squid_traffic.xml
index d69f2510..b6865596 100644
--- a/config/squid-head/squid_traffic.xml
+++ b/config/squid-head/squid_traffic.xml
@@ -171,7 +171,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_traffic($_POST, &amp;$input_errors);
+		squid_validate_traffic($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid-head/squid_upstream.xml b/config/squid-head/squid_upstream.xml
index b02a21b4..ac33b31e 100644
--- a/config/squid-head/squid_upstream.xml
+++ b/config/squid-head/squid_upstream.xml
@@ -125,7 +125,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_upstream($_POST, &amp;$input_errors);
+		squid_validate_upstream($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 9f7fe2b0..0ddd1645 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -278,7 +278,7 @@ function squid_deinstall_command() {
 	filter_configure();
 }
 
-function squid_before_form_general($pkg) {
+function squid_before_form_general(&$pkg) {
 	$values = get_dir(SQUID_CONFBASE . '/errors/');
 	// Get rid of '..' and '.'
 	array_shift($values);
diff --git a/config/squid/squid.xml b/config/squid/squid.xml
index 88bd94ec..67956229 100644
--- a/config/squid/squid.xml
+++ b/config/squid/squid.xml
@@ -320,7 +320,7 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_add_php_command>
 		squid_resync();
diff --git a/config/squid3/31/squid.inc b/config/squid3/31/squid.inc
index 0256d078..ef346e1a 100644
--- a/config/squid3/31/squid.inc
+++ b/config/squid3/31/squid.inc
@@ -365,7 +365,7 @@ function squid_deinstall_command() {
 	filter_configure();
 }
 
-function squid_before_form_general($pkg) {
+function squid_before_form_general(&$pkg) {
 	$values = get_dir(SQUID_CONFBASE . '/errors/');
 	// Get rid of '..' and '.' and ...
 	array_shift($values);
@@ -389,7 +389,7 @@ function squid_before_form_general($pkg) {
 		$field['options']['option'][] = array('name' => $names[$i], 'value' => $values[$i]);
 }
 
-function squid_validate_general($post, $input_errors) {
+function squid_validate_general($post, &$input_errors) {
 	global $config;
 	if (is_array($config['installedpackages']['squid']))
 		$settings = $config['installedpackages']['squid']['config'][0];
@@ -402,6 +402,7 @@ function squid_validate_general($post, $input_errors) {
 	if (!empty($icp_port) && !is_port($icp_port))
 		$input_errors[] = 'You must enter a valid port number in the \'ICP port\' field';
 
+
 	if (substr($post['log_dir'], -1, 1) == '/')
 		$input_errors[] = 'You may not end log location with an / mark';
 
@@ -451,7 +452,7 @@ function squid_validate_general($post, $input_errors) {
 	 }}
 }
 
-function squid_validate_upstream($post, $input_errors) {
+function squid_validate_upstream($post, &$input_errors) {
 	if ($post['enabled'] == 'on') {
 		$addr = trim($post['proxyaddr']);
 		if (empty($addr))
@@ -473,7 +474,7 @@ function squid_validate_upstream($post, $input_errors) {
 	}
 }
 
-function squid_validate_cache($post, $input_errors) {
+function squid_validate_cache($post, &$input_errors) {
 	$num_fields = array(	'harddisk_cache_size' => 'Hard disk cache size',
 				'memory_cache_size' => 'Memory cache size',
 				'maximum_object_size' => 'Maximum object size',
@@ -512,7 +513,7 @@ function squid_validate_cache($post, $input_errors) {
 
 }
 
-function squid_validate_nac($post, $input_errors) {
+function squid_validate_nac($post, &$input_errors) {
 	$allowed_subnets = explode("\n", $post['allowed_subnets']);
 	foreach ($allowed_subnets as $subnet) {
 		$subnet = trim($subnet);
@@ -558,7 +559,7 @@ function squid_validate_nac($post, $input_errors) {
 	 }}
 }
 
-function squid_validate_traffic($post, $input_errors) {
+function squid_validate_traffic($post, &$input_errors) {
 	$num_fields = array(	'max_download_size' => 'Maximum download size',
 				'max_upload_size' => 'Maximum upload size',
 				'perhost_throttling' => 'Per-host bandwidth throttling',
@@ -589,14 +590,13 @@ function squid_validate_traffic($post, $input_errors) {
   }	
 }
 
-function squid_validate_reverse($post, $input_errors) {
+function squid_validate_reverse($post, &$input_errors) {
 
 	if(!empty($post['reverse_ip'])) {
 		$reverse_ip = explode(";", ($post['reverse_ip']));
 		foreach ($reverse_ip as $reip) {
-		if (!is_ipaddr($reip))
-			$input_errors[] = 'You must enter a valid IP address in the \'User-defined reverse-proxy IPs\' field';
-			break;
+		if (!is_ipaddr(trim($reip)))
+			$input_errors[] = 'You must enter a valid IP address in the \'User-defined reverse-proxy IPs\' field'.' -> \''.$reip.'\' is invalid.';
 	}}	
 		
 	$fqdn = trim($post['reverse_external_fqdn']);
@@ -618,15 +618,12 @@ function squid_validate_reverse($post, $input_errors) {
       $input_errors[] = "You have to enable reverse HTTPS before enabling OWA support.";
       }
 
-/*
-		if (!is_cert($post['reverse_int_ca']))
- 			$input_errors[] = 'A valid certificate for the external interface must be selected';
-*/
-
-	$rowa = trim($post['reverse_owa_ip']);
-	if (!empty($rowa) && !is_ipaddr($rowa))
-		$input_errors[] = 'The field \'OWA frontend IP address\' must contain a valid IP address';
-
+	if(!empty($post['reverse_owa_ip'])) {
+		$reverse_owa_ip = explode(";", ($post['reverse_owa_ip']));
+		foreach ($reverse_owa_ip as $reowaip) {
+		if (!is_ipaddr(trim($reowaip)))
+			$input_errors[] = 'You must enter a valid IP address in the \'CAS-Array / OWA frontend IP address\' field'.' -> \''.$reowaip.'\' is invalid.';
+	}}	
 	
     $contents = $post['reverse_cache_peer'];
     if(!empty($contents)) {
@@ -644,7 +641,7 @@ function squid_validate_reverse($post, $input_errors) {
 
 }
 
-function squid_validate_auth($post, $input_errors) {
+function squid_validate_auth($post, &$input_errors) {
 	$num_fields = array(	array('auth_processes', 'Authentication processes', 1),
 				array('auth_ttl', 'Authentication TTL', 0),
 	);
diff --git a/config/squid3/31/squid.xml b/config/squid3/31/squid.xml
index 53293acd..a05e9427 100644
--- a/config/squid3/31/squid.xml
+++ b/config/squid3/31/squid.xml
@@ -429,13 +429,13 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_add_php_command>
 		squid_resync();
 	</custom_add_php_command>
 	<custom_php_validation_command>
-		squid_validate_general($_POST, &amp;$input_errors);
+		squid_validate_general($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_auth.xml b/config/squid3/31/squid_auth.xml
index 307669c5..8dbaae67 100644
--- a/config/squid3/31/squid_auth.xml
+++ b/config/squid3/31/squid_auth.xml
@@ -244,7 +244,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_auth($_POST, &amp;$input_errors);
+		squid_validate_auth($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_after_form_command>
 		squid_print_javascript_auth2();
diff --git a/config/squid3/31/squid_cache.xml b/config/squid3/31/squid_cache.xml
index 7f371f49..50c0dca0 100644
--- a/config/squid3/31/squid_cache.xml
+++ b/config/squid3/31/squid_cache.xml
@@ -287,7 +287,7 @@
 		}
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_cache($_POST, &amp;$input_errors);
+		squid_validate_cache($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_nac.xml b/config/squid3/31/squid_nac.xml
index 659d626f..de3d670c 100644
--- a/config/squid3/31/squid_nac.xml
+++ b/config/squid3/31/squid_nac.xml
@@ -178,7 +178,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_nac($_POST, &amp;$input_errors);
+		squid_validate_nac($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc
index 993508aa..d2611c79 100644
--- a/config/squid3/31/squid_reverse.inc
+++ b/config/squid3/31/squid_reverse.inc
@@ -100,14 +100,23 @@ function squid_resync_reverse() {
 
 	//PEERS
  	if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])))
- 		$conf .= "cache_peer {$settings['reverse_owa_ip']} parent 443 0 proxy-only no-query originserver login=PASS connection-auth=on ssl sslflags=DONT_VERIFY_PEER front-end-https=on name=OWA_HOST_pfs\n";
-
+		
+		if(!empty($settings['reverse_owa_ip'])) {
+			$reverse_owa_ip = explode(";", ($settings['reverse_owa_ip']));
+			$casnr = 0;
+			foreach ($reverse_owa_ip as $reowaip) {
+				$casnr++;
+				$conf .= "cache_peer {$reowaip} parent 443 0 proxy-only no-query originserver login=PASS ssl sslflags=DONT_VERIFY_PEER front-end-https=on name=OWA_HOST_443_{$casnr}_pfs\n";
+				$conf .= "cache_peer {$reowaip} parent 80 0 proxy-only no-query originserver login=PASS name=OWA_HOST_80_{$casnr}_pfs\n";
+			}
+		}
+		
  	$active_peers=array();
  	if (is_array($reverse_peers))
  	 foreach ($reverse_peers as $rp){
  		if ($rp['enable'] =="on" && $rp['name'] !="" && $rp['ip'] !="" && $rp['port'] !=""){
  			$conf_peer = "#{$rp['description']}\n";
- 			$conf_peer .= "cache_peer {$rp['ip']} parent {$rp['port']} 0 proxy-only no-query no-digest originserver login=PASS ";
+ 			$conf_peer .= "cache_peer {$rp['ip']} parent {$rp['port']} 0 proxy-only no-query no-digest originserver login=PASS round-robin ";
  			if($rp['protocol'] == 'HTTPS')
 	            	$conf_peer .= "ssl sslflags=DONT_VERIFY_PEER front-end-https=auto ";
 			$conf_peer .= "name=rvp_{$rp['name']}\n\n";
@@ -170,6 +179,8 @@ function squid_resync_reverse() {
 					array_push($owa_dirs,'Microsoft-Server-ActiveSync');
 			if($settings['reverse_owa_rpchttp'])	
 					array_push($owa_dirs,'rpc/rpcproxy.dll','rpcwithcert/rpcproxy.dll');
+			if($settings['reverse_owa_mapihttp'])	
+					array_push($owa_dirs,'mapi');
 			if($settings['reverse_owa_webservice']){
 					array_push($owa_dirs,'EWS');
 					$conf .= "ignore_expect_100 on\n";
@@ -181,6 +192,9 @@ function squid_resync_reverse() {
 			
 		if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) {
 			$reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.');
+			$conf .= "acl OWA_URI_pfs url_regex -i ^http://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n";
+			$conf .= "acl OWA_URI_pfs url_regex -i ^https://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n";
+			$conf .= "acl OWA_URI_pfs url_regex -i ^http://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n";
 			$conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n";
 			}
 		}
@@ -209,8 +223,15 @@ function squid_resync_reverse() {
 
 	//ACCESS
   	if ($settings['reverse_owa'] == 'on' && !empty($settings['reverse_owa_ip']) && $settings['reverse_https'] =="on") {
-		$conf .= "cache_peer_access OWA_HOST_pfs allow OWA_URI_pfs\n";
-		$conf .= "cache_peer_access OWA_HOST_pfs deny allsrc\n";
+		
+		for($cascnt=1;$cascnt<$casnr+1;$cascnt++)
+		{
+			$conf .= "cache_peer_access OWA_HOST_443_{$cascnt}_pfs allow OWA_URI_pfs\n";
+			$conf .= "cache_peer_access OWA_HOST_80_{$cascnt}_pfs allow OWA_URI_pfs\n";
+			$conf .= "cache_peer_access OWA_HOST_443_{$cascnt}_pfs deny allsrc\n";
+			$conf .= "cache_peer_access OWA_HOST_80_{$cascnt}_pfs deny allsrc\n";
+		}
+		
 		$conf .= "never_direct allow OWA_URI_pfs\n";
 		$conf .= "http_access allow OWA_URI_pfs\n";        
 		}
diff --git a/config/squid3/31/squid_reverse.xml b/config/squid3/31/squid_reverse.xml
index 7c25c371..b3a4c6cb 100644
--- a/config/squid3/31/squid_reverse.xml
+++ b/config/squid3/31/squid_reverse.xml
@@ -165,7 +165,7 @@
 			<fieldname>reverse_https</fieldname>
 			<description>If this field is checked, the proxy-server will act in HTTPS reverse mode. &lt;br&gt;(You have to add a rule with destination "WAN-address")</description>
 			<type>checkbox</type>
-			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
+			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
 			<required/>
 			<default_value>off</default_value>
 		</field> 
@@ -214,14 +214,14 @@
 			<fieldname>reverse_owa</fieldname>
 			<description>If this field is checked, squid will act as an accelerator/ SSL offloader for Outlook Web App.</description>
 			<type>checkbox</type>
-			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
+			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
 		</field>
 		<field>
-			<fielddescr>OWA frontend IP address</fielddescr>
+			<fielddescr>CAS-Array / OWA frontend IP address</fielddescr>
 			<fieldname>reverse_owa_ip</fieldname>
-			<description>This is the internal IP Address of the OWA frontend server.</description>
+			<description>These are the internal IPs of the CAS-Array (OWA frontend servers). Separate by semi-colons (;). </description>
 			<type>input</type>
-			<size>15</size>
+			<size>70</size>
 		</field>		
 		<field>
 			<fielddescr>Enable ActiveSync</fielddescr>
@@ -236,6 +236,13 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>Enable MAPI HTTP</fielddescr>
+			<fieldname>reverse_owa_mapihttp</fieldname>
+			<description><![CDATA[If this field is checked, MAPI over HTTP will be enabled.<br>
+								<strong>This feature is only available with at least Exchange 2013 SP1</strong>]]></description>
+			<type>checkbox</type>
+		</field>
+		<field>
 			<fielddescr>Enable Exchange WebServices</fielddescr>
 			<fieldname>reverse_owa_webservice</fieldname>
 			<description><![CDATA[If this field is checked, Exchange WebServices will be enabled.<br>
@@ -346,10 +353,10 @@
 
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_reverse($_POST, &amp;$input_errors);
+		squid_validate_reverse($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_reverse_general.xml b/config/squid3/31/squid_reverse_general.xml
index 2211bb20..47426c8e 100644
--- a/config/squid3/31/squid_reverse_general.xml
+++ b/config/squid3/31/squid_reverse_general.xml
@@ -149,7 +149,7 @@
 			<fieldname>reverse_https</fieldname>
 			<description>If this field is checked, the proxy-server will act in HTTPS reverse mode. &lt;br&gt;(You have to add a rule with destination "WAN-address")</description>
 			<type>checkbox</type>
-			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
+			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
 			<required/>
 			<default_value>off</default_value>
 		</field> 
@@ -202,14 +202,14 @@
 			<fieldname>reverse_owa</fieldname>
 			<description>If this field is checked, squid will act as an accelerator/ SSL offloader for Outlook Web App.</description>
 			<type>checkbox</type>
-			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
+			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
 		</field>
 		<field>
-			<fielddescr>OWA frontend IP address</fielddescr>
+			<fielddescr>CAS-Array / OWA frontend IP address</fielddescr>
 			<fieldname>reverse_owa_ip</fieldname>
-			<description>This is the internal IP Address of the OWA frontend server.</description>
+			<description>These are the internal IPs of the CAS-Array (OWA frontend servers). Separate by semi-colons (;). </description>
 			<type>input</type>
-			<size>15</size>
+			<size>70</size>
 		</field>		
 		<field>
 			<fielddescr>Enable ActiveSync</fielddescr>
@@ -224,6 +224,13 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>Enable MAPI HTTP</fielddescr>
+			<fieldname>reverse_owa_mapihttp</fieldname>
+			<description><![CDATA[If this field is checked, MAPI over HTTP will be enabled.<br>
+								<strong>This feature is only available with at least Exchange 2013 SP1</strong>]]></description>
+			<type>checkbox</type>
+		</field>
+		<field>
 			<fielddescr>Enable Exchange WebServices</fielddescr>
 			<fieldname>reverse_owa_webservice</fieldname>
 			<description><![CDATA[If this field is checked, Exchange WebServices will be enabled.<br>
@@ -238,12 +245,12 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_reverse($_POST, &amp;$input_errors);
+		squid_validate_reverse($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
 	</custom_php_resync_config_command>
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/squid3/31/squid_reverse_peer.xml b/config/squid3/31/squid_reverse_peer.xml
index abfbf19b..b5a340e7 100644
--- a/config/squid3/31/squid_reverse_peer.xml
+++ b/config/squid3/31/squid_reverse_peer.xml
@@ -156,12 +156,12 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_reverse($_POST, &amp;$input_errors);
+		squid_validate_reverse($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
 	</custom_php_resync_config_command>
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/squid3/31/squid_traffic.xml b/config/squid3/31/squid_traffic.xml
index 62269792..786205c1 100644
--- a/config/squid3/31/squid_traffic.xml
+++ b/config/squid3/31/squid_traffic.xml
@@ -195,7 +195,7 @@
 		</field>        		
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_traffic($_POST, &amp;$input_errors);
+		squid_validate_traffic($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_upstream.xml b/config/squid3/31/squid_upstream.xml
index 049d301c..45e5576a 100644
--- a/config/squid3/31/squid_upstream.xml
+++ b/config/squid3/31/squid_upstream.xml
@@ -349,7 +349,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_upstream($_POST, &amp;$input_errors);
+		squid_validate_upstream($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc
index a97746e2..d9bb1549 100755
--- a/config/squid3/33/squid.inc
+++ b/config/squid3/33/squid.inc
@@ -382,7 +382,7 @@ function squid_deinstall_command() {
 	filter_configure();
 }
 
-function squid_before_form_general($pkg) {
+function squid_before_form_general(&$pkg) {
 	$values = get_dir(SQUID_CONFBASE . '/errors/');
 	// Get rid of '..' and '.' and ...
 	array_shift($values);
@@ -406,7 +406,7 @@ function squid_before_form_general($pkg) {
 		$field['options']['option'][] = array('name' => $names[$i], 'value' => $values[$i]);
 }
 
-function squid_validate_general($post, $input_errors) {
+function squid_validate_general($post, &$input_errors) {
 	global $config;
 	if (is_array($config['installedpackages']['squid']))
 		$settings = $config['installedpackages']['squid']['config'][0];
@@ -472,7 +472,7 @@ function squid_validate_general($post, $input_errors) {
 	 }}
 }
 
-function squid_validate_upstream($post, $input_errors) {
+function squid_validate_upstream($post, &$input_errors) {
 	if ($post['enabled'] == 'on') {
 		$addr = trim($post['proxyaddr']);
 		if (empty($addr))
@@ -494,7 +494,7 @@ function squid_validate_upstream($post, $input_errors) {
 	}
 }
 
-function squid_validate_cache($post, $input_errors) {
+function squid_validate_cache($post, &$input_errors) {
 	$num_fields = array(	'harddisk_cache_size' => 'Hard disk cache size',
 				'memory_cache_size' => 'Memory cache size',
 				'maximum_object_size' => 'Maximum object size',
@@ -533,7 +533,7 @@ function squid_validate_cache($post, $input_errors) {
 
 }
 
-function squid_validate_nac($post, $input_errors) {
+function squid_validate_nac($post, &$input_errors) {
 	$allowed_subnets = explode("\n", $post['allowed_subnets']);
 	foreach ($allowed_subnets as $subnet) {
 		$subnet = trim($subnet);
@@ -579,7 +579,7 @@ function squid_validate_nac($post, $input_errors) {
 	 }}
 }
 
-function squid_validate_traffic($post, $input_errors) {
+function squid_validate_traffic($post, &$input_errors) {
 	$num_fields = array(	'max_download_size' => 'Maximum download size',
 				'max_upload_size' => 'Maximum upload size',
 				'perhost_throttling' => 'Per-host bandwidth throttling',
@@ -610,14 +610,13 @@ function squid_validate_traffic($post, $input_errors) {
   }	
 }
 
-function squid_validate_reverse($post, $input_errors) {
+function squid_validate_reverse($post, &$input_errors) {
 
 	if(!empty($post['reverse_ip'])) {
 		$reverse_ip = explode(";", ($post['reverse_ip']));
 		foreach ($reverse_ip as $reip) {
-		if (!is_ipaddr($reip))
-			$input_errors[] = 'You must enter a valid IP address in the \'User-defined reverse-proxy IPs\' field';
-			break;
+		if (!is_ipaddr(trim($reip)))
+			$input_errors[] = 'You must enter a valid IP address in the \'User-defined reverse-proxy IPs\' field'.' -> \''.$reip.'\' is invalid.';
 	}}	
 		
 	$fqdn = trim($post['reverse_external_fqdn']);
@@ -639,15 +638,12 @@ function squid_validate_reverse($post, $input_errors) {
       $input_errors[] = "You have to enable reverse HTTPS before enabling OWA support.";
       }
 
-/*
-		if (!is_cert($post['reverse_int_ca']))
- 			$input_errors[] = 'A valid certificate for the external interface must be selected';
-*/
-
-	$rowa = trim($post['reverse_owa_ip']);
-	if (!empty($rowa) && !is_ipaddr($rowa))
-		$input_errors[] = 'The field \'OWA frontend IP address\' must contain a valid IP address';
-
+	if(!empty($post['reverse_owa_ip'])) {
+		$reverse_owa_ip = explode(";", ($post['reverse_owa_ip']));
+		foreach ($reverse_owa_ip as $reowaip) {
+		if (!is_ipaddr(trim($reowaip)))
+			$input_errors[] = 'You must enter a valid IP address in the \'CAS-Array / OWA frontend IP address\' field'.' -> \''.$reowaip.'\' is invalid.';
+	}}	
 	
     $contents = $post['reverse_cache_peer'];
     if(!empty($contents)) {
@@ -665,7 +661,7 @@ function squid_validate_reverse($post, $input_errors) {
 
 }
 
-function squid_validate_auth($post, $input_errors) {
+function squid_validate_auth($post, &$input_errors) {
 	$num_fields = array(	array('auth_processes', 'Authentication processes', 1),
 				array('auth_ttl', 'Authentication TTL', 0),
 	);
diff --git a/config/squid3/33/squid.xml b/config/squid3/33/squid.xml
index bf740221..7e13e456 100644
--- a/config/squid3/33/squid.xml
+++ b/config/squid3/33/squid.xml
@@ -555,13 +555,13 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_add_php_command>
 		squid_resync();
 	</custom_add_php_command>
 	<custom_php_validation_command>
-		squid_validate_general($_POST, &amp;$input_errors);
+		squid_validate_general($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/33/squid_auth.xml b/config/squid3/33/squid_auth.xml
index e71a7e8d..c79bf873 100755
--- a/config/squid3/33/squid_auth.xml
+++ b/config/squid3/33/squid_auth.xml
@@ -250,7 +250,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_auth($_POST, &amp;$input_errors);
+		squid_validate_auth($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_after_form_command>
 		squid_print_javascript_auth2();
diff --git a/config/squid3/33/squid_cache.xml b/config/squid3/33/squid_cache.xml
index f60863c9..612e9b73 100755
--- a/config/squid3/33/squid_cache.xml
+++ b/config/squid3/33/squid_cache.xml
@@ -312,7 +312,7 @@
 		}
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_cache($_POST, &amp;$input_errors);
+		squid_validate_cache($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/33/squid_nac.xml b/config/squid3/33/squid_nac.xml
index bffefb61..2e94ae58 100755
--- a/config/squid3/33/squid_nac.xml
+++ b/config/squid3/33/squid_nac.xml
@@ -183,7 +183,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_nac($_POST, &amp;$input_errors);
+		squid_validate_nac($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc
index 34ff2366..a6b81c0b 100755
--- a/config/squid3/33/squid_reverse.inc
+++ b/config/squid3/33/squid_reverse.inc
@@ -89,9 +89,6 @@ function squid_resync_reverse() {
 	if(!empty($settings['reverse_ip'])) {
 		$reverse_ip = explode(";", ($settings['reverse_ip']));
 		foreach ($reverse_ip as $reip) {
-		      //IPv6 Addresses need to be enclosed in brackets
-		      if (strpos($reip, ':')) $reip = '[' . $reip . ']';
-		      
 		      //HTTP
 		      if (!empty($settings['reverse_http']))
 		      		$conf .= "http_port {$reip}:{$http_port} accel defaultsite={$http_defsite} vhost\n";
@@ -103,14 +100,23 @@ function squid_resync_reverse() {
 
 	//PEERS
  	if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])))
- 		$conf .= "cache_peer {$settings['reverse_owa_ip']} parent 443 0 proxy-only no-query originserver login=PASS connection-auth=on ssl sslflags=DONT_VERIFY_PEER front-end-https=on name=OWA_HOST_pfs\n";
-
+		
+		if(!empty($settings['reverse_owa_ip'])) {
+			$reverse_owa_ip = explode(";", ($settings['reverse_owa_ip']));
+			$casnr = 0;
+			foreach ($reverse_owa_ip as $reowaip) {
+				$casnr++;
+				$conf .= "cache_peer {$reowaip} parent 443 0 proxy-only no-query originserver login=PASSTHRU connection-auth=on ssl sslflags=DONT_VERIFY_PEER front-end-https=on name=OWA_HOST_443_{$casnr}_pfs\n";
+				$conf .= "cache_peer {$reowaip} parent 80 0 proxy-only no-query originserver login=PASSTHRU connection-auth=on name=OWA_HOST_80_{$casnr}_pfs\n";
+			}
+		}
+		
  	$active_peers=array();
  	if (is_array($reverse_peers))
  	 foreach ($reverse_peers as $rp){
  		if ($rp['enable'] =="on" && $rp['name'] !="" && $rp['ip'] !="" && $rp['port'] !=""){
  			$conf_peer = "#{$rp['description']}\n";
- 			$conf_peer .= "cache_peer {$rp['ip']} parent {$rp['port']} 0 proxy-only no-query no-digest originserver login=PASS round-robin ";
+ 			$conf_peer .= "cache_peer {$rp['ip']} parent {$rp['port']} 0 proxy-only no-query no-digest originserver login=PASSTHRU connection-auth=on round-robin ";
  			if($rp['protocol'] == 'HTTPS')
 	            	$conf_peer .= "ssl sslflags=DONT_VERIFY_PEER front-end-https=auto ";
 			$conf_peer .= "name=rvp_{$rp['name']}\n\n";
@@ -173,10 +179,11 @@ function squid_resync_reverse() {
 					array_push($owa_dirs,'Microsoft-Server-ActiveSync');
 			if($settings['reverse_owa_rpchttp'])	
 					array_push($owa_dirs,'rpc/rpcproxy.dll','rpcwithcert/rpcproxy.dll');
+			if($settings['reverse_owa_mapihttp'])	
+					array_push($owa_dirs,'mapi');
 			if($settings['reverse_owa_webservice']){
 					array_push($owa_dirs,'EWS');
-					//$conf .= "ignore_expect_100 on\n"; Obsolete on 3.3
-					}
+					}	
 			}
 		if (is_array($owa_dirs))
 		  foreach ($owa_dirs as $owa_dir)
@@ -184,9 +191,12 @@ function squid_resync_reverse() {
 			
 		if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) {
 			$reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.');
+			$conf .= "acl OWA_URI_pfs url_regex -i ^http://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n";
+			$conf .= "acl OWA_URI_pfs url_regex -i ^https://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n";
+			$conf .= "acl OWA_URI_pfs url_regex -i ^http://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n";
 			$conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n";
 			}
-		}	
+		}
 	//$conf .= "ssl_unclean_shutdown on";
 	if (is_array($reverse_maps))
 	 foreach ($reverse_maps as $rm){
@@ -212,8 +222,15 @@ function squid_resync_reverse() {
 
 	//ACCESS
   	if ($settings['reverse_owa'] == 'on' && !empty($settings['reverse_owa_ip']) && $settings['reverse_https'] =="on") {
-		$conf .= "cache_peer_access OWA_HOST_pfs allow OWA_URI_pfs\n";
-		$conf .= "cache_peer_access OWA_HOST_pfs deny allsrc\n";
+		
+		for($cascnt=1;$cascnt<$casnr+1;$cascnt++)
+		{
+			$conf .= "cache_peer_access OWA_HOST_443_{$cascnt}_pfs allow OWA_URI_pfs\n";
+			$conf .= "cache_peer_access OWA_HOST_80_{$cascnt}_pfs allow OWA_URI_pfs\n";
+			$conf .= "cache_peer_access OWA_HOST_443_{$cascnt}_pfs deny allsrc\n";
+			$conf .= "cache_peer_access OWA_HOST_80_{$cascnt}_pfs deny allsrc\n";
+		}
+		
 		$conf .= "never_direct allow OWA_URI_pfs\n";
 		$conf .= "http_access allow OWA_URI_pfs\n";        
 		}
diff --git a/config/squid3/33/squid_reverse.xml b/config/squid3/33/squid_reverse.xml
index 7c25c371..b3a4c6cb 100755
--- a/config/squid3/33/squid_reverse.xml
+++ b/config/squid3/33/squid_reverse.xml
@@ -165,7 +165,7 @@
 			<fieldname>reverse_https</fieldname>
 			<description>If this field is checked, the proxy-server will act in HTTPS reverse mode. &lt;br&gt;(You have to add a rule with destination "WAN-address")</description>
 			<type>checkbox</type>
-			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
+			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
 			<required/>
 			<default_value>off</default_value>
 		</field> 
@@ -214,14 +214,14 @@
 			<fieldname>reverse_owa</fieldname>
 			<description>If this field is checked, squid will act as an accelerator/ SSL offloader for Outlook Web App.</description>
 			<type>checkbox</type>
-			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
+			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
 		</field>
 		<field>
-			<fielddescr>OWA frontend IP address</fielddescr>
+			<fielddescr>CAS-Array / OWA frontend IP address</fielddescr>
 			<fieldname>reverse_owa_ip</fieldname>
-			<description>This is the internal IP Address of the OWA frontend server.</description>
+			<description>These are the internal IPs of the CAS-Array (OWA frontend servers). Separate by semi-colons (;). </description>
 			<type>input</type>
-			<size>15</size>
+			<size>70</size>
 		</field>		
 		<field>
 			<fielddescr>Enable ActiveSync</fielddescr>
@@ -236,6 +236,13 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>Enable MAPI HTTP</fielddescr>
+			<fieldname>reverse_owa_mapihttp</fieldname>
+			<description><![CDATA[If this field is checked, MAPI over HTTP will be enabled.<br>
+								<strong>This feature is only available with at least Exchange 2013 SP1</strong>]]></description>
+			<type>checkbox</type>
+		</field>
+		<field>
 			<fielddescr>Enable Exchange WebServices</fielddescr>
 			<fieldname>reverse_owa_webservice</fieldname>
 			<description><![CDATA[If this field is checked, Exchange WebServices will be enabled.<br>
@@ -346,10 +353,10 @@
 
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_reverse($_POST, &amp;$input_errors);
+		squid_validate_reverse($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/33/squid_reverse_general.xml b/config/squid3/33/squid_reverse_general.xml
index 374666d7..47426c8e 100755
--- a/config/squid3/33/squid_reverse_general.xml
+++ b/config/squid3/33/squid_reverse_general.xml
@@ -149,7 +149,7 @@
 			<fieldname>reverse_https</fieldname>
 			<description>If this field is checked, the proxy-server will act in HTTPS reverse mode. &lt;br&gt;(You have to add a rule with destination "WAN-address")</description>
 			<type>checkbox</type>
-			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
+			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
 			<required/>
 			<default_value>off</default_value>
 		</field> 
@@ -200,19 +200,16 @@
 		<field>
 			<fielddescr>Enable OWA reverse proxy</fielddescr>
 			<fieldname>reverse_owa</fieldname>
-			<description><![CDATA[If this field is checked, squid will act as an accelerator/ SSL offloader for Outlook Web App.<br><br>
-			See also:<br>
-			<a target=_new href='http://support.microsoft.com/?scid=kb%3Ben-us%3B327800&x=17&y=16'>How to configure SSL Offloading for Outlook Web Access in Exchange 2000 Server and in Exchange Server 2003</a>
-			]]></description>
+			<description>If this field is checked, squid will act as an accelerator/ SSL offloader for Outlook Web App.</description>
 			<type>checkbox</type>
-			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
+			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
 		</field>
 		<field>
-			<fielddescr>OWA frontend IP address</fielddescr>
+			<fielddescr>CAS-Array / OWA frontend IP address</fielddescr>
 			<fieldname>reverse_owa_ip</fieldname>
-			<description>This is the internal IP Address of the OWA frontend server.</description>
+			<description>These are the internal IPs of the CAS-Array (OWA frontend servers). Separate by semi-colons (;). </description>
 			<type>input</type>
-			<size>15</size>
+			<size>70</size>
 		</field>		
 		<field>
 			<fielddescr>Enable ActiveSync</fielddescr>
@@ -227,6 +224,13 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>Enable MAPI HTTP</fielddescr>
+			<fieldname>reverse_owa_mapihttp</fieldname>
+			<description><![CDATA[If this field is checked, MAPI over HTTP will be enabled.<br>
+								<strong>This feature is only available with at least Exchange 2013 SP1</strong>]]></description>
+			<type>checkbox</type>
+		</field>
+		<field>
 			<fielddescr>Enable Exchange WebServices</fielddescr>
 			<fieldname>reverse_owa_webservice</fieldname>
 			<description><![CDATA[If this field is checked, Exchange WebServices will be enabled.<br>
@@ -241,12 +245,12 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_reverse($_POST, &amp;$input_errors);
+		squid_validate_reverse($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
 	</custom_php_resync_config_command>
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/squid3/33/squid_reverse_peer.xml b/config/squid3/33/squid_reverse_peer.xml
index abfbf19b..b5a340e7 100755
--- a/config/squid3/33/squid_reverse_peer.xml
+++ b/config/squid3/33/squid_reverse_peer.xml
@@ -156,12 +156,12 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_reverse($_POST, &amp;$input_errors);
+		squid_validate_reverse($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
 	</custom_php_resync_config_command>
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/squid3/33/squid_traffic.xml b/config/squid3/33/squid_traffic.xml
index 82e849c1..85822fef 100755
--- a/config/squid3/33/squid_traffic.xml
+++ b/config/squid3/33/squid_traffic.xml
@@ -200,7 +200,7 @@
 		</field>        		
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_traffic($_POST, &amp;$input_errors);
+		squid_validate_traffic($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/33/squid_upstream.xml b/config/squid3/33/squid_upstream.xml
index 407cedd8..f8e467b7 100755
--- a/config/squid3/33/squid_upstream.xml
+++ b/config/squid3/33/squid_upstream.xml
@@ -353,7 +353,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_upstream($_POST, &amp;$input_errors);
+		squid_validate_upstream($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/old/squid.inc b/config/squid3/old/squid.inc
index 784fea8f..ce196700 100644
--- a/config/squid3/old/squid.inc
+++ b/config/squid3/old/squid.inc
@@ -289,7 +289,7 @@ function squid_deinstall_command() {
 	filter_configure();
 }
 
-function squid_before_form_general($pkg) {
+function squid_before_form_general(&$pkg) {
 	$values = get_dir(SQUID_CONFBASE . '/errors/');
 	// Get rid of '..' and '.'
 	array_shift($values);
@@ -310,7 +310,7 @@ function squid_before_form_general($pkg) {
 		$field['options']['option'][] = array('name' => $names[$i], 'value' => $values[$i]);
 }
 
-function squid_validate_general($post, $input_errors) {
+function squid_validate_general($post, &$input_errors) {
 	global $config;
 	$settings = $config['installedpackages']['squid']['config'][0];
 	$port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128);
@@ -367,7 +367,7 @@ function squid_validate_general($post, $input_errors) {
 	 }}
 }
 
-function squid_validate_upstream($post, $input_errors) {
+function squid_validate_upstream($post, &$input_errors) {
 	if ($post['proxy_forwarding'] == 'on') {
 		$addr = trim($post['proxy_addr']);
 		if (empty($addr))
@@ -389,7 +389,7 @@ function squid_validate_upstream($post, $input_errors) {
 	}
 }
 
-function squid_validate_cache($post, $input_errors) {
+function squid_validate_cache($post, &$input_errors) {
 	$num_fields = array(	'harddisk_cache_size' => 'Hard disk cache size',
 				'memory_cache_size' => 'Memory cache size',
 				'maximum_object_size' => 'Maximum object size',
@@ -428,7 +428,7 @@ function squid_validate_cache($post, $input_errors) {
 
 }
 
-function squid_validate_nac($post, $input_errors) {
+function squid_validate_nac($post, &$input_errors) {
 	$allowed_subnets = explode("\n", $post['allowed_subnets']);
 	foreach ($allowed_subnets as $subnet) {
 		$subnet = trim($subnet);
@@ -466,7 +466,7 @@ function squid_validate_nac($post, $input_errors) {
 	 }}
 }
 
-function squid_validate_traffic($post, $input_errors) {
+function squid_validate_traffic($post, &$input_errors) {
 	$num_fields = array(	'max_download_size' => 'Maximum download size',
 				'max_upload_size' => 'Maximum upload size',
 				'perhost_throttling' => 'Per-host bandwidth throttling',
@@ -498,7 +498,7 @@ function squid_validate_traffic($post, $input_errors) {
 
 }
 
-function squid_validate_auth($post, $input_errors) {
+function squid_validate_auth($post, &$input_errors) {
 	$num_fields = array(	array('auth_processes', 'Authentication processes', 1),
 				array('auth_ttl', 'Authentication TTL', 0),
 	);
diff --git a/config/squid3/old/squid.xml b/config/squid3/old/squid.xml
index 5762efb1..83fb9bc0 100644
--- a/config/squid3/old/squid.xml
+++ b/config/squid3/old/squid.xml
@@ -315,13 +315,13 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_add_php_command>
 		squid_resync();
 	</custom_add_php_command>
 	<custom_php_validation_command>
-		squid_validate_general($_POST, &amp;$input_errors);
+		squid_validate_general($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
@@ -339,4 +339,4 @@
 		exec("/bin/rm -f /usr/local/etc/rc.d/squid*");
 	</custom_php_deinstall_command>
 	<filter_rules_needed>squid_generate_rules</filter_rules_needed>
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/squid3/old/squid_auth.xml b/config/squid3/old/squid_auth.xml
index c8e34553..db26756b 100644
--- a/config/squid3/old/squid_auth.xml
+++ b/config/squid3/old/squid_auth.xml
@@ -220,7 +220,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_auth($_POST, &amp;$input_errors);
+		squid_validate_auth($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_after_form_command>
 		squid_print_javascript_auth2();
diff --git a/config/squid3/old/squid_cache.xml b/config/squid3/old/squid_cache.xml
index 881f15b3..a765d911 100644
--- a/config/squid3/old/squid_cache.xml
+++ b/config/squid3/old/squid_cache.xml
@@ -214,7 +214,7 @@
 		}
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_cache($_POST, &amp;$input_errors);
+		squid_validate_cache($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/old/squid_nac.xml b/config/squid3/old/squid_nac.xml
index 193a89c6..0d914dca 100644
--- a/config/squid3/old/squid_nac.xml
+++ b/config/squid3/old/squid_nac.xml
@@ -135,7 +135,7 @@
 		</field>	
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_nac($_POST, &amp;$input_errors);
+		squid_validate_nac($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/old/squid_traffic.xml b/config/squid3/old/squid_traffic.xml
index d560a7ad..f34eec19 100644
--- a/config/squid3/old/squid_traffic.xml
+++ b/config/squid3/old/squid_traffic.xml
@@ -169,7 +169,7 @@
 		</field>        		
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_traffic($_POST, &amp;$input_errors);
+		squid_validate_traffic($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/old/squid_upstream.xml b/config/squid3/old/squid_upstream.xml
index ad494524..b9a14dc8 100644
--- a/config/squid3/old/squid_upstream.xml
+++ b/config/squid3/old/squid_upstream.xml
@@ -125,7 +125,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_upstream($_POST, &amp;$input_errors);
+		squid_validate_upstream($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squidGuard-devel/squidguard.inc b/config/squidGuard-devel/squidguard.inc
index d58dfb79..0be94a6f 100644
--- a/config/squidGuard-devel/squidguard.inc
+++ b/config/squidGuard-devel/squidguard.inc
@@ -101,12 +101,12 @@ sg_init(convert_pfxml_to_sgxml());
 # ==============================================================================
 # Validations
 # ==============================================================================
-function squidguard_validate($post, $input_errors)
+function squidguard_validate($post, &$input_errors)
 {
     $submit = isset($_GET['submit']) ? $_GET['submit'] : $_POST['submit'];
 
     # check config if 'Apply'
-    if ($submit === APPLY_BTN)  sg_check_config_data(&$input_errors);
+    if ($submit === APPLY_BTN)  sg_check_config_data($input_errors);
 }
 
 # ------------------------------------------------------------------------------
@@ -114,13 +114,13 @@ function squidguard_validate($post, $input_errors)
 # ------------------------------------------------------------------------------
 function squidguard_validate_default($post, $input_errors)
 {
-    squidguard_validate_acl($post, &$input_errors);
+    squidguard_validate_acl($post, $input_errors);
 }
 
 # ------------------------------------------------------------------------------
 # validate acl
 # ------------------------------------------------------------------------------
-function squidguard_validate_acl($post, $input_errors)
+function squidguard_validate_acl(&$post, &$input_errors)
 {
     $pass_up = array();
     $deny_up = array();
@@ -134,7 +134,7 @@ function squidguard_validate_acl($post, $input_errors)
     $name = trim($post[F_NAME]);
     if(!empty($name)) {
         # validate name format
-        check_name_format($name, &$input_errors);
+        check_name_format($name, $input_errors);
 
         # check unique name
         if (!sg_check_unique_name(F_ACLS, $name))
@@ -148,7 +148,7 @@ function squidguard_validate_acl($post, $input_errors)
         $sgx = array();
         $sgx[F_NAME] = $post[F_NAME];
         $sgx[F_SOURCE] = $post[F_SOURCE];
-        sg_check_src($sgx, &$input_errors);
+        sg_check_src($sgx, $input_errors);
     }
 
     # store destinations to 'dest' value
@@ -192,7 +192,7 @@ function squidguard_validate_acl($post, $input_errors)
 
     # check redirect
     $errmsg = '';
-    if (!sg_check_redirect($post[F_RMOD], $post[F_REDIRECT], &$errmsg)) {
+    if (!sg_check_redirect($post[F_RMOD], $post[F_REDIRECT], $errmsg)) {
          $input_errors[] = "Redirect info error. $errmsg";
     }
 }
@@ -203,14 +203,14 @@ function squidguard_validate_acl($post, $input_errors)
 #    date:   <date(or range)><time (or range)> -- days not parsed (reset to *)
 #    weekly: <day or *><time or range>         -- dates not parsed (reset to '')
 # ------------------------------------------------------------------------------
-function squidguard_validate_times($post, $input_errors)
+function squidguard_validate_times(&$post, &$input_errors)
 {
     $id = get_item_id();
 
     # check name
     $name = trim($post[F_NAME]);
     if(!empty($name)) {
-        check_name_format($name, &$input_errors);
+        check_name_format($name, $input_errors);
 
         # check unique name
         if (!sg_check_unique_name(F_TIMES, $name))
@@ -246,18 +246,18 @@ function squidguard_validate_times($post, $input_errors)
         $sgx[F_ITEM][] = $sgx_row;
     }
     #
-    sg_check_time($sgx, &$input_errors);
+    sg_check_time($sgx, $input_errors);
 
 }
 
 # ------------------------------------------------------------------------------
 # validate destinations
 # ------------------------------------------------------------------------------
-function squidguard_validate_destination($post, $input_errors) {
+function squidguard_validate_destination($post, &$input_errors) {
     # check name
     $name = trim($post[F_NAME]);
     if(!empty($name)) {
-        check_name_format($name, &$input_errors);
+        check_name_format($name, $input_errors);
 
         # check unique name
         if (!sg_check_unique_name(F_DESTINATIONS, $name))
@@ -277,18 +277,18 @@ function squidguard_validate_destination($post, $input_errors) {
     $sgx[F_RMOD]        = $post[F_RMOD];
     $sgx[F_REDIRECT]    = $post[F_REDIRECT];
     #
-    sg_check_dest($sgx, &$input_errors);
+    sg_check_dest($sgx, $input_errors);
 }
 
 # ------------------------------------------------------------------------------
 # validate rewrites
 # ------------------------------------------------------------------------------
-function squidguard_validate_rewrite($post, $input_errors) {
+function squidguard_validate_rewrite($post, &$input_errors) {
          # check name
          $name = trim($post[F_NAME]);
          if(!empty($name)) {
             # check name format <char><symbols without space> - Ab123
-            check_name_format($name, &$input_errors);
+            check_name_format($name, $input_errors);
 
             # check unique name
             if (!sg_check_unique_name(F_REWRITES, $name))
@@ -447,7 +447,7 @@ function get_sgconf_items_list($data_group, $fieldname) {
 # ==============================================================================
 # squidguard_before_form
 # ------------------------------------------------------------------------------
-function squidguard_before_form($pkg) {
+function squidguard_before_form(&$pkg) {
     $i=0;
 
     foreach($pkg['fields']['field'] as $field) {
@@ -470,7 +470,7 @@ function squidguard_before_form($pkg) {
 # -----------------------------------------------------------------------------
 # squidguard_before_form_acl
 # -----------------------------------------------------------------------------
-function squidguard_before_form_acl($pkg, $is_acl=true) {
+function squidguard_before_form_acl(&$pkg, $is_acl=true) {
     global $g;
     global $squidguard_config;
 
@@ -638,7 +638,7 @@ function squidguard_before_form_acl($pkg, $is_acl=true) {
 # -----------------------------------------------------------------------------
 # squidguard_before_form_dest
 # -----------------------------------------------------------------------------
-function squidguard_before_form_dest($pkg) {
+function squidguard_before_form_dest(&$pkg) {
 	global $g, $squidguard_config;
 	$destination_items = get_sgconf_items_list(F_DESTINATIONS, 'name');
 //var_dump($squidguard_config);
@@ -1301,12 +1301,12 @@ function squidguard_adt_rewrite_safesrch()
     $res[F_NAME] = SAFESEARCH;
     $res[F_DESCRIPTION] = "Google, Yandex safesearch";
     $res[F_LOG]         = 'on';
-    squidguard_adt_safesrch_add(&$res[F_ITEM]);
+    squidguard_adt_safesrch_add($res[F_ITEM]);
 
     return $res;
 }
 
-function squidguard_adt_safesrch_add($rewrite_item)
+function squidguard_adt_safesrch_add(&$rewrite_item)
 {
     if (!is_array($rewrite_item)) $rewrite_item = array();
 
@@ -1331,7 +1331,7 @@ function squidguard_adt_safesrch_add($rewrite_item)
 }
 
 # log dump
-function squidguard_logdump($filename, $lnoffset, $lncount, $reverse)
+function squidguard_logdump($filename, &$lnoffset, $lncount, $reverse)
 {
     define('LOGSHOW_BUFSIZE', '262144');
     $cnt = '';
@@ -1371,10 +1371,10 @@ function squidguard_logdump($filename, $lnoffset, $lncount, $reverse)
 }
 
 # dump SG log
-function squidguard_filterdump($lnoffset, $lncount, $reverse)
+function squidguard_filterdump(&$lnoffset, $lncount, $reverse)
 {
     $res  = array();
-    $cont = squidguard_logdump(SQUIDGUARD_LOGDIR . '/squidGuard.log', &$lnoffset, $lncount, $reverse);
+    $cont = squidguard_logdump(SQUIDGUARD_LOGDIR . '/squidGuard.log', $lnoffset, $lncount, $reverse);
 
     foreach($cont as $cn) {
         $cn = explode(" ", trim($cn), 4);
@@ -1385,10 +1385,10 @@ function squidguard_filterdump($lnoffset, $lncount, $reverse)
 }
 
 # dump SG Gui log
-function squidguard_guidump($lnoffset, $lncount, $reverse)
+function squidguard_guidump(&$lnoffset, $lncount, $reverse)
 {
     $res  = array();
-    $cont = squidguard_logdump(SQUIDGUARD_LOGDIR . SQUIDGUARD_CONFLOGFILE, &$lnoffset, $lncount, $reverse);
+    $cont = squidguard_logdump(SQUIDGUARD_LOGDIR . SQUIDGUARD_CONFLOGFILE, $lnoffset, $lncount, $reverse);
 
     foreach($cont as $cn) {
         $cn = explode(" ", trim($cn), 4);
@@ -1399,10 +1399,10 @@ function squidguard_guidump($lnoffset, $lncount, $reverse)
 }
 
 # dump SG blocked
-function squidguard_blockdump($lnoffset, $lncount, $reverse)
+function squidguard_blockdump(&$lnoffset, $lncount, $reverse)
 {
     $res  = array();
-    $cont = squidguard_logdump(SQUIDGUARD_LOGDIR . '/' . SQUIDGUARD_LOGFILE, &$lnoffset, $lncount, $reverse);
+    $cont = squidguard_logdump(SQUIDGUARD_LOGDIR . '/' . SQUIDGUARD_LOGFILE, $lnoffset, $lncount, $reverse);
 
     foreach($cont as $cn) {
         $cn = explode(" ", trim($cn), 9);
diff --git a/config/squidGuard-devel/squidguard.xml b/config/squidGuard-devel/squidguard.xml
index d5f2b82d..3c91402a 100644
--- a/config/squidGuard-devel/squidguard.xml
+++ b/config/squidGuard-devel/squidguard.xml
@@ -239,10 +239,10 @@
 	</fields>
 	<custom_add_php_command/>
 	<custom_php_validation_command>
-                squidguard_validate(&amp;$_POST, &amp;$input_errors);
+                squidguard_validate($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_command_before_form>
-                squidguard_before_form(&amp;$pkg);
+                squidguard_before_form($pkg);
 	</custom_php_command_before_form>
 	<custom_php_after_form_command>
 		squidGuard_print_javascript();
diff --git a/config/squidGuard-devel/squidguard_acl.xml b/config/squidGuard-devel/squidguard_acl.xml
index cd3e8016..b074a830 100644
--- a/config/squidGuard-devel/squidguard_acl.xml
+++ b/config/squidGuard-devel/squidguard_acl.xml
@@ -224,10 +224,10 @@
 				</field>
 	</fields>
 	<custom_php_validation_command>
-				squidguard_validate_acl(&amp;$_POST, &amp;$input_errors);
+				squidguard_validate_acl($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_command_before_form>
-				squidguard_before_form_acl(&amp;$pkg);
+				squidguard_before_form_acl($pkg);
 	</custom_php_command_before_form>
 	<custom_php_after_form_command>
 				squidGuard_print_javascript();
diff --git a/config/squidGuard-devel/squidguard_configurator.inc b/config/squidGuard-devel/squidguard_configurator.inc
index 3cf7bc61..493606d7 100644
--- a/config/squidGuard-devel/squidguard_configurator.inc
+++ b/config/squidGuard-devel/squidguard_configurator.inc
@@ -846,7 +846,7 @@ function sg_create_config()
     }
 
     # check configuration data
-    if (!sg_check_config_data(&$error_res)) {
+    if (!sg_check_config_data($error_res)) {
         sg_addlog("sg_create_config", "Bad config data. It's all error_res: $error_res", SQUIDGUARD_ERROR);
         sg_addlog("sg_create_config", "Terminated.", SQUIDGUARD_ERROR);
         return sg_create_simple_config('', '', "Error! Check squidGuard configuration data." . " (sg_create_config: [2]).");
@@ -1071,8 +1071,8 @@ function sg_create_config()
 
                 # delete blacklist entries from 'pass' if blacklist disabled
                 if ($squidguard_config[F_BLACKLISTENABLED] !== 'on') {
-                    acl_remove_blacklist_items(&$acl[F_DESTINATIONNAME]);
-                    acl_remove_blacklist_items(&$acl[F_OVERDESTINATIONNAME]);
+                    acl_remove_blacklist_items($acl[F_DESTINATIONNAME]);
+                    acl_remove_blacklist_items($acl[F_OVERDESTINATIONNAME]);
                 }
 
                 # not allowing IP in URL
@@ -1128,7 +1128,7 @@ function sg_create_config()
 
         # delete blacklist entries from 'pass' if blacklist disabled
         if ($squidguard_config[F_BLACKLISTENABLED] !== 'on')
-            acl_remove_blacklist_items(&$def[F_DESTINATIONNAME]);
+            acl_remove_blacklist_items($def[F_DESTINATIONNAME]);
 
         # not allowing IP in URL
         if ($def[F_NOTALLOWINGIP])
@@ -1254,7 +1254,7 @@ function sg_redirector_base_url($rdr_info, $redirect_mode)
 
     # check redirect
     $errmsg = '';
-    if (!sg_check_redirect($redirect_mode, $rdr_info, &$errmsg)) {
+    if (!sg_check_redirect($redirect_mode, $rdr_info, $errmsg)) {
         $redirect_mode = RMOD_INT_ERRORPAGE;
         $rdr_info = "Bad redirect settings. $errmsg Check you configuration.";
         sg_addlog("sg_redirector_base_url", "$errmsg", SQUIDGUARD_ERROR);
@@ -1310,7 +1310,7 @@ function sg_aclpass_reorder($pass)
 # ------------------------------------------------------------
 # sg_check_config_data
 # ------------------------------------------------------------
-function sg_check_config_data ($input_errors)
+function sg_check_config_data (&$input_errors)
 {
     global $squidguard_config;
     $elog = array();
@@ -1327,14 +1327,14 @@ function sg_check_config_data ($input_errors)
             # check name as unique and name format
             $tm_name = $tm[F_NAME];
             $err_s = '';
-            if (!check_name_format($tm_name, &$err_s))
+            if (!check_name_format($tm_name, $err_s))
                 $elog[] = "(T1) TIME '$tm_name' error: >>> $err_s";
 
             if ($key_tm[$tm_name] > 1)
                 $elog[] = "(T2) TIME '$tm_name' error: duplicate time name '$tm_name'";
 
             # check time items format
-            sg_check_time($tm, &$elog);
+            sg_check_time($tm, $elog);
         }
     }
 
@@ -1345,7 +1345,7 @@ function sg_check_config_data ($input_errors)
             # check name as unique and name format
             $src_name = $src[F_NAME];
             $err_s = '';
-            if (!check_name_format($src_name, &$err_s))
+            if (!check_name_format($src_name, $err_s))
                 $elog[] = "(A1) ACL '$src_name'error: $err_s";
 
             if ($key_src[$src_name] > 1)
@@ -1362,13 +1362,13 @@ function sg_check_config_data ($input_errors)
             # check name as unique and name format
             $dst_name = $dst[F_NAME];
             $err_s = '';
-            if (!check_name_format($dst_name, &$err_s))
+            if (!check_name_format($dst_name, $err_s))
                 $elog[] = "(D1) DEST '$dst_name' error: $err_s";
 
             if ($key_dst[$dst_name] > 1)
                 $elog[] = "(D2) DEST '$dst_name' error: duplicate destination name '$dst_name'";
             #
-            sg_check_dest($dst, &$elog);
+            sg_check_dest($dst, $elog);
         }
     }
 
@@ -1396,7 +1396,7 @@ function sg_check_config_data ($input_errors)
             # check check name as unique and name format
             $rw_name = $rw[F_NAME];
             $err_s = '';
-            if (!check_name_format($rw_name, &$err_s))
+            if (!check_name_format($rw_name, $err_s))
                 $elog[] = "(R1) REWRITE '$rw_name' error: $err_s";
 
             if ($key_rw[$rw_name] > 1)
@@ -1674,7 +1674,7 @@ function is_username($username)
 # ------------------------------------------------------------------------------
 # check name
 # ------------------------------------------------------------------------------
-function check_name_format ($name, $input_errors)
+function check_name_format ($name, &$input_errors)
 {
     $elog = array();
     $val = trim($name);
@@ -1698,7 +1698,7 @@ function check_name_format ($name, $input_errors)
 # ******************************************************************************
 # check redirect
 # ------------------------------------------------------------------------------
-function sg_check_redirect($rdr_mode, $rdr_info, $err_msg)
+function sg_check_redirect($rdr_mode, $rdr_info, &$err_msg)
 {
     $res = true;
     switch($rdr_mode) {
@@ -1720,7 +1720,7 @@ function sg_check_redirect($rdr_mode, $rdr_info, $err_msg)
 # ------------------------------------------------------------------------------
 # sg_check_time
 # ------------------------------------------------------------------------------
-function sg_check_time($sgtime, $input_errors)
+function sg_check_time($sgtime, &$input_errors)
 {
     $err = '';
     $days = array("*", "mon", "tue", "wed", "thu", "fri", "sat", "sun");
@@ -1746,14 +1746,14 @@ function sg_check_time($sgtime, $input_errors)
 # ------------------------------------------------------------------------------
 # sg_check_dest
 # ------------------------------------------------------------------------------
-function sg_check_dest($sgx, $input_errors)
+function sg_check_dest($sgx, &$input_errors)
 {
     $elog = array();
     $dm = explode(" ", $sgx[F_DOMAINS]);
 #   $ex = explode(" ", $sgx[F_EXPRESSIONS]);
     $ur = explode(" ", $sgx[F_URLS]);
-    array_packitems(&$dm);
-    array_packitems(&$ur);
+    array_packitems($dm);
+    array_packitems($ur);
 
     # domain or ip
     foreach ($dm as $d_it) {
@@ -1765,7 +1765,7 @@ function sg_check_dest($sgx, $input_errors)
         if ($u_it && !is_dest_url($u_it)) $elog[] = "Item '$u_it' is not a url.";
 
     # check redirect
-    sg_check_redirect($sgx[F_RMOD], $sgx[F_REDIRECT], &$elog);
+    sg_check_redirect($sgx[F_RMOD], $sgx[F_REDIRECT], $elog);
 
     # update log
     if (!empty($elog)) {
@@ -1780,7 +1780,7 @@ function sg_check_dest($sgx, $input_errors)
 # ------------------------------------------------------------------------------
 # sg_check_src
 # ------------------------------------------------------------------------------
-function sg_check_src($sgx, $input_errors)
+function sg_check_src($sgx, &$input_errors)
 {
     $elog = array();
 
@@ -1822,7 +1822,7 @@ function str_packspaces($str)
     while(strpos($str, '  ')) $str = str_replace('  ', ' ', $str);
 }
 
-function array_packitems($arval)
+function array_packitems(&$arval)
 {
     if (is_array($arval)) {
         $arval = array_map("trim", $arval);          # trim all items
@@ -1894,7 +1894,7 @@ function check_time($time)
 # -----------------------------------------------------------------------------
 # acl_remove_blacklist_items
 # -----------------------------------------------------------------------------
-function acl_remove_blacklist_items($items)
+function acl_remove_blacklist_items(&$items)
 {
     # add !items and ^items
     $db_entries = sg_entries_blacklist();
@@ -2206,7 +2206,7 @@ function sg_update_blacklist($from_file)
             $blk_list  = array();
 
             # scan blacklist items
-            scan_blacklist_cat($tmp_unpack_dir, "blk", & $blk_items);
+            scan_blacklist_cat($tmp_unpack_dir, "blk", $blk_items);
 
             # move blacklist catalog structure to 'one level' (from tmp_DB to arch_DB)
             foreach ($blk_items as $key => $val) {
@@ -2415,7 +2415,7 @@ function squidguard_blacklist_restore_arcdb()
 #    ["urls"]        urls file path
 #    ["expressions"] expressions file path
 # ------------------------------------------------------------------------------
-function scan_blacklist_cat($curdir, $key_name, $cat_array)
+function scan_blacklist_cat($curdir, $key_name, &$cat_array)
 {
 
     if (file_exists($curdir) and is_dir($curdir)) {
@@ -2448,7 +2448,7 @@ function scan_blacklist_cat($curdir, $key_name, $cat_array)
                      $fls_key = $key_name . "_" . $fls;
 
                      # recursive call
-                     scan_blacklist_cat($fls_file, $fls_key, & $cat_array);
+                     scan_blacklist_cat($fls_file, $fls_key, $cat_array);
                  }
             }
         }
diff --git a/config/squidGuard-devel/squidguard_default.xml b/config/squidGuard-devel/squidguard_default.xml
index 01380ea5..4a03c2b6 100644
--- a/config/squidGuard-devel/squidguard_default.xml
+++ b/config/squidGuard-devel/squidguard_default.xml
@@ -134,10 +134,10 @@
 			</field>
 	</fields>
 	<custom_php_validation_command>
-				squidguard_validate_acl(&amp;$_POST, &amp;$input_errors);
+				squidguard_validate_acl($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_command_before_form>
-				squidguard_before_form_acl(&amp;$pkg, false);
+				squidguard_before_form_acl($pkg, false);
 	</custom_php_command_before_form>
 	<custom_php_after_form_command>
 				squidGuard_print_javascript();
diff --git a/config/squidGuard-devel/squidguard_dest.xml b/config/squidGuard-devel/squidguard_dest.xml
index 3525098e..5f128a49 100644
--- a/config/squidGuard-devel/squidguard_dest.xml
+++ b/config/squidGuard-devel/squidguard_dest.xml
@@ -172,10 +172,10 @@
 				</field>
 				</fields>
 	<custom_php_command_before_form>
-				squidguard_before_form_dest(&amp;$pkg);
+				squidguard_before_form_dest($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-				squidguard_validate_destination($_POST, &amp;$input_errors);
+				squidguard_validate_destination($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 				squidguard_resync_dest();
diff --git a/config/squidGuard-devel/squidguard_log.php b/config/squidGuard-devel/squidguard_log.php
index 8eba2311..562feb96 100644
--- a/config/squidGuard-devel/squidguard_log.php
+++ b/config/squidGuard-devel/squidguard_log.php
@@ -77,14 +77,14 @@ function squidguard_log_AJAX_response( $request )
               $res = squidguard_prep_textareacont($cont);
               break;
         case 'guilog':
-              $res = squidguard_logrep(squidguard_guidump( &$offset, 50, true));
+              $res = squidguard_logrep(squidguard_guidump( $offset, 50, true));
               break;
         case 'filterlog':
-              $res = squidguard_logrep(squidguard_filterdump( &$offset, 50, true));
+              $res = squidguard_logrep(squidguard_filterdump( $offset, 50, true));
               break;
         case "blocked":
         default:
-              $res = squidguard_logrep(squidguard_blockdump( &$offset, 50, true));
+              $res = squidguard_logrep(squidguard_blockdump( $offset, 50, true));
               break;
     }
 
diff --git a/config/squidGuard-devel/squidguard_rewr.xml b/config/squidGuard-devel/squidguard_rewr.xml
index c21cb1c0..4b55292d 100644
--- a/config/squidGuard-devel/squidguard_rewr.xml
+++ b/config/squidGuard-devel/squidguard_rewr.xml
@@ -136,7 +136,7 @@
 		squidGuard_print_javascript();
 	</custom_php_after_form_command>
 	<custom_php_validation_command>
-		squidguard_validate_rewrite($_POST, &amp;$input_errors);
+		squidguard_validate_rewrite($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 //		squidguard_resync_rewrite();
diff --git a/config/squidGuard-devel/squidguard_time.xml b/config/squidGuard-devel/squidguard_time.xml
index dfd589aa..7f682174 100644
--- a/config/squidGuard-devel/squidguard_time.xml
+++ b/config/squidGuard-devel/squidguard_time.xml
@@ -136,7 +136,7 @@
 		squidGuard_print_javascript();
 	</custom_php_after_form_command>
 	<custom_php_validation_command>
-		squidguard_validate_times(&amp;$_POST, &amp;$input_errors);
+		squidguard_validate_times($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 //		squidguard_resync_time();
diff --git a/config/suricata/suricata.xml b/config/suricata/suricata.xml
index a2acd49e..6aae2d93 100644
--- a/config/suricata/suricata.xml
+++ b/config/suricata/suricata.xml
@@ -51,7 +51,7 @@
 	<description>Suricata IDS/IPS Package</description>
 	<requirements>None</requirements>
 	<name>suricata</name>
-	<version>1.4.6 pkg v1.0.2</version>
+	<version>1.4.6 pkg v1.0.6</version>
 	<title>Services: Suricata IDS</title>
 	<include_file>/usr/local/pkg/suricata/suricata.inc</include_file>
 	<menu>
diff --git a/config/suricata/suricata_rules_flowbits.php b/config/suricata/suricata_rules_flowbits.php
index c5193a8b..8d0fd5d3 100644
--- a/config/suricata/suricata_rules_flowbits.php
+++ b/config/suricata/suricata_rules_flowbits.php
@@ -65,7 +65,7 @@ if (is_null($id)) {
 
 // Set who called us so we can return to the correct page with
 // the RETURN ('cancel') button.
-if ($_POST['referrer'])
+if (isset($_POST['referrer']) && strpos($_POST['referrer'], '://'.$_SERVER['SERVER_NAME'].'/') !== FALSE)
 	$referrer = $_POST['referrer'];
 else
 	$referrer = $_SERVER['HTTP_REFERER'];
diff --git a/config/suricata/suricata_select_alias.php b/config/suricata/suricata_select_alias.php
index 527412d1..c11802c2 100644
--- a/config/suricata/suricata_select_alias.php
+++ b/config/suricata/suricata_select_alias.php
@@ -47,29 +47,31 @@ else
 
 // Retrieve any passed QUERY STRING or POST variables
 if (isset($_POST['type']))
-	$type = $_POST['type'];
+	$type = htmlspecialchars($_POST['type']);
 elseif (isset($_GET['type']))
 	$type = htmlspecialchars($_GET['type']);
 
 if (isset($_POST['varname']))
-	$varname = $_POST['varname'];
+	$varname = htmlspecialchars($_POST['varname']);
 elseif (isset($_GET['varname']))
 	$varname = htmlspecialchars($_GET['varname']);
 
 if (isset($_POST['multi_ip']))
-	$multi_ip = $_POST['multi_ip'];
+	$multi_ip = htmlspecialchars($_POST['multi_ip']);
 elseif (isset($_GET['multi_ip']))
 	$multi_ip = htmlspecialchars($_GET['multi_ip']);
 
-if (isset($_POST['returl']))
+if (isset($_POST['returl']) && substr($_POST['returl'], 0, 1) == '/')
 	$referrer = urldecode($_POST['returl']);
-elseif (isset($_GET['returl']))
+elseif (isset($_GET['returl']) && substr($_GET['returl'], 0, 1) == '/')
 	$referrer = urldecode($_GET['returl']);
+else
+	$referrer = $_SERVER['HTTP_REFERER'];
 
 // Make sure we have a valid VARIABLE name
 // and ALIAS TYPE, or else bail out.
 if (is_null($type) || is_null($varname)) {
-	header("Location: http://{$referrer}?{$querystr}");
+	header("Location: {$referrer}?{$querystr}");
 	exit;
 }
 
@@ -132,8 +134,8 @@ include("head.inc");
 <input type="hidden" name="varname" value="<?=$varname;?>"/>
 <input type="hidden" name="type" value="<?=$type;?>"/>
 <input type="hidden" name="multi_ip" value="<?=$multi_ip;?>"/>
-<input type="hidden" name="returl" value="<?=$referrer;?>"/>
-<input type="hidden" name="org_querystr" value="<?=$querystr;?>"/>
+<input type="hidden" name="returl" value="<?=htmlspecialchars($referrer);?>"/>
+<input type="hidden" name="org_querystr" value="<?=htmlspecialchars($querystr);?>"/>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <div id="boxarea">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index be790f1b..83542812 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -35,11 +35,11 @@
 		<descr><![CDATA[Asterisk is an open source framework for building communications applications.<br />Asterisk turns an ordinary computer into a communications server.]]></descr>
 		<website>http://www.asterisk.org/</website>
 		<category>Services</category>
-		<version>1.8.26.1_1 pkg v0.3.1</version>
+		<version>1.8.28.0 pkg v0.3.1</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/asterisk/asterisk.xml</config_file>
-		<depends_on_package_pbi>asterisk-1.8.26.1_1-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>asterisk-1.8.28.0-##ARCH##.pbi</depends_on_package_pbi>
 		<build_pbi>
 			<port>net/asterisk</port>
 		</build_pbi>
@@ -53,12 +53,12 @@
 		<descr><![CDATA[The most widely used name server software]]></descr>
 		<website>http://www.isc.org/downloads/BIND/</website>
 		<category>Services</category>
-		<version>9.9.5_12 pkg v 0.3.3</version>
+		<version>9.9.5_17 pkg v 0.3.3</version>
 		<status>RC</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
 		<configurationfile>bind.xml</configurationfile>
-		<depends_on_package_pbi>bind-9.9.5_12-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>bind-9.9.5_17-##ARCH##.pbi</depends_on_package_pbi>
 		<build_pbi>
 			<custom_name>bind</custom_name>
 			<port>dns/bind99</port>
@@ -128,7 +128,7 @@
 		<category>Firewall</category>
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,42543.0.html</pkginfolink>
 		<config_file>https://packages.pfsense.org/packages/config/pf-blocker/pfblocker.xml</config_file>
-		<version>1.0.2</version>
+		<version>1.0.3</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<maintainer>tom@tomschaefer.org marcellocoutinho@gmail.com</maintainer>
@@ -187,12 +187,12 @@
 				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5-dev24 pkg v 0.7</version>
+		<version>1.5-dev26 pkg v 0.8</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
-		<depends_on_package_pbi>haproxy-devel-1.5-dev24-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>haproxy-devel-1.5-dev26-##ARCH##.pbi</depends_on_package_pbi>
 		<build_pbi>
 			<ports_before>security/openssl</ports_before>
 			<custom_name>haproxy-devel</custom_name>
@@ -213,7 +213,7 @@
 		<status>ALPHA</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_virtualhost.xml</config_file>
-		<depends_on_package_pbi>proxy_mod_security-2.4.9_2-##ARCH##.pbi git-1.9.2-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>proxy_mod_security-2.4.9_2-##ARCH##.pbi git-1.9.3-##ARCH##.pbi</depends_on_package_pbi>
 		<configurationfile>apache_virtualhost.xml</configurationfile>
 		<build_pbi>
 			<custom_name>proxy_mod_security</custom_name>
@@ -230,7 +230,7 @@
 		<website>http://www.modsecurity.org/</website>
 		<descr>ModSecurity is a web application firewall that can work either embedded or as a reverse proxy. It provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. In addition this package allows URL forwarding which can be convenient for hosting multiple websites behind pfSense using 1 IP address.</descr>
 		<category>Network Management</category>
-		<version>0.1.5</version>
+		<version>0.1.6</version>
 		<status>ALPHA</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/apache_mod_security/apache_mod_security.xml</config_file>
@@ -256,7 +256,7 @@
 			<port>net/avahi</port>
 		</build_pbi>
 		<depends_on_package_pbi>avahi-0.6.31-##ARCH##.pbi</depends_on_package_pbi>
-		<version>0.6.31 pkg v1.02</version>
+		<version>0.6.31 pkg v1.03</version>
 		<status>ALPHA</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/avahi/avahi.xml</config_file>
@@ -268,13 +268,13 @@
 		<website>http://www.ntop.org/</website>
 		<descr>ntop is a network probe that shows network usage in a way similar to what top does for processes. In interactive mode, it displays the network status on the user's terminal. In Web mode it acts as a Web server, creating an HTML dump of the network status. It sports a NetFlow/sFlow emitter/collector, an HTTP-based client interface for creating ntop-centric monitoring applications, and RRD for persistently storing traffic statistics.</descr>
 		<category>Network Management</category>
-		<depends_on_package_pbi>ntop-5.0.1_1-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>ntop-5.0.1_4-##ARCH##.pbi</depends_on_package_pbi>
 		<build_pbi>
 			<ports_before>databases/gdbm net/GeoIP x11-fonts/font-util x11-fonts/webfonts graphics/graphviz</ports_before>
 			<port>net/ntop</port>
 		</build_pbi>
 		<build_options>WITH_PCAP_PORT=true;WITH_XMLDUMP=true;WITHOUT_JUMBO_FRAMES=true;WITH_MAKO=true;WITHOUT_DEJAVU=true;WITH_JSON=true;WITH_MMAP=true;WITHOUT_PERL_MODULE=true;WITHOUT_PYTHON_MODULE=true;WITHOUT_RUBY_MODULE=true;WITHOUT_EXAMPLES=true;WITHOUT_FPECTL=true;WITH_IPV6=true;WITH_NLS=true;WITHOUT_PTH=true;WITH_PYMALLOC=true;WITHOUT_SEM=true;WITH_THREADS=true;WITHOUT_UCS2=true;WITH_UCS4=true;WITH_FONTCONFIG=true;WITH_ICONV=true;WITHOUT_XPM=true;WITHOUT_DAG=true;WITHOUT_DIGCOLA=true;WITHOUT_IPSEPCOLA=true;WITHOUT_PANGOCAIRO=true;WITHOUT_GTK=true;WITHOUT_XCB=true</build_options>
-		<version>5.0.1_1 v2.3</version>
+		<version>5.0.1_4 v2.3</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/ntop2/ntop.xml</config_file>
@@ -371,7 +371,7 @@
 		</build_pbi>
 		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP;snort_SET=TARGETBASED PERFPROFILE SOURCEFIRE FLEXRESP3 GRE IPV6 MPLS NORMALIZER ZLIB;snort_UNSET=PULLEDPORK;perl_SET=THREADS;NOPORTDOCS=true</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file>
-		<version>2.9.6.0 pkg v3.0.9</version>
+		<version>2.9.6.0 pkg v3.0.13</version>
 		<required_version>2.2</required_version>
 		<status>Stable</status>
 		<configurationfile>/snort.xml</configurationfile>
@@ -432,7 +432,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,40622.0.html</pkginfolink>
 		<config_file>https://packages.pfsense.org/packages/config/postfix/postfix.xml</config_file>
 		<depends_on_package_pbi>postfix-2.11.0-##ARCH##.pbi</depends_on_package_pbi>
-		<version>2.10.2 pkg v.2.3.7</version>
+		<version>2.10.2 pkg v.2.3.8</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<configurationfile>postfix.xml</configurationfile>
@@ -453,7 +453,7 @@
 		<config_file>https://packages.pfsense.org/packages/config/dansguardian/dansguardian.xml</config_file>
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,43786.0.html</pkginfolink>
 		<depends_on_package_pbi>dansguardian-2.12.0.3_2-##ARCH##.pbi</depends_on_package_pbi>
-		<version>2.12.0.3_2 pkg v.0.1.9</version>
+		<version>2.12.0.3_2 pkg v.0.1.11</version>
 		<status>beta</status>
 		<required_version>2.2</required_version>
 		<configurationfile>dansguardian.xml</configurationfile>
@@ -462,7 +462,7 @@
 			<ports_before>security/ca_root_nss</ports_before>
 			<port>www/dansguardian-devel</port>
 		</build_pbi>
-		<build_options>dansguardian-devel_UNSET_FORCE=APACHE;dansguardian-devel_SET_FORCE=TRICKLE CLAMD ICAP NTLM SSL</build_options>
+		<build_options>dansguardian_UNSET_FORCE=APACHE;dansguardian_SET_FORCE=TRICKLE CLAMD ICAP NTLM SSL</build_options>
 		<!-- NOTE: Distfile must be fetched manually from http://dansguardian.org/downloads/2/Alpha/dansguardian-2.12.0.0.tar.gz -->
 	</package>
 	<package>
@@ -475,7 +475,7 @@
 		<config_file>https://packages.pfsense.org/packages/config/mailscanner/mailscanner.xml</config_file>
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,43687.0.html</pkginfolink>
 		<depends_on_package_pbi>mailscanner-4.84.6-##ARCH##.pbi</depends_on_package_pbi>
-		<version>4.84.6 pkg v.0.2.5</version>
+		<version>4.84.6 pkg v.0.2.7</version>
 		<status>beta</status>
 		<required_version>2.2</required_version>
 		<configurationfile>mailscanner.xml</configurationfile>
@@ -545,7 +545,7 @@
 		<config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file>
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink>
 		<depends_on_package_pbi>sarg-2.3.6_2-##ARCH##.pbi</depends_on_package_pbi>
-		<version>2.3.6_2 pkg v.0.6.3</version>
+		<version>2.3.6_2 pkg v.0.6.4</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<configurationfile>sarg.xml</configurationfile>
@@ -700,7 +700,7 @@
 		<category>Security</category>
 		<depends_on_package_pbi>nmap-6.46-##ARCH##.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file>
-		<version>nmap-6.46 pkg v1.2.1</version>
+		<version>nmap-6.46 pkg v1.2.2</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
 		<required_version>2.2</required_version>
@@ -732,7 +732,7 @@
 		<descr>Network UPS Tools</descr>
 		<website>http://www.networkupstools.org/</website>
 		<category>Network Management</category>
-		<version>2.6.5_1 pkg 2.0.1</version>
+		<version>2.6.5_1 pkg 2.0.2</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<maintainer>rswagoner@gmail.com</maintainer>
@@ -814,7 +814,7 @@
 					On pfSense docs there is a how-to which could help you on porting users.]]></descr>
 		<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
 		<category>System</category>
-		<version>2.1.12_1/2.2.5 pkg v1.6.7_2</version>
+		<version>2.1.12_1/2.2.5 pkg v1.6.7_3</version>
 		<status>RC1</status>
 		<required_version>2.2</required_version>
 		<maintainer>nachtfalkeaw@web.de</maintainer>
@@ -901,7 +901,7 @@
 		<website>http://www.bitwizard.nl/mtr/</website>
 		<category>Network Management</category>
 		<depends_on_package_pbi>mtr-0.85_1-##ARCH##.pbi</depends_on_package_pbi>
-		<version>0.85_1</version>
+		<version>0.85_1.1</version>
 		<status>Stable</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/mtr-nox11.xml</config_file>
@@ -916,7 +916,7 @@
 		<descr>High performance web proxy cache.</descr>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>2.7.9 pkg v.4.3.4</version>
+		<version>2.7.9 pkg v.4.3.5</version>
 		<status>Stable</status>
 		<required_version>2.2</required_version>
 		<maintainer>fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -939,7 +939,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.1.20 pkg 2.0.7</version>
+		<version>3.1.20 pkg 2.1.1</version>
 		<status>beta</status>
 		<required_version>2.2</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -963,7 +963,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.3.10 pkg 2.2.2</version>
+		<version>3.3.10 pkg 2.2.7</version>
 		<status>beta</status>
 		<required_version>2.2</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -1057,7 +1057,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>gugabsd@mundounix.com.br</maintainer>
 		<category>Network Management</category>
-		<version>1.5_3 beta</version>
+		<version>1.5_1.5 beta</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<depends_on_package_pbi>squidguard-devel-1.5_1-##ARCH##.pbi</depends_on_package_pbi>
@@ -1096,7 +1096,7 @@
 		<depends_on_package_pbi>zip-3.0-##ARCH##.pbi p7zip-9.20.1_2-##ARCH##.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
 		<build_port_path>/usr/ports/archivers/zip</build_port_path>
-		<version>1.2.11</version>
+		<version>1.2.12</version>
 		<status>RELEASE</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>
@@ -1125,7 +1125,7 @@
 		<name>blinkled</name>
 		<descr>Allows you to use LEDs for network activity on supported platforms (ALIX, WRAP, Soekris, etc)</descr>
 		<category>System</category>
-		<version>0.4.1</version>
+		<version>0.4.2</version>
 		<status>Beta</status>
 		<maintainer>jimp@pfsense.org</maintainer>
 		<required_version>2.2</required_version>
@@ -1257,7 +1257,7 @@
 				This allows traffic such as telnet, ftp and X to be protected from snooping as well as potentially gaining performance over low-bandwidth networks from compression.]]>
 		</descr>
 		<category>Services</category>
-		<version>1.2.1</version>
+		<version>1.2.2</version>
 		<status>BETA</status>
 		<website>http://www.winton.org.uk/zebedee/</website>
 		<maintainer>jorgelustosa@gmail.com marcellocoutinho@gmail.com</maintainer>
@@ -1303,7 +1303,7 @@
 		<descr><![CDATA[Bacula is a set of Open Source, computer programs that permit you (or the system administrator) to manage backup, recovery, and verification of computer data across a network of computers of different kinds.]]></descr>
 		<website>http://www.bacula.org/</website>
 		<category>Services</category>
-		<version>5.2.12_3 pkg v 1.0.2</version>
+		<version>5.2.12_3 pkg v 1.0.3</version>
 		<status>Stable</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/bacula-client/bacula-client.xml</config_file>
@@ -1366,19 +1366,19 @@
 		<build_pbi>
 			<port>devel/git</port>
 		</build_pbi>
-		<depends_on_package_pbi>git-1.9.2-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>git-1.9.3-##ARCH##.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<name>tinc</name>
 		<website>http://www.tinc-vpn.org/</website>
 		<descr>tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private mesh network between hosts on the Internet.</descr>
 		<category>Network Management</category>
-		<depends_on_package_pbi>tinc-1.0.23-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>tinc-1.0.24-##ARCH##.pbi</depends_on_package_pbi>
 		<build_pbi>
 			<port>security/tinc</port>
 		</build_pbi>
 		<build_options></build_options>
-		<version>1.0.23 v1.2.1</version>
+		<version>1.0.24 v1.2.1</version>
 		<status>ALPHA</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink>
 		<required_version>2.2</required_version>
@@ -1395,7 +1395,7 @@
 		<website>http://www.balabit.com/network-security/syslog-ng/</website>
 		<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
 		<category>Services</category>
-		<version>3.5.4.1_1 pkg.v.1.0.1</version>
+		<version>3.5.4.1 pkg.v.1.0.2</version>
 		<status>ALPHA</status>
 		<required_version>2.2</required_version>
 		<depends_on_package_pbi>syslog-ng-3.5.4.1-##ARCH##.pbi</depends_on_package_pbi>
@@ -1413,7 +1413,7 @@
 		<descr>Monitoring agent.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
-		<version>zabbix2-agent-2.2.2_1 pkg v0.8.1</version>
+		<version>zabbix2-agent-2.2.3_1 pkg v0.8.1</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1422,14 +1422,14 @@
 			<custom_name>zabbix22-agent</custom_name>
 			<port>net-mgmt/zabbix22-agent</port>
 		</build_pbi>
-		<depends_on_package_pbi>zabbix22-agent-2.2.2_1-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>zabbix22-agent-2.2.3_1-##ARCH##.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<name>Zabbix-2 Proxy</name>
 		<descr>Monitoring agent proxy.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
-		<version>zabbix2-proxy-2.2.2_1 pkg v0.8_1</version>
+		<version>zabbix2-proxy-2.2.3_1 pkg v0.8_1</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<configurationfile>zabbix2-proxy.xml</configurationfile>
@@ -1439,7 +1439,7 @@
 			<port>net-mgmt/zabbix22-proxy</port>
 		</build_pbi>
 		<build_options>OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI</build_options>
-		<depends_on_package_pbi>zabbix22-proxy-2.2.2_1-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>zabbix22-proxy-2.2.3_1-##ARCH##.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<!-- This does not exist yet, this is here to trigger a PBI build -->
@@ -1447,7 +1447,7 @@
 		<pkginfolink>https://forum.pfsense.org/</pkginfolink>
 		<descr><![CDATA[IPMI Tools for local/remote data retrieval and control (Console only, no GUI)]]></descr>
 		<category>Services</category>
-		<version>1.8.12_6</version>
+		<version>1.8.14</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/ipmitool/ipmitool.xml</config_file>
@@ -1457,7 +1457,7 @@
 			<port>sysutils/ipmitool</port>
 		</build_pbi>
 		<build_options>ipmitool_SET_FORCE=FREEIPMI;freeipmi_UNSET_FORCE=DOCS DEBUG IOPERM</build_options>
-		<depends_on_package_pbi>ipmitool-1.8.12_5-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>ipmitool-1.8.14-##ARCH##.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<name>sudo</name>
@@ -1541,7 +1541,7 @@
 		<website>http://suricata-ids.org/</website>
 		<descr><![CDATA[Suricata is the OISF IDP engine, the open source Intrusion Detection and Prevention Engine.]]></descr>
 		<category>Security</category>
-		<version>1.4.6 pkg v1.0.3</version>
+		<version>1.4.6 pkg v1.0.6</version>
 		<status>Stable</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/suricata/suricata.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b685e370..abf9a69b 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -34,14 +34,14 @@
 		<descr><![CDATA[Asterisk is an open source framework for building communications applications.<br />Asterisk turns an ordinary computer into a communications server.]]></descr>
 		<website>http://www.asterisk.org/</website>
 		<category>Services</category>
-		<version>1.8.26.1_1 pkg v0.3.2</version>
+		<version>1.8.26.1 pkg v0.3.3</version>
 		<status>Beta</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/asterisk/asterisk.xml</config_file>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>asterisk18-1.8.25.0.tbz</depends_on_package>
 		<depends_on_package>openldap-client-2.4.38.tbz</depends_on_package>
-		<depends_on_package_pbi>asterisk-1.8.26.1_1-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>asterisk-1.8.26.1-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/net/asterisk</build_port_path>
 		<maintainer>marcellocoutinho@gmail.com robreg@zsurob.hu</maintainer>
 		<configurationfile>asterisk.xml</configurationfile>
@@ -53,13 +53,13 @@
 		<descr><![CDATA[The most widely used name server software]]></descr>
 		<website>http://www.isc.org/downloads/BIND/</website>
 		<category>Services</category>
-		<version>9.9.5_12 pkg v 0.3.3</version>
+		<version>9.9.5_10 pkg v 0.3.4</version>
 		<status>RC</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
 		<configurationfile>bind.xml</configurationfile>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package_pbi>bind-9.9.5_12-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>bind-9.9.5_10-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/dns/bind99</build_port_path>
 		<build_pbi>
 			<custom_name>bind</custom_name>
@@ -192,14 +192,14 @@
 				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5-dev24 pkg v 0.8</version>
+		<version>1.5-dev22 pkg v 0.9</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>haproxy-1.4.22.tbz</depends_on_package>
-		<depends_on_package_pbi>haproxy-devel-1.5-dev24-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>haproxy-devel-1.5-dev22-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/net/haproxy-devel</build_port_path>
 		<build_pbi>
 			<ports_before>security/openssl</ports_before>
@@ -217,7 +217,7 @@
 			In addition this package allows URL forwarding which can be convenient for hosting multiple websites behind pfSense using 1 IP address.<br>
 			<b>Backup your location config before updating from 0.2.x to 0.3 package version.</b>]]></descr>
 		<category>Network Management</category>
-		<version>2.4.9_2 pkg v0.41</version>
+		<version>2.4.9 pkg v0.41</version>
 		<status>ALPHA</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_virtualhost.xml</config_file>
@@ -228,7 +228,7 @@
 		<depends_on_package>ap22-mod_memcache-0.1.0_4.tbz</depends_on_package>
 		<depends_on_package>apache-2.2.22_5.tbz</depends_on_package>
 		<depends_on_package>ap22-mod_security-2.6.5_1.tbz</depends_on_package>
-		<depends_on_package_pbi>proxy_mod_security-2.4.9_2-i386.pbi git-1.9.2-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>proxy_mod_security-2.4.9-i386.pbi git-1.9.0_1-i386.pbi</depends_on_package_pbi>
 		<configurationfile>apache_virtualhost.xml</configurationfile>
 		<build_port_path>/usr/ports/devel/gettext</build_port_path>
 		<build_port_path>/usr/ports/misc/help2man</build_port_path>
@@ -263,7 +263,7 @@
 		<website>http://www.modsecurity.org/</website>
 		<descr>ModSecurity is a web application firewall that can work either embedded or as a reverse proxy. It provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. In addition this package allows URL forwarding which can be convenient for hosting multiple websites behind pfSense using 1 IP address.</descr>
 		<category>Network Management</category>
-		<version>0.1.5</version>
+		<version>0.1.6</version>
 		<status>ALPHA</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/apache_mod_security/apache_mod_security.xml</config_file>
@@ -274,7 +274,7 @@
 		<depends_on_package>ap22-mod_memcache-0.1.0_4.tbz</depends_on_package>
 		<depends_on_package>apache-2.2.22_5.tbz</depends_on_package>
 		<depends_on_package>ap22-mod_security-2.6.5_1.tbz</depends_on_package>
-		<depends_on_package_pbi>proxy_mod_security-2.2.27_2-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>proxy_mod_security-2.2.27-i386.pbi</depends_on_package_pbi>
 		<configurationfile>apache_mod_security.xml</configurationfile>
 		<build_port_path>/usr/ports/devel/gettext</build_port_path>
 		<build_port_path>/usr/ports/misc/help2man</build_port_path>
@@ -339,7 +339,7 @@
 		</build_pbi>
 		<depends_on_package>avahi-app-0.6.29_1.tbz</depends_on_package>
 		<depends_on_package_pbi>avahi-0.6.31-i386.pbi</depends_on_package_pbi>
-		<version>0.6.31 pkg v1.03</version>
+		<version>0.6.31 pkg v1.04</version>
 		<status>ALPHA</status>
 		<required_version>1.2.3</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/avahi/avahi.xml</config_file>
@@ -352,7 +352,7 @@
 		<descr>ntop is a network probe that shows network usage in a way similar to what top does for processes. In interactive mode, it displays the network status on the user's terminal. In Web mode it acts as a Web server, creating an HTML dump of the network status. It sports a NetFlow/sFlow emitter/collector, an HTTP-based client interface for creating ntop-centric monitoring applications, and RRD for persistently storing traffic statistics.</descr>
 		<category>Network Management</category>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package_pbi>ntop-5.0.1_1-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>ntop-5.0.1-i386.pbi</depends_on_package_pbi>
 		<depends_on_package>rrdtool-1.2.30_2.tbz</depends_on_package>
 		<depends_on_package>gdbm-1.9.1.tbz</depends_on_package>
 		<depends_on_package>perl-5.14.2_2.tbz</depends_on_package>
@@ -373,7 +373,7 @@
 			<port>net/ntop</port>
 		</build_pbi>
 		<build_options>WITH_PCAP_PORT=true;WITH_XMLDUMP=true;WITHOUT_JUMBO_FRAMES=true;WITH_MAKO=true;WITHOUT_DEJAVU=true;WITH_JSON=true;WITH_MMAP=true;WITHOUT_PERL_MODULE=true;WITHOUT_PYTHON_MODULE=true;WITHOUT_RUBY_MODULE=true;WITHOUT_EXAMPLES=true;WITHOUT_FPECTL=true;WITH_IPV6=true;WITH_NLS=true;WITHOUT_PTH=true;WITH_PYMALLOC=true;WITHOUT_SEM=true;WITH_THREADS=true;WITHOUT_UCS2=true;WITH_UCS4=true;WITH_FONTCONFIG=true;WITH_ICONV=true;WITHOUT_XPM=true;WITHOUT_DAG=true;WITHOUT_DIGCOLA=true;WITHOUT_IPSEPCOLA=true;WITHOUT_PANGOCAIRO=true;WITHOUT_GTK=true;WITHOUT_XCB=true</build_options>
-		<version>5.0.1_1 v2.4</version>
+		<version>5.0.1 v2.5</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/ntop2/ntop.xml</config_file>
@@ -525,7 +525,7 @@
 		</build_pbi>
 		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET=TARGETBASED PERFPROFILE SOURCEFIRE FLEXRESP3 GRE IPV6 MPLS NORMALIZER ZLIB;snort_UNSET=PULLEDPORK;perl_SET=THREADS;NOPORTDOCS=true</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file>
-		<version>2.9.6.0 pkg v3.0.8</version>
+		<version>2.9.6.0 pkg v3.0.13</version>
 		<required_version>2.0</required_version>
 		<status>Stable</status>
 		<configurationfile>/snort.xml</configurationfile>
@@ -611,13 +611,18 @@
 		<depends_on_package>dansguardian-2.12.0.3.tbz</depends_on_package>
 		<depends_on_package>ca_root_nss-3.14.1.tbz</depends_on_package>
 		<depends_on_package_pbi>dansguardian-2.12.0.3_2-i386.pbi</depends_on_package_pbi>
-		<version>2.12.0.3_2 pkg v.0.1.9</version>
+		<version>2.12.0.3_2 pkg v.0.1.10</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<configurationfile>dansguardian.xml</configurationfile>
 		<build_port_path>/usr/ports/www/dansguardian-devel</build_port_path>
 		<build_port_path>/usr/ports/security/ca_root_nss</build_port_path>
-		<build_options>dansguardian-devel_UNSET_FORCE=APACHE;dansguardian-devel_SET=TRICKLE CLAMD ICAP NTLM SSL</build_options>
+		<build_pbi>
+			<custom_name>dansguardian</custom_name>
+			<ports_before>security/ca_root_nss</ports_before>
+			<port>www/dansguardian-devel</port>
+		</build_pbi>
+		<build_options>dansguardian_UNSET_FORCE=APACHE;dansguardian_SET=TRICKLE CLAMD ICAP NTLM SSL</build_options>
 		<!-- NOTE: Distfile must be fetched manually from http://dansguardian.org/downloads/2/Alpha/dansguardian-2.12.0.0.tar.gz -->
 	</package>
 	<package>
@@ -637,7 +642,7 @@
 		<depends_on_package>p5-IP-Country-2.28.tbz</depends_on_package>
 		<depends_on_package>MailScanner-4.84.5_3.tbz</depends_on_package>
 		<depends_on_package_pbi>mailscanner-4.84.6-i386.pbi</depends_on_package_pbi>
-		<version>4.84.6 pkg v.0.2.5</version>
+		<version>4.84.6 pkg v.0.2.6</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<configurationfile>mailscanner.xml</configurationfile>
@@ -952,9 +957,9 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>lua-5.1.5_4.tbz</depends_on_package>
 		<depends_on_package>nmap-6.25_1.tbz</depends_on_package>
-		<depends_on_package_pbi>nmap-6.46-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>nmap-6.40_2-i386.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file>
-		<version>nmap-6.46 pkg v1.2.1</version>
+		<version>nmap-6.40_2 pkg v1.2.2</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
 		<required_version>2.0</required_version>
@@ -985,7 +990,7 @@
 		<descr>Network UPS Tools</descr>
 		<website>http://www.networkupstools.org/</website>
 		<category>Network Management</category>
-		<version>2.6.5_1 pkg 2.0.1</version>
+		<version>2.6.5_1 pkg 2.0.2</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<maintainer>rswagoner@gmail.com</maintainer>
@@ -1089,13 +1094,13 @@
 					On pfSense docs there is a how-to which could help you on porting users.]]></descr>
 		<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
 		<category>System</category>
-		<version>2.1.12_1/2.2.5 pkg v1.6.7_2</version>
+		<version>2.1.12_1/2.2.4 pkg v1.6.7_3</version>
 		<status>RC1</status>
 		<required_version>2.0</required_version>
 		<maintainer>nachtfalkeaw@web.de</maintainer>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>freeradius-2.1.12_1.tbz</depends_on_package>
-		<depends_on_package_pbi>freeradius-2.2.5-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>freeradius-2.2.4-i386.pbi</depends_on_package_pbi>
 		<depends_on_package>mysql-client-5.1.63.tbz</depends_on_package>
 		<depends_on_package>postgresql-client-8.4.12.tbz</depends_on_package>
 		<depends_on_package>openldap-sasl-client-2.4.23.tbz</depends_on_package>
@@ -1190,7 +1195,7 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>mtr-nox11-0.82.tbz</depends_on_package>
 		<depends_on_package_pbi>mtr-0.85_1-i386.pbi</depends_on_package_pbi>
-		<version>0.85_2</version>
+		<version>0.85_1.1</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/mtr-nox11.xml</config_file>
@@ -1233,7 +1238,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.1.20 pkg 2.0.7</version>
+		<version>3.1.20 pkg 2.1.0</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -1260,7 +1265,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.3.10 pkg 2.2.2</version>
+		<version>3.3.10 pkg 2.2.6</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -1369,7 +1374,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>gugabsd@mundounix.com.br</maintainer>
 		<category>Network Management</category>
-		<version>1.5_3 beta</version>
+		<version>1.5_1.1 beta</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
@@ -1453,7 +1458,7 @@
 		<depends_on_package_pbi>zip-3.0-i386.pbi p7zip-9.20.1-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
 		<build_port_path>/usr/ports/archivers/zip</build_port_path>
-		<version>1.2.11</version>
+		<version>1.2.12</version>
 		<status>RELEASE</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>
@@ -1674,7 +1679,7 @@
 				This allows traffic such as telnet, ftp and X to be protected from snooping as well as potentially gaining performance over low-bandwidth networks from compression.]]>
 		</descr>
 		<category>Services</category>
-		<version>1.2.1</version>
+		<version>1.2.2</version>
 		<status>BETA</status>
 		<website>http://www.winton.org.uk/zebedee/</website>
 		<maintainer>jorgelustosa@gmail.com marcellocoutinho@gmail.com</maintainer>
@@ -1730,7 +1735,7 @@
 		<descr><![CDATA[Bacula is a set of Open Source, computer programs that permit you (or the system administrator) to manage backup, recovery, and verification of computer data across a network of computers of different kinds.]]></descr>
 		<website>http://www.bacula.org/</website>
 		<category>Services</category>
-		<version>5.2.12_4 pkg v 1.0.2</version>
+		<version>5.2.12_3 pkg v 1.0.3</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/bacula-client/bacula-client.xml</config_file>
@@ -1788,7 +1793,7 @@
 		<pkginfolink>https://forum.pfsense.org/</pkginfolink>
 		<descr><![CDATA[GIT Source Code Management (console/shell only)]]></descr>
 		<category>Services</category>
-		<version>1.9.2</version>
+		<version>1.9.0_1.1</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/git/git.xml</config_file>
@@ -1800,7 +1805,7 @@
 			<port>devel/git</port>
 		</build_pbi>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package_pbi>git-1.9.2-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>git-1.9.0_1-i386.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<name>tinc</name>
@@ -1813,7 +1818,7 @@
 			<port>security/tinc</port>
 		</build_pbi>
 		<build_options></build_options>
-		<version>1.0.23 v1.2.1</version>
+		<version>1.0.23 v1.2.2</version>
 		<status>ALPHA</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink>
 		<required_version>2.1</required_version>
@@ -1830,7 +1835,7 @@
 		<website>http://www.balabit.com/network-security/syslog-ng/</website>
 		<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
 		<category>Services</category>
-		<version>3.5.4.1_1 pkg.v.1.0.1</version>
+		<version>3.5.4.1 pkg.v.1.0.2</version>
 		<status>ALPHA</status>
 		<required_version>2.1</required_version>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
@@ -1849,7 +1854,7 @@
 		<descr>Monitoring agent.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
-		<version>zabbix2-agent-2.2.2_1 pkg v0.8.1</version>
+		<version>zabbix2-agent-2.2.2 pkg v0.8.2</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1861,14 +1866,14 @@
 		</build_pbi>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>zabbix22-agent-2.2.2.tbz</depends_on_package>
-		<depends_on_package_pbi>zabbix22-agent-2.2.2_1-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>zabbix22-agent-2.2.2-i386.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<name>Zabbix-2 Proxy</name>
 		<descr>Monitoring agent proxy.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
-		<version>zabbix2-proxy-2.2.2_1 pkg v0.8.1</version>
+		<version>zabbix2-proxy-2.2.2 pkg v0.8.2</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-proxy.xml</configurationfile>
@@ -1881,7 +1886,7 @@
 		<build_options>OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI</build_options>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>zabbix22-proxy-2.2.2.tbz</depends_on_package>
-		<depends_on_package_pbi>zabbix22-proxy-2.2.2_1-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>zabbix22-proxy-2.2.2-i386.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<!-- This does not exist yet, this is here to trigger a PBI build -->
@@ -1889,7 +1894,7 @@
 		<pkginfolink>https://forum.pfsense.org/</pkginfolink>
 		<descr><![CDATA[IPMI Tools for local/remote data retrieval and control (Console only, no GUI)]]></descr>
 		<category>Services</category>
-		<version>1.8.12_6</version>
+		<version>1.8.12_5.1</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/ipmitool/ipmitool.xml</config_file>
@@ -1990,7 +1995,7 @@
 		<website>http://suricata-ids.org/</website>
 		<descr><![CDATA[Suricata is the OISF IDP engine, the open source Intrusion Detection and Prevention Engine.]]></descr>
 		<category>Security</category>
-		<version>1.4.6 pkg v1.0.2</version>
+		<version>1.4.6 pkg v1.0.6</version>
 		<status>Stable</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/suricata/suricata.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 458deebb..657da79a 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -34,14 +34,14 @@
 		<descr><![CDATA[Asterisk is an open source framework for building communications applications.<br />Asterisk turns an ordinary computer into a communications server.]]></descr>
 		<website>http://www.asterisk.org/</website>
 		<category>Services</category>
-		<version>1.8.26.1_1 pkg v0.3.2</version>
+		<version>1.8.26.1 pkg v0.3.3</version>
 		<status>Beta</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/asterisk/asterisk.xml</config_file>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>asterisk18-1.8.25.0.tbz</depends_on_package>
 		<depends_on_package>openldap-client-2.4.38.tbz</depends_on_package>
-		<depends_on_package_pbi>asterisk-1.8.26.1_1-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>asterisk-1.8.26.1-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/net/asterisk</build_port_path>
 		<maintainer>marcellocoutinho@gmail.com robreg@zsurob.hu</maintainer>
 		<configurationfile>asterisk.xml</configurationfile>
@@ -53,13 +53,13 @@
 		<descr><![CDATA[The most widely used name server software]]></descr>
 		<website>http://www.isc.org/downloads/BIND/</website>
 		<category>Services</category>
-		<version>9.9.5_12 pkg v 0.3.3</version>
+		<version>9.9.5_10 pkg v 0.3.4</version>
 		<status>RC</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
 		<configurationfile>bind.xml</configurationfile>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<depends_on_package_pbi>bind-9.9.5_12-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>bind-9.9.5_10-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/dns/bind99</build_port_path>
 		<build_pbi>
 			<custom_name>bind</custom_name>
@@ -179,14 +179,14 @@
 				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5-dev24 pkg v 0.8</version>
+		<version>1.5-dev22 pkg v 0.9</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>haproxy-1.4.22.tbz</depends_on_package>
-		<depends_on_package_pbi>haproxy-devel-1.5-dev24-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>haproxy-devel-1.5-dev22-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/net/haproxy-devel</build_port_path>
 		<build_pbi>
 			<ports_before>security/openssl</ports_before>
@@ -204,7 +204,7 @@
 			In addition this package allows URL forwarding which can be convenient for hosting multiple websites behind pfSense using 1 IP address.<br>
 			<b>Backup your location config before updating from 0.2.x to 0.3 package version.</b>]]></descr>
 		<category>Network Management</category>
-		<version>2.4.9_2 pkg v0.41</version>
+		<version>2.4.9 pkg v0.41</version>
 		<status>ALPHA</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_virtualhost.xml</config_file>
@@ -215,7 +215,7 @@
 		<depends_on_package>ap22-mod_memcache-0.1.0_4.tbz</depends_on_package>
 		<depends_on_package>apache-2.2.22_5.tbz</depends_on_package>
 		<depends_on_package>ap22-mod_security-2.6.5_1.tbz</depends_on_package>
-		<depends_on_package_pbi>proxy_mod_security-2.4.9_2-amd64.pbi git-1.9.2-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>proxy_mod_security-2.4.9-amd64.pbi git-1.9.0_1-amd64.pbi</depends_on_package_pbi>
 		<configurationfile>apache_virtualhost.xml</configurationfile>
 		<build_port_path>/usr/ports/devel/gettext</build_port_path>
 		<build_port_path>/usr/ports/misc/help2man</build_port_path>
@@ -250,7 +250,7 @@
 		<website>http://www.modsecurity.org/</website>
 		<descr>ModSecurity is a web application firewall that can work either embedded or as a reverse proxy. It provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. In addition this package allows URL forwarding which can be convenient for hosting multiple websites behind pfSense using 1 IP address.</descr>
 		<category>Network Management</category>
-		<version>0.1.5</version>
+		<version>0.1.6</version>
 		<status>ALPHA</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/apache_mod_security/apache_mod_security.xml</config_file>
@@ -261,7 +261,7 @@
 		<depends_on_package>ap22-mod_memcache-0.1.0_4.tbz</depends_on_package>
 		<depends_on_package>apache-2.2.22_5.tbz</depends_on_package>
 		<depends_on_package>ap22-mod_security-2.6.5_1.tbz</depends_on_package>
-		<depends_on_package_pbi>proxy_mod_security-2.2.27_2-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>proxy_mod_security-2.2.27-amd64.pbi</depends_on_package_pbi>
 		<configurationfile>apache_mod_security.xml</configurationfile>
 		<build_port_path>/usr/ports/devel/gettext</build_port_path>
 		<build_port_path>/usr/ports/misc/help2man</build_port_path>
@@ -326,7 +326,7 @@
 		</build_pbi>
 		<depends_on_package>avahi-0.6.29.tbz</depends_on_package>
 		<depends_on_package_pbi>avahi-0.6.31-amd64.pbi</depends_on_package_pbi>
-		<version>0.6.31 pkg v1.03</version>
+		<version>0.6.31 pkg v1.04</version>
 		<status>ALPHA</status>
 		<required_version>1.2.3</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/avahi/avahi.xml</config_file>
@@ -339,7 +339,7 @@
 		<descr>ntop is a network probe that shows network usage in a way similar to what top does for processes. In interactive mode, it displays the network status on the user's terminal. In Web mode it acts as a Web server, creating an HTML dump of the network status. It sports a NetFlow/sFlow emitter/collector, an HTTP-based client interface for creating ntop-centric monitoring applications, and RRD for persistently storing traffic statistics.</descr>
 		<category>Network Management</category>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<depends_on_package_pbi>ntop-5.0.1_1-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>ntop-5.0.1-amd64.pbi</depends_on_package_pbi>
 		<depends_on_package>rrdtool-1.2.30_2.tbz</depends_on_package>
 		<depends_on_package>gdbm-1.9.1.tbz</depends_on_package>
 		<depends_on_package>perl-5.14.2_2.tbz</depends_on_package>
@@ -360,7 +360,7 @@
 			<port>net/ntop</port>
 		</build_pbi>
 		<build_options>WITH_PCAP_PORT=true;WITH_XMLDUMP=true;WITHOUT_JUMBO_FRAMES=true;WITH_MAKO=true;WITHOUT_DEJAVU=true;WITH_JSON=true;WITH_MMAP=true;WITHOUT_PERL_MODULE=true;WITHOUT_PYTHON_MODULE=true;WITHOUT_RUBY_MODULE=true;WITHOUT_EXAMPLES=true;WITHOUT_FPECTL=true;WITH_IPV6=true;WITH_NLS=true;WITHOUT_PTH=true;WITH_PYMALLOC=true;WITHOUT_SEM=true;WITH_THREADS=true;WITHOUT_UCS2=true;WITH_UCS4=true;WITH_FONTCONFIG=true;WITH_ICONV=true;WITHOUT_XPM=true;WITHOUT_DAG=true;WITHOUT_DIGCOLA=true;WITHOUT_IPSEPCOLA=true;WITHOUT_PANGOCAIRO=true;WITHOUT_GTK=true;WITHOUT_XCB=true</build_options>
-		<version>5.0.1_1 v2.4</version>
+		<version>5.0.1 v2.5</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/ntop2/ntop.xml</config_file>
@@ -512,7 +512,7 @@
 		</build_pbi>
 		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP;snort_SET=TARGETBASED PERFPROFILE SOURCEFIRE FLEXRESP3 GRE IPV6 MPLS NORMALIZER ZLIB;snort_UNSET=PULLEDPORK;perl_SET=THREADS;NOPORTDOCS=true</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file>
-		<version>2.9.6.0 pkg v3.0.8</version>
+		<version>2.9.6.0 pkg v3.0.13</version>
 		<required_version>2.0</required_version>
 		<status>Stable</status>
 		<configurationfile>/snort.xml</configurationfile>
@@ -598,13 +598,18 @@
 		<depends_on_package>dansguardian-2.12.0.3.tbz</depends_on_package>
 		<depends_on_package>ca_root_nss-3.14.1.tbz</depends_on_package>
 		<depends_on_package_pbi>dansguardian-2.12.0.3_2-amd64.pbi</depends_on_package_pbi>
-		<version>2.12.0.3_2 pkg v.0.1.9</version>
+		<version>2.12.0.3_2 pkg v.0.1.10</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<configurationfile>dansguardian.xml</configurationfile>
 		<build_port_path>/usr/ports/www/dansguardian-devel</build_port_path>
 		<build_port_path>/usr/ports/security/ca_root_nss</build_port_path>
-		<build_options>dansguardian-devel_UNSET_FORCE=APACHE;dansguardian-devel_SET=TRICKLE CLAMD ICAP NTLM SSL</build_options>
+		<build_pbi>
+			<custom_name>dansguardian</custom_name>
+			<ports_before>security/ca_root_nss</ports_before>
+			<port>www/dansguardian-devel</port>
+		</build_pbi>
+		<build_options>dansguardian_UNSET_FORCE=APACHE;dansguardian_SET=TRICKLE CLAMD ICAP NTLM SSL</build_options>
 		<!-- NOTE: Distfile must be fetched manually from http://dansguardian.org/downloads/2/Alpha/dansguardian-2.12.0.0.tar.gz -->
 	</package>
 	<package>
@@ -624,7 +629,7 @@
 		<depends_on_package>p5-IP-Country-2.28.tbz</depends_on_package>
 		<depends_on_package>MailScanner-4.84.5_3.tbz</depends_on_package>
 		<depends_on_package_pbi>mailscanner-4.84.6-amd64.pbi</depends_on_package_pbi>
-		<version>4.84.6 pkg v.0.2.5</version>
+		<version>4.84.6 pkg v.0.2.6</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<configurationfile>mailscanner.xml</configurationfile>
@@ -939,9 +944,9 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>lua-5.1.5_4.tbz</depends_on_package>
 		<depends_on_package>nmap-6.25_1.tbz</depends_on_package>
-		<depends_on_package_pbi>nmap-6.46-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>nmap-6.40_2-amd64.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file>
-		<version>nmap-6.46 pkg v1.2.1</version>
+		<version>nmap-6.40_2 pkg v1.2.2</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
 		<required_version>2.0</required_version>
@@ -972,7 +977,7 @@
 		<descr>Network UPS Tools</descr>
 		<website>http://www.networkupstools.org/</website>
 		<category>Network Management</category>
-		<version>2.6.5_1 pkg 2.0.1</version>
+		<version>2.6.5_1 pkg 2.0.2</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<maintainer>rswagoner@gmail.com</maintainer>
@@ -1076,13 +1081,13 @@
 					On pfSense docs there is a how-to which could help you on porting users.]]></descr>
 		<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
 		<category>System</category>
-		<version>2.1.12_1/2.2.5 pkg v1.6.7_2</version>
+		<version>2.1.12_1/2.2.4 pkg v1.6.7_3</version>
 		<status>RC1</status>
 		<required_version>2.0</required_version>
 		<maintainer>nachtfalkeaw@web.de</maintainer>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>freeradius-2.1.12_1.tbz</depends_on_package>
-		<depends_on_package_pbi>freeradius-2.2.5-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>freeradius-2.2.4-amd64.pbi</depends_on_package_pbi>
 		<depends_on_package>mysql-client-5.1.63.tbz</depends_on_package>
 		<depends_on_package>postgresql-client-9.0.8.tbz</depends_on_package>
 		<depends_on_package>openldap-sasl-client-2.4.31_1.tbz</depends_on_package>
@@ -1177,7 +1182,7 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>mtr-nox11-0.82.tbz</depends_on_package>
 		<depends_on_package_pbi>mtr-0.85_1-amd64.pbi</depends_on_package_pbi>
-		<version>0.85_2</version>
+		<version>0.85_1.1</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/mtr-nox11.xml</config_file>
@@ -1220,7 +1225,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.1.20 pkg 2.0.7</version>
+		<version>3.1.20 pkg 2.1.0</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -1247,7 +1252,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.3.10 pkg 2.2.2</version>
+		<version>3.3.10 pkg 2.2.6</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
@@ -1356,7 +1361,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>gugabsd@mundounix.com.br</maintainer>
 		<category>Network Management</category>
-		<version>1.5_3 beta</version>
+		<version>1.5_1.1 beta</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
@@ -1440,7 +1445,7 @@
 		<depends_on_package_pbi>zip-3.0-amd64.pbi p7zip-9.20.1-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
 		<build_port_path>/usr/ports/archivers/zip</build_port_path>
-		<version>1.2.11</version>
+		<version>1.2.12</version>
 		<status>RELEASE</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>
@@ -1661,7 +1666,7 @@
 				This allows traffic such as telnet, ftp and X to be protected from snooping as well as potentially gaining performance over low-bandwidth networks from compression.]]>
 		</descr>
 		<category>Services</category>
-		<version>1.2.1</version>
+		<version>1.2.2</version>
 		<status>BETA</status>
 		<website>http://www.winton.org.uk/zebedee/</website>
 		<maintainer>jorgelustosa@gmail.com marcellocoutinho@gmail.com</maintainer>
@@ -1717,7 +1722,7 @@
 		<descr><![CDATA[Bacula is a set of Open Source, computer programs that permit you (or the system administrator) to manage backup, recovery, and verification of computer data across a network of computers of different kinds.]]></descr>
 		<website>http://www.bacula.org/</website>
 		<category>Services</category>
-		<version>5.2.12_4 pkg v 1.0.2</version>
+		<version>5.2.12_3 pkg v 1.0.3</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/bacula-client/bacula-client.xml</config_file>
@@ -1775,7 +1780,7 @@
 		<pkginfolink>https://forum.pfsense.org/</pkginfolink>
 		<descr><![CDATA[GIT Source Code Management (console/shell only)]]></descr>
 		<category>Services</category>
-		<version>1.9.2</version>
+		<version>1.9.0_1.1</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/git/git.xml</config_file>
@@ -1787,7 +1792,7 @@
 			<port>devel/git</port>
 		</build_pbi>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<depends_on_package_pbi>git-1.9.2-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>git-1.9.0_1-amd64.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<name>tinc</name>
@@ -1800,7 +1805,7 @@
 			<port>security/tinc</port>
 		</build_pbi>
 		<build_options></build_options>
-		<version>1.0.23 v1.2.1</version>
+		<version>1.0.23 v1.2.2</version>
 		<status>ALPHA</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink>
 		<required_version>2.1</required_version>
@@ -1817,7 +1822,7 @@
 		<website>http://www.balabit.com/network-security/syslog-ng/</website>
 		<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
 		<category>Services</category>
-		<version>3.5.4.1_1 pkg.v.1.0.1</version>
+		<version>3.5.4.1 pkg.v.1.0.2</version>
 		<status>ALPHA</status>
 		<required_version>2.1</required_version>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
@@ -1836,7 +1841,7 @@
 		<descr>Monitoring agent.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
-		<version>zabbix2-agent-2.2.2_1 pkg v0.8.1</version>
+		<version>zabbix2-agent-2.2.2 pkg v0.8.2</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1848,14 +1853,14 @@
 		</build_pbi>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>zabbix22-agent-2.2.2.tbz</depends_on_package>
-		<depends_on_package_pbi>zabbix22-agent-2.2.2_1-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>zabbix22-agent-2.2.2-amd64.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<name>Zabbix-2 Proxy</name>
 		<descr>Monitoring agent proxy.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
-		<version>zabbix2-proxy-2.2.2_1 pkg v0.8.1</version>
+		<version>zabbix2-proxy-2.2.2 pkg v0.8.2</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-proxy.xml</configurationfile>
@@ -1868,7 +1873,7 @@
 		<build_options>OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI</build_options>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>zabbix22-proxy-2.2.2.tbz</depends_on_package>
-		<depends_on_package_pbi>zabbix22-proxy-2.2.2_1-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>zabbix22-proxy-2.2.2-amd64.pbi</depends_on_package_pbi>
 	</package>
 	<package>
 		<!-- This does not exist yet, this is here to trigger a PBI build -->
@@ -1876,7 +1881,7 @@
 		<pkginfolink>https://forum.pfsense.org/</pkginfolink>
 		<descr><![CDATA[IPMI Tools for local/remote data retrieval and control (Console only, no GUI)]]></descr>
 		<category>Services</category>
-		<version>1.8.12_6</version>
+		<version>1.8.12_5.1</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/ipmitool/ipmitool.xml</config_file>
@@ -1977,7 +1982,7 @@
 		<website>http://suricata-ids.org/</website>
 		<descr><![CDATA[Suricata is the OISF IDP engine, the open source Intrusion Detection and Prevention Engine.]]></descr>
 		<category>Security</category>
-		<version>1.4.6 pkg v1.0.2</version>
+		<version>1.4.6 pkg v1.0.6</version>
 		<status>Stable</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/suricata/suricata.xml</config_file>
author	Stephane Lapie <stephane.lapie@asahinet.com>	2014-06-23 23:41:59 +0900
committer	Stephane Lapie <stephane.lapie@asahinet.com>	2014-06-23 23:41:59 +0900
commit	ec079fc18a1289be2676fa57c15829b20cb4a912 (patch)
tree	658ebfeb07d9ead4fb5c8d86d723a94819d02511
parent	ab69db91000fd3d83bf86811ede117062f57f438 (diff)
parent	5b4c84c4ecc9a6eded4ce3443a665eae2c8a43f9 (diff)
download	pfsense-packages-ec079fc18a1289be2676fa57c15829b20cb4a912.tar.gz pfsense-packages-ec079fc18a1289be2676fa57c15829b20cb4a912.tar.bz2 pfsense-packages-ec079fc18a1289be2676fa57c15829b20cb4a912.zip