Remove old linux-igd upnp from the list

Update squid.xml location
Bump squid version

1 files changed, 15 insertions, 15 deletions

diff --git a/pkg_config.xml b/pkg_config.xml
index 9e61f346..25db9b4b 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -500,14 +500,14 @@
       <descr>High performance web proxy cache.</descr>
       <website>http://www.squid-cache.org/</website>
       <category>Network</category>
-      <version>2.6</version>
+      <version>2.6.5_1-p2</version>
       <status>BETA</status>
       <required_version>1.0</required_version>
       <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl</maintainer>
       <depends_on_package_base_url>http://www.pfsense.org/packages/All</depends_on_package_base_url>
       <depends_on_package>squid-2.6.5.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>
+      <config_file>http://www.pfsense.org/packages/config/squid/squid.xml</config_file>
       <configurationfile>squid.xml</configurationfile>
     </package>
     <package>
@@ -547,6 +547,19 @@
 
 
     <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>
+      <category>Network Management</category>
+      <depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All</depends_on_package_base_url>
+      <depends_on_package>linuxigd-0.92_2.tbz</depends_on_package>
+      <version>1.0.5</version>
+      <status>*ALPHA* *DANGER* *MAY WRECK SECURITY, USE AT OWN RISK*</status>
+      <required_version>1.0</required_version>
+      <config_file>http://www.pfsense.com/packages/config/upnpd.xml</config_file>
+      <configurationfile>upnpd.xml</configurationfile>
+    </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>
@@ -657,19 +670,6 @@
       <required_version>1.0</required_version>
     </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>
-      <category>Network Management</category>
-      <depends_on_package_base_url>http://ftp13.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All</depends_on_package_base_url>
-      <depends_on_package>linuxigd-0.92_2.tbz</depends_on_package>
-      <version>1.0.5</version>
-      <status>*ALPHA* *DANGER* *MAY WRECK SECURITY, USE AT OWN RISK*</status>
-      <required_version>1.0</required_version>
-      <config_file>http://www.pfsense.com/packages/config/upnpd.xml</config_file>
-      <configurationfile>upnpd.xml</configurationfile>
-    </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>