Merge remote-tracking branch 'upstream/master'

11 files changed, 423 insertions, 33 deletions

diff --git a/config/open-vm-tools/open-vm-tools.inc b/config/open-vm-tools/open-vm-tools.inc
index f963d9b7..5db7de3f 100644
--- a/config/open-vm-tools/open-vm-tools.inc
+++ b/config/open-vm-tools/open-vm-tools.inc
@@ -11,6 +11,7 @@ function open_vm_tools_install() {
 	$load_conf = file_get_contents("/boot/loader.conf") . "\n";
 	if(!strstr($load_conf, "vmxnet")) {
 		$load_conf .= <<<EOFA
+
 vmblock_load="YES"
 vmmemct_load="YES"
 vmhgfs_load="YES"
diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc
index 679eec62..742eaee9 100644
--- a/config/open-vm-tools_2/open-vm-tools.inc
+++ b/config/open-vm-tools_2/open-vm-tools.inc
@@ -11,6 +11,7 @@ function open_vm_tools_install() {
 	$load_conf = file_get_contents("/boot/loader.conf");
 	if(!strstr($load_conf, "vmxnet")) {
 		$load_conf .= <<<EOFA
+
 vmblock_load="YES"
 vmmemct_load="YES"
 vmhgfs_load="YES"
@@ -168,4 +169,4 @@ EOF;
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index f27bb383..2973a409 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -473,7 +473,7 @@ function post_delete_logs()
 			//create_barnyard2_conf($id, $if_real, $snort_uuid);
 
 			if ($value['perform_stat'] == 'on')
-				file_put_contents("/var/log/snort/snort_{$snort_uuid}_{$if_real}.stats", "");
+				@file_put_contents("/var/log/snort/snort_{$snort_uuid}_{$if_real}.stats", "");
 		}
 	}
 }
diff --git a/config/snort/snort_alerts.php b/config/snort/snort_alerts.php
index 7bd47934..49bb9bff 100644
--- a/config/snort/snort_alerts.php
+++ b/config/snort/snort_alerts.php
@@ -85,7 +85,7 @@ if ($_POST['save'])
 
 }
 
-if ($_POST['delete'])
+if ($_GET['clear'])
 {
 	if(file_exists('/var/log/snort/alert'))
 	{
@@ -96,10 +96,9 @@ if ($_POST['delete'])
 		mwexec('/bin/chmod 660 /var/log/snort/*', true);
 		mwexec('/usr/bin/killall -HUP snort', true);
 		conf_mount_ro();
-
-		header("Location: /snort/snort_alerts.php");
-		exit;
 	}
+	header("Location: /snort/snort_alerts.php");
+	exit;
 }
 
 if ($_POST['download'])
@@ -304,9 +303,9 @@ if ($pconfig['arefresh'] == 'on')
 				<td width="78%" class="vtable">
 				<form action="/snort/snort_alerts.php" method="post"><input
 					name="download" type="submit" class="formbtn" value="Download"> All
-				log files will be saved. <input name="delete" type="submit"
+				log files will be saved. <a href="/snort/snort_alerts.php?action=clear"><input name="delete" type="button"
 					class="formbtn" value="Clear"
-					onclick="return confirm('Do you really want to remove all your logs ? All snort rule interfces may have to be restarted.')">
+					onclick="return confirm('Do you really want to remove all your logs ? All snort rule interfces may have to be restarted.')"></a>
 				<span class="red"><strong>Warning:</strong></span> all log files
 				will be deleted.</form>
 				</td>
@@ -561,21 +560,11 @@ if ($pconfig['arefresh'] == 'on')
 
 </div>
 
-		<?php
-
-		include("fend.inc");
-
-		echo $snort_custom_rnd_box;
-
-		?>
-
+<?php
+include("fend.inc");
 
-<script type="text/javascript">
-			var myTable = {};
-			window.addEvent('domready', function(){
-				myTable = new sortableTable('myTable', {overCls: 'over'});
-			});
-		</script>
+echo $snort_custom_rnd_box;
 
+?>
 </body>
 </html>
diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc
index 001f05d7..afb3c0b7 100644
--- a/config/unbound/unbound.inc
+++ b/config/unbound/unbound.inc
@@ -200,7 +200,7 @@ function unbound_control($action) {
 						unbound_ctl_exec("start");
 						/* Link dnsmasq.pid to prevent dhcpleases logging error */
 						if (!file_exists("/var/run/dnsmasq.pid"))
-							mwexec("/bin/ln -s /var/run/dnsmasq.pid /var/run/unbound.pid");
+							mwexec("/bin/ln -s /var/run/unbound.pid /var/run/dnsmasq.pid");
 					fetch_root_hints();
 				}
 				break;
@@ -311,6 +311,8 @@ function unbound_acls_config() {
 		foreach($unbound_acls as $unbound_acl){
 			$unboundcfg .= "#{$unbound_acl['aclname']}\n";
 			foreach($unbound_acl['row'] as $network) {
+				if ($unbound_acl['aclaction'] == "allow snoop")
+					$unbound_acl['aclaction'] = "allow_snoop";
 				$unboundcfg .= "access-control: {$network['acl_network']}/{$network['mask']} {$unbound_acl['aclaction']}\n";
 			}			
 		}
@@ -526,7 +528,7 @@ function unbound_ctl_exec($cmd) {
 function unbound_optimization() {
 	global $config;
 
-	$unbound_config = $config['installedpackages']['unbound']['config'][0];	
+	$unbound_config = $config['installedpackages']['unboundadvanced']['config'][0];
 	$optimization_settings = array();
 	
 	// Set the number of threads equal to number of CPUs.
@@ -861,4 +863,24 @@ function unbound_add_domain_overrides($pvt=false) {
 	}	
 }
 
+function unbound_acl_id_used($id) {
+	global $config;
+
+	if (is_array($config['installedpackages']['unboundacls']['config']))
+		foreach ($config['installedpackages']['unboundacls']['config'] as & $acls)
+			if ($id == $acls['aclid'])
+				return true;
+
+	return false;
+}
+
+function unbound_get_next_id() {
+
+	$aclid = 0;
+	while(unbound_acl_id_used($aclid))
+		$aclid++;
+
+	return $aclid;
+}
+
 ?>
\ No newline at end of file
diff --git a/config/unbound/unbound.xml b/config/unbound/unbound.xml
index ff73d1ed..5e6361d5 100644
--- a/config/unbound/unbound.xml
+++ b/config/unbound/unbound.xml
@@ -66,9 +66,9 @@
 		<item>http://www.pfsense.org/packages/config/unbound/unbound_status.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/www/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.org/packages/config/unbound/unbound_acls.xml</item>
+		<item>http://www.pfsense.org/packages/config/unbound/unbound_acls.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
@@ -89,7 +89,7 @@
 		</tab>
 		<tab>
 			<text>Unbound DNS ACLs</text>
-			<url>/pkg.php?xml=unbound_acls.xml</url>
+			<url>/unbound_acls.php</url>
 		</tab>
 		<tab>
 			<text>Unbound DNS Status</text>
diff --git a/config/unbound/unbound_acls.php b/config/unbound/unbound_acls.php
new file mode 100644
index 00000000..40f21595
--- /dev/null
+++ b/config/unbound/unbound_acls.php
@@ -0,0 +1,371 @@
+<?php
+/* $Id$ */
+/*
+	unbound_acls.php
+	part of pfSense (http://www.pfsense.com/)
+
+	Copyright (C) 2011 Warren Baker <warren@decoy.co.za>
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+require("unbound.inc");
+
+if(!is_process_running("unbound")) {
+	Header("Location: /pkg_edit.php?xml=unbound.xml&id=0");
+	exit;
+}
+
+if (!is_array($config['installedpackages']['unboundacls']['config']))
+	$config['installedpackages']['unboundacls']['config'] = array();
+
+$a_acls = &$config['installedpackages']['unboundacls']['config'];
+
+$id = $_GET['id'];
+if (isset($_POST['aclid']))
+	$id = $_POST['aclid'];
+
+$act = $_GET['act'];
+if (isset($_POST['act']))
+	$act = $_POST['act'];
+
+if ($act == "del") {
+	if (!$a_acls[$id]) {
+		pfSenseHeader("unbound_acls.php");
+		exit;
+	}
+
+	unset($a_acls[$id]);
+	write_config();
+	unbound_reconfigure();
+	$savemsg = gettext("Access List successfully deleted")."<br/>";
+}
+
+if ($act == "new") {
+	$id = unbound_get_next_id();
+}
+
+if ($act == "edit") {
+	if (isset($id) && $a_acls[$id]) {
+		$pconfig = $a_acls[$id];
+		$networkacl = $a_acls[$id]['row'];
+	}
+}
+
+if ($_POST) {
+
+	unset($input_errors);
+	$pconfig = $_POST;
+
+	/* input validation - only allow 50 entries in a single ACL*/
+	for($x=0; $x<50; $x++) {
+		if(isset($pconfig["acl_network{$x}"])) {
+			$networkacl[$x] = array();
+			$networkacl[$x]['acl_network'] = $pconfig["acl_network{$x}"];
+			$networkacl[$x]['mask'] = $pconfig["mask{$x}"];
+			$networkacl[$x]['description'] = $pconfig["description{$x}"];
+			if (!is_ipaddr($networkacl[$x]['acl_network']))
+				$input_errors[] = gettext("You must enter a valid network IP address for {$networkacl[$x]['acl_network']}.");
+
+			if (is_ipaddrv4($networkacl[$x]['acl_network'])) {
+				if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask']))
+					$input_errors[] = gettext("You must enter a valid IPv4 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}.");
+			} else if (function_exists("is_ipaddrv6")) {
+				if (!is_ipaddrv6($networkacl[$x]['acl_network']))
+					$input_errors[] = gettext("You must enter a valid IPv6 address for {$networkacl[$x]['acl_network']}.");
+				else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask']))
+					$input_errors[] = gettext("You must enter a valid IPv6 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}.");
+			} else
+				$input_errors[] = gettext("You must enter a valid IPv4 address for {$networkacl[$x]['acl_network']}.");
+		}
+	}
+	
+	if (!$input_errors) {
+
+		if(!$a_acls[$id])
+			$a_acls[$id]['aclid'] = $id;
+
+		if (isset($id) && $a_acls[$id]) {
+			$a_acls[$id]['aclid'] = $pconfig['aclid'];
+			$a_acls[$id]['aclname'] = $pconfig['aclname'];
+			$a_acls[$id]['aclaction'] = $pconfig['aclaction'];
+			$a_acls[$id]['description'] = $pconfig['description'];
+			$a_acls[$id]['row'] = array();
+			foreach ($networkacl as $acl)
+				$a_acls[$id]['row'][] = $acl;
+			write_config();
+			unbound_reconfigure();
+		}
+		header("Location: unbound_acls.php");
+		exit;
+	}
+}
+
+
+$pgtitle = "Services: Unbound DNS Forwarder: Access Lists";
+include("head.inc");
+
+?>
+
+<script type="text/javascript" src="/javascript/row_helper.js">
+</script>
+
+<script type="text/javascript">
+	function mask_field(fieldname, fieldsize, n) {
+		return '<select name="' + fieldname + n + '" class="formselect" id="' + fieldname + n + '"><?php
+			for ($i = 128; $i >= 0; $i--) {
+					echo "<option value=\"$i\">$i</option>";
+			}
+		?></select>';
+	}
+
+	rowtype[0] = "textbox";
+	rowname[0] = "acl_network";
+	rowsize[0] = "30";
+	rowname[1] = "mask";
+	rowtype[1] = mask_field;
+	rowtype[2] = "textbox";
+	rowname[2] = "description";
+	rowsize[2] = "40";
+</script>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+
+<?php include("fbegin.inc"); ?>
+<?php
+if (!$savemsg)
+	$savemsg = "";
+
+if ($input_errors)
+	print_input_errors($input_errors);
+
+if ($savemsg)
+	print_info_box($savemsg);
+?>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+ 	<tr>
+		<td class="tabnavtbl">
+			<ul id="tabnav">
+			<?php
+				$tab_array = array();
+				$tab_array[] = array(gettext("Unbound DNS Settings"), false, "/pkg_edit.php?xml=unbound.xml&amp;id=0");
+				$tab_array[] = array(gettext("Unbound DNS Advanced Settings"), false, "/pkg_edit.php?xml=unbound_advanced.xml&amp;id=0");
+				$tab_array[] = array(gettext("Unbound DNS ACLs"), true, "/unbound_acls.php");
+				$tab_array[] = array(gettext("Unbound DNS Status"), false, "/unbound_status.php");
+				display_top_tabs($tab_array, true);
+			?>
+			</ul>
+		</td>
+	</tr>    
+	<tr>
+		<td class="tabcont">
+
+			<?php if($act=="new" || $act=="edit"): ?>
+
+			<form action="unbound_acls.php" method="post" name="iform" id="iform">
+			<input name="aclid" type="hidden" value="<?=$id;?>">
+			<input name="act" type="hidden" value="<?=$act;?>">
+
+				<table width="100%" border="0" cellpadding="6" cellspacing="0">
+					<tr>
+						<td colspan="2" valign="top" class="listtopic"><?=sprintf(gettext("%s ACL"),$act);?></td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq"><?=gettext("ACL name");?></td>
+						<td width="78%" class="vtable">
+							<input name="aclname" type="text" class="formfld" id="aclname" size="30" maxlength="30" value="<?=htmlspecialchars($pconfig['aclname']);?>">
+							<br />
+							<span class="vexpl"><?=gettext("Provide an ACL name.");?></span>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq"><?=gettext("Action");?></td>
+						<td width="78%" class="vtable">
+							<select name="aclaction" class="formselect">
+								<?php $types = explode(",", "Allow,Deny,Refuse,Allow Snoop"); foreach ($types as $type): ?>
+								<option value="<?=strtolower($type);?>" <?php if (strtolower($type) == strtolower($pconfig['aclaction'])) echo "selected"; ?>>
+								<?=htmlspecialchars($type);?>
+								</option>
+								<?php endforeach; ?>
+							</select>
+							<br/>
+							<span class="vexpl">
+								<?=gettext("Choose what to do with DNS requests that match the criteria specified below.");?> <br/>
+								<?=gettext("<b>Deny:</b> This actions stops queries from hosts within the netblock defined below.");?> <br/>
+								<?=gettext("<b>Refuse:</b> This actions also stops queries from hosts within the netblock defined below, but sends back DNS rcode REFUSED error message back tot eh client.");?> <br/>
+								<?=gettext("<b>Allow:</b> This actions allows queries from hosts within the netblock defined below.");?> <br/>
+								<?=gettext("<b>Allow Snoop:</b> This actions allows recursive and nonrecursive access from hosts within the netblock defined below. Used for cache snooping and ideally should only be configured for your administrative host.");?> <br/>
+							</span>
+						</td>
+					</tr>
+					<tr>
+					<td width="22%" valign="top" class="vncellreq"><?=gettext("Networks");?></td>
+					<td width="78%" class="vtable">
+						<table id="maintable">
+							<tbody>
+								<tr>
+									<td><div id="onecolumn"><?=gettext("Network");?></div></td>
+									<td><div id="twocolumn"><?=gettext("CIDR");?></div></td>
+									<td><div id="threecolumn"><?=gettext("Description");?></div></td>
+								</tr>
+								<?php $counter = 0; ?>
+								<?php
+									if($networkacl)
+										foreach($networkacl as $item):
+								?>
+										<?php
+											$network = $item['acl_network'];
+											$cidr = $item['mask'];
+											$description = $item['description'];
+										?>
+								<tr>
+									<td>
+										<input autocomplete="off" name="acl_network<?=$counter;?>" type="text" class="formfld unknown" id="acl_network<?=$counter;?>" size="40" value="<?=htmlspecialchars($network);?>" />
+									</td>
+									<td>
+										<select name="mask<?=$counter;?>" class="formselect" id="mask<?=$counter;?>">
+										<?php
+											for ($i = 128; $i > 0; $i--) {
+												echo "<option value=\"$i\" ";
+												if ($i == $cidr) echo "selected";
+												echo ">" . $i . "</option>";
+											}
+										?>
+										</select>
+									</td>
+									<td>
+										<input autocomplete="off" name="description<?=$counter;?>" type="text" class="listbg" id="description<?=$counter;?>" size="40" value="<?=htmlspecialchars($description);?>" />
+									</td>
+									<td>
+										<a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" /></a>
+									</td>
+								</tr>
+								<?php $counter++; ?>
+								<?php endforeach; ?>
+							</tbody>
+							<tfoot>
+							</tfoot>
+						</table>
+						<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
+							<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
+						</a>
+						<script type="text/javascript">
+							field_counter_js = 3;
+							rows = 1;
+							totalrows = <?php echo $counter; ?>;
+							loaded = <?php echo $counter; ?>;
+						</script>
+
+						</td>
+					</tr>
+
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+						<td width="78%" class="vtable">
+							<input name="description" type="text" class="formfld unknown" id="description" size="52" maxlength="52" value="<?=htmlspecialchars($pconfig['description']);?>">
+							<br />
+							<span class="vexpl"><?=gettext("You may enter a description here for your reference.");?></span>
+						</td>
+					</tr>
+					<tr>
+						<td>&nbsp;</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top">&nbsp;</td>
+						<td width="78%">
+							&nbsp;<br>&nbsp;
+							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">  <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
+						</td>
+					</tr>
+				</table>
+			</form>
+
+			<?php else: ?>
+
+			<table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
+				<thead>
+				<tr>
+					<td width="25%" class="listhdrr"><?=gettext("Access List Name"); ?></td>
+					<td width="25%" class="listhdrr"><?=gettext("Action"); ?></td>
+					<td width="40%" class="listhdrr"><?=gettext("Description"); ?></td>
+					<td width="10%" class="list"></td>
+				</tr>
+				</thead>
+				<tbody>
+				<?php
+					$i = 0;
+					foreach($a_acls as $acl):
+				?>
+				<tr ondblclick="document.location='unbound_acls.php?act=edit&id=<?=$i;?>'">
+					<td class="listlr">
+						<?=$acl['aclname'];?>
+					</td>
+					<td class="listr">
+						<?=htmlspecialchars($acl['aclaction']);?>
+					</td>
+					<td class="listbg">
+						<?=htmlspecialchars($acl['description']);?>
+					</td>
+					<td valign="middle" nowrap class="list">
+						<a href="unbound_acls.php?act=edit&id=<?=$i;?>">
+							<img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit client"); ?>" width="17" height="17" border="0">
+						</a>
+						&nbsp;
+						<a href="unbound_acls.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this client?"); ?>')">
+							<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete client"); ?>" width="17" height="17" border="0">
+						</a>
+					</td>
+				</tr>
+				<?php
+					$i++;
+					endforeach;
+				?>
+				</tbody>
+				<tfoot>
+				<tr>
+					<td class="list" colspan="4"></td>
+					<td class="list">
+						<a href="unbound_acls.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("Add new ACL"); ?>" width="17" height="17" border="0">
+						</a>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="4">
+						<p>
+							<?=gettext("Access Lists to control access to Unbound can be defined here.");?>
+						</p>
+					</td>
+				</tr>
+				</tfoot>
+			</table>
+
+			<?php endif; ?>
+
+		</td>
+	</tr>
+</table>
+</body>
+<?php include("fend.inc"); ?>
+
+?>
\ No newline at end of file
diff --git a/config/unbound/unbound_advanced.xml b/config/unbound/unbound_advanced.xml
index 10449b2d..239c39ee 100644
--- a/config/unbound/unbound_advanced.xml
+++ b/config/unbound/unbound_advanced.xml
@@ -68,7 +68,7 @@
 		</tab>
 		<tab>
 			<text>Unbound DNS ACLs</text>
-			<url>/pkg.php?xml=unbound_acls.xml</url>
+			<url>/unbound_acls.php</url>
 		</tab>
 		<tab>
 			<text>Unbound DNS Status</text>
diff --git a/config/unbound/unbound_status.php b/config/unbound/unbound_status.php
index 405b24d4..d011b109 100644
--- a/config/unbound/unbound_status.php
+++ b/config/unbound/unbound_status.php
@@ -127,7 +127,7 @@ function execCmds() {
 		$tab_array = array();
 		$tab_array[] = array(gettext("Unbound DNS Settings"), false, "/pkg_edit.php?xml=unbound.xml&amp;id=0");
 		$tab_array[] = array(gettext("Unbound DNS Advanced Settings"), false, "/pkg_edit.php?xml=unbound_advanced.xml&amp;id=0");
-		$tab_array[] = array(gettext("Unbound DNS ACLs"), false, "/pkg.php?xml=unbound_acls.xml");
+		$tab_array[] = array(gettext("Unbound DNS ACLs"), false, "/unbound_acls.php");
 		$tab_array[] = array(gettext("Unbound DNS Status"), true, "/unbound_status.php");
 		display_top_tabs($tab_array, true);
 	?>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 483909cf..740f634d 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1095,7 +1095,7 @@
 		<descr>Unbound is a validating, recursive, and caching DNS resolver. This package is a drop in replacement for Services: DNS Forwarder and also supports DNSSEC extensions. Once installed please configure the Unbound service by visiting Services: Unbound DNS.</descr>
 		<website>http://www.unbound.net/</website>
 		<category>Services</category>
-		<version>1.4.12_03</version>
+		<version>1.4.13_00</version>
 		<status>Alpha</status>
 		<maintainer>warren@decoy.co.za</maintainer>
 		<required_version>2.0</required_version>
@@ -1103,7 +1103,7 @@
 		<config_file>http://www.pfsense.com/packages/config/unbound/unbound.xml</config_file>
 		<configurationfile>unbound.xml</configurationfile>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package>unbound-1.4.12.tbz</depends_on_package>
+		<depends_on_package>unbound-1.4.13.tbz</depends_on_package>
 		<depends_on_package>ldns-1.6.10.tbz</depends_on_package>
 		<depends_on_package>expat-2.0.1_1.tbz</depends_on_package>
 		<depends_on_package>libevent-1.4.14b_2.tbz</depends_on_package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index f3bd7beb..61b00244 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -42,6 +42,7 @@
 		<maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>squid-2.7.9_1.tbz</depends_on_package>
+		<depends_on_package_pbi>squid-2.7.9_1-amd64.pbi</depends_on_package_pbi>
 		<depends_on_package>squid_radius_auth-1.10.tbz</depends_on_package>
 		<depends_on_package>libwww-5.4.0_4.tbz</depends_on_package>
 		<build_port_path>/usr/ports/www/squid</build_port_path>
@@ -82,6 +83,7 @@
 		<configurationfile>varnish_backends.xml</configurationfile>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>varnish-2.1.5.tbz</depends_on_package>
+		<depends_on_package_pbi>varnish-3.0.1_2-amd64.pbi</depends_on_package_pbi>
 		<depends_on_package>gcc-4.2.5.20090325_5.tbz</depends_on_package>
 		<build_port_path>/usr/ports/www/varnish</build_port_path>
 		<build_port_path>/usr/ports/lang/gcc42</build_port_path>
@@ -228,6 +230,7 @@
 		<build_port_path>/usr/ports/net/avahi</build_port_path>
 		<build_port_path>/usr/ports/net/avahi-app</build_port_path>
 		<depends_on_package>avahi-0.6.28.tbz</depends_on_package>
+		<depends_on_package_pbi>avahi-0.6.29-amd64.pbi</depends_on_package_pbi>
 		<version>0.6.25_1</version>
 		<status>ALPHA</status>
 		<required_version>1.2.3</required_version>
@@ -241,6 +244,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>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
+		<depends_on_package_pbi>ntop-4.1.0_1-amd64.pbi</depends_on_package_pbi>
 		<depends_on_package>rrdtool-1.2.26_1.tbz</depends_on_package>
 		<depends_on_package>gdbm-1.8.3_3.tbz</depends_on_package>
 		<depends_on_package>perl-5.12.3.tbz</depends_on_package>
@@ -385,6 +389,7 @@
 		<descr>Snort is an open source network intrusion prevention and detection system (IDS/IPS). Combining the benefits of signature, protocol, and anomaly-based inspection.</descr>
 		<category>Security</category>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
+		<depends_on_package_pbi>snort-2.9.1-amd64.pbi</depends_on_package_pbi>
 		<depends_on_package>mysql-client-5.1.53.tbz</depends_on_package>
 		<depends_on_package>snort-2.9.0.5.tbz</depends_on_package>
 		<depends_on_package>perl-threaded-5.10.1_3.tbz</depends_on_package>
@@ -450,6 +455,7 @@
 		<config_file>http://www.pfsense.com/packages/config/postfix/postfix.xml</config_file>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>postfix-2.8.5,1.tbz</depends_on_package>
+		<depends_on_package_pbi>spamd-4.9.1-amd64.pbi</depends_on_package_pbi>
 		<version>2.8.5,1 pkg v.2.1</version>
 		<status>RC1</status>
 		<required_version>2.0</required_version>
@@ -1074,7 +1080,7 @@
 		<descr>Unbound is a validating, recursive, and caching DNS resolver. This package is a drop in replacement for Services: DNS Forwarder and also supports DNSSEC extensions. Once installed please configure the Unbound service by visiting Services: Unbound DNS.</descr>
 		<website>http://www.unbound.net/</website>
 		<category>Services</category>
-		<version>1.4.12_03</version>
+		<version>1.4.13_00</version>
 		<status>Alpha</status>
 		<maintainer>warren@decoy.co.za</maintainer>
 		<required_version>2.0</required_version>
@@ -1082,7 +1088,7 @@
 		<config_file>http://www.pfsense.com/packages/config/unbound/unbound.xml</config_file>
 		<configurationfile>unbound.xml</configurationfile>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<depends_on_package>unbound-1.4.12.tbz</depends_on_package>
+		<depends_on_package>unbound-1.4.13.tbz</depends_on_package>
 		<depends_on_package>ldns-1.6.10.tbz</depends_on_package>
 		<depends_on_package>expat-2.0.1_1.tbz</depends_on_package>
 		<depends_on_package>libevent-1.4.14b_2.tbz</depends_on_package>