lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707-v2
- Get this branch:
- bzr branch lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707-v2
Branch merges
- Daniel Holbach (community): Approve
- Micah Gersten: Pending requested
- Ubuntu branches: Pending requested
-
Diff: 178200 lines (+55095/-60844)682 files modified.pc/applied-patches (+1/-0)
.pc/configure-no-lcrypt/configure (+5077/-8403)
.pc/ldap-linker-lp722300.patch/configure.in (+1494/-0)
.pc/ldap-linker-lp722300.patch/m4/ax_lib_postgresql.m4 (+182/-0)
.pc/ldap-linker-lp722300.patch/m4/ldap.m4 (+97/-0)
.pc/no-swf-clock/frontends/php/include/screens.inc.php (+69/-32)
ChangeLog (+339/-19)
Makefile.am (+3/-8)
Makefile.in (+150/-73)
aclocal.m4 (+198/-113)
build/win32/project/Makefile_agent (+5/-18)
build/win32/project/Makefile_agent_x64 (+5/-18)
build/win32/project/Makefile_get (+1/-1)
build/win32/project/Makefile_get_x64 (+1/-1)
build/win32/project/Makefile_sender (+1/-1)
build/win32/project/Makefile_sender_x64 (+1/-1)
build/win64/README (+1/-1)
compile (+11/-10)
config.guess (+63/-56)
config.sub (+51/-16)
configure (+5076/-8402)
configure.in (+504/-451)
create/Makefile.am (+3/-1)
create/Makefile.in (+41/-14)
create/data/data.sql (+10/-0)
create/data/images_ibm_db2.sql (+25/-0)
create/schema/ibm_db2.sql (+1076/-0)
create/schema/mysql.sql (+2/-1)
create/schema/oracle.sql (+4/-1)
create/schema/postgresql.sql (+2/-1)
create/schema/sqlite.sql (+2/-1)
debian/changelog (+46/-0)
debian/control (+5/-5)
debian/patches/configure-no-lcrypt (+13/-13)
debian/patches/ldap-linker-lp722300.patch (+54/-0)
debian/patches/series (+1/-0)
debian/po/da.po (+105/-0)
debian/rules (+3/-4)
debian/watch (+1/-0)
depcomp (+64/-23)
frontends/php/acknow.php (+17/-22)
frontends/php/actionconf.php (+108/-136)
frontends/php/api/classes/class.caction.php (+109/-69)
frontends/php/api/classes/class.calert.php (+40/-31)
frontends/php/api/classes/class.capplication.php (+68/-39)
frontends/php/api/classes/class.cdcheck.php (+14/-43)
frontends/php/api/classes/class.cdhost.php (+15/-62)
frontends/php/api/classes/class.cdrule.php (+50/-70)
frontends/php/api/classes/class.cdservice.php (+15/-70)
frontends/php/api/classes/class.cevent.php (+66/-53)
frontends/php/api/classes/class.cgraph.php (+270/-276)
frontends/php/api/classes/class.cgraphitem.php (+36/-11)
frontends/php/api/classes/class.chistory.php (+23/-27)
frontends/php/api/classes/class.chost.php (+149/-121)
frontends/php/api/classes/class.chostgroup.php (+135/-72)
frontends/php/api/classes/class.cimage.php (+70/-36)
frontends/php/api/classes/class.citem.php (+49/-85)
frontends/php/api/classes/class.cmaintenance.php (+149/-49)
frontends/php/api/classes/class.cmap.php (+276/-226)
frontends/php/api/classes/class.cmediatype.php (+51/-88)
frontends/php/api/classes/class.cproxy.php (+32/-20)
frontends/php/api/classes/class.cscreen.php (+63/-41)
frontends/php/api/classes/class.cscript.php (+171/-40)
frontends/php/api/classes/class.ctemplate.php (+198/-117)
frontends/php/api/classes/class.ctrigger.php (+179/-136)
frontends/php/api/classes/class.ctriggerexpression.php (+759/-0)
frontends/php/api/classes/class.cuser.php (+116/-125)
frontends/php/api/classes/class.cusergroup.php (+67/-44)
frontends/php/api/classes/class.cusermacro.php (+407/-379)
frontends/php/api/classes/class.czbxapi.php (+3/-2)
frontends/php/api/rpc/class.cjsonrpc.php (+2/-2)
frontends/php/api/rpc/class.czbxrpc.php (+17/-11)
frontends/php/api_jsonrpc.php (+1/-1)
frontends/php/applications.php (+6/-16)
frontends/php/auditacts.php (+4/-3)
frontends/php/auditlogs.php (+3/-31)
frontends/php/chart.php (+0/-1)
frontends/php/chart2.php (+4/-4)
frontends/php/chart3.php (+9/-9)
frontends/php/conf/zabbix.conf.php.example (+13/-28)
frontends/php/config.php (+87/-46)
frontends/php/discovery.php (+21/-3)
frontends/php/discoveryconf.php (+243/-34)
frontends/php/events.php (+87/-9)
frontends/php/graphs.php (+3/-3)
frontends/php/history.php (+33/-39)
frontends/php/hostgroups.php (+73/-28)
frontends/php/hosts.php (+147/-45)
frontends/php/httpconf.php (+225/-21)
frontends/php/httpdetails.php (+13/-12)
frontends/php/imgstore.php (+8/-7)
frontends/php/include/acknow.inc.php (+2/-2)
frontends/php/include/actions.inc.php (+22/-15)
frontends/php/include/audit.inc.php (+39/-31)
frontends/php/include/blocks.inc.php (+13/-9)
frontends/php/include/classes/class.cbutton.php (+1/-1)
frontends/php/include/classes/class.cchart.php (+105/-90)
frontends/php/include/classes/class.ccheckbox.php (+1/-1)
frontends/php/include/classes/class.ccombobox.php (+26/-9)
frontends/php/include/classes/class.ccomboitem.php (+3/-5)
frontends/php/include/classes/class.cconfigfile.php (+163/-0)
frontends/php/include/classes/class.cformelement.php (+50/-50)
frontends/php/include/classes/class.cformtable.php (+16/-42)
frontends/php/include/classes/class.cipbox.php (+0/-65)
frontends/php/include/classes/class.clabel.php (+30/-0)
frontends/php/include/classes/class.cpagefilter.php (+467/-451)
frontends/php/include/classes/class.cpie.php (+4/-0)
frontends/php/include/classes/class.cstringparser.php (+23/-304)
frontends/php/include/classes/class.ctag.php (+1/-1)
frontends/php/include/classes/class.ctextarea.php (+1/-1)
frontends/php/include/classes/class.ctriggersinfo.php (+3/-10)
frontends/php/include/classes/class.curl.php (+8/-2)
frontends/php/include/classes/class.cwidget.php (+1/-1)
frontends/php/include/config.inc.php (+43/-29)
frontends/php/include/db.inc.php (+270/-98)
frontends/php/include/debug.inc.php (+44/-44)
frontends/php/include/defines.inc.php (+26/-10)
frontends/php/include/discovery.inc.php (+64/-48)
frontends/php/include/events.inc.php (+89/-54)
frontends/php/include/export.inc.php (+126/-84)
frontends/php/include/forms.inc.php (+176/-726)
frontends/php/include/func.inc.php (+122/-87)
frontends/php/include/hosts.inc.php (+71/-93)
frontends/php/include/httptest.inc.php (+19/-5)
frontends/php/include/items.inc.php (+316/-102)
frontends/php/include/js.inc.php (+21/-5)
frontends/php/include/locales.inc.php (+1/-0)
frontends/php/include/locales/cn_zh.inc.php (+2/-83)
frontends/php/include/locales/cs_cz.inc.php (+2/-81)
frontends/php/include/locales/de_de.inc.php (+1/-57)
frontends/php/include/locales/en_gb.inc.php (+123/-99)
frontends/php/include/locales/fr_fr.inc.php (+89/-88)
frontends/php/include/locales/hu_hu.inc.php (+1/-82)
frontends/php/include/locales/it_it.inc.php (+1/-10)
frontends/php/include/locales/ja_jp.inc.php (+168/-170)
frontends/php/include/locales/ko_kr.inc.php (+0/-21)
frontends/php/include/locales/lv_lv.inc.php (+158/-4)
frontends/php/include/locales/nl_nl.inc.php (+0/-12)
frontends/php/include/locales/pl_pl.inc.php (+1/-29)
frontends/php/include/locales/pt_br.inc.php (+121/-120)
frontends/php/include/locales/ru_ru.inc.php (+172/-175)
frontends/php/include/locales/sk_sk.inc.php (+2062/-0)
frontends/php/include/locales/sp_sp.inc.php (+1/-22)
frontends/php/include/locales/sv_se.inc.php (+0/-12)
frontends/php/include/locales/ua_ua.inc.php (+118/-126)
frontends/php/include/maps.inc.php (+797/-1162)
frontends/php/include/media.inc.php (+17/-10)
frontends/php/include/menu.inc.php (+3/-4)
frontends/php/include/nodes.inc.php (+0/-1)
frontends/php/include/page_footer.php (+12/-5)
frontends/php/include/page_header.php (+15/-6)
frontends/php/include/profiles.inc.php (+43/-43)
frontends/php/include/requirements.inc.php (+17/-0)
frontends/php/include/schema.inc.php (+4302/-651)
frontends/php/include/screens.inc.php (+69/-32)
frontends/php/include/scripts.inc.php (+0/-72)
frontends/php/include/services.inc.php (+3/-41)
frontends/php/include/setup.inc.php (+177/-423)
frontends/php/include/triggers.inc.php (+539/-822)
frontends/php/include/users.inc.php (+1/-1)
frontends/php/include/validate.inc.php (+22/-37)
frontends/php/include/xmlschemas/screens.rng (+135/-0)
frontends/php/index.php (+4/-2)
frontends/php/items.php (+59/-34)
frontends/php/js/class.calendar.js (+3/-3)
frontends/php/js/class.cmap.js (+59/-75)
frontends/php/js/class.cmessages.js (+5/-5)
frontends/php/js/class.csuggest.js (+2/-2)
frontends/php/js/class.cviewswitcher.js (+33/-50)
frontends/php/js/class.pmaster.js (+2/-2)
frontends/php/js/common.js (+62/-73)
frontends/php/js/functions.js (+49/-13)
frontends/php/js/ie6fix.js (+1/-1)
frontends/php/js/main.js (+91/-91)
frontends/php/js/prototype.js (+2/-3)
frontends/php/jsLoader.php (+118/-107)
frontends/php/jsrpc.php (+3/-3)
frontends/php/locales.php (+13/-61)
frontends/php/maintenance.php (+6/-6)
frontends/php/maps.php (+92/-77)
frontends/php/media_types.php (+115/-78)
frontends/php/popup.php (+46/-32)
frontends/php/popup_trexpr.php (+211/-104)
frontends/php/profile.php (+7/-9)
frontends/php/proxies.php (+3/-2)
frontends/php/queue.php (+9/-7)
frontends/php/report2.php (+73/-77)
frontends/php/report4.php (+160/-127)
frontends/php/report5.php (+1/-0)
frontends/php/screenconf.php (+23/-12)
frontends/php/screenedit.php (+10/-15)
frontends/php/screens.php (+74/-27)
frontends/php/scripts.php (+9/-9)
frontends/php/scripts_exec.php (+32/-33)
frontends/php/search.php (+17/-21)
frontends/php/services_form.php (+16/-4)
frontends/php/setup.php (+14/-8)
frontends/php/slideconf.php (+18/-13)
frontends/php/slides.php (+10/-4)
frontends/php/styles/calendar.css (+1/-1)
frontends/php/styles/css_od.css (+10/-2)
frontends/php/styles/table.css (+31/-33)
frontends/php/sysmap.php (+3/-4)
frontends/php/sysmaps.php (+18/-28)
frontends/php/templates.php (+31/-27)
frontends/php/tr_comments.php (+30/-6)
frontends/php/tr_events.php (+18/-8)
frontends/php/tr_logform.php (+33/-33)
frontends/php/tr_status.php (+44/-14)
frontends/php/tr_testexpr.php (+24/-35)
frontends/php/triggers.php (+94/-65)
frontends/php/users.php (+8/-6)
include/cfg.h (+0/-9)
include/common.h (+81/-83)
include/comms.h (+11/-7)
include/config.h.in (+53/-38)
include/daemon.h (+4/-5)
include/db.h (+108/-140)
include/dbcache.h (+16/-8)
include/dbschema.h (+16/-25)
include/email.h (+0/-28)
include/ipc.h (+1/-0)
include/jabber.h (+0/-27)
include/mutexs.h (+25/-30)
include/service.h (+5/-5)
include/sms.h (+0/-26)
include/snprintf.c (+0/-983)
include/sysinc.h (+7/-0)
include/sysinfo.h (+180/-140)
include/threads.h (+19/-10)
include/zbxdb.h (+131/-104)
include/zbxexec.h (+25/-0)
include/zbxicmpping.h (+11/-9)
include/zbxjson.h (+9/-6)
include/zbxmacros.h (+0/-1)
include/zbxmedia.h (+37/-0)
include/zbxodbc.h (+1/-1)
include/zbxplugin.h (+0/-61)
include/zbxself.h (+68/-0)
include/zbxserver.h (+4/-9)
include/zlog.h (+1/-1)
install-sh (+3/-2)
m4/ax_lib_ibm_db2.m4 (+64/-0)
m4/ax_lib_oracle_oci.m4 (+2/-2)
m4/ax_lib_postgresql.m4 (+3/-1)
m4/iconv.m4 (+1/-1)
m4/ldap.m4 (+3/-1)
m4/libcurl.m4 (+6/-2)
m4/openipmi.m4 (+1/-1)
m4/resolv.m4 (+1/-1)
man/Makefile.in (+130/-93)
man/zabbix_sender.man (+12/-8)
misc/Makefile.in (+38/-13)
misc/conf/zabbix_agent.conf (+0/-1)
misc/conf/zabbix_agentd.conf (+20/-22)
misc/conf/zabbix_agentd.win.conf (+43/-12)
misc/conf/zabbix_agentd/userparameter_examples.conf (+8/-0)
misc/conf/zabbix_agentd/userparameter_mysql.conf (+14/-0)
misc/conf/zabbix_proxy.conf (+37/-28)
misc/conf/zabbix_server.conf (+33/-12)
misc/init.d/debian/zabbix-agent (+3/-19)
misc/init.d/debian/zabbix-server (+2/-18)
misc/init.d/fedora/core/zabbix_agentd (+1/-1)
misc/init.d/fedora/core/zabbix_server (+1/-2)
misc/init.d/fedora/core5/zabbix_agentd (+2/-3)
misc/init.d/fedora/core5/zabbix_server (+2/-3)
misc/init.d/gentoo/zabbix-agentd (+4/-7)
misc/init.d/gentoo/zabbix-server (+4/-9)
misc/init.d/redhat/zabbix_agentd_ctl (+1/-1)
misc/init.d/redhat/zabbix_server_ctl (+1/-1)
misc/init.d/suse/9.1/zabbix_agentd (+1/-1)
misc/init.d/suse/9.1/zabbix_server (+1/-1)
misc/init.d/suse/9.2/zabbix_agentd (+1/-1)
misc/init.d/suse/9.2/zabbix_server (+1/-1)
misc/init.d/suse/9.3/zabbix_agentd (+1/-1)
misc/init.d/suse/9.3/zabbix_server (+1/-1)
misc/init.d/tru64/zabbix_agentd (+3/-3)
misc/init.d/tru64/zabbix_server (+3/-3)
misc/init.d/ubuntu/zabbix-agent.conf (+8/-0)
misc/init.d/ubuntu/zabbix-server.conf (+9/-0)
misc/snmptrap/snmptrap.sh (+1/-2)
missing (+29/-20)
src/Makefile.am (+1/-0)
src/Makefile.in (+108/-38)
src/libs/Makefile.am (+10/-15)
src/libs/Makefile.in (+117/-50)
src/libs/zbxalgo/Makefile.in (+56/-25)
src/libs/zbxalgo/algodefs.c (+4/-4)
src/libs/zbxalgo/binaryheap.c (+13/-57)
src/libs/zbxalgo/hashmap.c (+10/-40)
src/libs/zbxalgo/hashset.c (+2/-38)
src/libs/zbxalgo/vector.c (+1/-1)
src/libs/zbxcommon/Makefile.in (+56/-25)
src/libs/zbxcommon/comms.c (+22/-112)
src/libs/zbxcommon/file.c (+1/-2)
src/libs/zbxcommon/misc.c (+286/-95)
src/libs/zbxcommon/regexp.c (+38/-30)
src/libs/zbxcommon/str.c (+672/-212)
src/libs/zbxcomms/Makefile.in (+56/-25)
src/libs/zbxcomms/comms.c (+103/-65)
src/libs/zbxcommshigh/Makefile.in (+56/-25)
src/libs/zbxcommshigh/comms.c (+0/-1)
src/libs/zbxconf/Makefile.in (+56/-25)
src/libs/zbxconf/cfg.c (+136/-143)
src/libs/zbxcrypto/Makefile.in (+56/-25)
src/libs/zbxdb/Makefile.in (+56/-25)
src/libs/zbxdb/db.c (+833/-533)
src/libs/zbxdbcache/Makefile.in (+56/-25)
src/libs/zbxdbcache/dbcache.c (+106/-100)
src/libs/zbxdbcache/dbconfig.c (+441/-331)
src/libs/zbxdbcache/nextchecks.c (+25/-11)
src/libs/zbxdbhigh/Makefile.in (+70/-39)
src/libs/zbxdbhigh/db.c (+165/-188)
src/libs/zbxdbhigh/dbschema.c (+9/-3706)
src/libs/zbxdbhigh/discovery.c (+1/-1)
src/libs/zbxdbhigh/host.c (+37/-35)
src/libs/zbxdbhigh/macro.c (+12/-11)
src/libs/zbxdbhigh/odbc.c (+10/-11)
src/libs/zbxdbhigh/proxy.c (+33/-27)
src/libs/zbxemail/Makefile.am (+0/-5)
src/libs/zbxemail/Makefile.in (+0/-468)
src/libs/zbxemail/email.c (+0/-278)
src/libs/zbxexec/Makefile.am (+5/-0)
src/libs/zbxexec/Makefile.in (+499/-0)
src/libs/zbxexec/execute.c (+425/-0)
src/libs/zbxicmpping/Makefile.in (+56/-25)
src/libs/zbxicmpping/icmpping.c (+226/-155)
src/libs/zbxjabber/Makefile.am (+0/-5)
src/libs/zbxjabber/Makefile.in (+0/-468)
src/libs/zbxjabber/jabber.c (+0/-541)
src/libs/zbxjson/Makefile.in (+56/-25)
src/libs/zbxjson/json.c (+311/-237)
src/libs/zbxlog/Makefile.in (+56/-25)
src/libs/zbxlog/log.c (+1/-3)
src/libs/zbxmedia/Makefile.am (+13/-0)
src/libs/zbxmedia/Makefile.in (+511/-0)
src/libs/zbxmedia/email.c (+290/-0)
src/libs/zbxmedia/eztexting.c (+291/-0)
src/libs/zbxmedia/jabber.c (+541/-0)
src/libs/zbxmedia/sms.c (+269/-0)
src/libs/zbxmemory/Makefile.in (+56/-25)
src/libs/zbxmemory/memalloc.c (+28/-37)
src/libs/zbxmemory/strpool.c (+2/-20)
src/libs/zbxnix/Makefile.in (+56/-25)
src/libs/zbxnix/daemon.c (+37/-24)
src/libs/zbxnix/ipc.c (+5/-5)
src/libs/zbxnix/pid.c (+6/-2)
src/libs/zbxplugin/Makefile.am (+0/-5)
src/libs/zbxplugin/Makefile.in (+0/-468)
src/libs/zbxplugin/zbxplugin.c (+0/-33)
src/libs/zbxself/Makefile.am (+5/-0)
src/libs/zbxself/Makefile.in (+499/-0)
src/libs/zbxself/selfmon.c (+559/-0)
src/libs/zbxserver/Makefile.in (+56/-25)
src/libs/zbxserver/evalfunc.c (+726/-556)
src/libs/zbxserver/evalfunc.h (+7/-6)
src/libs/zbxserver/expression.c (+784/-919)
src/libs/zbxsms/Makefile.am (+0/-5)
src/libs/zbxsms/Makefile.in (+0/-468)
src/libs/zbxsms/sms.c (+0/-280)
src/libs/zbxsys/Makefile.in (+56/-25)
src/libs/zbxsys/mutexs.c (+72/-69)
src/libs/zbxsys/symbols.c (+0/-1)
src/libs/zbxsys/threads.c (+39/-46)
src/libs/zbxsysinfo/Makefile.in (+116/-46)
src/libs/zbxsysinfo/aix/Makefile.am (+0/-3)
src/libs/zbxsysinfo/aix/Makefile.in (+74/-94)
src/libs/zbxsysinfo/aix/aix.c (+5/-17)
src/libs/zbxsysinfo/aix/cpu.c (+25/-70)
src/libs/zbxsysinfo/aix/diskio.c (+0/-157)
src/libs/zbxsysinfo/aix/diskspace.c (+1/-12)
src/libs/zbxsysinfo/aix/inodes.c (+12/-51)
src/libs/zbxsysinfo/aix/kernel.c (+0/-78)
src/libs/zbxsysinfo/aix/memory.c (+4/-17)
src/libs/zbxsysinfo/aix/net.c (+4/-27)
src/libs/zbxsysinfo/aix/proc.c (+30/-35)
src/libs/zbxsysinfo/aix/sensors.c (+0/-116)
src/libs/zbxsysinfo/aix/swap.c (+0/-333)
src/libs/zbxsysinfo/aix/uptime.c (+1/-8)
src/libs/zbxsysinfo/aix/vmstats.c (+24/-30)
src/libs/zbxsysinfo/common/Makefile.in (+56/-25)
src/libs/zbxsysinfo/common/common.c (+95/-237)
src/libs/zbxsysinfo/common/common.h (+5/-4)
src/libs/zbxsysinfo/common/file.c (+2/-30)
src/libs/zbxsysinfo/common/file.h (+4/-3)
src/libs/zbxsysinfo/common/http.c (+102/-165)
src/libs/zbxsysinfo/common/http.h (+3/-2)
src/libs/zbxsysinfo/common/net.c (+40/-117)
src/libs/zbxsysinfo/common/net.h (+7/-7)
src/libs/zbxsysinfo/common/system.c (+3/-19)
src/libs/zbxsysinfo/common/system.h (+6/-5)
src/libs/zbxsysinfo/freebsd/Makefile.am (+2/-3)
src/libs/zbxsysinfo/freebsd/Makefile.in (+95/-81)
src/libs/zbxsysinfo/freebsd/boottime.c (+0/-4)
src/libs/zbxsysinfo/freebsd/cpu.c (+22/-57)
src/libs/zbxsysinfo/freebsd/diskio.c (+32/-61)
src/libs/zbxsysinfo/freebsd/diskspace.c (+1/-12)
src/libs/zbxsysinfo/freebsd/freebsd.c (+5/-8)
src/libs/zbxsysinfo/freebsd/inodes.c (+1/-15)
src/libs/zbxsysinfo/freebsd/kernel.c (+2/-11)
src/libs/zbxsysinfo/freebsd/memory.c (+2/-14)
src/libs/zbxsysinfo/freebsd/net.c (+9/-34)
src/libs/zbxsysinfo/freebsd/proc.c (+70/-53)
src/libs/zbxsysinfo/freebsd/sensors.c (+0/-116)
src/libs/zbxsysinfo/freebsd/swap.c (+5/-17)
src/libs/zbxsysinfo/freebsd/uptime.c (+3/-24)
src/libs/zbxsysinfo/hpux/Makefile.am (+1/-7)
src/libs/zbxsysinfo/hpux/Makefile.in (+68/-138)
src/libs/zbxsysinfo/hpux/cpu.c (+36/-101)
src/libs/zbxsysinfo/hpux/diskio.c (+0/-157)
src/libs/zbxsysinfo/hpux/diskspace.c (+1/-12)
src/libs/zbxsysinfo/hpux/hpux.c (+4/-29)
src/libs/zbxsysinfo/hpux/inodes.c (+8/-52)
src/libs/zbxsysinfo/hpux/kernel.c (+0/-78)
src/libs/zbxsysinfo/hpux/memory.c (+10/-97)
src/libs/zbxsysinfo/hpux/net.c (+0/-67)
src/libs/zbxsysinfo/hpux/proc.c (+0/-500)
src/libs/zbxsysinfo/hpux/sensors.c (+0/-116)
src/libs/zbxsysinfo/hpux/swap.c (+0/-333)
src/libs/zbxsysinfo/hpux/uptime.c (+0/-120)
src/libs/zbxsysinfo/linux/Makefile.am (+2/-2)
src/libs/zbxsysinfo/linux/Makefile.in (+97/-66)
src/libs/zbxsysinfo/linux/boottime.c (+2/-7)
src/libs/zbxsysinfo/linux/cpu.c (+27/-58)
src/libs/zbxsysinfo/linux/diskio.c (+34/-61)
src/libs/zbxsysinfo/linux/diskspace.c (+1/-12)
src/libs/zbxsysinfo/linux/inodes.c (+15/-61)
src/libs/zbxsysinfo/linux/kernel.c (+0/-7)
src/libs/zbxsysinfo/linux/linux.c (+8/-6)
src/libs/zbxsysinfo/linux/memory.c (+23/-80)
src/libs/zbxsysinfo/linux/net.c (+123/-62)
src/libs/zbxsysinfo/linux/proc.c (+32/-37)
src/libs/zbxsysinfo/linux/sensors.c (+141/-96)
src/libs/zbxsysinfo/linux/swap.c (+34/-45)
src/libs/zbxsysinfo/linux/uptime.c (+0/-4)
src/libs/zbxsysinfo/netbsd/Makefile.am (+2/-4)
src/libs/zbxsysinfo/netbsd/Makefile.in (+93/-96)
src/libs/zbxsysinfo/netbsd/boottime.c (+0/-4)
src/libs/zbxsysinfo/netbsd/cpu.c (+23/-61)
src/libs/zbxsysinfo/netbsd/diskio.c (+0/-157)
src/libs/zbxsysinfo/netbsd/diskspace.c (+1/-12)
src/libs/zbxsysinfo/netbsd/inodes.c (+1/-15)
src/libs/zbxsysinfo/netbsd/kernel.c (+2/-11)
src/libs/zbxsysinfo/netbsd/memory.c (+2/-14)
src/libs/zbxsysinfo/netbsd/net.c (+65/-261)
src/libs/zbxsysinfo/netbsd/netbsd.c (+5/-15)
src/libs/zbxsysinfo/netbsd/proc.c (+56/-38)
src/libs/zbxsysinfo/netbsd/sensors.c (+0/-116)
src/libs/zbxsysinfo/netbsd/swap.c (+0/-333)
src/libs/zbxsysinfo/netbsd/uptime.c (+1/-20)
src/libs/zbxsysinfo/openbsd/Makefile.am (+2/-2)
src/libs/zbxsysinfo/openbsd/Makefile.in (+97/-66)
src/libs/zbxsysinfo/openbsd/boottime.c (+0/-4)
src/libs/zbxsysinfo/openbsd/cpu.c (+21/-52)
src/libs/zbxsysinfo/openbsd/diskio.c (+9/-33)
src/libs/zbxsysinfo/openbsd/diskspace.c (+1/-12)
src/libs/zbxsysinfo/openbsd/inodes.c (+1/-15)
src/libs/zbxsysinfo/openbsd/kernel.c (+2/-11)
src/libs/zbxsysinfo/openbsd/memory.c (+2/-14)
src/libs/zbxsysinfo/openbsd/net.c (+146/-294)
src/libs/zbxsysinfo/openbsd/openbsd.c (+7/-8)
src/libs/zbxsysinfo/openbsd/proc.c (+65/-43)
src/libs/zbxsysinfo/openbsd/sensors.c (+175/-87)
src/libs/zbxsysinfo/openbsd/swap.c (+16/-30)
src/libs/zbxsysinfo/openbsd/uptime.c (+0/-5)
src/libs/zbxsysinfo/osf/Makefile.am (+0/-2)
src/libs/zbxsysinfo/osf/Makefile.in (+75/-77)
src/libs/zbxsysinfo/osf/cpu.c (+20/-78)
src/libs/zbxsysinfo/osf/diskio.c (+0/-157)
src/libs/zbxsysinfo/osf/diskspace.c (+1/-12)
src/libs/zbxsysinfo/osf/inodes.c (+7/-53)
src/libs/zbxsysinfo/osf/kernel.c (+3/-17)
src/libs/zbxsysinfo/osf/memory.c (+6/-70)
src/libs/zbxsysinfo/osf/net.c (+0/-67)
src/libs/zbxsysinfo/osf/osf.c (+5/-21)
src/libs/zbxsysinfo/osf/proc.c (+61/-72)
src/libs/zbxsysinfo/osf/sensors.c (+0/-116)
src/libs/zbxsysinfo/osf/swap.c (+22/-92)
src/libs/zbxsysinfo/osf/uptime.c (+2/-26)
src/libs/zbxsysinfo/osx/Makefile.am (+0/-2)
src/libs/zbxsysinfo/osx/Makefile.in (+75/-77)
src/libs/zbxsysinfo/osx/cpu.c (+49/-207)
src/libs/zbxsysinfo/osx/diskio.c (+0/-157)
src/libs/zbxsysinfo/osx/diskspace.c (+1/-12)
src/libs/zbxsysinfo/osx/inodes.c (+9/-50)
src/libs/zbxsysinfo/osx/kernel.c (+4/-19)
src/libs/zbxsysinfo/osx/memory.c (+10/-91)
src/libs/zbxsysinfo/osx/net.c (+0/-67)
src/libs/zbxsysinfo/osx/osx.c (+5/-21)
src/libs/zbxsysinfo/osx/proc.c (+18/-28)
src/libs/zbxsysinfo/osx/sensors.c (+0/-116)
src/libs/zbxsysinfo/osx/swap.c (+22/-90)
src/libs/zbxsysinfo/osx/uptime.c (+1/-23)
src/libs/zbxsysinfo/simple/Makefile.in (+56/-25)
src/libs/zbxsysinfo/simple/ntp.c (+128/-136)
src/libs/zbxsysinfo/simple/ntp.h (+4/-3)
src/libs/zbxsysinfo/simple/simple.c (+65/-79)
src/libs/zbxsysinfo/simple/simple.h (+3/-2)
src/libs/zbxsysinfo/solaris/Makefile.am (+1/-2)
src/libs/zbxsysinfo/solaris/Makefile.in (+93/-79)
src/libs/zbxsysinfo/solaris/boottime.c (+0/-5)
src/libs/zbxsysinfo/solaris/cpu.c (+72/-108)
src/libs/zbxsysinfo/solaris/diskio.c (+69/-109)
src/libs/zbxsysinfo/solaris/diskspace.c (+1/-12)
src/libs/zbxsysinfo/solaris/inodes.c (+6/-47)
src/libs/zbxsysinfo/solaris/kernel.c (+4/-19)
src/libs/zbxsysinfo/solaris/memory.c (+16/-42)
src/libs/zbxsysinfo/solaris/net.c (+28/-129)
src/libs/zbxsysinfo/solaris/proc.c (+29/-33)
src/libs/zbxsysinfo/solaris/sensors.c (+0/-116)
src/libs/zbxsysinfo/solaris/solaris.c (+5/-7)
src/libs/zbxsysinfo/solaris/swap.c (+26/-72)
src/libs/zbxsysinfo/solaris/uptime.c (+0/-5)
src/libs/zbxsysinfo/specsysinfo.h (+6/-5)
src/libs/zbxsysinfo/sysinfo.c (+54/-69)
src/libs/zbxsysinfo/unknown/Makefile.am (+1/-12)
src/libs/zbxsysinfo/unknown/Makefile.in (+60/-200)
src/libs/zbxsysinfo/unknown/cpu.c (+0/-465)
src/libs/zbxsysinfo/unknown/diskio.c (+0/-157)
src/libs/zbxsysinfo/unknown/diskspace.c (+0/-171)
src/libs/zbxsysinfo/unknown/inodes.c (+0/-237)
src/libs/zbxsysinfo/unknown/kernel.c (+0/-78)
src/libs/zbxsysinfo/unknown/memory.c (+0/-408)
src/libs/zbxsysinfo/unknown/net.c (+0/-67)
src/libs/zbxsysinfo/unknown/proc.c (+0/-500)
src/libs/zbxsysinfo/unknown/sensors.c (+0/-116)
src/libs/zbxsysinfo/unknown/swap.c (+0/-333)
src/libs/zbxsysinfo/unknown/unknown.c (+4/-38)
src/libs/zbxsysinfo/unknown/uptime.c (+0/-120)
src/libs/zbxsysinfo/win32/cpu.c (+3/-34)
src/libs/zbxsysinfo/win32/diskio.c (+0/-24)
src/libs/zbxsysinfo/win32/diskspace.c (+5/-5)
src/libs/zbxsysinfo/win32/inodes.c (+0/-33)
src/libs/zbxsysinfo/win32/kernel.c (+0/-40)
src/libs/zbxsysinfo/win32/memory.c (+0/-2)
src/libs/zbxsysinfo/win32/net.c (+5/-32)
src/libs/zbxsysinfo/win32/pdhmon.c (+34/-27)
src/libs/zbxsysinfo/win32/proc.c (+20/-30)
src/libs/zbxsysinfo/win32/sensors.c (+0/-34)
src/libs/zbxsysinfo/win32/swap.c (+0/-22)
src/libs/zbxsysinfo/win32/uptime.c (+1/-1)
src/libs/zbxsysinfo/win32/win32.c (+9/-23)
src/libs/zbxwin32/service.c (+11/-12)
src/zabbix_agent/Makefile.am (+3/-4)
src/zabbix_agent/Makefile.in (+111/-85)
src/zabbix_agent/active.c (+192/-218)
src/zabbix_agent/active.h (+44/-42)
src/zabbix_agent/cpustat.c (+438/-479)
src/zabbix_agent/cpustat.h (+47/-52)
src/zabbix_agent/diskdevices.c (+21/-9)
src/zabbix_agent/diskdevices.h (+6/-6)
src/zabbix_agent/eventlog.c (+14/-12)
src/zabbix_agent/eventlog.h (+4/-4)
src/zabbix_agent/interfaces.c (+0/-406)
src/zabbix_agent/interfaces.h (+0/-55)
src/zabbix_agent/listener.c (+32/-42)
src/zabbix_agent/logfiles.c (+2/-2)
src/zabbix_agent/perfstat.c (+5/-4)
src/zabbix_agent/perfstat.h (+20/-20)
src/zabbix_agent/stats.c (+74/-113)
src/zabbix_agent/stats.h (+7/-15)
src/zabbix_agent/zabbix_agent.c (+12/-25)
src/zabbix_agent/zabbix_agent.h (+0/-23)
src/zabbix_agent/zabbix_agentd.c (+48/-45)
src/zabbix_agent/zbxconf.c (+107/-85)
src/zabbix_agent/zbxconf.h (+4/-2)
src/zabbix_get/Makefile.am (+2/-2)
src/zabbix_get/Makefile.in (+88/-44)
src/zabbix_get/zabbix_get.c (+21/-26)
src/zabbix_proxy/Makefile.am (+3/-0)
src/zabbix_proxy/Makefile.in (+152/-63)
src/zabbix_proxy/datasender/Makefile.in (+56/-25)
src/zabbix_proxy/datasender/datasender.c (+64/-102)
src/zabbix_proxy/datasender/datasender.h (+2/-2)
src/zabbix_proxy/events.c (+1/-20)
src/zabbix_proxy/events.h (+1/-2)
src/zabbix_proxy/heart/Makefile.in (+56/-25)
src/zabbix_proxy/heart/heart.c (+20/-35)
src/zabbix_proxy/heart/heart.h (+2/-2)
src/zabbix_proxy/housekeeper/Makefile.in (+56/-25)
src/zabbix_proxy/housekeeper/housekeeper.c (+41/-32)
src/zabbix_proxy/housekeeper/housekeeper.h (+4/-5)
src/zabbix_proxy/proxy.c (+384/-254)
src/zabbix_proxy/proxyconfig/Makefile.in (+56/-25)
src/zabbix_proxy/proxyconfig/proxyconfig.c (+13/-28)
src/zabbix_proxy/servercomms.c (+34/-19)
src/zabbix_proxy/servercomms.h (+1/-1)
src/zabbix_proxy/zlog.c (+2/-2)
src/zabbix_sender/Makefile.am (+2/-2)
src/zabbix_sender/Makefile.in (+88/-44)
src/zabbix_sender/zabbix_sender.c (+122/-93)
src/zabbix_server/Makefile.am (+6/-8)
src/zabbix_server/Makefile.in (+159/-73)
src/zabbix_server/actions.c (+112/-109)
src/zabbix_server/actions.h (+0/-1)
src/zabbix_server/alerter/Makefile.in (+56/-25)
src/zabbix_server/alerter/alerter.c (+16/-19)
src/zabbix_server/alerter/alerter.h (+1/-1)
src/zabbix_server/dbconfig/Makefile.in (+56/-25)
src/zabbix_server/dbconfig/dbconfig.c (+18/-16)
src/zabbix_server/dbconfig/dbconfig.h (+1/-3)
src/zabbix_server/dbsyncer/Makefile.in (+56/-25)
src/zabbix_server/dbsyncer/dbsyncer.c (+24/-24)
src/zabbix_server/dbsyncer/dbsyncer.h (+1/-5)
src/zabbix_server/discoverer/Makefile.in (+56/-25)
src/zabbix_server/discoverer/discoverer.c (+87/-72)
src/zabbix_server/discoverer/discoverer.h (+1/-5)
src/zabbix_server/escalator/Makefile.in (+56/-25)
src/zabbix_server/escalator/escalator.c (+60/-125)
src/zabbix_server/escalator/escalator.h (+1/-3)
src/zabbix_server/events.c (+47/-83)
src/zabbix_server/events.h (+1/-2)
src/zabbix_server/housekeeper/Makefile.in (+56/-25)
src/zabbix_server/housekeeper/housekeeper.c (+51/-76)
src/zabbix_server/housekeeper/housekeeper.h (+3/-4)
src/zabbix_server/httppoller/Makefile.in (+56/-25)
src/zabbix_server/httppoller/httpmacro.c (+1/-4)
src/zabbix_server/httppoller/httpmacro.h (+1/-1)
src/zabbix_server/httppoller/httppoller.c (+35/-78)
src/zabbix_server/httppoller/httppoller.h (+2/-2)
src/zabbix_server/httppoller/httptest.c (+286/-362)
src/zabbix_server/httppoller/httptest.h (+21/-27)
src/zabbix_server/nodewatcher/Makefile.in (+58/-27)
src/zabbix_server/nodewatcher/history.c (+15/-12)
src/zabbix_server/nodewatcher/nodecomms.c (+20/-48)
src/zabbix_server/nodewatcher/nodecomms.h (+0/-1)
src/zabbix_server/nodewatcher/nodesender.c (+211/-142)
src/zabbix_server/nodewatcher/nodewatcher.c (+110/-34)
src/zabbix_server/nodewatcher/nodewatcher.h (+5/-2)
src/zabbix_server/operations.c (+64/-68)
src/zabbix_server/operations.h (+4/-7)
src/zabbix_server/pinger/Makefile.in (+56/-25)
src/zabbix_server/pinger/pinger.c (+126/-123)
src/zabbix_server/pinger/pinger.h (+1/-5)
src/zabbix_server/poller/Makefile.in (+56/-25)
src/zabbix_server/poller/checks_agent.c (+2/-2)
src/zabbix_server/poller/checks_aggregate.c (+27/-34)
src/zabbix_server/poller/checks_calculated.c (+27/-19)
src/zabbix_server/poller/checks_db.c (+8/-11)
src/zabbix_server/poller/checks_external.c (+51/-72)
src/zabbix_server/poller/checks_external.h (+0/-2)
src/zabbix_server/poller/checks_internal.c (+129/-35)
src/zabbix_server/poller/checks_ipmi.c (+46/-103)
src/zabbix_server/poller/checks_simple.c (+9/-9)
src/zabbix_server/poller/checks_snmp.c (+28/-14)
src/zabbix_server/poller/checks_ssh.c (+35/-32)
src/zabbix_server/poller/checks_telnet.c (+5/-5)
src/zabbix_server/poller/poller.c (+331/-307)
src/zabbix_server/poller/poller.h (+1/-9)
src/zabbix_server/proxypoller/Makefile.in (+56/-25)
src/zabbix_server/proxypoller/proxypoller.c (+55/-43)
src/zabbix_server/proxypoller/proxypoller.h (+0/-1)
src/zabbix_server/selfmon/Makefile.am (+5/-0)
src/zabbix_server/selfmon/Makefile.in (+499/-0)
src/zabbix_server/selfmon/selfmon.c (+43/-0)
src/zabbix_server/selfmon/selfmon.h (+25/-0)
src/zabbix_server/server.c (+529/-333)
src/zabbix_server/timer/Makefile.in (+56/-25)
src/zabbix_server/timer/timer.c (+152/-68)
src/zabbix_server/timer/timer.h (+1/-1)
src/zabbix_server/trapper/Makefile.in (+58/-27)
src/zabbix_server/trapper/active.c (+10/-4)
src/zabbix_server/trapper/nodecommand.c (+11/-28)
src/zabbix_server/trapper/nodehistory.c (+76/-34)
src/zabbix_server/trapper/nodesync.c (+30/-4)
src/zabbix_server/trapper/proxyconfig.c (+2/-2)
src/zabbix_server/trapper/trapper.c (+32/-37)
src/zabbix_server/trapper/trapper.h (+1/-4)
src/zabbix_server/utils/Makefile.in (+56/-25)
src/zabbix_server/utils/nodechange.c (+1/-2)
src/zabbix_server/watchdog/Makefile.in (+56/-25)
src/zabbix_server/watchdog/watchdog.c (+71/-46)
src/zabbix_server/watchdog/watchdog.h (+1/-1)
src/zabbix_server/zlog.c (+2/-2)
upgrades/Makefile.in (+38/-13)
upgrades/dbpatches/1.6/mysql/patch.sql (+2/-0)
upgrades/dbpatches/1.6/oracle/patch.sql (+2/-0)
upgrades/dbpatches/1.6/postgresql/patch.sql (+2/-0)
upgrades/dbpatches/1.8/mysql/patch.sql (+2/-1)
upgrades/dbpatches/1.8/mysql/upgrade (+62/-19)
upgrades/dbpatches/1.8/oracle/patch.sql (+2/-1)
upgrades/dbpatches/1.8/postgresql/patch.sql (+2/-1)
Branch information
- Owner:
- Nigel Jones
- Status:
- Merged
Recent revisions
- 37. By Nigel Jones
-
ldap-linker-
lp722300. patch: Fix FTBFS issues due to incorrect placement of
linker arguments. (LP: #722300) - 36. By Nigel Jones
-
* Merge from debian unstable (LP: #721707). Remaining changes:
- update build depend for mysql-transition
* New upstream release
* Ignore release candidates via 'uscan' in debian/watch
(closes: #599921)
* Added --with-ssh2 for SSH2 support during ./configure
(closes: #609744)
* Fixed typo in debian/rules to properly build with libcurl support
(closes: #613322)
* New upstream release
* Packaging repository moved to git.debian.org
[ Michael Ablassmeier ]
* zabbix-proxy-pgsql and -mysql: Fix package description (Closes: #586961)
* debian/po/da.po: added (Closes: #585485) - 35. By Bhavani Shankar
-
* Merge from debian unstable. Remaining changes:
- update build depend for mysql-transition - 34. By Jean-Louis Dupond
-
* Merge from debian unstable. (LP: #593104) Remaining changes:
- Mysql translation. - 32. By Christoph Haas <email address hidden>
-
* New upstream release
* Javascript library path fixed (Closes: #564029) - 31. By Fabio Tranchitella
-
[ Christoph Haas ]
* New upstream release; it fixes the following vulnerabilities:
- https://support. zabbix. com/browse/ ZBX-1030
- https://support. zabbix. com/browse/ ZBX-1031
- https://support. zabbix. com/browse/ ZBX-993
- https://support. zabbix. com/browse/ ZBX-1355
(Closes: #562613)[ Fabio Tranchitella ]
* debian/watch: updated for the 1.8 branch.
* debian/*.init: rewrote init scripts to use the "--retry N" option from
start-stop-daemon; this should fix the timing issues.
(Closes: #557760, #473911)
* debian/rules:
- do not ship usr/share/zabbix/ fonts/DejaVuSan s.ttf, link it from the
ttf-dejavu-core package instead.
- do not ship the database upgrade scripts for dbconfig-common, they
contains errors that dbconfig-common cannot ignore.
* debian/zabbix- server- {pgsql, mysql}. postinst: if upgrading from a pre-1.8
version, show a debconf note to inform the user that a manual upgrade is
needed for the SQL database. - 30. By Fabio Tranchitella
-
Set Default-Start to "2 3 4 5" and Default-Stop to "0 1 6" for all the init
scripts. - 29. By Christoph Haas <email address hidden>
-
* debian/po/ja.po updated (Closes: #548651)
* debian/po/cs.po updated (Closes: #548675)
* debian/po/sv.po updated (Closes: #548796)
* debian/po/de.po updated (Closes: #549248)
* debian/po/it.po updated (Closes: #549579)
* debian/po/pt.po updated (Closes: #550087)
* debian/po/ru.po updated (Closes: #550102)
* debian/po/es.po updated (Closes: #550173)
* debian/po/fr.po updated (Closes: #550315)
* Manpages for zabbix_server and zabbix_agent added (Closes: #496696)
* Added hint about the difference of the zabbix_agent.conf and
zabbix_agentd. conf in each config file as a comment. (Closes: #548701) - 28. By Fabio Tranchitella
-
* New upstream release.
* debian/control: fixed typos in the package descriptions. (Closes: #546638)
* debian/po/ja.po: updated. (Closes: #538223, #545399)
* debian/zabbix- agent.initd: added the status action. (Closes: #524205)
* debian/zabbix- server- {pgsql, mysql}. zabbix- server. init: improved the init
scripts (fail if the daemon is not executable, do not remove the pid file
while starting up the server). (Closes: #450528, 530577)
* debian/zabbix- frontend- php.templates: updated, thanks Christian.
(Closes: #522880)
* debian/control: bumped Standards-Version to 3.8.3, no changed needed.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/oneiric/zabbix