diff options
Diffstat (limited to 'main/zabbix')
| -rw-r--r-- | main/zabbix/002-fix-res_send-on-uclibc.patch | 35 | ||||
| -rw-r--r-- | main/zabbix/APKBUILD | 16 | ||||
| -rw-r--r-- | main/zabbix/zabbix_server.conf.patch | 11 |
3 files changed, 16 insertions, 46 deletions
diff --git a/main/zabbix/002-fix-res_send-on-uclibc.patch b/main/zabbix/002-fix-res_send-on-uclibc.patch deleted file mode 100644 index da2ca1f428..0000000000 --- a/main/zabbix/002-fix-res_send-on-uclibc.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -152,6 +152,10 @@ if test "x$found_resolv" != "xyes"; then - AC_MSG_ERROR([Unable to do DNS lookups (libresolv check failed)]) - fi - LIBS="${LIBS} ${RESOLV_LIBS}" -+AC_SEARCH_LIBS([res_mkquery], [], [AC_DEFINE([HAVE_RES_MKQUERY], 1, [Define if res_mkquery exists])]) -+AC_SEARCH_LIBS([__res_mkquery], [], [AC_DEFINE([HAVE_RES_MKQUERY], 1, [Define if res_mkquery exists])]) -+AC_SEARCH_LIBS([res_send], [], [AC_DEFINE([HAVE_RES_SEND], 1, [Define if res_send exists])]) -+AC_SEARCH_LIBS([__res_send], [], [AC_DEFINE([HAVE_RES_SEND], 1, [Define if res_send exists])]) - - dnl ***************************************************************** - dnl * * ---- a/src/libs/zbxsysinfo/common/net.c -+++ b/src/libs/zbxsysinfo/common/net.c -@@ -424,6 +424,7 @@ static int dns_query(AGENT_REQUEST *requ - if (-1 == res_init()) /* initialize always, settings might have changed */ - return SYSINFO_RET_FAIL; - -+#if defined(HAVE_RES_MKQUERY) && defined(HAVE_RES_SEND) - if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf)))) - return SYSINFO_RET_FAIL; - -@@ -448,6 +449,11 @@ static int dns_query(AGENT_REQUEST *requ - _res.retry = retry; - - res = res_send(buf, res, answer.buffer, sizeof(answer.buffer)); -+#else /* defined(HAVE_RES_QUERY) && defined(HAVE_RES_SEND) */ -+ /* retrand and retry are ignored */ -+ if (-1 == (res = res_query(zone, C_IN, type, answer.buffer, sizeof(answer.buffer)))) -+ return SYSINFO_RET_FAIL; -+#endif - - _res.retrans = saved_retrans; - _res.retry = saved_retry; diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD index de3e7407c6..4e9a0533cc 100644 --- a/main/zabbix/APKBUILD +++ b/main/zabbix/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zabbix pkgver=2.4.7 -pkgrel=0 +pkgrel=1 pkgdesc="Enterprise-class open source distributed monitoring" url="http://www.zabbix.com" arch="all" @@ -26,7 +26,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz zabbix-server.confd zabbix-agentd.initd zabbix-proxy.initd - 002-fix-res_send-on-uclibc.patch + zabbix_server.conf.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -36,12 +36,6 @@ prepare() { # update_config_sub || return 1 for i in $source; do case $i in - *uclibc*.patch) - if [ "$CLIBC" == "uclibc" ]; then - msg "Applying $i" - patch -p1 -i "$srcdir"/$i || return 1 - fi - ;; *eglibc*.patch) if [ "$CLIBC" == "eglibc" ]; then msg "Applying $i" @@ -203,7 +197,7 @@ f44105322022734dc42032db0396fe9e zabbix-server.initd bd91d0243cf8f72b86b9bf0b91963663 zabbix-server.confd d9711779f969958c8aa348991170578b zabbix-agentd.initd 0ce2ab963a0bc5a0a6e17a708b7c7064 zabbix-proxy.initd -c3b399a406f7dd1df0de7b3fae3ed081 002-fix-res_send-on-uclibc.patch" +3d031903ea14e1de0804ff1230fd968e zabbix_server.conf.patch" sha256sums="d2c47b8f5b9b91f18010d54c45de55845d979014a8b3fe4bef64e0b08f8b00da zabbix-2.4.7.tar.gz d2c0651c5fa67a1857707552e79ecece7ca95c149042460c40456634bf7611dc zabbix-getloadavg.patch b347ca77660e69bea353c50e2fce0c7c4cc837f782c9f84f74ba92c1a62b4c1b automake.patch @@ -212,7 +206,7 @@ d4c6dcf9b78f78a2ef2b4a4f2763fb90f81d0298bc90bd164db8604f161182ec zabbix-server. ddf75041fb0afc5b211dd79a934341cc9db4325447ad33a42cbf09bdfb5cad42 zabbix-server.confd 62223dce45fb915cc66eb24c839cf63e81c80159da9360e7669e7384082e3a08 zabbix-agentd.initd ec3a8c564be20221ea7560fbec345191cd251d58bd15e9c41abec40c2cf5b4f2 zabbix-proxy.initd -c796e9aa371f50155b396da53504375f35f77bd3941440525dcaf92da33dac99 002-fix-res_send-on-uclibc.patch" +f87b221d32b3088db78c013f11d035339d7058817092dfdcc39898b4b3ee8448 zabbix_server.conf.patch" sha512sums="81860dfab38241e939a5cced50527fd16d35ec7b82232b2e0a4f17c90c1fc8ffb9bb95891ec27bb87445e5f81fba066dccc6b1a8833a4af4f483532f83d6172a zabbix-2.4.7.tar.gz b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700b53d1b7609e6185642650d7edd013c554b2af37fddae771c zabbix-getloadavg.patch 9bff8966cb8b3f1767bfb1b3f3529bca5c9957f2c8179a40ded3b4e43615ba9fb408aef43092fd119b7df80b042555d05c9780fac3760176b95524aa48252fee automake.patch @@ -221,4 +215,4 @@ b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700 a91821c6086a1fc0197750cc68073419defcb7d775b11b14a993409a8f61c7a1a0a0af95de27eed9f3b8357f8362640cb1b26b91b56f4f1d714ca6f222d02b80 zabbix-server.confd 7cc2672b717f1b47b12342fe225e9dc3838c61a0bf81d359d0a71efb0adc9b354fb8bc8b5bb64c9defa5700bcaf651b35778194a50b6b03b0a723dce76460092 zabbix-agentd.initd e19490e724c6e4ecdadf7ee3898567b82f18ea2a894ef709bfc181c3076d50435b45429207dd4d537aacbec0242d83393240e48b434d9681ebb0d67a45643ed1 zabbix-proxy.initd -cc00603b26a4bd49fba5d8b5e2aaaa7c947c888f4970a4a582a201012aee956f926251eb85236014660fe0b3fa1a22a7ac27b4331e00af64d2a658e972d2d7df 002-fix-res_send-on-uclibc.patch" +e0c9f937d39e15fa34e70e8ae9e6578b221b51c13dc0515e807675d153a85ab6370ed20ce2d06aa4457baaf3963edce525cd00e85fb105b36b58741798d13836 zabbix_server.conf.patch" diff --git a/main/zabbix/zabbix_server.conf.patch b/main/zabbix/zabbix_server.conf.patch new file mode 100644 index 0000000000..44c22f114f --- /dev/null +++ b/main/zabbix/zabbix_server.conf.patch @@ -0,0 +1,11 @@ +--- a/conf/zabbix_server.conf ++++ b/conf/zabbix_server.conf +@@ -56,7 +56,7 @@ + # + # Mandatory: no + # Default: +-# PidFile=/tmp/zabbix_server.pid ++PidFile=/tmp/zabbix_server.pid + + ### Option: DBHost + # Database host name. |