diff options
author | jim-p <jimp@pfsense.org> | 2013-02-05 20:29:20 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2013-02-05 20:29:20 -0500 |
commit | 945561f15da9f243047e6af5982b0e218ff4cde5 (patch) | |
tree | 6431d9c2eaa7a96f3b45d347130fa8a2e89ff4fd | |
parent | 4b3cb08a990fdaa9f4f11eed7233abcceeaa9579 (diff) | |
download | pfsense-packages-945561f15da9f243047e6af5982b0e218ff4cde5.tar.gz pfsense-packages-945561f15da9f243047e6af5982b0e218ff4cde5.tar.bz2 pfsense-packages-945561f15da9f243047e6af5982b0e218ff4cde5.zip |
Update pkg descr for quagga and openbgpd to note a conflict, as quagga also installs a bgpd binary.
-rw-r--r-- | pkg_config.8.xml | 4 | ||||
-rw-r--r-- | pkg_config.8.xml.amd64 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 1f3ee09f..16663816 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -652,7 +652,7 @@ </package> <package> <name>OpenBGPD</name> - <descr>OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol.</descr> + <descr>OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol. -- WARNING! Installs files to the same place as Quagga OSPF. Installing both will result in a broken state, remove this package before installing Quagga OSPF.</descr> <category>NET</category> <config_file>http://www.pfsense.com/packages/config/openbgpd/openbgpd.xml</config_file> <build_port_path>/usr/ports/net/openbgpd</build_port_path> @@ -1664,7 +1664,7 @@ </package> <package> <name>Quagga OSPF</name> - <descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD. Installing both will break things.</descr> + <descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD and OpenBGPD. Installing both will break things.</descr> <maintainer>jimp@pfsense.org</maintainer> <version>0.99.20.1 v0.5</version> <category>Routing</category> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index cb63eb04..ca308734 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -639,7 +639,7 @@ </package> <package> <name>OpenBGPD</name> - <descr>OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol.</descr> + <descr>OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol. -- WARNING! Installs files to the same place as Quagga OSPF. Installing both will result in a broken state, remove this package before installing Quagga OSPF.</descr> <category>NET</category> <config_file>http://www.pfsense.com/packages/config/openbgpd/openbgpd.xml</config_file> <build_port_path>/usr/ports/net/openbgpd</build_port_path> @@ -1651,7 +1651,7 @@ </package> <package> <name>Quagga OSPF</name> - <descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD. Installing both will break things.</descr> + <descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD and OpenBGPD. Installing both will break things.</descr> <maintainer>jimp@pfsense.org</maintainer> <version>0.99.20.1 v0.5</version> <category>Routing</category> |