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

1 files changed, 63 insertions, 65 deletions

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 65639c09..c5a7c4b7 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -43,9 +43,9 @@
       <name>Proxy Server with mod_security</name>
       <pkginfolink>http://doc.pfsense.org/index.php/ProxyServerModSecurity_package</pkginfolink>
       <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. </descr>
+      <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.0</version>
+      <version>0.1.2</version>
       <status>ALPHA</status>
       <required_version>1.2.3</required_version>
       <config_file>http://www.pfsense.com/packages/config/apache_mod_security/apache_mod_security.xml</config_file>
@@ -127,7 +127,7 @@
       <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.8.3.5</version>
+      <version>0.8.3.6</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
@@ -142,7 +142,7 @@
       <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/freeswitch_dev/freeswitch.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.9.7.25</version>
+      <version>0.9.7.26</version>
       <status>Beta</status>
       <required_version>1.2.3</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
@@ -227,7 +227,7 @@
       <pkginfolink>http://doc.pfsense.org/index.php/vhosts</pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/vhosts/vhosts.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.7.3</version>
+      <version>0.7.4</version>
       <status>Stable</status>
       <required_version>1.2.3</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
@@ -239,38 +239,35 @@
       <website>http://www.snort.org</website>
       <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://files.pfsense.org/packages/70/All/</depends_on_package_base_url>
-	  <depends_on_package>libdnet-1.11_3.tbz</depends_on_package>
-	  <depends_on_package>pcre-7.9.tbz</depends_on_package>
-	  <depends_on_package>perl-5.8.9_3.tbz</depends_on_package>
-      <depends_on_package>mysql-client-5.1.34.tbz</depends_on_package>
-	  <depends_on_package>snort-2.8.4.1_1.tbz</depends_on_package>
+      <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>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>
       <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
-      <version>2.8.4.1_4 pkg v.1.7</version>
-      <required_version>3.0</required_version>
-      <status>Stable</status>
-      <configurationfile>snort.xml</configurationfile>
-	  <after_install_info>Please visit the Snort settings tab and enter your oinkid code.   Afterwards visit the update rules tab to download the snort rules.</after_install_info>
-    </package>
-    <package>
-      <name>snort-dev</name>
-	  <pkginfolink>http://forum.pfsense.org/index.php/topic,16847.0.html</pkginfolink>
-      <website>http://www.snort.org</website>
-      <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-dev/bin/</depends_on_package_base_url>
-	  <depends_on_package>libnet10-1.0.2a_4,1.tbz</depends_on_package>
-	  <depends_on_package>pcre-7.9.tbz</depends_on_package>
-          <depends_on_package>mysql-client-5.1.34.tbz</depends_on_package>
-	  <depends_on_package>snort-2.8.5.2.tbz</depends_on_package>
-	  <depends_on_package>barnyard2-1.7.tbz</depends_on_package>
-      <config_file>http://www.pfsense.com/packages/config/snort-dev/snort.xml</config_file>
-      <version>2.8.5.2</version>
+      <version>2.8.5.3 pkg v. 1.21</version>
       <required_version>2.0</required_version>
       <status>Stable</status>
       <configurationfile>/snort.xml</configurationfile>
-	  <after_install_info>Please visit the Snort settings tab and enter your oinkid code.   Afterwards visit the update rules tab to download the snort rules.</after_install_info>
+	  <after_install_info>This is the Snort branch and is stable.</after_install_info>
     </package>
+	<package>
+		<name>spamd</name>
+		<website>http://www.openbsd.org/spamd/</website>
+		<descr>Tarpits like spamd are fake SMTP servers, which accept connections but don't deliver mail. Instead, they keep the connections open and reply very slowly. If the peer is patient enough to actually complete the SMTP dialogue (which will take ten minutes or more), the tarpit returns a 'temporary error' code (4xx), which indicates that the mail could not be delivered successfully and that the sender should keep the mail in their queue and retry again later.</descr>
+		<category>Services</category>
+		<config_file>http://www.pfsense.com/packages/config/spamd/spamd.xml</config_file>
+		<depends_on_package_base_url>http://files.pfsense.org/packages/80/All/</depends_on_package_base_url>
+		<depends_on_package>spamd-4.5.0_3.tbz</depends_on_package>
+		<version>4.5.0_4</version>
+		<status>Beta</status>
+		<required_version>1.2.1</required_version>
+		<configurationfile>spamd.xml</configurationfile>
+		<logging>
+			<facilityname>spamd</facilityname>
+			<logfilename>spamd.log</logfilename>
+		</logging>
+	</package>
     <package>
       <name>siproxd</name>
       <website>http://siproxd.sourceforge.net/</website>
@@ -278,9 +275,9 @@
       <category>Services</category>
       <config_file>http://www.pfsense.com/packages/config/siproxd.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/80/All/</depends_on_package_base_url>
-      <depends_on_package>siproxd-0.7.0_1.tbz</depends_on_package>
+      <depends_on_package>siproxd-0.7.1_1.tbz</depends_on_package>
       <pkginfolink>http://doc.pfsense.org/index.php/Siproxd_package</pkginfolink>
-      <version>0.7.2</version>
+      <version>0.7.3</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <configurationfile>siproxd.xml</configurationfile>
@@ -302,15 +299,16 @@
       <name>OpenOSPFD</name>
       <descr>OSPF routing protocol</descr>
       <maintainer>cmb@pfsense.org</maintainer>
-      <version>0.2</version>
+      <version>0.5.1</version>
       <category>Routing</category>
-      <status>ALPHA</status>
+      <status>BETA</status>
       <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-      <depends_on_package>openospfd-4.3.tbz</depends_on_package>
+      <depends_on_package>openospfd-4.6.tbz</depends_on_package>
       <config_file>http://www.pfsense.com/packages/config/openospfd/openospfd.xml</config_file>
       <pkginfolink></pkginfolink>
       <required_version>1.2.1</required_version>
       <configurationfile>openospfd.xml</configurationfile>
+      <depends_on_package>libevent-1.4.13.tbz</depends_on_package>
     </package>
     <package>
       <name>Lightsquid</name>
@@ -361,7 +359,7 @@
       <descr>pfSense version of TinyDNS which features failover host support</descr>
       <website>http://cr.yp.to/djbdns.html</website>
       <category>Services</category>
-      <version>1.0.6.4</version>
+      <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>
@@ -377,20 +375,30 @@
       <descr>VMware Tools</descr>
       <website>http://open-vm-tools.sourceforge.net/</website>
       <category>Services</category>
-      <version>102166_7_2</version>
+      <version>217847</version>
       <status>Stable</status>
       <pkginfolink>http://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink>
-      <required_version>1.2.1</required_version>
-      <config_file>http://www.pfsense.org/packages/config/open-vm-tools/open-vm-tools.xml</config_file>
+      <required_version>2.0</required_version>
+      <config_file>http://www.pfsense.org/packages/config/open-vm-tools_2/open-vm-tools.xml</config_file>
       <configurationfile>open-vm-tools.xml</configurationfile>
-      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <depends_on_package>open-vm-tools-nox11-167859_1.tbz</depends_on_package>
-      <depends_on_package>libtool-2.2.6a_1.tbz</depends_on_package>
-      <depends_on_package>libiconv-1.13.1.tbz</depends_on_package>
-      <depends_on_package>libdnet-1.11_3.tbz</depends_on_package>
-      <depends_on_package>icu-3.8.1_2.tbz</depends_on_package>
-      <depends_on_package>gmake-3.81_3.tbz</depends_on_package>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
+      <depends_on_package>open-vm-tools-nox11-217847_1.tbz</depends_on_package>
+      <depends_on_package>fusefs-kmod-0.3.9.p1.20080208_6.tbz</depends_on_package>
+      <depends_on_package>fusefs-libs-2.7.4.tbz</depends_on_package>
       <depends_on_package>gettext-0.17_1.tbz</depends_on_package>
+      <depends_on_package>glib-2.22.4.tbz</depends_on_package>
+      <depends_on_package>gmake-3.81_3.tbz</depends_on_package>
+      <depends_on_package>icu-3.8.1_2.tbz</depends_on_package>
+      <depends_on_package>libdnet-1.11_3.tbz</depends_on_package>
+      <depends_on_package>libiconv-1.13.1_1.tbz</depends_on_package>
+      <depends_on_package>libtool-2.2.6b.tbz</depends_on_package>
+      <depends_on_package>pcre-8.00.tbz</depends_on_package>
+      <depends_on_package>perl-5.10.1.tbz</depends_on_package>
+      <depends_on_package>pkg-config-0.23_1.tbz</depends_on_package>
+      <depends_on_package>python26-2.6.4.tbz</depends_on_package>
+      <depends_on_package>ruby+oniguruma-1.8.7.248,1.tbz</depends_on_package>
+      <depends_on_package>ruby18-deplate-0.8.5.tbz</depends_on_package>
+      <depends_on_package>unzip-6.0.tbz</depends_on_package>
     </package>
     <package>
       <name>AutoConfigBackup</name>
@@ -607,15 +615,15 @@
       <descr>High performance web proxy cache.</descr>
       <website>http://www.squid-cache.org/</website>
       <category>Network</category>
-      <version>2.6.21_11</version>
+      <version>2.7.8</version>
       <status>Stable</status>
-      <required_version>3</required_version>
-      <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer>
-      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <depends_on_package>squid-2.6.21.tbz</depends_on_package>
+      <required_version>2</required_version>
+      <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/8/All/</depends_on_package_base_url>
+      <depends_on_package>squid-2.7.8.tbz</depends_on_package>
       <depends_on_package>squid_radius_auth-1.10.tbz</depends_on_package>
-      <depends_on_package>openldap-client-2.4.10.tbz</depends_on_package>
-      <config_file>http://www.pfsense.org/packages/config/squid/squid.xml</config_file>
+      <depends_on_package>libwww-5.4.0_4.tbz</depends_on_package>
+      <config_file>http://www.pfsense.org/packages/config/squid-8/squid.xml</config_file>
       <configurationfile>squid.xml</configurationfile>
     </package>
     <package>
@@ -725,16 +733,6 @@
       <maintainer>dv_serg@mail.ru</maintainer>
       <after_install_info>Please check the HAVP settings.</after_install_info>
     </package>
-    <package>
-      <name>onatproto</name>
-      <descr>Patch to add Protocol options to Manual Outbound NAT. WARNING! Cannot be uninstalled.</descr>
-      <category>System</category>
-      <config_file>http://www.pfsense.com/packages/config/onatproto/onatproto.xml</config_file>
-      <version>0.1</version>
-      <status>BETA</status>
-      <required_version>1.2.1</required_version>
-      <maximum_version>1.2.3</maximum_version>
-    </package>
   <package>
    <name>pfJailctl</name>
    <descr>pfSense wrapper for jailctl - a jail management tool. Allows you to run jails on pfSense.</descr>