Merge lp://qastaging/~logan/ubuntu/raring/zabbix/2.0.4+dfsg-2ubuntu1 into lp://qastaging/ubuntu/raring/zabbix

.pc/applied-patches (+2/-1)
.pc/config-debian-customizations.patch/conf/zabbix_agentd.conf (+1/-1)
.pc/config-debian-customizations.patch/conf/zabbix_proxy.conf (+2/-1)
.pc/config-debian-customizations.patch/conf/zabbix_server.conf (+2/-0)
.pc/js_redirect.patch/frontends/php/include/func.inc.php (+0/-1857)
.pc/no-swf-clock.patch/frontends/php/api/classes/CScreenItem.php (+137/-32)
.pc/sql-upgrades-path.patch/upgrades/dbpatches/2.0/mysql/patch.sql (+41/-17)
.pc/sql-upgrades-path.patch/upgrades/dbpatches/2.0/postgresql/patch.sql (+29/-1)
ChangeLog (+136/-2)
Makefile.in (+46/-22)
aclocal.m4 (+78/-56)
compile (+183/-16)
conf/zabbix_agent.conf (+1/-1)
conf/zabbix_agentd.conf (+1/-1)
conf/zabbix_agentd.win.conf (+1/-1)
conf/zabbix_proxy.conf (+2/-1)
conf/zabbix_server.conf (+2/-0)
config.guess (+200/-203)
config.sub (+150/-70)
configure (+530/-441)
configure.in (+6/-3)
database/Makefile.in (+15/-8)
database/ibm_db2/data.sql (+53/-53)
database/mysql/data.sql (+53/-53)
database/oracle/data.sql (+139/-139)
database/postgresql/data.sql (+53/-53)
database/sqlite3/data.sql (+53/-53)
debian/changelog (+43/-0)
debian/control (+5/-9)
debian/copyright (+1/-1)
debian/patches/ZBX-6097_CVE-2013-1364.patch (+159/-0)
debian/patches/basename.patch (+69/-0)
debian/patches/config-debian-customizations.patch (+53/-19)
debian/patches/js_redirect.patch (+0/-21)
debian/patches/series (+2/-1)
debian/rules (+2/-0)
depcomp (+66/-8)
frontends/php/actionconf.php (+2/-2)
frontends/php/adm.gui.php (+4/-0)
frontends/php/adm.housekeeper.php (+6/-3)
frontends/php/adm.iconmapping.php (+18/-10)
frontends/php/adm.images.php (+13/-7)
frontends/php/adm.other.php (+6/-3)
frontends/php/adm.regexps.php (+43/-21)
frontends/php/adm.triggerdisplayingoptions.php (+0/-128)
frontends/php/adm.triggerdisplayoptions.php (+4/-8)
frontends/php/adm.valuemapping.php (+19/-9)
frontends/php/adm.workingtime.php (+4/-0)
frontends/php/api/classes/CApplication.php (+23/-9)
frontends/php/api/classes/CDiscoveryRule.php (+53/-69)
frontends/php/api/classes/CEvent.php (+0/-1)
frontends/php/api/classes/CGraph.php (+18/-120)
frontends/php/api/classes/CGraphGeneral.php (+113/-1)
frontends/php/api/classes/CGraphPrototype.php (+22/-116)
frontends/php/api/classes/CHistory.php (+0/-1)
frontends/php/api/classes/CHost.php (+0/-7)
frontends/php/api/classes/CHostGroup.php (+76/-74)
frontends/php/api/classes/CHostInterface.php (+2/-3)
frontends/php/api/classes/CItem.php (+11/-27)
frontends/php/api/classes/CItemGeneral.php (+18/-2)
frontends/php/api/classes/CItemPrototype.php (+177/-151)
frontends/php/api/classes/CMaintenance.php (+2/-2)
frontends/php/api/classes/CScreen.php (+70/-31)
frontends/php/api/classes/CScreenItem.php (+137/-32)
frontends/php/api/classes/CScript.php (+44/-27)
frontends/php/api/classes/CTemplate.php (+2/-5)
frontends/php/api/classes/CTemplateScreen.php (+347/-128)
frontends/php/api/classes/CTrigger.php (+165/-99)
frontends/php/api/classes/CTriggerExpression.php (+0/-774)
frontends/php/api/classes/CTriggerGeneral.php (+27/-12)
frontends/php/api/classes/CTriggerPrototype.php (+81/-205)
frontends/php/api/classes/CUser.php (+25/-16)
frontends/php/api/classes/CUserMacro.php (+6/-6)
frontends/php/api/rpc/class.cjsonrpc.php (+77/-53)
frontends/php/api/rpc/class.czbxrpc.php (+46/-35)
frontends/php/applications.php (+40/-14)
frontends/php/authentication.php (+11/-9)
frontends/php/chart.php (+9/-4)
frontends/php/chart2.php (+3/-1)
frontends/php/chart3.php (+4/-1)
frontends/php/chart6.php (+4/-2)
frontends/php/chart7.php (+3/-1)
frontends/php/charts.php (+31/-14)
frontends/php/conf/COPYING (+0/-278)
frontends/php/disc_prototypes.php (+2/-2)
frontends/php/discoveryconf.php (+32/-9)
frontends/php/events.php (+11/-10)
frontends/php/graphs.php (+28/-20)
frontends/php/history.php (+1/-1)
frontends/php/httpconf.php (+42/-19)
frontends/php/include/acknow.inc.php (+7/-8)
frontends/php/include/blocks.inc.php (+0/-2)
frontends/php/include/classes/api/API.php (+0/-8)
frontends/php/include/classes/class.cchart.php (+5/-14)
frontends/php/include/classes/class.ccombobox.php (+3/-1)
frontends/php/include/classes/class.cconfigfile.php (+14/-16)
frontends/php/include/classes/class.cpagefilter.php (+0/-114)
frontends/php/include/classes/class.cstringparser.php (+0/-748)
frontends/php/include/classes/class.ctableinfo.php (+87/-2)
frontends/php/include/classes/class.ctag.php (+12/-0)
frontends/php/include/classes/class.curl.php (+5/-1)
frontends/php/include/classes/class.cwebuser.php (+3/-3)
frontends/php/include/classes/class.frontendsetup.php (+20/-0)
frontends/php/include/classes/core/ZBase.php (+1/-0)
frontends/php/include/classes/db/DB.php (+0/-1)
frontends/php/include/classes/export/CConfigurationExport.php (+4/-2)
frontends/php/include/classes/helpers/trigger/CTriggerDescription.php (+52/-51)
frontends/php/include/classes/import/CConfigurationImport.php (+8/-4)
frontends/php/include/classes/import/CXmlImport18.php (+17/-15)
frontends/php/include/classes/import/formatters/C20ImportFormatter.php (+2/-0)
frontends/php/include/classes/import/importers/CTemplateScreenImporter.php (+1/-1)
frontends/php/include/classes/parsers/CTriggerExpression.php (+765/-0)
frontends/php/include/classes/screens/CScreenBase.php (+29/-4)
frontends/php/include/classes/screens/CScreenBuilder.php (+17/-0)
frontends/php/include/classes/screens/CScreenChart.php (+2/-9)
frontends/php/include/classes/screens/CScreenGraph.php (+4/-3)
frontends/php/include/classes/screens/CScreenHistory.php (+4/-8)
frontends/php/include/classes/screens/CScreenMap.php (+6/-2)
frontends/php/include/classes/screens/CScreenPlainText.php (+5/-0)
frontends/php/include/classes/screens/CScreenScreen.php (+1/-0)
frontends/php/include/classes/screens/CScreenSimpleGraph.php (+6/-4)
frontends/php/include/classes/screens/CScreenSystemStatus.php (+5/-0)
frontends/php/include/classes/tree/CTree.php (+2/-1)
frontends/php/include/classes/validators/CTimePeriodValidator.php (+1/-1)
frontends/php/include/classes/validators/CTriggerFunctionValidator.php (+325/-0)
frontends/php/include/db.inc.php (+8/-6)
frontends/php/include/debug.inc.php (+12/-1)
frontends/php/include/defines.inc.php (+11/-3)
frontends/php/include/events.inc.php (+23/-6)
frontends/php/include/forms.inc.php (+17/-9)
frontends/php/include/func.inc.php (+13/-5)
frontends/php/include/graphs.inc.php (+1/-0)
frontends/php/include/hosts.inc.php (+2/-3)
frontends/php/include/items.inc.php (+42/-40)
frontends/php/include/js.inc.php (+15/-0)
frontends/php/include/locales.inc.php (+11/-3)
frontends/php/include/maps.inc.php (+140/-79)
frontends/php/include/media.inc.php (+6/-11)
frontends/php/include/menu.inc.php (+6/-9)
frontends/php/include/page_footer.php (+7/-2)
frontends/php/include/reports.inc.php (+21/-15)
frontends/php/include/setup.inc.php (+1/-3)
frontends/php/include/triggers.inc.php (+208/-471)
frontends/php/include/validate.inc.php (+0/-11)
frontends/php/include/views/administration.general.iconmap.edit.php (+4/-5)
frontends/php/include/views/configuration.graph.edit.php (+1/-1)
frontends/php/include/views/configuration.graph.list.php (+1/-0)
frontends/php/include/views/configuration.host.edit.php (+1/-1)
frontends/php/include/views/configuration.item.edit.php (+1/-1)
frontends/php/include/views/configuration.template.edit.php (+21/-1)
frontends/php/include/views/configuration.triggers.edit.php (+2/-3)
frontends/php/include/views/configuration.triggers.expression.php (+7/-12)
frontends/php/include/views/general.login.php (+2/-2)
frontends/php/include/views/general.script.execute.php (+1/-1)
frontends/php/include/views/js/administration.general.iconmap.js.php (+49/-40)
frontends/php/include/views/js/configuration.graph.edit.js.php (+1/-1)
frontends/php/include/views/js/configuration.item.edit.js.php (+6/-6)
frontends/php/include/views/js/configuration.sysmaps.js.php (+2/-1)
frontends/php/include/views/js/configuration.triggers.expression.js.php (+11/-2)
frontends/php/include/views/monitoring.charts.php (+6/-4)
frontends/php/include/views/monitoring.discovery.php (+6/-7)
frontends/php/include/views/monitoring.history.php (+5/-2)
frontends/php/include/views/monitoring.slides.php (+3/-14)
frontends/php/index.php (+1/-1)
frontends/php/items.php (+67/-60)
frontends/php/js/browsers.js (+1/-1)
frontends/php/js/class.cdebug.js (+4/-0)
frontends/php/js/class.cmap.js (+1/-1)
frontends/php/js/class.ctree.js (+93/-137)
frontends/php/js/common.js (+3/-0)
frontends/php/js/flickerfreescreen.js (+444/-96)
frontends/php/js/gtlc.js (+8/-8)
frontends/php/js/main.js (+4/-2)
frontends/php/js/vendors/activity-indicator.js (+7/-0)
frontends/php/jsLoader.php (+2/-0)
frontends/php/jsrpc.php (+3/-2)
frontends/php/latest.php (+2/-2)
frontends/php/locale/cs/LC_MESSAGES/frontend.po (+2092/-1717)
frontends/php/locale/de/LC_MESSAGES/frontend.po (+2165/-1794)
frontends/php/locale/el/LC_MESSAGES/frontend.po (+2085/-1710)
frontends/php/locale/en_US/LC_MESSAGES/frontend.po (+2121/-1752)
frontends/php/locale/es/LC_MESSAGES/frontend.po (+2091/-1716)
frontends/php/locale/fa/LC_MESSAGES/frontend.po (+13871/-0)
frontends/php/locale/fi/LC_MESSAGES/frontend.po (+13890/-0)
frontends/php/locale/fr/LC_MESSAGES/frontend.po (+2088/-1713)
frontends/php/locale/hu/LC_MESSAGES/frontend.po (+2114/-1738)
frontends/php/locale/id/LC_MESSAGES/frontend.po (+13883/-0)
frontends/php/locale/it/LC_MESSAGES/frontend.po (+2825/-2442)
frontends/php/locale/ja/LC_MESSAGES/frontend.po (+2092/-1717)
frontends/php/locale/ko/LC_MESSAGES/frontend.po (+2090/-1715)
frontends/php/locale/lv/LC_MESSAGES/frontend.po (+2089/-1714)
frontends/php/locale/nl/LC_MESSAGES/frontend.po (+2089/-1714)
frontends/php/locale/pl/LC_MESSAGES/frontend.po (+2089/-1714)
frontends/php/locale/pt_BR/LC_MESSAGES/frontend.po (+2876/-2484)
frontends/php/locale/pt_PT/LC_MESSAGES/frontend.po (+13904/-0)
frontends/php/locale/ru/LC_MESSAGES/frontend.po (+2157/-1782)
frontends/php/locale/sk/LC_MESSAGES/frontend.po (+2139/-1761)
frontends/php/locale/sv/LC_MESSAGES/frontend.po (+2090/-1715)
frontends/php/locale/tr/LC_MESSAGES/frontend.po (+2088/-1713)
frontends/php/locale/uk/LC_MESSAGES/frontend.po (+2090/-1715)
frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po (+4443/-4093)
frontends/php/locale/zh_TW/LC_MESSAGES/frontend.po (+2098/-1723)
frontends/php/maintenance.php (+28/-21)
frontends/php/media_types.php (+30/-8)
frontends/php/popup.php (+20/-17)
frontends/php/popup_media.php (+2/-2)
frontends/php/popup_trexpr.php (+450/-190)
frontends/php/proxies.php (+42/-31)
frontends/php/report2.php (+42/-33)
frontends/php/report4.php (+250/-213)
frontends/php/screenconf.php (+6/-5)
frontends/php/setup.php (+1/-4)
frontends/php/slideconf.php (+34/-20)
frontends/php/slides.php (+11/-3)
frontends/php/styles/blocks.css (+1/-1)
frontends/php/styles/default.css (+15/-9)
frontends/php/templates.php (+50/-35)
frontends/php/tr_logform.php (+6/-7)
frontends/php/tr_status.php (+50/-18)
frontends/php/tr_testexpr.php (+29/-23)
frontends/php/trigger_prototypes.php (+2/-4)
frontends/php/triggers.php (+14/-16)
frontends/php/usergrps.php (+31/-11)
frontends/php/users.php (+28/-10)
frontends/php/vtext.php (+0/-83)
frontends/php/warning.php (+3/-3)
include/common.h (+1/-0)
include/dbcache.h (+2/-2)
include/threads.h (+2/-1)
include/version.h (+3/-3)
include/zbxserver.h (+5/-4)
install-sh (+18/-11)
m4/ax_lib_postgresql.m4 (+67/-42)
man/Makefile.in (+23/-14)
misc/Makefile.in (+15/-8)
missing (+4/-49)
src/Makefile.in (+15/-8)
src/libs/Makefile.in (+15/-8)
src/libs/zbxalgo/Makefile.in (+16/-9)
src/libs/zbxcommon/Makefile.in (+16/-9)
src/libs/zbxcommon/str.c (+24/-1)
src/libs/zbxcomms/Makefile.in (+16/-9)
src/libs/zbxcommshigh/Makefile.in (+16/-9)
src/libs/zbxconf/Makefile.in (+16/-9)
src/libs/zbxcrypto/Makefile.in (+16/-9)
src/libs/zbxdb/Makefile.in (+16/-9)
src/libs/zbxdb/db.c (+6/-11)
src/libs/zbxdbcache/Makefile.in (+16/-9)
src/libs/zbxdbcache/dbcache.c (+7/-7)
src/libs/zbxdbcache/dbconfig.c (+104/-75)
src/libs/zbxdbhigh/Makefile.in (+16/-9)
src/libs/zbxdbhigh/host.c (+9/-1)
src/libs/zbxdbhigh/lld.c (+1/-1)
src/libs/zbxdbhigh/proxy.c (+28/-3)
src/libs/zbxexec/Makefile.in (+16/-9)
src/libs/zbxicmpping/Makefile.in (+16/-9)
src/libs/zbxjson/Makefile.in (+16/-9)
src/libs/zbxlog/Makefile.in (+16/-9)
src/libs/zbxmedia/Makefile.in (+16/-9)
src/libs/zbxmedia/email.c (+75/-8)
src/libs/zbxmemory/Makefile.in (+16/-9)
src/libs/zbxnix/Makefile.in (+16/-9)
src/libs/zbxnix/daemon.c (+1/-1)
src/libs/zbxself/Makefile.in (+16/-9)
src/libs/zbxserver/Makefile.in (+16/-9)
src/libs/zbxserver/expression.c (+6/-4)
src/libs/zbxsys/Makefile.in (+16/-9)
src/libs/zbxsysinfo/Makefile.in (+17/-10)
src/libs/zbxsysinfo/agent/Makefile.in (+16/-9)
src/libs/zbxsysinfo/aix/Makefile.in (+16/-9)
src/libs/zbxsysinfo/aix/proc.c (+0/-1)
src/libs/zbxsysinfo/common/Makefile.in (+16/-9)
src/libs/zbxsysinfo/freebsd/Makefile.in (+16/-9)
src/libs/zbxsysinfo/freebsd/diskio.c (+9/-4)
src/libs/zbxsysinfo/freebsd/freebsd.c (+2/-2)
src/libs/zbxsysinfo/freebsd/memory.c (+1/-1)
src/libs/zbxsysinfo/freebsd/net.c (+1/-1)
src/libs/zbxsysinfo/hpux/Makefile.in (+16/-9)
src/libs/zbxsysinfo/linux/Makefile.in (+16/-9)
src/libs/zbxsysinfo/linux/diskio.c (+8/-3)
src/libs/zbxsysinfo/linux/linux.c (+1/-1)
src/libs/zbxsysinfo/linux/software.c (+16/-6)
src/libs/zbxsysinfo/netbsd/Makefile.in (+16/-9)
src/libs/zbxsysinfo/openbsd/Makefile.in (+16/-9)
src/libs/zbxsysinfo/openbsd/openbsd.c (+2/-2)
src/libs/zbxsysinfo/openbsd/proc.c (+11/-1)
src/libs/zbxsysinfo/osf/Makefile.in (+16/-9)
src/libs/zbxsysinfo/osx/Makefile.in (+16/-9)
src/libs/zbxsysinfo/simple/Makefile.in (+16/-9)
src/libs/zbxsysinfo/solaris/Makefile.in (+16/-9)
src/libs/zbxsysinfo/solaris/memory.c (+1/-1)
src/libs/zbxsysinfo/solaris/solaris.c (+2/-2)
src/libs/zbxsysinfo/sysinfo.c (+4/-0)
src/libs/zbxsysinfo/unknown/Makefile.in (+16/-9)
src/zabbix_agent/Makefile.in (+17/-10)
src/zabbix_agent/active.c (+4/-0)
src/zabbix_agent/cpustat.h (+4/-0)
src/zabbix_agent/listener.c (+2/-0)
src/zabbix_agent/stats.c (+2/-0)
src/zabbix_agent/stats.h (+7/-0)
src/zabbix_agent/zabbix_agent.c (+1/-1)
src/zabbix_get/Makefile.in (+16/-9)
src/zabbix_java/Makefile.in (+15/-8)
src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java (+3/-3)
src/zabbix_java/src/com/zabbix/gateway/HelperFunctionChest.java (+51/-0)
src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java (+61/-30)
src/zabbix_proxy/Makefile.in (+16/-9)
src/zabbix_proxy/datasender/Makefile.in (+16/-9)
src/zabbix_proxy/heart/Makefile.in (+16/-9)
src/zabbix_proxy/housekeeper/Makefile.in (+16/-9)
src/zabbix_proxy/proxy.c (+1/-1)
src/zabbix_proxy/proxyconfig/Makefile.in (+16/-9)
src/zabbix_sender/Makefile.in (+16/-9)
src/zabbix_sender/zabbix_sender.c (+3/-2)
src/zabbix_server/Makefile.in (+16/-9)
src/zabbix_server/actions.c (+4/-0)
src/zabbix_server/alerter/Makefile.in (+16/-9)
src/zabbix_server/dbconfig/Makefile.in (+16/-9)
src/zabbix_server/dbsyncer/Makefile.in (+16/-9)
src/zabbix_server/discoverer/Makefile.in (+16/-9)
src/zabbix_server/escalator/Makefile.in (+16/-9)
src/zabbix_server/escalator/escalator.c (+1/-0)
src/zabbix_server/housekeeper/Makefile.in (+16/-9)
src/zabbix_server/housekeeper/housekeeper.c (+1/-1)
src/zabbix_server/httppoller/Makefile.in (+16/-9)
src/zabbix_server/httppoller/httptest.c (+18/-6)
src/zabbix_server/nodewatcher/Makefile.in (+16/-9)
src/zabbix_server/operations.c (+3/-7)
src/zabbix_server/pinger/Makefile.in (+16/-9)
src/zabbix_server/pinger/pinger.c (+10/-8)
src/zabbix_server/poller/Makefile.in (+16/-9)
src/zabbix_server/poller/checks_snmp.c (+50/-17)
src/zabbix_server/poller/poller.c (+13/-12)
src/zabbix_server/proxypoller/Makefile.in (+16/-9)
src/zabbix_server/scripts.c (+13/-4)
src/zabbix_server/selfmon/Makefile.in (+16/-9)
src/zabbix_server/snmptrapper/Makefile.in (+16/-9)
src/zabbix_server/snmptrapper/snmptrapper.c (+9/-3)
src/zabbix_server/timer/Makefile.in (+16/-9)
src/zabbix_server/trapper/Makefile.in (+16/-9)
src/zabbix_server/trapper/active.c (+28/-22)
src/zabbix_server/trapper/nodehistory.c (+3/-3)
src/zabbix_server/utils/Makefile.in (+16/-9)
src/zabbix_server/watchdog/Makefile.in (+16/-9)
upgrades/Makefile.in (+15/-8)
upgrades/dbpatches/2.0/ibm_db2/patch.sql (+30/-2)
upgrades/dbpatches/2.0/mysql/patch.sql (+41/-17)
upgrades/dbpatches/2.0/oracle/patch.sql (+29/-1)
upgrades/dbpatches/2.0/postgresql/patch.sql (+29/-1)