diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-08-19 13:59:40 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-08-19 13:59:40 -0300 |
commit | 1fae5d99efd9d44dec1bf5b309fa7ecb37812714 (patch) | |
tree | bb9c6046caa063299886d0d6affa5ca1d1ae657e | |
parent | 906e342cd9726889caec52e529cdad12022ec5d6 (diff) | |
parent | 34eab9680449175eb2abcc860132b99841cf0377 (diff) | |
download | pfsense-packages-1fae5d99efd9d44dec1bf5b309fa7ecb37812714.tar.gz pfsense-packages-1fae5d99efd9d44dec1bf5b309fa7ecb37812714.tar.bz2 pfsense-packages-1fae5d99efd9d44dec1bf5b309fa7ecb37812714.zip |
Merge pull request #689 from dbaio/master
-rw-r--r-- | config/zabbix2/zabbix2-agent.xml | 4 | ||||
-rw-r--r-- | config/zabbix2/zabbix2-proxy.xml | 4 | ||||
-rw-r--r-- | config/zabbix2/zabbix2.inc | 2 | ||||
-rw-r--r-- | pkg_config.10.xml | 8 | ||||
-rw-r--r-- | pkg_config.8.xml | 12 | ||||
-rw-r--r-- | pkg_config.8.xml.amd64 | 12 |
6 files changed, 21 insertions, 21 deletions
diff --git a/config/zabbix2/zabbix2-agent.xml b/config/zabbix2/zabbix2-agent.xml index 57ef7be3..3d2400ad 100644 --- a/config/zabbix2/zabbix2-agent.xml +++ b/config/zabbix2/zabbix2-agent.xml @@ -6,7 +6,7 @@ /* ========================================================================== */ /* zabbix2-agent.xml - part of the Zebedee package for pfSense + part of the Zabbix package for pfSense Copyright (C) 2013 Danilo G. Baio Copyright (C) 2013 Marcello Coutinho @@ -41,7 +41,7 @@ <name>zabbixagent</name> <title>Services: Zabbix-2 Agent</title> <category>Monitoring</category> - <version>0.8.1</version> + <version>0.8.3</version> <include_file>/usr/local/pkg/zabbix2.inc</include_file> <addedit_string>Zabbix Agent has been created/modified.</addedit_string> <delete_string>Zabbix Agent has been deleted.</delete_string> diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml index b51d1d6b..00d9b106 100644 --- a/config/zabbix2/zabbix2-proxy.xml +++ b/config/zabbix2/zabbix2-proxy.xml @@ -6,7 +6,7 @@ /* ========================================================================== */ /* zabbix2-proxy.xml - part of the Zebedee package for pfSense + part of the Zabbix package for pfSense Copyright (C) 2013 Danilo G. Baio Copyright (C) 2013 Marcello Coutinho @@ -41,7 +41,7 @@ <name>zabbixproxy</name> <title>Services: Zabbix-2 Proxy</title> <category>Monitoring</category> - <version>0.8.1</version> + <version>0.8.3</version> <include_file>/usr/local/pkg/zabbix2.inc</include_file> <addedit_string>Zabbix Proxy has been created/modified.</addedit_string> <delete_string>Zabbix Proxy has been deleted.</delete_string> diff --git a/config/zabbix2/zabbix2.inc b/config/zabbix2/zabbix2.inc index c2ff4244..13713988 100644 --- a/config/zabbix2/zabbix2.inc +++ b/config/zabbix2/zabbix2.inc @@ -3,7 +3,7 @@ /* ========================================================================== */ /* zabbix2-proxy.inc - part of the Zebedee package for pfSense + part of the Zabbix package for pfSense Copyright (C) 2013 Danilo G. Baio Copyright (C) 2013 Marcello Coutinho diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 971cf336..333cc34c 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1417,7 +1417,7 @@ <descr>Monitoring agent.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file> - <version>zabbix2-agent-2.2.3_1 pkg v0.8.1</version> + <version>zabbix2-agent-2.2.5 pkg v0.8.3</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>zabbix2-agent.xml</configurationfile> @@ -1426,14 +1426,14 @@ <custom_name>zabbix22-agent</custom_name> <port>net-mgmt/zabbix22-agent</port> </build_pbi> - <depends_on_package_pbi>zabbix22-agent-2.2.3_1-##ARCH##.pbi</depends_on_package_pbi> + <depends_on_package_pbi>zabbix22-agent-2.2.5-##ARCH##.pbi</depends_on_package_pbi> </package> <package> <name>Zabbix-2 Proxy</name> <descr>Monitoring agent proxy.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file> - <version>zabbix2-proxy-2.2.3_1 pkg v0.8_1</version> + <version>zabbix2-proxy-2.2.5 pkg v0.8.3</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>zabbix2-proxy.xml</configurationfile> @@ -1443,7 +1443,7 @@ <port>net-mgmt/zabbix22-proxy</port> </build_pbi> <build_options>OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI</build_options> - <depends_on_package_pbi>zabbix22-proxy-2.2.3_1-##ARCH##.pbi</depends_on_package_pbi> + <depends_on_package_pbi>zabbix22-proxy-2.2.5-##ARCH##.pbi</depends_on_package_pbi> </package> <package> <!-- This does not exist yet, this is here to trigger a PBI build --> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 7e3b0be6..74569f96 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1822,7 +1822,7 @@ <descr>Monitoring agent.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file> - <version>zabbix2-agent-2.2.2 pkg v0.8.2</version> + <version>zabbix2-agent-2.2.5 pkg v0.8.3</version> <status>BETA</status> <required_version>2.0</required_version> <configurationfile>zabbix2-agent.xml</configurationfile> @@ -1833,15 +1833,15 @@ <port>net-mgmt/zabbix22-agent</port> </build_pbi> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> - <depends_on_package>zabbix22-agent-2.2.2.tbz</depends_on_package> - <depends_on_package_pbi>zabbix22-agent-2.2.2-i386.pbi</depends_on_package_pbi> + <depends_on_package>zabbix22-agent-2.2.5.tbz</depends_on_package> + <depends_on_package_pbi>zabbix22-agent-2.2.5-i386.pbi</depends_on_package_pbi> </package> <package> <name>Zabbix-2 Proxy</name> <descr>Monitoring agent proxy.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file> - <version>zabbix2-proxy-2.2.2 pkg v0.8.2</version> + <version>zabbix2-proxy-2.2.5 pkg v0.8.3</version> <status>BETA</status> <required_version>2.0</required_version> <configurationfile>zabbix2-proxy.xml</configurationfile> @@ -1853,8 +1853,8 @@ </build_pbi> <build_options>OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI</build_options> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> - <depends_on_package>zabbix22-proxy-2.2.2.tbz</depends_on_package> - <depends_on_package_pbi>zabbix22-proxy-2.2.2-i386.pbi</depends_on_package_pbi> + <depends_on_package>zabbix22-proxy-2.2.5.tbz</depends_on_package> + <depends_on_package_pbi>zabbix22-proxy-2.2.5-i386.pbi</depends_on_package_pbi> </package> <package> <!-- This does not exist yet, this is here to trigger a PBI build --> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 98141cd4..1bbb323b 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1809,7 +1809,7 @@ <descr>Monitoring agent.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file> - <version>zabbix2-agent-2.2.2 pkg v0.8.2</version> + <version>zabbix2-agent-2.2.5 pkg v0.8.3</version> <status>BETA</status> <required_version>2.0</required_version> <configurationfile>zabbix2-agent.xml</configurationfile> @@ -1820,15 +1820,15 @@ <port>net-mgmt/zabbix22-agent</port> </build_pbi> <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <depends_on_package>zabbix22-agent-2.2.2.tbz</depends_on_package> - <depends_on_package_pbi>zabbix22-agent-2.2.2-amd64.pbi</depends_on_package_pbi> + <depends_on_package>zabbix22-agent-2.2.5.tbz</depends_on_package> + <depends_on_package_pbi>zabbix22-agent-2.2.5-amd64.pbi</depends_on_package_pbi> </package> <package> <name>Zabbix-2 Proxy</name> <descr>Monitoring agent proxy.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file> - <version>zabbix2-proxy-2.2.2 pkg v0.8.2</version> + <version>zabbix2-proxy-2.2.5 pkg v0.8.3</version> <status>BETA</status> <required_version>2.0</required_version> <configurationfile>zabbix2-proxy.xml</configurationfile> @@ -1840,8 +1840,8 @@ </build_pbi> <build_options>OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI</build_options> <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <depends_on_package>zabbix22-proxy-2.2.2.tbz</depends_on_package> - <depends_on_package_pbi>zabbix22-proxy-2.2.2-amd64.pbi</depends_on_package_pbi> + <depends_on_package>zabbix22-proxy-2.2.5.tbz</depends_on_package> + <depends_on_package_pbi>zabbix22-proxy-2.2.5-amd64.pbi</depends_on_package_pbi> </package> <package> <!-- This does not exist yet, this is here to trigger a PBI build --> |