diff options
| -rw-r--r-- | config/countryblock/countryblock.inc | 8 | ||||
| -rw-r--r-- | config/countryblock/countryblock.tmp | 5 | ||||
| -rw-r--r-- | config/countryblock/countryblock.xml | 7 | ||||
| -rw-r--r-- | config/countryblock/countryblock_IPBlocklist.widget.tmp | 116 | ||||
| -rw-r--r-- | config/countryblock/countryblock_if.tmp | 2 | ||||
| -rw-r--r-- | config/countryblock/help.tmp | 4 | ||||
| -rw-r--r-- | config/countryblock/settings.tmp | 2 | ||||
| -rw-r--r-- | config/countryblock/whitelist.tmp | 2 | ||||
| -rw-r--r-- | config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp | 116 | ||||
| -rwxr-xr-x | config/ipblocklist/8/ipblocklist.inc | 18 | ||||
| -rwxr-xr-x | config/ipblocklist/8/ipblocklist.tmp | 5 | ||||
| -rwxr-xr-x | config/ipblocklist/8/ipblocklist.xml | 7 | ||||
| -rw-r--r-- | config/unbound/unbound_acls.php | 5 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 6 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 7 |
16 files changed, 286 insertions, 26 deletions
diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc index f67fd76f..64c1f4cc 100644 --- a/config/countryblock/countryblock.inc +++ b/config/countryblock/countryblock.inc @@ -62,6 +62,9 @@ function php_install_command_cb() //rename PHP files from .tmp to .php + exec("cp /tmp/countryblock_IPBlocklist.widget.tmp /usr/local/www/widgets/widgets/countryblock_IPBlocklist.widget.php"); + unlink_if_exists("/tmp/countryblock_IPBlocklist.widget.tmp"); + exec("cp /tmp/class.phpmailer.tmp /usr/local/www/packages/countryblock/class.phpmailer.php"); unlink_if_exists("/tmp/class.phpmailer.tmp "); exec("cp /tmp/class.smtp.tmp /usr/local/www/packages/countryblock/class.smtp.php"); @@ -114,6 +117,10 @@ function php_install_command_cb() exec("mkdir /usr/local/www/packages/countryblock/lists"); exec("touch /usr/local/www/packages/countryblock/lists/countries.txt"); + //Attempt to restore from backup + exec("mkdir /usr/local/www/packages/countryblock_bkup"); + exec("cp /usr/local/www/packages/countryblock_bkup/countries.txt /usr/local/www/packages/countryblock/countries.txt"); + conf_mount_ro(); config_unlock(); } @@ -125,6 +132,7 @@ function deinstall_command_cb() $handle = popen("/usr/local/etc/rc.d/countryblock.sh stop", "r"); unlink_if_exists("/usr/local/pkg/countryblock.xml"); unlink_if_exists("/usr/local/pkg/countryblock.inc"); + //unlink_if_exists("/usr/local/pkg/pf/countryblock.sh"); exec("rm -R /usr/local/www/packages/countryblock/countryblocks"); exec("rm -R /usr/local/www/packages/countryblock"); exec("rm /usr/local/etc/rc.d/countryblock.sh"); diff --git a/config/countryblock/countryblock.tmp b/config/countryblock/countryblock.tmp index 0ddb4c5f..39ee6e64 100644 --- a/config/countryblock/countryblock.tmp +++ b/config/countryblock/countryblock.tmp @@ -60,6 +60,9 @@ if (count($_POST)>0) { //mwexec("pfctl -t countryblock -T kill"); //mwexec("sed -i -e '/countryblock/d' /tmp/rules.debug"); mwexec("sh execute.sh"); + + //attempt to create a backup of countries.txt + mwexec("cp /usr/local/www/packages/countryblock/countries.txt /usr/local/www/packages/countryblock_bkup/countries.txt"); } else { @@ -118,7 +121,7 @@ else { $tab_array[2] = array("Whitelist", false, "whitelist.php"); $tab_array[3] = array("Interfaces", false, "countryblock_if.php"); $tab_array[4] = array("Help", false, "help.php"); - $tab_array[5] = array("Email", false, "email.php"); + //$tab_array[5] = array("Email", false, "email.php"); display_top_tabs($tab_array); ?> </td></tr> diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml index dbbefd18..1d278d20 100644 --- a/config/countryblock/countryblock.xml +++ b/config/countryblock/countryblock.xml @@ -41,7 +41,7 @@ <requirements>Active Internet</requirements> <faq>http://forum.pfsense.org/index.php/topic,25732.0.html</faq> <name>Country Block Settings</name> - <version>0.2.2</version> + <version>0.2.4</version> <title>Settings</title> <include_file>/usr/local/pkg/countryblock.inc</include_file> <menu> @@ -164,6 +164,11 @@ <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/countryblock/email.tmp</item> </additional_files_needed> + <additional_files_needed> + <prefix>/tmp/</prefix> + <chmod>0644</chmod> + <item>http://www.pfsense.org/packages/config/countryblock/countryblock_IPBlocklist.widget.tmp</item> + </additional_files_needed> <fields> <field> <fielddescr>Variable One</fielddescr> diff --git a/config/countryblock/countryblock_IPBlocklist.widget.tmp b/config/countryblock/countryblock_IPBlocklist.widget.tmp new file mode 100644 index 00000000..a62fcede --- /dev/null +++ b/config/countryblock/countryblock_IPBlocklist.widget.tmp @@ -0,0 +1,116 @@ +<?php +/* + Copyright 2011 Thomas Schaefer - Tomschaefer.org + Part of pfSense widgets (www.pfsense.com) + + 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. +*/ + +$nocsrf = true; + +@require_once("guiconfig.inc"); +@require_once("pfsense-utils.inc"); +@require_once("functions.inc"); + +$ipblocklist_file = "/usr/local/www/packages/ipblocklist/ipblocklist.php"; +$countryblock_file = "/usr/local/www/packages/countryblock/countryblock.php"; + +echo "<table style=\"padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\""; +echo" <tr>"; +if (file_exists($ipblocklist_file)) { + echo " <td class=\"listhdrr\">IP-Blocklist"; + ob_start(); + $results = exec("/sbin/pfctl -s rules | grep -c ipblocklist"); + ob_end_clean(); + if ($results > '2') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>"; + else + echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>"; + echo "</td>"; +} +if (file_exists($countryblock_file)) { + echo " <td class=\"listhdrr\">Countryblock"; + ob_start(); + $results = exec("/sbin/pfctl -s rules | grep -c countryblock"); + ob_end_clean(); + if ($results > '0') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>"; + else + echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>"; + echo "</td>"; +} +echo" </tr>"; +echo" <tr>"; +if (file_exists($ipblocklist_file)) { + echo " <td class=\"listlr\">"; + ob_start(); + $resultsIP = exec("/sbin/pfctl -T show -t ipblocklist |grep -v -c Z"); + ob_end_clean(); + echo $resultsIP; + echo " Networks"; + echo "</td>"; +} +if (file_exists($countryblock_file)) { + echo " <td class=\"listr\">"; + ob_start(); + $resultsCB = exec("pfctl -T show -t countryblock |grep -v -c Z"); + ob_end_clean(); + echo $resultsCB; + echo " Networks"; + echo "</td>"; +} +echo" </tr>"; +echo" <tr>"; +if (file_exists($ipblocklist_file)) { + ob_start(); + $resultsIP = exec("tail -r /usr/local/www/packages/ipblocklist/errorOUT.txt"); + ob_end_clean(); + if ($resultsIP == "") { + echo " <td></td>"; + } else { + echo " <td class=\"listlr\">"; + echo "<br/><span style='color:red'>"; + echo $resultsIP; + echo "</span>"; + echo "</td>"; + } +} +if (file_exists($countryblock_file)) { + ob_start(); + $resultsCB = exec("tail -r /usr/local/www/packages/countryblock/errorOUT.txt"); + ob_end_clean(); + if ($resultsCB == "") { + echo " <td></td>"; + } else { + echo " <td class=\"listlr\">"; + echo "<br/><span style='color:red'>"; + echo $resultsCB; + echo "</span>"; + echo "</td>"; + } +} +echo" </tr>"; +//echo" <tr>"; +//if (file_exists($ipblocklist_file)) echo " <td> </td>"; +//if (file_exists($countryblock_file)) echo " <td> </td>"; +//echo" </tr>"; +echo"</table>"; + +?> diff --git a/config/countryblock/countryblock_if.tmp b/config/countryblock/countryblock_if.tmp index 8471f075..65b80992 100644 --- a/config/countryblock/countryblock_if.tmp +++ b/config/countryblock/countryblock_if.tmp @@ -122,7 +122,7 @@ include("head.inc"); $tab_array[2] = array("Whitelist", false, "whitelist.php"); $tab_array[3] = array("Interfaces", true, "countryblock_if.php"); $tab_array[4] = array("Help", false, "help.php"); - $tab_array[5] = array("Email", false, "email.php"); + //$tab_array[5] = array("Email", false, "email.php"); display_top_tabs($tab_array); ?> </td></tr> diff --git a/config/countryblock/help.tmp b/config/countryblock/help.tmp index 17f30f90..2f466947 100644 --- a/config/countryblock/help.tmp +++ b/config/countryblock/help.tmp @@ -34,7 +34,7 @@ $pgtitle = "Firewall: Countryblock - Help"; $tab_array[2] = array("Whitelist", false, "whitelist.php"); $tab_array[3] = array("Interfaces", false, "countryblock_if.php"); $tab_array[4] = array("Help", true, "help.php"); - $tab_array[5] = array("Email", false, "email.php"); + //$tab_array[5] = array("Email", false, "email.php"); display_top_tabs($tab_array); ?> </td></tr> @@ -91,7 +91,7 @@ To run countryblock as a cron job use /usr/local/etc/rc.d/countryblock.sh <br> <span style="color:red">Warning!</span> - Apply after every firewall change or state reset. Use at your own risk. ---> -<a href="http://doc.pfsense.org/index.php/Country_Block">Please see wiki for help</a> +<a href="http://doc.pfsense.org/index.php/Country_Block">Please see wiki for help</a> or the <a href="http://forum.pfsense.org/index.php/topic,25732.0.html">Forum</a> </div> diff --git a/config/countryblock/settings.tmp b/config/countryblock/settings.tmp index 5bbfedc3..0a067d83 100644 --- a/config/countryblock/settings.tmp +++ b/config/countryblock/settings.tmp @@ -44,7 +44,7 @@ $pgtitle = "Firewall: Countryblock - Settings"; $tab_array[2] = array("Whitelist", false, "whitelist.php"); $tab_array[3] = array("Interfaces", false, "countryblock_if.php"); $tab_array[4] = array("Help", false, "help.php"); - $tab_array[5] = array("Email", false, "email.php"); + //$tab_array[5] = array("Email", false, "email.php"); display_top_tabs($tab_array); ?> </td></tr> diff --git a/config/countryblock/whitelist.tmp b/config/countryblock/whitelist.tmp index 0dbed5d0..d613ee11 100644 --- a/config/countryblock/whitelist.tmp +++ b/config/countryblock/whitelist.tmp @@ -43,7 +43,7 @@ mwexec("touch countries-white.txt"); $tab_array[2] = array("Whitelist", true, "whitelist.php"); $tab_array[3] = array("Interfaces", false, "countryblock_if.php"); $tab_array[4] = array("Help", false, "help.php"); - $tab_array[5] = array("Email", false, "email.php"); + //$tab_array[5] = array("Email", false, "email.php"); display_top_tabs($tab_array); ?> </td></tr> diff --git a/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp b/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp new file mode 100644 index 00000000..a62fcede --- /dev/null +++ b/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp @@ -0,0 +1,116 @@ +<?php +/* + Copyright 2011 Thomas Schaefer - Tomschaefer.org + Part of pfSense widgets (www.pfsense.com) + + 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. +*/ + +$nocsrf = true; + +@require_once("guiconfig.inc"); +@require_once("pfsense-utils.inc"); +@require_once("functions.inc"); + +$ipblocklist_file = "/usr/local/www/packages/ipblocklist/ipblocklist.php"; +$countryblock_file = "/usr/local/www/packages/countryblock/countryblock.php"; + +echo "<table style=\"padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\""; +echo" <tr>"; +if (file_exists($ipblocklist_file)) { + echo " <td class=\"listhdrr\">IP-Blocklist"; + ob_start(); + $results = exec("/sbin/pfctl -s rules | grep -c ipblocklist"); + ob_end_clean(); + if ($results > '2') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>"; + else + echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>"; + echo "</td>"; +} +if (file_exists($countryblock_file)) { + echo " <td class=\"listhdrr\">Countryblock"; + ob_start(); + $results = exec("/sbin/pfctl -s rules | grep -c countryblock"); + ob_end_clean(); + if ($results > '0') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>"; + else + echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>"; + echo "</td>"; +} +echo" </tr>"; +echo" <tr>"; +if (file_exists($ipblocklist_file)) { + echo " <td class=\"listlr\">"; + ob_start(); + $resultsIP = exec("/sbin/pfctl -T show -t ipblocklist |grep -v -c Z"); + ob_end_clean(); + echo $resultsIP; + echo " Networks"; + echo "</td>"; +} +if (file_exists($countryblock_file)) { + echo " <td class=\"listr\">"; + ob_start(); + $resultsCB = exec("pfctl -T show -t countryblock |grep -v -c Z"); + ob_end_clean(); + echo $resultsCB; + echo " Networks"; + echo "</td>"; +} +echo" </tr>"; +echo" <tr>"; +if (file_exists($ipblocklist_file)) { + ob_start(); + $resultsIP = exec("tail -r /usr/local/www/packages/ipblocklist/errorOUT.txt"); + ob_end_clean(); + if ($resultsIP == "") { + echo " <td></td>"; + } else { + echo " <td class=\"listlr\">"; + echo "<br/><span style='color:red'>"; + echo $resultsIP; + echo "</span>"; + echo "</td>"; + } +} +if (file_exists($countryblock_file)) { + ob_start(); + $resultsCB = exec("tail -r /usr/local/www/packages/countryblock/errorOUT.txt"); + ob_end_clean(); + if ($resultsCB == "") { + echo " <td></td>"; + } else { + echo " <td class=\"listlr\">"; + echo "<br/><span style='color:red'>"; + echo $resultsCB; + echo "</span>"; + echo "</td>"; + } +} +echo" </tr>"; +//echo" <tr>"; +//if (file_exists($ipblocklist_file)) echo " <td> </td>"; +//if (file_exists($countryblock_file)) echo " <td> </td>"; +//echo" </tr>"; +echo"</table>"; + +?> diff --git a/config/ipblocklist/8/ipblocklist.inc b/config/ipblocklist/8/ipblocklist.inc index 003f28bf..545cb4ab 100755 --- a/config/ipblocklist/8/ipblocklist.inc +++ b/config/ipblocklist/8/ipblocklist.inc @@ -55,12 +55,16 @@ function php_install_command_ip() //install PERL - exec("pkg_add -r perl"); - exec("pkg_add -r p5-Net-CIDR"); - exec("pkg_add -r compat7x-i386.tbz"); - exec("pkg_add -r compat6x-i386.tbz"); + exec("pkg_add -r ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8-stable/All/perl-5.12.4_2.tbz"); + exec("pkg_add -r ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8-stable/All/p5-Net-CIDR-0.14.tbz"); + //exec("pkg_add -r compat7x-i386.tbz"); + //exec("pkg_add -r compat6x-i386.tbz"); + exec("rehash"); //rename PHP files from .tmp to .php + exec("cp /tmp/countryblock_IPBlocklist.widget.tmp /usr/local/www/widgets/widgets/countryblock_IPBlocklist.widget.php"); + unlink_if_exists("/tmp/countryblock_IPBlocklist.widget.tmp"); + exec("cp /tmp/lists.txt /usr/local/www/packages/ipblocklist/lists.txt"); exec("cp /tmp/class.phpmailer.tmp /usr/local/www/packages/ipblocklist/class.phpmailer.php"); unlink_if_exists("/tmp/class.phpmailer.tmp "); @@ -109,6 +113,9 @@ function php_install_command_ip() exec("/usr/bin/touch /usr/local/www/packages/ipblocklist/OUTBOUND"); + //Attempt to pull from a backup + exec("/bin/mkdir /usr/local/www/packages/ipblocklist_bkup"); + exec("cp /usr/local/www/packages/ipblocklist_bkup/lists.txt /usr/local/www/packages/ipblocklist/lists.txt"); conf_mount_ro(); config_unlock(); @@ -121,11 +128,12 @@ function deinstall_command_ip() $handle = popen("/usr/local/etc/rc.d/ipblocklist.sh stop", "r"); unlink_if_exists("/usr/local/pkg/ipblocklist.xml"); unlink_if_exists("/usr/local/pkg/ipblocklist.inc"); + unlink_if_exists("/usr/local/pkg/pf/IP-Blocklist.sh"); exec("rm -R /usr/local/www/packages/ipblocklist/ipblocklists"); exec("rm -R /usr/local/www/packages/ipblocklist"); exec("rm /usr/local/etc/rc.d/IP-Blocklist.sh"); exec("pfctl -t ipblocklist -T kill"); - exec("ipfw -f flush"); + //exec("ipfw -f flush"); conf_mount_ro(); } diff --git a/config/ipblocklist/8/ipblocklist.tmp b/config/ipblocklist/8/ipblocklist.tmp index ffbfdc57..9291a468 100755 --- a/config/ipblocklist/8/ipblocklist.tmp +++ b/config/ipblocklist/8/ipblocklist.tmp @@ -56,13 +56,16 @@ if (count($_POST)>0) { //Now clear ipfw, and process each list to ipfw commands exec("/bin/sh convert-execute.sh"); + + //Attempt to create a backup of user lists + mwexec("cp /usr/local/www/packages/ipblocklist/lists.txt /usr/local/www/packages/ipblocklist_bkup/lists.txt"); } else { //echo "disabled"; $config['installedpackages']['ipblocklist_settings']['config'][0]['enable'] = 0; //Clear Lists - mwexec("ipfw -f flush"); + //mwexec("ipfw -f flush"); mwexec("pfctl -t ipblocklist -T kill"); mwexec("rm -R /usr/local/www/packages/ipblocklist/lists"); mwexec("sed -i -e '/ipblocklist/d' /tmp/rules.debug"); diff --git a/config/ipblocklist/8/ipblocklist.xml b/config/ipblocklist/8/ipblocklist.xml index ca488d01..00ac22b8 100755 --- a/config/ipblocklist/8/ipblocklist.xml +++ b/config/ipblocklist/8/ipblocklist.xml @@ -41,7 +41,7 @@ <requirements>perl</requirements> <faq>http://forum.pfsense.org/index.php/topic,24769.0.html</faq> <name>IP Blocklist Settings</name> - <version>0.3.4</version> + <version>0.3.5</version> <title>Settings</title> <include_file>/usr/local/pkg/ipblocklist.inc</include_file> <menu> @@ -154,6 +154,11 @@ <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/ipblocklist/8/lists.txt</item> </additional_files_needed> + <additional_files_needed> + <prefix>/tmp/</prefix> + <chmod>0644</chmod> + <item>http://www.pfsense.org/packages/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp</item> + </additional_files_needed> <fields> <field> <fielddescr>Variable One</fielddescr> diff --git a/config/unbound/unbound_acls.php b/config/unbound/unbound_acls.php index 40f21595..ff3ce3bd 100644 --- a/config/unbound/unbound_acls.php +++ b/config/unbound/unbound_acls.php @@ -32,11 +32,6 @@ 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(); diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 6d9b5ebc..06fe4b86 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -23,7 +23,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.2.2</version> + <version>0.2.4</version> <status>Beta</status> <required_version>1.2.2</required_version> <maintainer>tom@tomschaefer.org</maintainer> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 461561e6..706954ef 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -52,7 +52,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.2.2</version> + <version>0.2.4</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org</maintainer> @@ -66,7 +66,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,24769.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.3.3</version> + <version>0.3.5</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org</maintainer> @@ -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.13_01</version> + <version>1.4.13_02</version> <status>Alpha</status> <maintainer>warren@decoy.co.za</maintainer> <required_version>2.0</required_version> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 424a9b95..1c16d588 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -126,7 +126,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <version>0.2.2</version> + <version>0.2.4</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org</maintainer> @@ -140,7 +140,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,24769.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <version>0.3.3</version> + <version>0.3.5</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org</maintainer> @@ -1080,13 +1080,14 @@ <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.13_01</version> + <version>1.4.13_02</version> <status>Alpha</status> <maintainer>warren@decoy.co.za</maintainer> <required_version>2.0</required_version> <pkginfolink>http://doc.pfsense.org/index.php/Unbound_package</pkginfolink> <config_file>http://www.pfsense.com/packages/config/unbound/unbound.xml</config_file> <configurationfile>unbound.xml</configurationfile> + <depends_on_package_pbi>unbound-1.4.13-i386.pbi</depends_on_package_pbi> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package>unbound-1.4.13.tbz</depends_on_package> <depends_on_package>ldns-1.6.10.tbz</depends_on_package> |