update to 6.0.3; from Mark Patruck
ok sthen@, naddy@
This commit is contained in:
parent
4cb01f22c6
commit
1d424ebc9a
@ -3,7 +3,7 @@ COMMENT-server = network and application monitoring - server
|
||||
COMMENT-proxy = network and application monitoring - proxy
|
||||
COMMENT-web = network and application monitoring - web frontend
|
||||
|
||||
VERSION = 6.0.2
|
||||
VERSION = 6.0.3
|
||||
DISTNAME = zabbix-${VERSION}
|
||||
FULLPKGNAME-main = zabbix-agent-${VERSION}
|
||||
FULLPKGPATH-main = net/zabbix,-main
|
||||
@ -13,10 +13,6 @@ FULLPKGNAME-web = zabbix-web-${VERSION}
|
||||
FULLPKGPATH-web = net/zabbix,-web
|
||||
CATEGORIES = net
|
||||
|
||||
REVISION-main = 2
|
||||
REVISION-server = 1
|
||||
REVISION-proxy = 1
|
||||
|
||||
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
|
||||
|
||||
HOMEPAGE = http://www.zabbix.com/
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (zabbix-6.0.2.tar.gz) = fKiVVL2Ziry534GSZCk/fiIrTvSiJayuOpNi2TwIFBE=
|
||||
SIZE (zabbix-6.0.2.tar.gz) = 33082787
|
||||
SHA256 (zabbix-6.0.3.tar.gz) = 5hlTKJQnROyl8AUdtC+YMNJmEqk/Q56JZWWI2UiKMEI=
|
||||
SIZE (zabbix-6.0.3.tar.gz) = 33135282
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: src/libs/zbxcrypto/tls.h
|
||||
--- src/libs/zbxcrypto/tls.h.orig
|
||||
+++ src/libs/zbxcrypto/tls.h
|
||||
@@ -31,7 +31,7 @@
|
||||
@@ -33,7 +33,7 @@
|
||||
# include <openssl/rand.h>
|
||||
#endif
|
||||
|
||||
|
@ -3,7 +3,7 @@ Add ZBX_CPU_STATE_SPIN to monitor CP_SPIN
|
||||
Index: src/zabbix_agent/cpustat.c
|
||||
--- src/zabbix_agent/cpustat.c.orig
|
||||
+++ src/zabbix_agent/cpustat.c
|
||||
@@ -674,6 +674,7 @@ read_again:
|
||||
@@ -675,6 +675,7 @@ read_again:
|
||||
counter[ZBX_CPU_STATE_NICE] = (zbx_uint64_t)all_states[CP_NICE];
|
||||
counter[ZBX_CPU_STATE_SYSTEM] = (zbx_uint64_t)all_states[CP_SYS];
|
||||
counter[ZBX_CPU_STATE_INTERRUPT] = (zbx_uint64_t)all_states[CP_INTR];
|
||||
@ -11,7 +11,7 @@ Index: src/zabbix_agent/cpustat.c
|
||||
counter[ZBX_CPU_STATE_IDLE] = (zbx_uint64_t)all_states[CP_IDLE];
|
||||
}
|
||||
else
|
||||
@@ -694,6 +695,7 @@ read_again:
|
||||
@@ -695,6 +696,7 @@ read_again:
|
||||
counter[ZBX_CPU_STATE_NICE] = (zbx_uint64_t)one_states[CP_NICE];
|
||||
counter[ZBX_CPU_STATE_SYSTEM] = (zbx_uint64_t)one_states[CP_SYS];
|
||||
counter[ZBX_CPU_STATE_INTERRUPT] = (zbx_uint64_t)one_states[CP_INTR];
|
||||
|
@ -4,7 +4,7 @@
|
||||
Index: src/zabbix_sender/zabbix_sender.c
|
||||
--- src/zabbix_sender/zabbix_sender.c.orig
|
||||
+++ src/zabbix_sender/zabbix_sender.c
|
||||
@@ -1861,6 +1861,9 @@ exit:
|
||||
@@ -1859,6 +1859,9 @@ exit:
|
||||
}
|
||||
#endif
|
||||
zabbix_close_log();
|
||||
|
@ -1473,10 +1473,10 @@ zabbix/locale/lv/LC_MESSAGES/
|
||||
zabbix/locale/lv/LC_MESSAGES/frontend.mo
|
||||
zabbix/locale/lv/LC_MESSAGES/frontend.po
|
||||
zabbix/locale/make_mo.sh
|
||||
zabbix/locale/nb-NO/
|
||||
zabbix/locale/nb-NO/LC_MESSAGES/
|
||||
zabbix/locale/nb-NO/LC_MESSAGES/frontend.mo
|
||||
zabbix/locale/nb-NO/LC_MESSAGES/frontend.po
|
||||
zabbix/locale/nb_NO/
|
||||
zabbix/locale/nb_NO/LC_MESSAGES/
|
||||
zabbix/locale/nb_NO/LC_MESSAGES/frontend.mo
|
||||
zabbix/locale/nb_NO/LC_MESSAGES/frontend.po
|
||||
zabbix/locale/nl/
|
||||
zabbix/locale/nl/LC_MESSAGES/
|
||||
zabbix/locale/nl/LC_MESSAGES/frontend.mo
|
||||
@ -1505,10 +1505,10 @@ zabbix/locale/sk/
|
||||
zabbix/locale/sk/LC_MESSAGES/
|
||||
zabbix/locale/sk/LC_MESSAGES/frontend.mo
|
||||
zabbix/locale/sk/LC_MESSAGES/frontend.po
|
||||
zabbix/locale/sv-SE/
|
||||
zabbix/locale/sv-SE/LC_MESSAGES/
|
||||
zabbix/locale/sv-SE/LC_MESSAGES/frontend.mo
|
||||
zabbix/locale/sv-SE/LC_MESSAGES/frontend.po
|
||||
zabbix/locale/sv_SE/
|
||||
zabbix/locale/sv_SE/LC_MESSAGES/
|
||||
zabbix/locale/sv_SE/LC_MESSAGES/frontend.mo
|
||||
zabbix/locale/sv_SE/LC_MESSAGES/frontend.po
|
||||
zabbix/locale/tr/
|
||||
zabbix/locale/tr/LC_MESSAGES/
|
||||
zabbix/locale/tr/LC_MESSAGES/frontend.mo
|
||||
|
Loading…
Reference in New Issue
Block a user