Merge commit 'mainline/master'

2 files changed, 692 insertions, 2 deletions

diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 113bc09f..0f94c1e5 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -1248,7 +1248,9 @@ function squid_generate_rules($type) {
 			$rules .= "rdr on \$pppoe proto tcp from any to !(\$pppoe) port 80 -> 127.0.0.1 port 80\n";
 		}
 		/* Handle PPTP case */
-		if($config['pptpd']['mode'] != "off") {
+//		if($config['pptpd']['mode'] != "off") {
+//    <mode> is not present in config.xml after disabling "redir"
+      if($config['pptpd']['mode'] == "server") {
 			$rules .= "rdr on \$pptp proto tcp from any to !(\$pptp) port 80 -> 127.0.0.1 port 80\n";
 		}		
 		$rules .= "\n";
@@ -1263,7 +1265,9 @@ function squid_generate_rules($type) {
 		if($config['pppoe']['mode'] == "off") {
 			$rules .= "pass in quick on \$pppoe proto tcp from any to !(\$pppoe) port $port flags S/SA keep state\n";			
 		}			
-		if($config['pptpd']['mode'] != "off") {
+//		if($config['pptpd']['mode'] != "off") {
+//    <mode> is not present in config.xml after disabling "redir"
+		if($config['pptpd']['mode'] == "server") {
 			$rules .= "pass in quick on \$pptp proto tcp from any to !(\$pptp) port $port flags S/SA keep state\n";
 		}			
 		break;
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
new file mode 100755
index 00000000..5c1a6cb6
--- /dev/null
+++ b/pkg_config.8.xml
@@ -0,0 +1,686 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- pfSense packages -->
+<pfsensepkgs>
+  <packages>
+	<package>
+		<name>frickin</name>
+		<descr>The Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP) client to connect to a PPTP server through Network Address Translation.</descr>
+		<website>http://www.placid.tv</website>
+		<category>Services</category>
+		<version>2.0</version>
+		<status>ALPHA</status>
+		<required_version>1.2.2</required_version>
+		<config_file>http://www.pfsense.com/packages/config/frickin/frickin.xml</config_file>
+		<configurationfile>frickin.xml</configurationfile>
+		<after_install_info>Please visit the Frickin PPTP settings tab and press save after setting the service up to start.</after_install_info>
+	</package>
+    <package>
+      <name>pure-ftpd</name>
+      <website>http://www.pureftpd.org/</website>
+      <descr>*DO NOT RUN THIS ON A FIREWALL. USE A DEDICATED MACHINE!* Pure FTPd Server is a fast, production quality, standards-conformant FTP server based on Troll-FTPd. It has no known vulnerabilities, is trivial to set up, and is especially designed for modern kernels. Features include PAM support, IPv6, chroot()ed home directories, virtual domains, built-in 'ls', FXP protocol, anti-warez system, bandwidth throttling, restricted ports for passive downloads, an LDAP backend, XML output, and more.</descr>
+      <category>FTP</category>
+      <config_file>http://www.pfsense.com/packages/config/pure-ftpd.xml</config_file>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>pure-ftpd-1.0.20_3.tbz</depends_on_package>
+      <version>1.0.21</version>
+      <status>Stable</status>
+      <configurationfile>pure-ftpd.xml</configurationfile>
+      <required_version>2.0</required_version>
+      <logging>
+        <facilityname>ftp</facilityname>
+        <logfilename>pure-ftpd.log</logfilename>
+      </logging>
+    </package>
+    <package>
+      <name>Avahi</name>
+      <pkginfolink>http://doc.pfsense.org/index.php/Avahi_package</pkginfolink>
+      <website>http://www.avahi.org/</website>
+      <descr>Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple MacOS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient. Avahi is mainly based on Lennart Poettering's flexmdns mDNS implementation for Linux which has been discontinued in favour of Avahi.</descr>
+      <category>Network Management</category>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <version>0.6.25</version>
+      <status>ALPHA</status>
+      <required_version>1.2.3</required_version>
+      <config_file>http://www.pfsense.com/packages/config/avahi/avahi.xml</config_file>
+      <configurationfile>avahi.xml</configurationfile>
+	  <after_install_info>Please visit the Avahi settings tab and select which interfaces you do not wish Avahi to listen on and click save to start the service.</after_install_info>
+    </package>
+    <package>
+      <name>ntop</name>
+      <website>http://www.ntop.org/</website>
+      <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/7/All/</depends_on_package_base_url>
+      <depends_on_package>ntop-3.3.8.tbz</depends_on_package>
+      <depends_on_package>gdbm-1.8.3_3.tbz</depends_on_package>
+      <depends_on_package>perl-5.8.8_1.tbz</depends_on_package>
+      <version>3.3.8</version>
+      <status>BETA</status>
+      <required_version>1.2.1</required_version>
+      <config_file>http://www.pfsense.com/packages/config/ntop/ntop.xml</config_file>
+      <configurationfile>ntop.xml</configurationfile>
+    </package>
+    <package>
+      <name>Pubkey</name>
+      <descr>pfSense release key</descr>
+      <website>http://pfsense.org</website>
+      <category>System</category>
+      <version>1.0</version>
+      <required_version>1.0</required_version>
+      <status>RELEASE</status>
+      <pkginfolink>http://doc.pfsense.org/index.php/Pubkey_package</pkginfolink>
+      <config_file>http://www.pfsense.org/packages/config/pubkey.xml</config_file>
+      <configurationfile>pubkey.xml</configurationfile>
+	<after_install_info>The pfSense release key has been updated.</after_install_info>
+    </package>
+    <package>
+      <name>Dashboard</name>
+      <descr>Adds pfSense dashboard that will be included with 2.0. WARNING!  Cannot be deinstalled.</descr>
+      <category>System</category>
+      <config_file>http://www.pfsense.com/packages/config/dashboard/dashboard.xml</config_file>
+      <version>0.7.5.3</version>
+      <status>BETA</status>
+      <required_version>1.2</required_version>
+      <maximum_version>1.9</maximum_version>
+      <configurationfile>dashboard.xml</configurationfile>
+    </package>
+    <package>
+      <name>FreeSWITCH</name>
+      <website>http://www.freeswitch.org/</website>
+      <descr>FreeSWITCH is an open source telephony platform designed to facilitate the creation of voice and chat driven products scaling from a soft-phone up to a soft-switch.  It can be used as a simple switching engine, a PBX, a media gateway or a media server to host IVR applications using simple scripts or XML to control the callflow. </descr>
+      <category>Services</category>
+      <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>
+      <status>Beta</status>
+      <required_version>1.2.1</required_version>
+      <maintainer>markjcrane@gmail.com</maintainer>
+      <configurationfile>freeswitch.xml</configurationfile>
+    </package>
+    <package>
+      <name>Notes</name>
+      <website/>
+      <descr>Track things you want to note for this system.</descr>
+      <category>Status</category>
+      <pkginfolink/>
+      <config_file>http://www.pfsense.com/packages/config/notes/notes.xml</config_file>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <version>0.2.4</version>
+      <status>Alpha</status>
+      <required_version>1.2.1</required_version>
+      <maintainer>markjcrane@gmail.com</maintainer>
+      <configurationfile>notes.xml</configurationfile>
+    </package>
+    <package>
+      <name>TFTP</name>
+      <website/>
+      <descr>Trivial File Transport Protocol is a very simple file transfer protocol. Often used with routers, voip phones and more.</descr>
+      <category>Services</category>
+      <pkginfolink/>
+      <config_file>http://www.pfsense.com/packages/config/tftp/tftp.xml</config_file>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <version>1.0.5</version>
+      <status>Stable</status>
+      <required_version>1.2.1</required_version>
+      <maintainer>markjcrane@gmail.com</maintainer>
+      <configurationfile>tftp.xml</configurationfile>
+    </package>
+    <package>
+      <name>PHPService</name>
+      <website/>
+      <descr>PHP run as a service it can do anything PHP can do including but not limited to monitoring files, CPU, RAM, and send alerts to the syslog.</descr>
+      <category>Services</category>
+      <pkginfolink>http://doc.pfsense.org/index.php/PHPService</pkginfolink>
+      <config_file>http://www.pfsense.com/packages/config/phpservice/phpservice.xml</config_file>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <version>0.4.1</version>
+      <status>Beta</status>
+      <required_version>1.2.1</required_version>
+      <maintainer>markjcrane@gmail.com</maintainer>
+      <configurationfile>phpservice.xml</configurationfile>
+    </package>
+    <package>
+      <name>Backup</name>
+      <website/>
+      <descr>Tool to Backup and Restore files and directories.</descr>
+      <category>System</category>
+      <pkginfolink></pkginfolink>
+      <config_file>http://www.pfsense.com/packages/config/backup/backup.xml</config_file>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <version>0.1.5</version>
+      <status>Beta</status>
+      <required_version>1.2</required_version>
+      <maintainer>markjcrane@gmail.com</maintainer>
+      <configurationfile>backup.xml</configurationfile>
+    </package>
+    <package>
+      <name>Cron</name>
+      <website/>
+      <descr>The cron utility is used to manage commands on a schedule.</descr>
+      <category>Services</category>
+      <pkginfolink></pkginfolink>
+      <config_file>http://www.pfsense.com/packages/config/cron/cron.xml</config_file>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <version>0.1.5</version>
+      <status>Beta</status>
+      <required_version>1.2</required_version>
+      <maintainer>markjcrane@gmail.com</maintainer>
+      <configurationfile>cron.xml</configurationfile>
+    </package>
+    <package>
+      <name>snort</name>
+      <descr>Snort is a libpcap-based packet sniffer/logger which can be used as a lightweight network intrusion detection system. 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/7/All/</depends_on_package_base_url>
+      <depends_on_package>snort-2.8.2.1.tbz</depends_on_package>
+      <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
+      <version>2.8.2.6_2</version>
+      <required_version>1.2</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>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.xml</config_file>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>spamd-4.1.2.tbz</depends_on_package>
+      <version>4.3.7</version>
+      <status>Stable</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>
+      <descr>Proxy for handling NAT of multiple SIP devices to a single public IP.</descr>
+      <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/7/All/</depends_on_package_base_url>
+      <depends_on_package>siproxd-0.7.0_1.tbz</depends_on_package>
+      <pkginfolink>http://doc.pfsense.org/index.php/Siproxd_package</pkginfolink>
+      <version>0.7.2</version>
+      <status>Beta</status>
+      <required_version>1.2.1</required_version>
+      <configurationfile>siproxd.xml</configurationfile>
+    </package>
+    <package>
+      <name>OpenBGPD</name>
+      <descr>OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol.</descr>
+      <category>NET</category>
+      <config_file>http://www.pfsense.com/packages/config/openbgpd/openbgpd.xml</config_file>
+      <version>0.4</version>
+      <status>STABLE</status>
+      <required_version>1.3</required_version>
+      <configurationfile>openbgpd.xml</configurationfile>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>openbgpd-4.0.tbz</depends_on_package>
+    </package>
+    <package>
+      <name>Lightsquid</name>
+      <descr>High perfomance web proxy report. Requires squid.</descr>
+      <website>http://lightsquid.sf.net/</website>
+      <category>Network</category>
+      <version>1.7.1</version>
+      <maintainer>dv_serg@mail.ru</maintainer>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>lightsquid-1.7.1_1.tbz</depends_on_package>
+      <status>Beta1</status>
+      <required_version>1.2.1</required_version>
+      <config_file>http://www.pfsense.com/packages/config/lightsquid/lightsquid.xml</config_file>
+      <configurationfile>lightsquid.xml</configurationfile>
+    </package>
+    <package>
+      <name>vnstat</name>
+      <website>http://humdi.net/vnstat/</website>
+      <descr>A console-based network traffic monitor</descr>
+      <category>Network Management</category>
+	  <depends_on_package_base_url>http://www.pfsense.com/packages/config/vnstat/bin/</depends_on_package_base_url>
+	  <depends_on_package>vnstat-1.6_3.tbz</depends_on_package>
+      <version>1.6.3</version>
+      <status>Beta</status>
+      <required_version>1.2.3</required_version>
+      <maintainer>crazypark2@yahoo.dk</maintainer>
+      <config_file>http://www.pfsense.com/packages/config/vnstat/vnstat.xml</config_file>
+      <configurationfile>vnstat.xml</configurationfile>
+    </package>
+    <package>
+      <name>phpSysInfo</name>
+      <website>http://phpsysinfo.sourceforge.net/</website>
+      <descr>PHPSysInfo is a customizable PHP Script that parses /proc, and formats information nicely. It will display information about system facts like Uptime, CPU, Memory, PCI devices, SCSI devices, IDE devices, Network adapters, Disk usage, and more.</descr>
+      <category>System</category>
+      <version>2.5.4</version>
+      <status>Beta</status>
+      <required_version>1.0</required_version>
+      <depends_on_package_base_url>http://www.pfsense.com/packages/config/phpsysinfo/bin/</depends_on_package_base_url>
+      <depends_on_package>mbmon-205_4.tbz</depends_on_package>
+      <config_file>http://www.pfsense.com/packages/config/phpsysinfo/phpsysinfo.xml</config_file>
+      <configurationfile>phpsysinfo.xml</configurationfile>
+    </package>
+    <package>
+      <name>Fit123</name>
+      <website>http://pfsense.comuf.com</website>
+      <descr>A list of small custom things that can be added to pfSense 1.2.3 :	Date,Code-red,LTSP,AFC and DDNS</descr>
+      <category>System</category>
+      <version>0.0.1</version>
+      <status>ALPHA</status>
+      <required_version>1.2.3</required_version>
+      <maintainer>crazypark2@yahoo.dk</maintainer>
+      <config_file>http://www.pfsense.com/packages/config/Fit123/fit123.xml</config_file>
+      <configurationfile>fit123.xml</configurationfile>
+    </package>
+    <package>
+      <name>dns-server</name>
+      <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.2</version>
+      <status>Beta</status>
+      <pkginfolink>http://doc.pfsense.org/index.php/Tinydns_package</pkginfolink>
+      <required_version>1.2</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/7/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>
+    </package>
+    <package>
+      <name>Open-VM-Tools</name>
+      <descr>VMware Tools</descr>
+      <website>http://open-vm-tools.sourceforge.net/</website>
+      <category>Services</category>
+      <version>102166_7_1</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>
+      <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-102166_7.tbz</depends_on_package>
+      <depends_on_package>libtool-1.5.26.tbz</depends_on_package>
+      <depends_on_package>libiconv-1.11_1.tbz</depends_on_package>
+      <depends_on_package>libdnet-1.11_2.tbz</depends_on_package>
+      <depends_on_package>icu-3.8.1_1.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>
+    </package>
+    <package>
+      <name>AutoConfigBackup</name>
+      <maintainer>portal@bsdperimeter.com</maintainer>
+      <descr>Automatically backs up your pfSense configuration.  All contents are encrypted on the server.  Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</descr>
+      <website>https://portal.pfsense.org</website>
+      <category>Services</category>
+      <version>1.15</version>
+      <status>BETA</status>
+      <required_version>1.2</required_version>
+      <pkginfolink>http://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
+      <config_file>http://www.pfsense.com/packages/config/autoconfigbackup/autoconfigbackup.xml</config_file>
+      <configurationfile>autoconfigbackup.xml</configurationfile>
+    </package>
+    <package>
+      <name>arping</name>
+      <descr>Broadcasts a who-has ARP packet on the network and prints answers. </descr>
+      <website>http://www.habets.pp.se/synscan/programs.php?prog=arping</website>
+      <category>Services</category>
+      <version>2.06</version>
+      <status>Beta</status>
+      <pkginfolink>http://doc.pfsense.org/index.php/Arping_package</pkginfolink>
+      <required_version>1.0.1</required_version>
+      <config_file>http://www.pfsense.com/packages/config/arping/arping.xml</config_file>
+      <configurationfile>arping.xml</configurationfile>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>arping-2.06.tbz</depends_on_package>
+    </package>
+    <package>
+      <name>nmap</name>
+      <maintainer>billm@pfsense.org</maintainer>
+      <descr>NMap is a utility for network exploration or security auditing. It supports ping scanning (determine which hosts are up), many port scanning techniques (determine what services the hosts are offering), version detection (determine what application/service is runing on a port), and TCP/IP fingerprinting (remote host OS or device identification). It also offers flexible target and port specification, decoy/stealth scanning, SunRPC scanning, and more. Most Unix and Windows platforms are supported in both GUI and command line modes. Several popular handheld devices are also supported, including the Sharp Zaurus and the iPAQ.</descr>
+      <category>Security</category>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>nmap-4.76.tbz</depends_on_package>
+      <config_file>http://www.pfsense.com/packages/config/nmap/nmap.xml</config_file>
+      <version>4.76</version>
+      <status>Stable</status>
+      <pkginfolink>http://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
+      <required_version>1.2.1</required_version>
+      <configurationfile>nmap.xml</configurationfile>
+    </package>
+    <package>
+      <name>imspector</name>
+      <descr>IMSpector is an Instant Messenger transparent proxy with logging capabilities. Currently it supports MSN, AIM, ICQ, Yahoo and IRC to different degrees.</descr>
+      <website>http://www.imspector.org/</website>
+      <category>Network Management</category>
+      <maintainer>billm@pfsense.org</maintainer>
+      <version>0.8-9</version>
+      <required_version>1.2.1</required_version>
+      <status>BETA</status>
+      <pkginfolink>http://doc.pfsense.org/index.php/IMSpector_package</pkginfolink>
+      <config_file>http://www.pfsense.com/packages/config/imspector/imspector.xml</config_file>
+      <configurationfile>imspector.xml</configurationfile>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>imspector-0.8.tbz</depends_on_package>
+      <depends_on_package>libiconv-1.11_1.tbz</depends_on_package>
+      <depends_on_package>mysql-client-5.0.77.tbz</depends_on_package>
+      <depends_on_package>sqlite3-3.6.10.tbz</depends_on_package>
+    </package>
+    <package>
+      <name>nut</name>
+      <descr>Network UPS Tools</descr>
+      <website>http://www.networkupstools.org/</website>
+      <category>Network Management</category>
+      <version>2.0.4</version>
+      <status>BETA</status>
+      <required_version>1.2.1</required_version>
+      <maintainer>rswagoner@gmail.com</maintainer>
+      <config_file>http://www.pfsense.com/packages/config/nut/nut.xml</config_file>
+      <configurationfile>nut.xml</configurationfile>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>nut-2.2.2.tbz</depends_on_package>
+    </package>
+    <package>
+      <name>diag_new_states</name>
+      <descr>Paul Taylors version of Diagnostics States which utilizes pftop.</descr>
+      <website>http://www.addressplus.net</website>
+      <category>Network Management</category>
+      <version>0.2</version>
+      <maintainer>ptaylor@addressplus.net</maintainer>
+      <required_version>1.2.1</required_version>
+      <status>BETA</status>
+      <config_file>http://www.pfsense.org/packages/config/diag_states_pt/diag_new_states.xml</config_file>
+      <configurationfile>http://www.pfsense.com/packages/config/diag_states_pt/diag_new_states.xml</configurationfile>
+    </package>
+    <package>
+      <name>darkstat</name>
+      <website>http://dmr.ath.cx/net/darkstat/</website>
+      <descr>darkstat is a network statistics gatherer. It's a packet sniffer that runs as a background process on a cable/DSL router, gathers all sorts of statistics about network usage, and serves them over HTTP.</descr>
+      <category>Network Management</category>
+      <depends_on_package_base_url>http://www.pfsense.com/packages/config/darkstat/bin/</depends_on_package_base_url>
+      <depends_on_package>darkstat-3.0.712.tbz</depends_on_package>
+      <depends_on_package>gettext-0.17_1.tbz</depends_on_package>
+      <version>3.0.712</version>
+      <status>Stable</status>
+      <required_version>1.2.1</required_version>
+      <maintainer>sullrich+pfsp@gmail.com</maintainer>
+      <config_file>http://www.pfsense.com/packages/config/darkstat/darkstat.xml</config_file>
+      <configurationfile>darkstat.xml</configurationfile>
+    </package>
+    <package>
+      <name>pfflowd</name>
+      <website>http://www.mindrot.org/pfflowd.html</website>
+      <descr>pfflowd converts OpenBSD PF status messages (sent via the pfsync interface) to Cisco NetFlow datagrams. These datagrams may be sent (via UDP) to a host of one's choice. Utilising the OpenBSD stateful packet filter infrastructure means that flow tracking is very fast and accurate.</descr>
+      <category>Network Management</category>
+      <config_file>http://www.pfsense.com/packages/config/pfflowd.xml</config_file>
+      <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-7-stable/All</depends_on_package_base_url>
+      <depends_on_package>pfflowd-0.7.tbz</depends_on_package>
+      <version>0.7</version>
+      <status>Stable</status>
+      <required_version>1.2.1</required_version>
+      <configurationfile>pfflowd.xml</configurationfile>
+      <maintainer>nick@buraglio.com</maintainer>
+    </package>
+    <package>
+      <name>widentd</name>
+      <descr>RFC1413 auth/identd daemon with fixed fake reply</descr>
+      <website>http://www.webweaving.org/widentd</website>
+      <category>Services</category>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>widentd-1.03_1.tbz</depends_on_package>
+      <version>1.03_1</version>
+      <status>Stable</status>
+      <pkginfolink>http://doc.pfsense.org/index.php/Widentd_package</pkginfolink>
+      <required_version>1.2.1</required_version>
+      <config_file>http://www.pfsense.com/packages/config/widentd.xml</config_file>
+      <configurationfile>widentd.xml</configurationfile>
+    </package>
+    <package>
+      <name>freeradius</name>
+      <website>http://www.freeradius.org/</website>
+      <descr>A free implementation of the RADIUS protocol.</descr>
+      <category>System</category>
+      <version>1.1.2_1</version>
+      <status>BETA</status>
+      <required_version>1.2.1</required_version>
+      <maintainer>none</maintainer>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>freeradius-1.1.7_3.tbz</depends_on_package>
+      <depends_on_package>libltdl-1.5.26.tbz</depends_on_package>
+      <config_file>http://www.pfsense.org/packages/config/freeradius.xml</config_file>
+      <configurationfile>freeradius.xml</configurationfile>
+    </package>
+    <package>
+      <name>bandwidthd</name>
+      <website>http://bandwidthd.sourceforge.net/</website>
+      <descr>BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization. Charts are built by individual IPs, and by default display utilization over 2 day, 8 day, 40 day, and 400 day periods. Furthermore, each ip address's utilization can be logged out at intervals of 3.3 minutes, 10 minutes, 1 hour or 12 hours in cdf format, or to a backend database server. HTTP, TCP, UDP, ICMP, VPN, and P2P traffic are color coded.</descr>
+      <category>System</category>
+      <version>2.0.1.2</version>
+      <status>BETA</status>
+      <required_version>1.2.1</required_version>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>bandwidthd-2.0.1_1.tbz</depends_on_package>
+      <depends_on_package>libiconv-1.11_1.tbz</depends_on_package>
+      <config_file>http://www.pfsense.org/packages/config/bandwidthd/bandwidthd.xml</config_file>
+      <configurationfile>bandwidthd.xml</configurationfile>
+    </package>
+    <package>
+      <name>stunnel</name>
+      <website>http://www.stunnel.org/</website>
+      <descr>An SSL encryption wrapper between remote client and local or remote servers. </descr>
+      <category>Network Management</category>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>stunnel-4.25.tbz</depends_on_package>
+      <version>4.30.1</version>
+      <status>Stable</status>
+      <pkginfolink>http://doc.pfsense.org/index.php/Stunnel_package</pkginfolink>
+      <required_version>1.2.1</required_version>
+      <config_file>http://www.pfsense.com/packages/config/stunnel.xml</config_file>
+      <configurationfile>stunnel.xml</configurationfile>
+    </package>
+    <package>
+      <name>iperf</name>
+      <website>http://dast.nlanr.net/Projects/Iperf/</website>
+      <descr>Iperf is a tool for testing network throughput, loss, and jitter.</descr>
+      <category>Network Management</category>
+      <config_file>http://www.pfsense.com/packages/config/iperf.xml</config_file>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>iperf-2.0.4.tbz</depends_on_package>
+      <version>2.0.2_1</version>
+      <status>Beta</status>
+      <pkginfolink>http://doc.pfsense.org/index.php/Iperf_package</pkginfolink>
+      <required_version>1.2.1</required_version>
+      <configurationfile>iperf.xml</configurationfile>
+    </package>
+    <package>
+      <name>netio</name>
+      <website>http://freshmeat.net/projects/netio/</website>
+      <descr>This is a network benchmark for DOS, OS/2 2.x, Windows NT/2000 and Unix. It measures the net throughput of a network via NetBIOS and/or TCP/IP protocols (Unix and DOS only support TCP/IP) using various different packet sizes.</descr>
+      <category>Network Management</category>
+      <config_file>http://www.pfsense.com/packages/config/netio.xml</config_file>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/All</depends_on_package_base_url>
+      <depends_on_package>netio-1.26.tbz</depends_on_package>
+      <version>1.26</version>
+      <required_version>2.0</required_version>
+      <status>ALPHA</status>
+      <configurationfile>netio.xml</configurationfile>
+    </package>
+    <package>
+      <name>mtr-nox11</name>
+      <maintainer>billm@pfsense.org</maintainer>
+      <descr>Enhanced traceroute replacement</descr>
+      <website>http://www.bitwizard.nl/mtr/</website>
+      <category>Network Management</category>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>mtr-nox11-0.73_1.tbz</depends_on_package>
+      <version>0.65_2</version>
+      <status>Stable</status>
+      <required_version>2.0</required_version>
+      <config_file>http://www.pfsense.com/packages/config/mtr-nox11.xml</config_file>
+      <configurationfile>mtr-nox11.xml</configurationfile>
+    </package>
+    <package>
+      <name>squid</name>
+      <descr>High performance web proxy cache.</descr>
+      <website>http://www.squid-cache.org/</website>
+      <category>Network</category>
+      <version>2.6.21_09</version>
+      <status>Stable</status>
+      <required_version>1.2.1</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>
+      <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>
+      <configurationfile>squid.xml</configurationfile>
+    </package>
+    <package>
+      <name>squid3</name>
+      <descr>EXPERIMENTAL! Not all directives are ported yet! High performance web proxy cache.</descr>
+      <website>http://www.squid-cache.org/</website>
+      <category>Network</category>
+      <version>3.0.8_08</version>
+      <status>ALPHA</status>
+      <required_version>1.2.1</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-3.0.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/squid3/squid.xml</config_file>
+      <configurationfile>squid.xml</configurationfile>
+    </package>
+    <package>
+      <name>LCDproc</name>
+      <descr>LCD display driver</descr>
+      <website>http://www.lcdproc.org/</website>
+      <category>Utility</category>
+      <version>lcdproc-0.5.2_2</version>
+      <status>BETA</status>
+      <required_version>1.2.1</required_version>
+      <maintainer>seth.mos@xs4all.nl</maintainer>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>lcdproc-0.5.2_2.tbz</depends_on_package>
+      <config_file>http://www.pfsense.org/packages/config/lcdproc/lcdproc.xml</config_file>
+      <configurationfile>lcdproc.xml</configurationfile>
+    </package>
+    <package>
+      <name>arpwatch</name>
+      <descr>Arpwatch monitors ethernet/ip address pairings. It also logs certain changes to syslog.</descr>
+      <website>http://www-nrg.ee.lbl.gov/</website>
+      <category>Security</category>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>arpwatch-2.1.a15_4.tbz</depends_on_package>
+      <version>2.1.a13</version>
+      <status>ALPHA</status>
+      <required_version>2.0</required_version>
+      <config_file>http://www.pfsense.com/packages/config/arpwatch.xml</config_file>
+      <configurationfile>arpwatch.xml</configurationfile>
+      <logging>
+        <facilityname>arpwatch</facilityname>
+        <logfilename>arpwatch.log</logfilename>
+      </logging>
+    </package>
+    <package>
+      <name>squidGuard</name>
+      <descr>
+          High perfomance web proxy filter. 
+          Required proxy Squid package. 
+	  </descr>
+      <website>http://www.squidGuard.org/</website>
+      <maintainer>dv_serg@mail.ru</maintainer>
+      <category>Network Management</category>
+      <version>1.3-2</version>
+      <status>Beta</status>
+      <required_version>1.1</required_version>
+      <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>
+      <configurationfile>squidguard.xml</configurationfile>
+    </package>
+    <package>
+      <name>Zabbix Agent</name>
+      <descr>Monitoring agent.</descr>
+      <category>Services</category>
+      <config_file>http://www.pfsense.com/packages/config/zabbix-agent/zabbix-agent.xml</config_file>
+      <version>0.22</version>
+      <status>FINAL</status>
+      <required_version>1.2.3</required_version>
+      <configurationfile>zabbix-agent.xml</configurationfile>
+      <maintainer>remco.verhoef@redfive.biz</maintainer>
+      <depends_on_package_base_url>http://www.pfsense.com/packages/config/zabbix-agent/bin/</depends_on_package_base_url>
+      <depends_on_package>zabbix-agent-1.4.5,2.tbz</depends_on_package>
+    </package>
+    <package>
+      <name>OpenVPN Client Export Utility</name>
+      <descr>Allows a pre-configured OpenVPN Windows Client to be exported directly from pfSense.</descr>
+      <category>Security</category>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
+      <depends_on_package>p7zip-4.58.tbz</depends_on_package>
+      <version>0.1</version>
+      <status>BETA</status>
+      <required_version>2.0</required_version>
+      <config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>
+      <configurationfile>openvpn-client-export.xml</configurationfile>
+    </package>
+    <package>
+      <name>HAVP</name> 
+      <pkginfolink></pkginfolink> 
+      <website>http://www.server-side.de/</website> 
+      <descr>HAVP (HTTP Antivirus Proxy) is a proxy with a ClamAV anti-virus scanner. The main aims are continuous, non-blocking downloads and smooth scanning of dynamic and password protected HTTP traffic. Havp antivirus proxy has a parent and transparent proxy mode. It can be used with squid or standalone.</descr> 
+      <category>Network Management</category> 
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> 
+      <depends_on_package>havp-0.88.tbz</depends_on_package>
+      <version>0.88</version> 
+      <status>ALPHA</status> 
+      <required_version>1.2.2</required_version> 
+      <config_file>http://www.pfsense.com/packages/config/havp/havp.xml</config_file> 
+      <configurationfile>havp.xml</configurationfile> 
+      <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>
+   <website>http://anduin.net/jailctl/</website>
+   <category>System</category>
+   <version>0.51</version>
+   <required_version>1.2.3</required_version>
+   <status>BETA</status>
+   <pkginfolink>http://doc.pfsense.org/index.php/PfJailctl_package</pkginfolink>
+   <config_file>http://www.pfsense.com/packages/config/jailctl.xml</config_file>
+   <configurationfile>jailctl.xml</configurationfile>
+   <maintainer>ltning-jailctl@anduin.net</maintainer>
+  </package>
+  <package>
+   <name>jail_template</name>
+   <descr>Basic template for jails, probably requires pfJailctl to be useful. Includes 'base' and 'manpages' dists.</descr>
+   <website>http://anduin.net/jailctl/</website>
+   <category>System</category>
+   <version>0.2</version>
+   <required_version>1.2.3</required_version>
+   <status>BETA</status>
+   <pkginfolink>http://doc.pfsense.org/index.php/PfJailctl_package</pkginfolink>
+   <config_file>http://www.pfsense.com/packages/config/jail_template.xml</config_file>
+   <configurationfile>jail_template.xml</configurationfile>
+   <maintainer>ltning-jailctl@anduin.net</maintainer>
+  </package>
+  </packages>
+</pfsensepkgs>