aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/quagga_ospfd/quagga_ospfd.xml4
-rw-r--r--pkg_config.10.xml3
-rw-r--r--pkg_config.8.xml3
-rw-r--r--pkg_config.8.xml.amd643
4 files changed, 8 insertions, 5 deletions
diff --git a/config/quagga_ospfd/quagga_ospfd.xml b/config/quagga_ospfd/quagga_ospfd.xml
index 01d67d8a..860c298b 100644
--- a/config/quagga_ospfd/quagga_ospfd.xml
+++ b/config/quagga_ospfd/quagga_ospfd.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>quagga_ospfd</name>
- <version>0.6.6</version>
+ <version>0.6.8</version>
<title>Services: Quagga OSPFd</title>
<include_file>/usr/local/pkg/quagga_ospfd.inc</include_file>
<aftersaveredirect>pkg_edit.php?xml=quagga_ospfd.xml&amp;id=0</aftersaveredirect>
@@ -56,7 +56,7 @@
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
- <item>http://www.pfsense.com/packages/config/quagga_ospfd/quagga_ospfd_raw.xml</item>
+ <item>https://packages.pfsense.org/packages/config/quagga_ospfd/quagga_ospfd_raw.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index d4beb247..0263b71d 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1201,6 +1201,7 @@
<ports_after>security/clamav</ports_after>
</build_pbi>
<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
+ <conflicts>squid3</conflicts>
<version>1.10.0</version>
<status>BETA</status>
<required_version>2.2</required_version>
@@ -1365,7 +1366,7 @@
]]>
</descr>
<maintainer>jimp@pfsense.org</maintainer>
- <version>0.6.7</version>
+ <version>0.6.8</version>
<category>Routing</category>
<status>BETA</status>
<depends_on_package_pbi>quagga-0.99.23.1_2-##ARCH##.pbi</depends_on_package_pbi>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 5abf5f5d..b5dfe9ec 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1377,6 +1377,7 @@
<depends_on_package_pbi>havp-0.91_1-i386.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/www/havp</build_port_path>
<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
+ <conflicts>squid3-dev</conflicts>
<version>0.91_1 pkg v1.10.0</version>
<status>BETA</status>
<required_version>1.2.2</required_version>
@@ -1565,7 +1566,7 @@
<name>Quagga OSPF</name>
<descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenBGPD. Installing both will break things.</descr>
<maintainer>jimp@pfsense.org</maintainer>
- <version>0.99.22.3 v0.6.5</version>
+ <version>0.99.22.3 v0.6.8</version>
<category>Routing</category>
<status>BETA</status>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index cb21d413..4a479f28 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1364,6 +1364,7 @@
<depends_on_package_pbi>havp-0.91_1-amd64.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/www/havp</build_port_path>
<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
+ <conflicts>squid3-dev</conflicts>
<version>0.91_1 pkg v1.10.0</version>
<status>BETA</status>
<required_version>1.2.2</required_version>
@@ -1552,7 +1553,7 @@
<name>Quagga OSPF</name>
<descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenBGPD. Installing both will break things.</descr>
<maintainer>jimp@pfsense.org</maintainer>
- <version>0.99.22.3 v0.6.5</version>
+ <version>0.99.22.3 v0.6.8</version>
<category>Routing</category>
<status>BETA</status>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>