diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-06 13:12:44 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-06 13:12:44 -0200 |
| commit | 6e08c9a0a4a0b109281c9f9041cf3380a6742906 (patch) | |
| tree | 8966fa0403d34f6ac7580ba82c5d91cda1bf6b6f | |
| parent | e5f7f95db693c592d0797c64637f3eec82484716 (diff) | |
| download | pfsense-packages-6e08c9a0a4a0b109281c9f9041cf3380a6742906.tar.gz pfsense-packages-6e08c9a0a4a0b109281c9f9041cf3380a6742906.tar.bz2 pfsense-packages-6e08c9a0a4a0b109281c9f9041cf3380a6742906.zip | |
Revert "Mark conflicting packages as such"
This reverts commit e905d04f18fda340787ab8e6687e66ec5df91b05.
| -rw-r--r-- | pkg_config.8.xml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/pkg_config.8.xml b/pkg_config.8.xml index b7f75afd..ad249928 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1131,7 +1131,6 @@ <build_options>squid_UNSET_FORCE=DNS_HELPER IPFILTER PINGER STACKTRACES STRICT_HTTP_DESC USERAGENT_LOG WCCPV2;squid_SET=PF LDAP_AUTH NIS_AUTH SASL_AUTH ARP_ACL AUFS CACHE_DIGESTS CARP COSS DELAY_POOLS FOLLOW_XFF HTCP IDENT KERB_AUTH KQUEUE LARGEFILE REFERER_LOG SNMP SSL VIA_DB WCCP;SQUID_UID=proxy;SQUID_GID=proxy</build_options> <conflicts>squid3</conflicts> <conflicts>squid3-dev</conflicts> - <conflicts>squidGuard-squid3</conflicts> <config_file>https://packages.pfsense.org/packages/config/squid/squid.xml</config_file> <configurationfile>squid.xml</configurationfile> </package> @@ -1160,8 +1159,6 @@ <!--<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>--> <conflicts>squid</conflicts> <conflicts>squid3-dev</conflicts> - <conflicts>squidGuard</conflicts> - <conflicts>squidGuard-devel</conflicts> <config_file>https://packages.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> @@ -1195,8 +1192,6 @@ <build_options>c-icap_UNSET_FORCE=IPV6;squid_UNSET_FORCE=AUTH_SMB AUTH_SQL DNS_HELPER FS_COSS ESI SNMP ECAP STACKTRACES STRICT_HTTP TP_IPF TP_IPFW VIA_DB DEBUG DOCS EXAMPLES AUTH_SASL;squid_SET=ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS 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> <conflicts>squid</conflicts> <conflicts>squid3</conflicts> - <conflicts>squidGuard</conflicts> - <conflicts>squidGuard-devel</conflicts> <config_file>https://packages.pfsense.org/packages/config/squid3/33/squid.xml</config_file> <configurationfile>squid.xml</configurationfile> <depends_on_package_pbi>squid-3.3.10-i386.pbi</depends_on_package_pbi> @@ -1279,8 +1274,6 @@ <port>www/squidguard</port> </build_pbi> <build_options>squidGuard_UNSET_FORCE=SQUID32 SQUID33;squidGuard_SET=SAMPLE_BL SASL LDAP SQUID27;squid_UNSET_FORCE=DNS_HELPER IPFILTER PINGER STACKTRACES STRICT_HTTP_DESC USERAGENT_LOG WCCPV2;squid_SET=PF LDAP_AUTH NIS_AUTH SASL_AUTH ARP_ACL AUFS CACHE_DIGESTS CARP COSS DELAY_POOLS FOLLOW_XFF HTCP IDENT KERB_AUTH KQUEUE LARGEFILE REFERER_LOG SNMP SSL VIA_DB WCCP;SQUID_UID=proxy;SQUID_GID=proxy</build_options> - <conflicts>squid3</conflicts> - <conflicts>squid3-dev</conflicts> <conflicts>squidGuard-devel</conflicts> <conflicts>squidGuard-squid3</conflicts> <config_file>https://packages.pfsense.org/packages/config/squidGuard/squidguard.xml</config_file> @@ -1303,8 +1296,6 @@ <custom_name>squidguard-devel</custom_name> </build_pbi> <build_options>squidGuard-devel_UNSET_FORCE=SQUID32 SQUID33;squidGuard-devel_SET=LDAP STRIPNT SQUID27;squid_UNSET_FORCE=DNS_HELPER IPFILTER PINGER STACKTRACES STRICT_HTTP_DESC USERAGENT_LOG WCCPV2;squid_SET=PF LDAP_AUTH NIS_AUTH SASL_AUTH ARP_ACL AUFS CACHE_DIGESTS CARP COSS DELAY_POOLS FOLLOW_XFF HTCP IDENT KERB_AUTH KQUEUE LARGEFILE REFERER_LOG SNMP SSL VIA_DB WCCP;SQUID_UID=proxy;SQUID_GID=proxy</build_options> - <conflicts>squid3</conflicts> - <conflicts>squid3-dev</conflicts> <conflicts>squidGuard</conflicts> <conflicts>squidGuard-squid3</conflicts> <config_file>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard.xml</config_file> @@ -1327,7 +1318,6 @@ <custom_name>squidguard-squid3</custom_name> </build_pbi> <build_options>OPTIONS_SET=FETCH LDAP;squidGuard_UNSET_FORCE=SQUID27;squidGuard_SET=SAMPLE_BL SASL SQUID33;c-icap_UNSET_FORCE=IPV6 squid_UNSET_FORCE=AUTH_SMB AUTH_SQL DNS_HELPER FS_COSS ESI SNMP ECAP STACKTRACES STRICT_HTTP TP_IPF TP_IPFW VIA_DB DEBUG DOCS EXAMPLES;squid_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> - <conflicts>squid</conflicts> <conflicts>squidGuard</conflicts> <conflicts>squidGuard-devel</conflicts> <config_file>https://packages.pfsense.org/packages/config/squidGuard/squidguard.xml</config_file> |