cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

zabbix: update to 5.0 LTS

Browse Source 
Updated to 5.0 LTS version.

Removed 120-uclibc-res.patch
Frontend moved from frontend to ui
zabbix-proxy added libevent dependencie
refresh patches

Compile tested: aarch64 cortex-a53
Run tested: aarch64 cortex-a53

Signed-off-by: Scott Roberts <ttocsr@gmail.com>
This commit is contained in:
Scott Roberts
2020-06-18 19:50:24 -06:00
parent 4426e4c69b
commit 9694ae7afa
4 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/zabbix/patches/010-change-agentd-config.patch
+4 -4
View File
@@ -27,7 +27,7 @@
### Option: LogFileSize
# Maximum size of log file in MB.
# 0 - disable automatic log rotation.
@@ -117,6 +114,7 @@ Server=127.0.0.1
@@ -138,6 +135,7 @@ Server=127.0.0.1
# Range: 0-100
# Default:
# StartAgents=3
@@ -35,7 +35,7 @@
##### Active checks related
@@ -132,8 +130,6 @@ Server=127.0.0.1
@@ -153,8 +151,6 @@ Server=127.0.0.1
# Default:
# ServerActive=
@@ -44,7 +44,7 @@
### Option: Hostname
# Unique, case sensitive hostname.
# Required for active checks and must match hostname as configured on the server.
@@ -143,8 +139,6 @@ ServerActive=127.0.0.1
@@ -164,8 +160,6 @@ ServerActive=127.0.0.1
# Default:
# Hostname=
@@ -53,7 +53,7 @@
### Option: HostnameItem
# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
# Does not support UserParameters or aliases.
@@ -262,8 +256,8 @@ Hostname=Zabbix server
@@ -305,8 +299,8 @@ Hostname=Zabbix server
# Include=
# Include=/usr/local/etc/zabbix_agentd.userparams.conf
admin/zabbix/patches/110-reproducible-builds.patch
+1 -1
View File
@@ -7,5 +7,5 @@
- printf("Revision %s %s, compilation time: %s %s\n\n", ZABBIX_REVISION, ZABBIX_REVDATE, __DATE__, __TIME__);
+ printf("Revision %s %s\n\n", ZABBIX_REVISION, ZABBIX_REVDATE);
puts(copyright_message);
#if defined(HAVE_POLARSSL) || defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
#if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
printf("\n");
admin/zabbix/patches/120-uclibc-res.patch
-23
View File
@@ -1,23 +0,0 @@
--- a/src/libs/zbxsysinfo/common/net.c
+++ b/src/libs/zbxsysinfo/common/net.c
@@ -547,7 +547,7 @@ static int dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
return SYSINFO_RET_FAIL;
}
-#if defined(HAVE_RES_NINIT) && !defined(_AIX)
+#if defined(HAVE_RES_NINIT) && !defined(_AIX) && !defined(__UCLIBC__)
if (-1 == (res = res_nmkquery(&res_state_local, QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf))))
#else
if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf))))
@@ -643,7 +643,11 @@ static int dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
res_state_local.retrans = retrans;
res_state_local.retry = retry;
+#ifndef __UCLIBC__
res = res_nsend(&res_state_local, buf, res, answer.buffer, sizeof(answer.buffer));
+#else
+ res = res_search(*res_state_local.dnsrch, res, 0, answer.buffer, sizeof(answer.buffer));
+#endif
# ifdef HAVE_RES_U_EXT /* Linux */
if (NULL != ip && '\0' != *ip && AF_INET6 == ip_type)