aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-11-06 13:13:34 -0200
committerRenato Botelho <renato@netgate.com>2015-11-06 13:13:34 -0200
commit22c622b57d6751aceabaf82fe33bde17babc304b (patch)
treef1d8b7fd1a225f9ea343a65d9515661edd0b752a
parentd93547eb15a36dfc160f0179c34fd2656e5ec1af (diff)
downloadpfsense-packages-22c622b57d6751aceabaf82fe33bde17babc304b.tar.gz
pfsense-packages-22c622b57d6751aceabaf82fe33bde17babc304b.tar.bz2
pfsense-packages-22c622b57d6751aceabaf82fe33bde17babc304b.zip
Revert "Bunch of other conflicting things"
This reverts commit 671d60698f6ef4baf6be06cf8671a035e3841786.
-rw-r--r--pkg_config.8.xml.amd645
1 files changed, 0 insertions, 5 deletions
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 3113d5e3..741f1e88 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -538,8 +538,6 @@
</build_pbi>
<build_options>dansguardian_UNSET_FORCE=APACHE;dansguardian_SET=TRICKLE CLAMD ICAP NTLM SSL</build_options>
<!-- NOTE: Distfile must be fetched manually from http://dansguardian.org/downloads/2/Alpha/dansguardian-2.12.0.0.tar.gz -->
- <conflicts>HAVP antivirus</conflicts>
- <conflicts>squid3-dev</conflicts>
</package>
<package>
<name>mailscanner</name>
@@ -1151,8 +1149,6 @@
<conflicts>squid3-dev</conflicts>
<conflicts>squidGuard</conflicts>
<conflicts>squidGuard-devel</conflicts>
- <conflicts>Dansguardian</conflicts>
- <conflicts>HAVP antivirus</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-amd64.pbi</depends_on_package_pbi>
@@ -1352,7 +1348,6 @@
<build_port_path>/usr/ports/www/havp</build_port_path>
<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
<conflicts>squid3-dev</conflicts>
- <conflicts>Dansguardian</conflicts>
<version>0.91_1 pkg v1.10.0</version>
<status>BETA</status>
<required_version>1.2.2</required_version>