Backout last commit and unbreak all of the packages.

1 files changed, 126 insertions, 172 deletions

diff --git a/pkg_config.xml b/pkg_config.xml
index 30df5958..902c0af9 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -1,70 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- pfSense packages -->
+<?xml version="1.0"?>
+<!-- pfsense packages -->
 <pfsensepkgs>
-	<packages>
-		<package>
-			<name>spamassassin</name>
-			<descr>The SpamAssassin spam detection software.</descr>
-			<website>http://spamassassin.apache.org/</website>
-			<category>Security</category>
-			<version>0.1</version>
-			<status>PRE-ALPHA</status>
-			<mantainer>fernando@netfilter.com.br</mantainer>
-			<depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6.1-release/All</depends_on_package_base_url>
-			<depends_on_package>p5-Mail-SpamAssassin-3.1.0_6.tbz</depends_on_package>
-			<config_file>http://www.pfsense.org/packages/config/sassassin.xml</config_file>
-			<configurationfile>sassassin.xml</configurationfile>
-		</package>
-		<package>
-			<name>p3scan</name>
-			<descr>Packet Filter port of a POP3 virus/spam scanner.</descr>
-			<website>http://www.undergroundsecurity.com/p3scan/</website>
-			<category>Security</category>
-			<version>0.1</version>
-			<status>PRE-ALPHA</status>
-			<mantainer>fernando@netfilter.com.br</mantainer>
-			<depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6.1-release/All</depends_on_package_base_url>
-			<depends_on_package>pcre-6.6_1.tbz</depends_on_package>
-			<config_file>http://www.pfsense.org/packages/config/p3scan.xml</config_file>
-			<configurationfile>p3scan.xml</configurationfile>
-		</package>
-		<package>
-			<name>clamsmtp</name>
-			<descr>SMTP virus scanner.</descr>
-			<website>http://memberwebs.com/nielsen/software/clamsmtp/</website>
-			<category>Security</category>
-			<version>0.1</version>
-			<status>PRE-ALPHA</status>
-			<mantainer>fernando@netfilter.com.br</mantainer>
-			<config_file>http://www.pfsense.org/packages/config/clamsmtp.xml</config_file>
-			<configurationfile>clamsmtp.xml</configurationfile>
-		</package>
-		<package>
-			<name>viralator</name>
-			<descr>HTTP virus scanner.</descr>
-			<website>http://viralator.sourceforge.net/</website>
-			<category>Security</category>
-			<version>0.1</version>
-			<status>PRE-ALPHA</status>
-			<mantainer>fernando@netfilter.com.br</mantainer>
-			<depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6.1-release/All</depends_on_package_base_url>
-			<depends_on_package>perl-5.8.8.tbz</depends_on_package>
-			<depends_on_package>p5-libwww-5.805.tbz</depends_on_package>
-			<depends_on_package>squirm-1.26.tbz</depends_on_package>
-			<config_file>http://www.pfsense.org/packages/config/viralator.xml</config_file>
-			<configurationfile>viralator.xml</configurationfile>
-		</package>
+	  <packages>
 		<package>
 			<name>clamav</name>
-			<descr>The ClamAV antivirus.</descr>
 			<website>http://www.clamav.net/</website>
+			<descr>Opensource anti virus</descr>
 			<category>Security</category>
-			<version>0.1</version>
-			<status>PRE-ALPHA</status>
-			<maintainer>fernando@netfilter.com.br</maintainer>
-			<depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6.0-release/All<depends_on_package_base_url>
-			<config_file>http://www.pfsense.org/packages/config/clamav.xml</config_file>
+			<config_file>http://agni.linuxense.com/packages/config/clamav.xml</config_file>
+			<depends_on_package_base_url>http://agni.linuxense.com/packages</depends_on_package_base_url>
+			<depends_on_package>clamav-0.88_1.tbz</depends_on_package>
+			<version>0.4</version>
+			<status>BROKEN</status>
+			<maintainer>raj@linuxense.com</maintainer>
 			<configurationfile>clamav.xml</configurationfile>
+			<logging>
+			    <facilityname>freshclam</facilityname>
+			    <logfilename>freshclam.log</logfilename>
+			</logging>
 		</package>
 		<package>
 			<name>havp</name>
@@ -79,11 +32,11 @@
 			<maintainer>raj@linuxense.com</maintainer>
 			<configurationfile>havp.xml</configurationfile>
 			<logging>
-				<facilityname>HAVP Access Log </facilityname>
-				<logfilename>access.log</logfilename>
+			    <facilityname>HAVP Access Log </facilityname>
+			    <logfilename>access.log</logfilename>
 			</logging>
-		</package>
-		<package>
+		</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>
@@ -94,8 +47,8 @@
 			<status>BETA</status>
 			<config_file>http://www.pfsense.com/packages/config/ntop.xml</config_file>
 			<configurationfile>ntop.xml</configurationfile>
-		</package>
-		<package>
+	    </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>
@@ -107,33 +60,32 @@
 			<status>BETA</status>
 			<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://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6.0-release/All</depends_on_package_base_url>
-			<depends_on_package>widentd-1.03.tbz</depends_on_package>
-			<version>1.03</version>
-			<status>ALPHA ALPHA</status>
-			<config_file>http://www.pfsense.com/packages/config/widentd.xml</config_file>
-			<configurationfile>widentd.xml</configurationfile>
-		</package>
-		<package>
+	    </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://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6.0-release/All</depends_on_package_base_url> 
+			<depends_on_package>widentd-1.03.tbz</depends_on_package> 
+			<version>1.03</version> 
+			<status>ALPHA ALPHA</status> 
+			<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>0.1</version>
-			<status>PRE-ALPHA</status>
-			<maintainer>fernando@netfilter.com.br</maintainer>
-			<depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6.0-release/All</depends_on_package_base_url>
+			<descr>FreeRADIUS is the premiere open source RADIUS server. It is fast, flexible, configurable, and supports more authentication protocols than many commercial servers. A client entry for localhost with the shared secret "pfsense" is defined on installation for easy integration with the captive portal. This package is currently intended to provide a local user database for captive portal and pptp - it does not employ SQL and is not meant to supplant an external RADIUS server for advanced tasks.</descr>
+			<category>Security</category>
+			<config_file>http://www.pfsense.com/packages/config/freeradius.xml</config_file>                       
+			<depends_on_package_base_url>http://www.pfsense.com/packages/All</depends_on_package_base_url>                                                                         
 			<depends_on_package>freeradius-1.0.4.tbz</depends_on_package>
-			<config_file>http://www.pfsense.org/packages/config/freeradius.xml</config_file>
+			<version>1.0.4</version>
+			<status>BROKEN</status>
 			<configurationfile>freeradius.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>stunnel</name>
 			<website>http://www.stunnel.org/</website>
 			<descr>The stunnel program is designed to work as an SSL encryption wrapper between remote client and local (inetd-startable) or remote servers. It can be used to add SSL functionality to commonly used inetd daemons like POP2, POP3, and IMAP servers without any changes in the program's code. It will negotiate an SSL connection using the OpenSSL or SSLeay libraries. It calls the underlying crypto libraries, allowing stunnel to support whatever cryptographic algorithms you compiled into your crypto package.</descr>
@@ -144,8 +96,8 @@
 			<status>Stable</status>
 			<config_file>http://www.pfsense.com/packages/config/stunnel.xml</config_file>
 			<configurationfile>stunnel.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>iperf</name>
 			<website>http://dast.nlanr.net/Projects/Iperf/</website>
 			<descr>Iperf is a tool for measuring maximum TCP and UDP bandwidth, reminiscent of ttcp and nettest. It has been written to overcome the shortcomings of those aging tools. Iperf can also test UDP bandwidth, loss, and jitter.</descr>
@@ -156,8 +108,8 @@
 			<version>2.0.2</version>
 			<status>ALPHA</status>
 			<configurationfile>iperf.xml</configurationfile>
-		</package>
-		<package>
+	    </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>
@@ -171,10 +123,10 @@
 			<configurationfile>spamd.xml</configurationfile>
 			<logging>
 				<facilityname>spamd</facilityname>
-				<logfilename>spamd.log</logfilename>
-			</logging>
-		</package>
-		<package>
+				<logfilename>spamd.log</logfilename>                                 
+			</logging>                       	
+	    </package>
+	    <package>
 			<name>assp</name>
 			<website>http://assp.sourceforge.net</website>
 			<descr>The Anti-Spam SMTP Proxy (ASSP) Server project is an open source platform-independent SMTP Proxy server which implements whitelists and Bayesian filtering to rid the planet of the blight of unsolicited email (UCE). UCE must be stopped at the SMTP server. Anti-spam tools must be adaptive to new spam and customized for each site's mail patterns. This free, easy-to-use tool works with any mail transport and achieves these goals requiring no operator intervention after the initial setup phase.  Default username: anything, Password: nospam4me</descr>
@@ -186,8 +138,8 @@
 			<version>0.1</version>
 			<status>ALPHA</status>
 			<configurationfile>assp.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>siproxd</name>
 			<website>http://siproxd.sourceforge.net/</website>
 			<descr>Siproxd is a proxy/masquerading daemon for the SIP protocol. It handles registrations of SIP clients on a private IP network and performs rewriting of the SIP message bodies to make SIP connections possible via a masquerading firewall. It allows SIP clients (like kphone, linphone) to work behind an IP masquerading firewall or router.</descr>
@@ -198,8 +150,8 @@
 			<version>0.5.11</version>
 			<status>ALPHA</status>
 			<configurationfile>siproxd.xml</configurationfile>
-		</package>
-		<package>
+	    </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>
@@ -210,8 +162,8 @@
 			<version>1.14</version>
 			<status>ALPHA</status>
 			<configurationfile>netio.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>ifdepd</name>
 			<descr>The ifdepd daemon implements dependencies between network interfaces in a reliable fashion. If any of the source interfaces fails, ifdepd sets all destination interfaces to state down. If all source interfaces are up, ifdepd sets all destination interfaces to state up.</descr>
 			<website>http://hugo.bmg.gv.at</website>
@@ -222,8 +174,8 @@
 			<status>ALPHA</status>
 			<config_file>http://www.pfsense.com/packages/config/ifdepd.xml</config_file>
 			<configurationfile>ifdepd.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>mtr-nox11</name>
 			<descr>Enhanced traceroute replacement</descr>
 			<website>http://www.bitwizard.nl/mtr/</website>
@@ -234,39 +186,41 @@
 			<status>ALPHA ALPHA</status>
 			<config_file>http://www.pfsense.com/packages/config/mtr-nox11.xml</config_file>
 			<configurationfile>mtr-nox11.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>squid</name>
-			<descr>High performance web proxy cache.</descr>
+			<descr>High performance Web proxy cache</descr>
 			<website>http://www.squid-cache.org/</website>
-			<category>Network</category>
-			<version>0.1</version>
-			<status>PRE-ALPHA</status>
-			<maintainer>fernando@netfilter.com.br</maintainer>
-			<depends_on_package_base_url>http://www.pfsense.org/packages/All</depends_on_package_base_url>
-			<depends_on_package>squid-2.5.13_1.tbz</depends_on_package>
-			<depends_on_package>squid_radius_auth-1.0.8.tbz</depends_on_package>
-			<config_file>http://www.pfsense.org/packages/config/squid.xml</config_file>
-			<configurationfile>squid.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>
+			<category>Network Management</category>
 			<depends_on_package_base_url>http://www.pfsense.com/packages/All</depends_on_package_base_url>
-			<depends_on_package>arpwatch-2.1.a13.tbz</depends_on_package>
-			<version>2.1.a13</version>
+			<depends_on_package>squid-2.5.12_4.tbz</depends_on_package>
+			<version>2.5.12_4</version>
 			<status>ALPHA</status>
-			<config_file>http://www.pfsense.com/packages/config/arpwatch.xml</config_file>
-			<configurationfile>arpwatch.xml</configurationfile>
+			<config_file>http://www.pfsense.com/packages/config/squid_ng.xml</config_file>
+			<configurationfile>squid_ng.xml</configurationfile>
 			<logging>
-				<facilityname>arpwatch</facilityname>
-				<logfilename>arpwatch.log</logfilename>
+				<facilityname>Squid Cache Log</facilityname>
+				<logfilename>cache.log</logfilename>
 			</logging>
-		</package>
+	    </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://www.pfsense.com/packages/All</depends_on_package_base_url>
+		    <depends_on_package>arpwatch-2.1.a13.tbz</depends_on_package>
+		    <version>2.1.a13</version>
+		    <status>ALPHA</status>
+		    <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>
 	  </packages>
-		<package>
+	    <package>
 			<name>powerdns</name>
 			<descr>PowerDNS (AKA pdns) is an advanced high performance authoritative nameserver with MANY advanced features</descr>
 			<website>http://www.powerdns.com/</website>
@@ -277,8 +231,8 @@
 			<status>ALPHA (NO GUI)</status>
 			<config_file>http://www.pfsense.com/packages/config/powerdns.xml</config_file>
 			<configurationfile>powerdns.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <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>
@@ -287,10 +241,10 @@
 			<status>ALPHA</status>
 			<config_file>http://www.pfsense.com/packages/config/frickin.xml</config_file>
 			<configurationfile>frickin.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>postfix</name>
-			<descr>Postfix mail forwarder.	Forwards mail to another mail server.</descr>
+			<descr>Postfix mail forwarder.  Forwards mail to another mail server.</descr>
 			<website>http://www.postfix.com/</website>
 			<category>Mail</category>
 			<depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-5.3-release/mail</depends_on_package_base_url>
@@ -299,8 +253,8 @@
 			<status>ALPHA</status>
 			<config_file>http://www.pfsense.com/packages/config/postfix.xml</config_file>
 			<configurationfile>postfix.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>doorman</name>
 			<website>http://doorman.sourceforge.net</website>
 			<descr>Doorman is a port knocking implementation which allows a server to run silently, invisibly, with all TCP ports closed except to those who know the secret knock.</descr>
@@ -311,20 +265,20 @@
 			<version>0.8_1</version>
 			<status>ALPHA</status>
 			<configurationfile>doorman.xml</configurationfile>
-		</package>
-		<package>
-			<name>squidGuard</name>
-			<descr>High performance Web proxy Guard</descr>
-			<website>http://www.squidguard.org/</website>
-			<category>Network Management</category>
-			<depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6.0-release/All/</depends_on_package_base_url>
-			<depends_on_package>squidGuard-1.2.0_1.tbz</depends_on_package>
-			<version>1.2.0_1</version>
-			<status>ALPHA</status>
-			<config_file>http://www.pfsense.com/packages/config/squidGuard.xml</config_file>
-			<configurationfile>squidGuard.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
+	        <name>squidGuard</name>
+	        <descr>High performance Web proxy Guard</descr>
+	        <website>http://www.squidguard.org/</website>
+	        <category>Network Management</category>
+	        <depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6.0-release/All/</depends_on_package_base_url>
+	        <depends_on_package>squidGuard-1.2.0_1.tbz</depends_on_package>
+	        <version>1.2.0_1</version>
+	        <status>ALPHA</status>
+	        <config_file>http://www.pfsense.com/packages/config/squidGuard.xml</config_file>
+	        <configurationfile>squidGuard.xml</configurationfile>
+	    </package>
+	    <package>
 			<name>nmap</name>
 			<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>
@@ -333,8 +287,8 @@
 			<config_file>http://www.pfsense.com/packages/config/nmap.xml</config_file>
 			<version>3.93</version>
 			<configurationfile>nmap.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>pfstat</name>
 			<website>http://www.benzedrine.cx/pfstat.html</website>
 			<descr>pfstat is a small utility that collects packet filter statistics and produces graphs.</descr>
@@ -345,10 +299,10 @@
 			<status>Stable</status>
 			<version>1.7</version>
 			<configurationfile>pfstat.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>upclient</name>
-			<website>http://uptimes.hostingwired.com</website>
+			<website>http://uptimes.hostingwired.com</website>              
 			<descr>upclient sends system uptime and status information to a server (typically uptimes.hostingwired.com) that tracks and compares uptime statistics.</descr>
 			<category>Miscellaneous</category>
 			<config_file>http://www.pfsense.com/packages/config/upclient.xml</config_file>
@@ -357,8 +311,8 @@
 			<version>5.0.b8_2</version>
 			<status>ALPHA</status>
 			<configurationfile>upclient.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>PerUserBW</name>
 			<descr>Adds a per user bandwidth distribution option.  Requires 0.79.4 or newer.</descr>
 			<category>NET</category>
@@ -366,20 +320,20 @@
 			<version>0.1</version>
 			<status>ALPHA</status>
 			<configurationfile>per-user-bandwidth-distribution.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>doorman</name>
 			<website>http://doorman.sourceforge.net</website>
-			<descr>Doorman is a port knocking implementation which allows a server to run silently, invisibly, with all TCP ports closed except to those who know the secret knock.</descr>
-			<category>Security</category>
+			<descr>Doorman is a port knocking implementation which allows a server to run silently, invisibly, with all TCP ports closed except to those who know the secret knock.</descr>                                             
+			<category>Security</category>                                                                                                                                                                           
 			<config_file>http://www.pfsense.com/packages/config/doorman.xml</config_file>
 			<depends_on_package_base_url>http://www.pfsense.com/packages/All</depends_on_package_base_url>
 			<depends_on_package>doorman-0.8_1.tbz</depends_on_package>
 			<version>0.8_1</version>
 			<status>ALPHA</status>
 			<configurationfile>doorman.xml</configurationfile>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>quagga</name>
 			<website>http://www.quagga.net/</website>
 			<descr>*NO GUI*</descr>
@@ -388,7 +342,7 @@
 			<depends_on_package>quagga-0.98.5_1.tbz</depends_on_package>
 			<status>ALPHA</status>
 			<version>9.5</version>
-		</package>
+	    </package>
 		<package>
 			<name>zebra</name>
 			<website>http://www.zebra.org/</website>
@@ -398,8 +352,8 @@
 			<depends_on_package>zebra-9.5.tbz</depends_on_package>
 			<status>ALPHA</status>
 			<version>9.5</version>
-		</package>
-		<package>
+	    </package>
+	    <package>
 			<name>upnp</name>
 			<descr>Emulates Microsoft's Internet Connection Service (ICS). It implements the UPnP Internet Gateway Device specification (IGD) and allows UPnP aware clients, such as MSN Messenger to work properly from behind a NAT firewall.</descr>
 			<website>http://linux-igd.sourceforge.net/</website>
@@ -410,8 +364,8 @@
 			<status>*ALPHA* *DANGER* *MAY WRECK SECURITY, USE AT OWN RISK*</status>
 			<config_file>http://www.pfsense.com/packages/config/upnpd.xml</config_file>
 			<configurationfile>upnpd.xml</configurationfile>
-		</package>
-		<package>
+	    </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>
@@ -426,5 +380,5 @@
 			<facilityname>ftp</facilityname>
 			<logfilename>pure-ftpd.log</logfilename>
 			</logging>
-		</package>
+	    </package>	
 </pfsensepkgs>