squid3 - mv squid files from squid-reverse to squid3/31

28 files changed, 24 insertions, 24 deletions

diff --git a/config/squid-reverse/proxy_monitor.sh b/config/squid3/31/proxy_monitor.sh
index e69de29b..e69de29b 100644
--- a/config/squid-reverse/proxy_monitor.sh
+++ b/config/squid3/31/proxy_monitor.sh
diff --git a/config/squid-reverse/sqpmon.sh b/config/squid3/31/sqpmon.sh
index 244b3b61..244b3b61 100644
--- a/config/squid-reverse/sqpmon.sh
+++ b/config/squid3/31/sqpmon.sh
diff --git a/config/squid-reverse/squid.inc b/config/squid3/31/squid.inc
index 0256d078..0256d078 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid3/31/squid.inc
diff --git a/config/squid-reverse/squid.xml b/config/squid3/31/squid.xml
index bcfd5fb3..aa76c0f1 100644
--- a/config/squid-reverse/squid.xml
+++ b/config/squid3/31/squid.xml
@@ -111,112 +111,112 @@
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid.inc</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse_general.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_general.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse_peer.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_peer.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse_uri.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_uri.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse_sync.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_sync.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_sync.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_sync.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_cache.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_cache.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_nac.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_nac.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_ng.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_ng.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_ng.inc</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_ng.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_traffic.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_traffic.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_upstream.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_upstream.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse.inc</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_auth.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_auth.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_users.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_users.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/sqpmon.sh</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/sqpmon.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/swapstate_check.php</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/swapstate_check.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse_redir.xml</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_redir.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/www/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_monitor.php</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_monitor.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/www/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_monitor_data.php</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_monitor_data.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/www/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_log_parser.php</item>
+		<item>http://www.pfsense.org/packages/config/squid3/31/squid_log_parser.php</item>
 	</additional_files_needed>
 
 	<fields>
diff --git a/config/squid-reverse/squid_auth.inc b/config/squid3/31/squid_auth.inc
index 7c99a01b..7c99a01b 100644
--- a/config/squid-reverse/squid_auth.inc
+++ b/config/squid3/31/squid_auth.inc
diff --git a/config/squid-reverse/squid_auth.xml b/config/squid3/31/squid_auth.xml
index 307669c5..307669c5 100644
--- a/config/squid-reverse/squid_auth.xml
+++ b/config/squid3/31/squid_auth.xml
diff --git a/config/squid-reverse/squid_cache.xml b/config/squid3/31/squid_cache.xml
index 7f371f49..7f371f49 100644
--- a/config/squid-reverse/squid_cache.xml
+++ b/config/squid3/31/squid_cache.xml
diff --git a/config/squid-reverse/squid_extauth.xml b/config/squid3/31/squid_extauth.xml
index 41d9f633..41d9f633 100644
--- a/config/squid-reverse/squid_extauth.xml
+++ b/config/squid3/31/squid_extauth.xml
diff --git a/config/squid-reverse/squid_log_parser.php b/config/squid3/31/squid_log_parser.php
index f6cd7de8..f6cd7de8 100755
--- a/config/squid-reverse/squid_log_parser.php
+++ b/config/squid3/31/squid_log_parser.php
diff --git a/config/squid-reverse/squid_monitor.php b/config/squid3/31/squid_monitor.php
index 86c7d33a..86c7d33a 100644
--- a/config/squid-reverse/squid_monitor.php
+++ b/config/squid3/31/squid_monitor.php
diff --git a/config/squid-reverse/squid_monitor_data.php b/config/squid3/31/squid_monitor_data.php
index 7e27919d..7e27919d 100644
--- a/config/squid-reverse/squid_monitor_data.php
+++ b/config/squid3/31/squid_monitor_data.php
diff --git a/config/squid-reverse/squid_nac.xml b/config/squid3/31/squid_nac.xml
index 659d626f..659d626f 100644
--- a/config/squid-reverse/squid_nac.xml
+++ b/config/squid3/31/squid_nac.xml
diff --git a/config/squid-reverse/squid_ng.inc b/config/squid3/31/squid_ng.inc
index 0e1e0515..0e1e0515 100644
--- a/config/squid-reverse/squid_ng.inc
+++ b/config/squid3/31/squid_ng.inc
diff --git a/config/squid-reverse/squid_ng.xml b/config/squid3/31/squid_ng.xml
index 142536d6..142536d6 100644
--- a/config/squid-reverse/squid_ng.xml
+++ b/config/squid3/31/squid_ng.xml
diff --git a/config/squid-reverse/squid_reverse.inc b/config/squid3/31/squid_reverse.inc
index eb2d4c73..eb2d4c73 100644
--- a/config/squid-reverse/squid_reverse.inc
+++ b/config/squid3/31/squid_reverse.inc
diff --git a/config/squid-reverse/squid_reverse.xml b/config/squid3/31/squid_reverse.xml
index ce09f8e7..ce09f8e7 100644
--- a/config/squid-reverse/squid_reverse.xml
+++ b/config/squid3/31/squid_reverse.xml
diff --git a/config/squid-reverse/squid_reverse_general.xml b/config/squid3/31/squid_reverse_general.xml
index 2211bb20..2211bb20 100644
--- a/config/squid-reverse/squid_reverse_general.xml
+++ b/config/squid3/31/squid_reverse_general.xml
diff --git a/config/squid-reverse/squid_reverse_peer.xml b/config/squid3/31/squid_reverse_peer.xml
index abfbf19b..abfbf19b 100644
--- a/config/squid-reverse/squid_reverse_peer.xml
+++ b/config/squid3/31/squid_reverse_peer.xml
diff --git a/config/squid-reverse/squid_reverse_redir.xml b/config/squid3/31/squid_reverse_redir.xml
index de25f56a..de25f56a 100644
--- a/config/squid-reverse/squid_reverse_redir.xml
+++ b/config/squid3/31/squid_reverse_redir.xml
diff --git a/config/squid-reverse/squid_reverse_sync.xml b/config/squid3/31/squid_reverse_sync.xml
index 041576b8..041576b8 100755
--- a/config/squid-reverse/squid_reverse_sync.xml
+++ b/config/squid3/31/squid_reverse_sync.xml
diff --git a/config/squid-reverse/squid_reverse_uri.xml b/config/squid3/31/squid_reverse_uri.xml
index 1232cfe3..1232cfe3 100644
--- a/config/squid-reverse/squid_reverse_uri.xml
+++ b/config/squid3/31/squid_reverse_uri.xml
diff --git a/config/squid-reverse/squid_sync.xml b/config/squid3/31/squid_sync.xml
index cdd91e78..cdd91e78 100755
--- a/config/squid-reverse/squid_sync.xml
+++ b/config/squid3/31/squid_sync.xml
diff --git a/config/squid-reverse/squid_traffic.xml b/config/squid3/31/squid_traffic.xml
index 62269792..62269792 100644
--- a/config/squid-reverse/squid_traffic.xml
+++ b/config/squid3/31/squid_traffic.xml
diff --git a/config/squid-reverse/squid_upstream.xml b/config/squid3/31/squid_upstream.xml
index 049d301c..049d301c 100644
--- a/config/squid-reverse/squid_upstream.xml
+++ b/config/squid3/31/squid_upstream.xml
diff --git a/config/squid-reverse/squid_users.xml b/config/squid3/31/squid_users.xml
index 791a5fa9..791a5fa9 100644
--- a/config/squid-reverse/squid_users.xml
+++ b/config/squid3/31/squid_users.xml
diff --git a/config/squid-reverse/swapstate_check.php b/config/squid3/31/swapstate_check.php
index 6ecfff3c..6ecfff3c 100644
--- a/config/squid-reverse/swapstate_check.php
+++ b/config/squid3/31/swapstate_check.php
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 080888a5..0ccaead8 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1259,7 +1259,7 @@
 		</build_pbi>
 		<build_options>squid33_UNSET=AUTH_SMB AUTH_SQL DNS_HELPER FS_COSS ESI SNMP ECAP STACKTRACES STRICT_HTTP TP_IPF TP_IPFW VIA_DB DEBUG DOCS EXAMPLES;squid33_SET=ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF TP_PF MSSL_CRTD WCCP WCCPV2 FS_AUFS HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE SSL SSL_CRTD</build_options>
 		<!--<build_options>WITH_SQUID_KERB_AUTH=true;WITH_SQUID_LDAP_AUTH=true;WITH_SQUID_NIS_AUTH=true;WITH_SQUID_SASL_AUTH=true;WITH_SQUID_IPV6=true;WITH_SQUID_DELAY_POOLS=true;WITH_SQUID_SNMP=true;WITH_SQUID_SSL=true;WITH_SQUID_SSL_CRTD=true;WITH_SQUID_PINGER=true;WITHOUT_SQUID_DNS_HELPER=true;WITH_SQUID_HTCP=true;WITH_SQUID_VIA_DB=true;WITH_SQUID_CACHE_DIGESTS=true;WITHOUT_SQUID_WCCP=true;WITH_SQUID_WCCPV2=true;WITHOUT_SQUID_STRICT_HTTP=true;WITH_SQUID_IDENT=true;WITH_SQUID_REFERER_LOG=true;WITH_SQUID_USERAGENT_LOG=true;WITH_SQUID_ARP_ACL=true;WITH_SQUID_IPFW=true;WITH_SQUID_PF=true;WITHOUT_SQUID_IPFILTER=true;WITH_SQUID_FOLLOW_XFF=true;WITHOUT_SQUID_ECAP=true;WITHOUT_SQUID_ICAP=true;WITHOUT_SQUID_ESI=true;WITH_SQUID_AUFS=true;WITHOUT_SQUID_COSS=true;WITHOUT_SQUID_KQUEUE=true;WITH_SQUID_LARGEFILE=true;WITHOUT_SQUID_STACKTRACES=true;WITHOUT_SQUID_DEBUG=true</build_options>-->
-		<config_file>http://www.pfsense.org/packages/config/squid-reverse/squid.xml</config_file>
+		<config_file>http://www.pfsense.org/packages/config/squid3/31/squid.xml</config_file>
 		<configurationfile>squid.xml</configurationfile>
 		<depends_on_package_pbi>squid-3.1.22_1-i386.pbi</depends_on_package_pbi>
 	</package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 104d74f0..36dc9d04 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1246,7 +1246,7 @@
 		</build_pbi>
 		<build_options>squid33_UNSET=AUTH_SMB AUTH_SQL DNS_HELPER FS_COSS ESI ECAP SNMP STACKTRACES STRICT_HTTP TP_IPF TP_IPFW VIA_DB DEBUG DOCS EXAMPLES;squid33_SET=ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF TP_PF MSSL_CRTD WCCP WCCPV2 FS_AUFS HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE SSL SSL_CRTD</build_options>
 		<!--<build_options>WITH_SQUID_KERB_AUTH=true;WITH_SQUID_LDAP_AUTH=true;WITH_SQUID_NIS_AUTH=true;WITH_SQUID_SASL_AUTH=true;WITH_SQUID_IPV6=true;WITH_SQUID_DELAY_POOLS=true;WITH_SQUID_SNMP=true;WITH_SQUID_SSL=true;WITH_SQUID_SSL_CRTD=true;WITH_SQUID_PINGER=true;WITHOUT_SQUID_DNS_HELPER=true;WITH_SQUID_HTCP=true;WITH_SQUID_VIA_DB=true;WITH_SQUID_CACHE_DIGESTS=true;WITHOUT_SQUID_WCCP=true;WITH_SQUID_WCCPV2=true;WITHOUT_SQUID_STRICT_HTTP=true;WITH_SQUID_IDENT=true;WITH_SQUID_REFERER_LOG=true;WITH_SQUID_USERAGENT_LOG=true;WITH_SQUID_ARP_ACL=true;WITH_SQUID_IPFW=true;WITH_SQUID_PF=true;WITHOUT_SQUID_IPFILTER=true;WITH_SQUID_FOLLOW_XFF=true;WITHOUT_SQUID_ECAP=true;WITHOUT_SQUID_ICAP=true;WITHOUT_SQUID_ESI=true;WITH_SQUID_AUFS=true;WITHOUT_SQUID_COSS=true;WITHOUT_SQUID_KQUEUE=true;WITH_SQUID_LARGEFILE=true;WITHOUT_SQUID_STACKTRACES=true;WITHOUT_SQUID_DEBUG=true</build_options>-->
-		<config_file>http://www.pfsense.org/packages/config/squid-reverse/squid.xml</config_file>
+		<config_file>http://www.pfsense.org/packages/config/squid3/31/squid.xml</config_file>
 		<configurationfile>squid.xml</configurationfile>
 		<depends_on_package_pbi>squid-3.1.22_1-amd64.pbi</depends_on_package_pbi>
 	</package>