Merge branch 'master' of http://gitweb.pfsense.org/pfsense-packages/mainline

1 files changed, 21 insertions, 7 deletions

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 8653ffb2..1f05446b 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -2,6 +2,20 @@
 <!-- pfSense packages -->
 <pfsensepkgs>
   <packages>
+      <package>
+		<name>IP-Blocklist</name>
+		<website/>
+		<descr>IP-Blocklist is like PeerGuardian2. IP lists are used to add deny/allow rules to the firewall for in &amp; out traffic.</descr>
+		<category>Firewall</category>
+		<pkginfolink>http://forum.pfsense.org/index.php/topic,24769.0.html</pkginfolink>
+		<config_file>http://pfsense.org/packages/config/ipblocklist/ipblocklist.xml</config_file>
+		<depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+		<version>0.2.0</version>
+		<status>Beta</status>
+		<required_version>1.2.2</required_version>
+		<maintainer>tom@tomschaefer.org</maintainer>
+		<configurationfile>ipblocklist.xml</configurationfile>
+	</package>
 	<package>
 		<name>anyterm</name>
 		<descr>Ajax Interactive Shell - Have you ever wanted SSH or telnet access to your system from an internet desert - from behind a strict firewall, from an internet cafe, or even from a mobile phone? Anyterm is a combination of a web page and a process that runs on your web server that provides this access. WARNING!  We suggest using Stunnel in combination with this package!</descr>
@@ -240,12 +254,12 @@
       <descr>Used by fortune 500 companies and goverments Snort is the most widely deployed IDS/IPS technology worldwide. It features rules based logging and can perform content searching/matching in addition to being used to detect a variety of other attacks and probes, such as buffer overflows, stealth port scans, CGI attacks, SMB probes, and much more.</descr>
       <category>Security</category>
       <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort/bin/8.0.x86/</depends_on_package_base_url>
-	  <depends_on_package>pcre-8.00.tbz</depends_on_package>
+	  <depends_on_package>pcre-8.02.tbz</depends_on_package>
 	  <depends_on_package>perl-5.10.1.tbz</depends_on_package>
       <depends_on_package>mysql-client-5.1.45.tbz</depends_on_package>
-	  <depends_on_package>snort-2.8.5.3.tbz</depends_on_package>
+	  <depends_on_package>snort-2.8.6_1.tbz</depends_on_package>
       <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
-      <version>2.8.5.3 pkg v. 1.25</version>
+      <version>2.8.6 pkg v. 1.26</version>
       <required_version>2.0</required_version>
       <status>Stable</status>
       <configurationfile>/snort.xml</configurationfile>
@@ -333,7 +347,7 @@
       <descr>A console-based network traffic monitor + vnstat PHP frontend</descr>
       <pkginfolink>http://forum.pfsense.org/index.php/topic,14179.0.html</pkginfolink>
       <category>Network Management</category>
-      <depends_on_package_base_url>http://pfsense.comuf.com/packages/All/</depends_on_package_base_url>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
       <depends_on_package>vnstat-1.10_2.tbz</depends_on_package>
       <version>1.10_2</version>
       <status>test</status>
@@ -364,13 +378,13 @@
       <version>1.0.6.6</version>
       <status>Beta</status>
       <pkginfolink>http://doc.pfsense.org/index.php/Tinydns_package</pkginfolink>
-      <required_version>1.2</required_version>
+      <required_version>2.0</required_version>
       <config_file>http://www.pfsense.com/packages/config/tinydns/tinydns.xml</config_file>
       <configurationfile>tinydns.xml</configurationfile>
       <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
       <depends_on_package>ucspi-tcp-0.88_2.tbz</depends_on_package>
-      <depends_on_package>daemontools-0.76_12.tbz</depends_on_package>
-      <depends_on_package>djbdns-1.05_12.tbz</depends_on_package>
+      <depends_on_package>daemontools-0.76_14.tbz</depends_on_package>
+      <depends_on_package>djbdns-1.05_13.tbz</depends_on_package>
     </package>
     <package>
       <name>Open-VM-Tools</name>