From 3e532e5de8ec36647825bf77e405eeef184005fc Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 1 May 2005 00:07:56 +0000
Subject: Bring squid back.  SquidGUARD will remain inactive until we verify
 that squid is working ok.

---
 pkg_config.xml | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/pkg_config.xml b/pkg_config.xml
index 258edda1..3aaf2918 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -211,6 +211,18 @@ test server or link availability and modify translation or routing rules. This p
         <config_file>http://www.pfsense.com/packages/config/arpwatch.xml</config_file>
         <configurationfile>arpwatch.xml</configurationfile>
     </package>
+    <package>
+	<name>squid</name>
+	<descr>High performance Web proxy cache</descr>
+	<website>http://www.squid-cache.org/</website>
+	<category>Network Management</category>
+	<depends_on_package_base_url>http://www.pfSense.com/packages/All</depends_on_package_base_url>
+	<depends_on_package>squid-2.5.7_5.tbz</depends_on_package>
+	<version>2.5.7_5</version>
+	<status>Stable</status>
+	<config_file>http://www.pfsense.com/packages/config/squid.xml</config_file>
+	<configurationfile>squid.xml</configurationfile>
+    </package>    
   </packages>
   <!-- BEGIN - these packages are inactive -->
     <package>
@@ -259,29 +271,5 @@ test server or link availability and modify translation or routing rules. This p
         <config_file>http://www.pfsense.com/packages/config/squidGuard.xml</config_file>
         <configurationfile>squidGuard.xml</configurationfile>
     </package>
-        <package>
-	<name>squid</name>
-	<descr>High performance Web proxy cache</descr>
-	<website>http://www.squid-cache.org/</website>
-	<category>Network Management</category>
-	<depends_on_package_base_url>http://www.pfSense.com/packages/All</depends_on_package_base_url>
-	<depends_on_package>squid-2.5.7_5.tbz</depends_on_package>
-	<version>2.5.7_5</version>
-	<status>Stable</status>
-	<config_file>http://www.pfsense.com/packages/config/squid.xml</config_file>
-	<configurationfile>squid.xml</configurationfile>
-    </package>
-    <package>
-	<name>squid</name>
-	<descr>High performance Web proxy cache</descr>
-	<website>http://www.squid-cache.org/</website>
-	<category>Network Management</category>
-	<depends_on_package_base_url>http://www.pfSense.com/packages/All</depends_on_package_base_url>
-	<depends_on_package>squid-2.5.7_5.tbz</depends_on_package>
-	<version>2.5.7_5</version>
-	<status>Stable</status>
-	<config_file>http://www.pfsense.com/packages/config/squid.xml</config_file>
-	<configurationfile>squid.xml</configurationfile>
-    </package>	
     <!-- END - these packages are inactive -->
 </pfsensepkgs>
-- 
cgit v1.2.3