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

1 files changed, 55 insertions, 30 deletions

diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 2457f4e1..413985ac 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -32,19 +32,31 @@
 		<descr>The Reliable, High Performance TCP/HTTP Load Balancer</descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>0.29</version>
+		<version>0.30</version>
 		<status>BETA</status>
 		<required_version>1.2.3</required_version>
 		<config_file>http://www.pfsense.com/packages/config/haproxy-dev/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 	</package>
+	<package>
+		<pkginfolink>http://doc.pfsense.org/index.php/haproxy_package</pkginfolink>
+		<name>haproxy-stable</name>
+		<descr>The Reliable, High Performance TCP/HTTP Load Balancer</descr>
+		<website>http://haproxy.1wt.eu/</website>
+		<category>Services</category>
+		<version>0.30</version>
+		<status>BETA</status>
+		<required_version>1.2.3</required_version>
+		<config_file>http://www.pfsense.com/packages/config/haproxy-stable/haproxy.xml</config_file>
+		<configurationfile>haproxy.xml</configurationfile>
+	</package>
     <package>
       <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>
@@ -168,7 +180,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.9.5</version>
+      <version>0.9.6</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
@@ -183,7 +195,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>
@@ -310,17 +322,17 @@
       <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>
       <configurationfile>vhosts.xml</configurationfile>
     </package>
     <package>
-      <name>snort</name>
+      <name>snort-old</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>
+      <descr>WARNING: This is the old snort package. A few current snort.org rules are not supported in this package. This package will not be supported in Pfsense 2.0.</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>
@@ -328,31 +340,30 @@
 	  <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>
-      <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
-      <version>2.8.4.1_5 pkg v.1.7</version>
-      <required_version>1.2.2</required_version>
-      <status>Stable</status>
+      <config_file>http://www.pfsense.com/packages/config/snort-old/snort.xml</config_file>
+      <version>2.8.4.1_5 pkg v.1.8</version>
+      <required_version>1.2.3</required_version>
+      <status>legacy</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>
+      <name>snort</name>
 	  <pkginfolink>http://forum.pfsense.org/index.php/topic,16847.0.html</pkginfolink>
       <website>http://www.snort.org</website>
-      <descr>WARNING: This is the Snort-dev branch and is unstable. Please post package version on the forums. Revert back to alpha.</descr>
+      <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>
-      <config_file>http://www.pfsense.com/packages/config/snort-dev/snort.xml</config_file>
-      <version>2.8.4.1_7 pkg v. 1.8</version>
+      <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort/bin/7.2.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.44_1.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.5.3 pkg v. 1.21</version>
       <required_version>1.2.3</required_version>
-      <status>alpha</status>
+      <status>Stable</status>
       <configurationfile>/snort.xml</configurationfile>
-	  <after_install_info>This is the Snort-dev branch and is stable as of RC3.</after_install_info>
+	  <after_install_info>This is the Snort branch and is stable.</after_install_info>
     </package>
     <package>
       <name>siproxd</name>
@@ -462,7 +473,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>
@@ -492,7 +503,7 @@
       <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>gettext-0.17_1.tbz</depends_on_package>
-	  <depends_on_package>glib-2.20.4.tbz</depends_on_package>
+  	  <depends_on_package>glib-2.20.4.tbz</depends_on_package>
     </package>
     <package>
       <name>AutoConfigBackup</name>
@@ -539,9 +550,9 @@
       <name>OpenOSPFD</name>
       <descr>OSPF routing protocol</descr>
       <maintainer>cmb@pfsense.org</maintainer>
-      <version>0.2</version>
+      <version>0.5</version>
       <category>Routing</category>
-      <status>ALPHA</status>
+      <status>BETA</status>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
       <depends_on_package>openospfd-4.3.tbz</depends_on_package>
       <config_file>http://www.pfsense.com/packages/config/openospfd/openospfd.xml</config_file>
@@ -736,6 +747,7 @@
       <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>
       <configurationfile>squid.xml</configurationfile>
+      <noembedded>true</noembedded>
     </package>
     <package>
       <name>squid3</name>
@@ -797,6 +809,7 @@
       <version>1.3-2</version>
       <status>Beta</status>
       <required_version>1.1</required_version>
+          <noembedded>true</noembedded>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
       <depends_on_package>squidGuard-1.3_1.tbz</depends_on_package>
       <config_file>http://www.pfsense.org/packages/config/squidGuard/squidguard.xml</config_file>
@@ -896,12 +909,14 @@
   </package>
   <package>
 	<name>NRPE v2</name>
-	<website>http://example.org</website>
+	<website>http://wiki.nagios.org/index.php/Howtos:nrpe_nsca</website>
 	<descr>NRPE is an addon for Nagios that allows you to execute plugins on remote Linux/Unix hosts. This is useful if you need to monitor local resources/attributes like disk usage, CPU load, memory usage, etc. on a remote host.</descr>
 	<category>Services</category>
-	<depends_on_package_base_url>http://www.pfsense.com/packages/config/nrpe2/bin/</depends_on_package_base_url>
+	<depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
 	<depends_on_package>nrpe-2.12_1.tbz</depends_on_package>
 	<depends_on_package>nagios-plugins-1.4.13,1.tbz</depends_on_package>
+        <depends_on_package>libiconv-1.11_1.tbz</depends_on_package>
+        <depends_on_package>gettext-0.17_1.tbz</depends_on_package>
 	<config_file>http://www.pfsense.com/packages/config/nrpe2/nrpe2.xml</config_file>
 	<version>2.11</version>
 	<status>Beta</status>
@@ -968,5 +983,15 @@
       <config_file>http://www.pfsense.org/packages/config/states-summary/states-summary.xml</config_file>
       <configurationfile>states-summary.xml</configurationfile>
     </package>
+    <package>
+      <name>IP Range Aliases</name>
+      <descr>Patch to add IP Range support to Network Aliases. WARNING! Cannot be uninstalled.</descr>
+      <category>System</category>
+      <config_file>http://www.pfsense.com/packages/config/iprangealiases/iprangealiases.xml</config_file>
+      <version>0.2</version>
+      <status>BETA</status>
+      <required_version>1.2.3</required_version>
+      <maximum_version>1.2.3</maximum_version>
+    </package>
   </packages>
 </pfsensepkgs>