squid3 - merge squid3 and squid-reverse in one package

1 files changed, 5 insertions, 54 deletions

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 2fdec7fd..1da960e0 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1003,74 +1003,25 @@
 		<configurationfile>squid.xml</configurationfile>
 	</package>
 	<package>
-		<name>squid-reverse</name>
+		<name>squid3</name>
 		<descr><![CDATA[High performance web proxy cache.<br>
 					   It combines squid as a proxy server with it's capabilities of acting as a HTTP / HTTPS reverse proxy.<br>
-					   It includes an Exchange-Web-Access (OWA) Assistant.<br>
-					   <i>squid-reverse replaces the squid-packages (squid is to be deinstalled, config is maintained)</i>.]]></descr>
+					   It includes an Exchange-Web-Access (OWA) Assistant.]]></descr>
 		<pkginfolink>http://forum.pfsense.org/index.php/topic,44735.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.1.19_2</version>
-		<status>Stable</status>
+		<version>3.1.19 pkg 2.0</version>
+		<status>RC1</status>
 		<required_version>2.0</required_version>
-		<maintainer>fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
+		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>squid-3.1.19.tbz</depends_on_package>
-		<depends_on_package>squid_radius_auth-1.10.tbz</depends_on_package>
-		<depends_on_package>libwww-5.4.0_4.tbz</depends_on_package>
-		<depends_on_package_pbi>
-			libwww-5.4.0_4-i386.pbi
-			squid_radius_auth-1.10-i386.pbi
-			squid-3.1.19-i386.pbi
-		</depends_on_package_pbi>
 		<!-- use build ports from squid 2.0 -->
     <build_options>WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_CARP=true WITH_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true</build_options>
 		<config_file>http://www.pfsense.org/packages/config/squid-reverse/squid.xml</config_file>
 		<configurationfile>squid.xml</configurationfile>
 	</package>
 	<package>
-		<name>squid3</name>
-		<descr><![CDATA[This package is superseded by the <b>squid-reverse</b> package.<br>
-					   It's no longer supported nor maintained.<br>
-					   <i>squid-reverse replaces the squid-packages (squid is to be deinstalled, config is maintained)</i>.]]></descr>
-		<website>http://www.squid-cache.org/</website>
-		<category>Network</category>
-		<version>3.1.9_0.1</version>
-		<status>ALPHA</status>
-		<required_version>2.0</required_version>
-		<maintainer>fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com</maintainer>
-		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package>squid-3.1.9.tbz</depends_on_package>
-		<depends_on_package>squid_radius_auth-1.10.tbz</depends_on_package>
-		<depends_on_package>libwww-5.4.0_4.tbz</depends_on_package>
-		<!-- Do not add build paths please, it conflicts with squid 2.x -->
-		<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 WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITHOUT_SQUID_IPFW=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_ECAP=true WITH_SQUID_ICAP=true WITHOUT_SQUID_ESI=true WITH_SQUID_AUFS=true WITHOUT_SQUID_COSS=true WITH_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/squid3/squid.xml</config_file>
-		<configurationfile>squid.xml</configurationfile>
-		<noembedded>true</noembedded>
-	</package>
-	<package>
-		<name>squid3-reverse</name>
-		<descr>EXPERIMENTAL! High performance web proxy cache with reverse proxy.</descr>
-		<website>http://www.squid-cache.org/</website>
-		<category>Network</category>
-		<version>3.1.14_0.1</version>
-		<status>PRE-ALPHA</status>
-		<required_version>3.0</required_version>
-		<maintainer>fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com</maintainer>
-		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package>squid-3.1.14.tbz</depends_on_package>
-		<depends_on_package>squid_radius_auth-1.10.tbz</depends_on_package>
-		<depends_on_package>libwww-5.4.0_4.tbz</depends_on_package>
-		<!-- Do not add build paths please, it conflicts with squid 2.x -->
-		<!-- COSS IS NOT SUPPORTED WITH VERSION 3.1.14 [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 WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITHOUT_SQUID_IPFW=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_ECAP=true WITH_SQUID_ICAP=true WITHOUT_SQUID_ESI=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITHOUT_SQUID_DEBUG=true</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 WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITHOUT_SQUID_IPFW=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_ECAP=true WITH_SQUID_ICAP=true WITHOUT_SQUID_ESI=true WITH_SQUID_AUFS=true WITHOUT_SQUID_COSS=true WITH_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/squid3-reverse/squid.xml</config_file>
-		<configurationfile>squid.xml</configurationfile>
-		<noembedded>true</noembedded>
-	</package>
-	<package>
 		<name>LCDproc</name>
 		<descr>LCD display driver</descr>
 		<website>http://www.lcdproc.org/</website>