diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-06 13:25:50 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-06 13:25:50 -0200 |
| commit | f7aa914f424636ab19982d1d58ab937cf6375d3f (patch) | |
| tree | ba50f3567241266dbb2d42a7e40dc9547ef08734 | |
| parent | 8fd85b791f167918abfe56860da9f06b1a90ec4a (diff) | |
| download | pfsense-packages-f7aa914f424636ab19982d1d58ab937cf6375d3f.tar.gz pfsense-packages-f7aa914f424636ab19982d1d58ab937cf6375d3f.tar.bz2 pfsense-packages-f7aa914f424636ab19982d1d58ab937cf6375d3f.zip | |
Revert "Mark conflicting packages as such"
This reverts commit 9e07dbf05077df5774502c887ce25db2cc370b5e.
| -rw-r--r-- | pkg_config.10.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkg_config.10.xml b/pkg_config.10.xml index b69d312e..4cecdeb7 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1067,7 +1067,6 @@ </build_pbi> <build_options>c-icap_SET_FORCE=LARGE_FILES;squid_SET_FORCE=ARP_ACL AUTH_LDAP AUTH_NIS AUTH_SASL CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS FS_DISKD GSSAPI_MIT HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE LAX_HTTP SNMP SSL SSL_CRTD TP_PF WCCP WCCPV2;squid_UNSET_FORCE=AUTH_SMB AUTH_SQL DEBUG DNS_HELPER ECAP ESI FS_ROCK GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL STACKTRACES TP_IPF TP_IPFW VIA_DB</build_options> <conflicts>squid</conflicts> - <conflicts>squidGuard-devel</conflicts> <config_file>https://packages.pfsense.org/packages/config/squid3/34/squid.xml</config_file> <configurationfile>squid.xml</configurationfile> <depends_on_package_pbi>squid-3.4.10_2-##ARCH##.pbi</depends_on_package_pbi> @@ -1175,7 +1174,6 @@ <custom_name>squidguard-devel</custom_name> </build_pbi> <build_options>squidGuard-devel_UNSET_FORCE=SQUID32 SQUID33;squidGuard-devel_SET_FORCE=LDAP STRIPNT SQUID27;squid_UNSET_FORCE=DNS_HELPER IPFILTER PINGER STACKTRACES STRICT_HTTP_DESC USERAGENT_LOG WCCPV2;squid_SET_FORCE=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>squidGuard</conflicts> <config_file>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard.xml</config_file> <configurationfile>squidguard.xml</configurationfile> |