aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-10-15 18:03:16 +0200
committerdoktornotor <notordoktor@gmail.com>2015-10-15 18:03:16 +0200
commit9e07dbf05077df5774502c887ce25db2cc370b5e (patch)
treea74a643c989a3e3e285bf41f19a6c4a7f57eda6b
parente6f7fc6681c67880bc1019e2aab5cb9986b5cee1 (diff)
downloadpfsense-packages-9e07dbf05077df5774502c887ce25db2cc370b5e.tar.gz
pfsense-packages-9e07dbf05077df5774502c887ce25db2cc370b5e.tar.bz2
pfsense-packages-9e07dbf05077df5774502c887ce25db2cc370b5e.zip
Mark conflicting packages as such
Only allow installing relevant SquidGuard package version matching the Squid package.
-rw-r--r--pkg_config.10.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index b6155f86..c3196c88 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1066,6 +1066,7 @@
</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>
@@ -1173,6 +1174,7 @@
<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>