main/zabbix: security upgrade to 2.0.11 (CVE-2014-1685, CVE-2014-1682, CVE-2013-5572)

3 files changed, 42 insertions, 48 deletions

diff --git a/main/zabbix/res_send.patch b/main/zabbix/002-fix-res_send-on-uclibc.patch
index 6e0592a2a4..727143068a 100644
--- a/main/zabbix/res_send.patch
+++ b/main/zabbix/002-fix-res_send-on-uclibc.patch
@@ -1,41 +1,35 @@
-Index: src/libs/zbxsysinfo/common/net.c
-===================================================================
---- ./src/libs/zbxsysinfo/common/net.c	(revision 28283)
-+++ ./src/libs/zbxsysinfo/common/net.c	(working copy)
-@@ -418,6 +418,7 @@
- #else	/* not _WINDOWS */
- 	res_init();	/* initialize always, settings might have changed */
+--- a/configure.in
++++ b/configure.in
+@@ -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 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;
  
-@@ -436,7 +437,12 @@
+@@ -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
-+	
- 	hp = (HEADER *)answer.buffer;
- 
- 	if (1 == short_answer)
-Index: configure.in
-===================================================================
---- ./configure.in	(revision 28283)
-+++ ./configure.in	(working copy)
-@@ -149,6 +149,10 @@
- 	AC_MSG_ERROR([Unable to DNS lookup functions "${found_resolv}"])
- 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 *                                                               *
++	return SYSINFO_RET_FAIL;
++#endif 
+
+	_res.retrans = saved_retrans; 
+	_res.retry = saved_retry;
diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index 9995fe1700..58a8e6cd37 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jeff Bilyk <jbilyk at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zabbix
-pkgver=2.0.10
+pkgver=2.0.11
 pkgrel=0
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="http://www.zabbix.com"
@@ -22,11 +22,11 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	zabbix_proxy.conf
 	zabbix_agentd.conf
 	zabbix-getloadavg.patch
-	res_send.patch
 	automake.patch
 	zabbix-server.initd
 	zabbix-agentd.initd
 	zabbix-proxy.initd
+	002-fix-res_send-on-uclibc.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -165,36 +165,36 @@ agent() {
 
 }
 
-md5sums="49297c0ac61858fd75ab9ea18ca6cdbb  zabbix-2.0.10.tar.gz
+md5sums="9b093a98bc6907a987d4ab58c306d3be  zabbix-2.0.11.tar.gz
 26b0401a83bdb1dce29338e5b2786620  zabbix_server.conf
 9832a81e134c8e2c11e2a06b7adbf88f  zabbix_trapper.conf
 0310b92afb3f35c1075fff53db737212  zabbix_proxy.conf
 721c18077fa739f956340afca9f067f4  zabbix_agentd.conf
 8d1d2e53479173aac0df0c38a4d6afda  zabbix-getloadavg.patch
-b80eca2e260cc9e563f4b7a1b30bb158  res_send.patch
-5f7b1815a309d8dade4a1d15d5048742  automake.patch
+0ba69aa1cdc6755a9496fd35920a6057  automake.patch
 d823c2ab6c2bbdd0ebd3511fac4a83b4  zabbix-server.initd
 1a5c718bcf815fcf659e14fb0b576a1a  zabbix-agentd.initd
-a99978139481e69434f78fc3e8c53441  zabbix-proxy.initd"
-sha256sums="71415b5da223c6c0ba2f1c21c3c03cad9a5be0c8986791d7031c014986a9065d  zabbix-2.0.10.tar.gz
+a99978139481e69434f78fc3e8c53441  zabbix-proxy.initd
+a81f5309359ed01b83773a7b0455542f  002-fix-res_send-on-uclibc.patch"
+sha256sums="d1901aa54dc9a47626aef4b60509ba388589f0c27923a058e6027c0b39a61def  zabbix-2.0.11.tar.gz
 3b09a8fdc38216d859022c5966c36f0bcb6984974208cf4c69c17129649efdf5  zabbix_server.conf
 3ae307895c9a7189e29c4ebf7479ce08d4c3bbe1a7f0a3554828170dac417bab  zabbix_trapper.conf
 0cd9cab17d1a2f791262b683aeedc5115722478a4847cb438aadb51198f67287  zabbix_proxy.conf
 98343193215c9e1bc79ff332688c684f7023da38583bba800acc404b12c6cc51  zabbix_agentd.conf
 1b26263896cd9adbe918e4251eba3d425993c3ad331076d6bc4e7f5fe4ab3eba  zabbix-getloadavg.patch
-552d14493b97e2ef082d4481bc4b128428ed44d46b63f8dee6e67cf0ab129d19  res_send.patch
-4cd7ab9c6fa95aacab0c1f7b77bad18e9b500feca70b16c866a581775b4ad611  automake.patch
+09f2f8fba70ed3e2ad6f08f852e4f9d43cfe03bffafa8e59a27bbead551c3df0  automake.patch
 f4e18cca40cd7299140aec3077cf39429487860094d7f5d88d76d8e040dca9b8  zabbix-server.initd
 4f93c4868726a3e8fed12a030cfce8911f105217a59187d6b3e1565d8d3e76b5  zabbix-agentd.initd
-60a01c08df054a0c1bcfb71e378544b4c4e489e6a6779d96383387ed34ddc0b0  zabbix-proxy.initd"
-sha512sums="800d4ef6b4fa5a6f1b8a7195ae134abfebf218b1545a40dfb57af887888db1006822d8564321c09ad4b178260aa15da89c1c699027bbfd31a4c502bd37157d35  zabbix-2.0.10.tar.gz
+60a01c08df054a0c1bcfb71e378544b4c4e489e6a6779d96383387ed34ddc0b0  zabbix-proxy.initd
+61ec2116fe3d0b03f045e71746448fad3ae1ef77e2f84f0766a67482c8820b56  002-fix-res_send-on-uclibc.patch"
+sha512sums="30c9a868406f9fc67acfaee5f8cdf102f7ff42a34fa1e54b44757bfe19c0bf60274d159b938cedd945472fb60cfe0ee58cb9907d98225cc2f6a1e60bc4722836  zabbix-2.0.11.tar.gz
 3170d56a61871e6efadf705c19f864fdecf9420c4263f2a1129245b3b55bd730d1ba5a6a26ea866fc7842c86f7745e51ea28878bb9e9267ed9176499cb75e8bb  zabbix_server.conf
 cd08d907838de646f65316950e8c71deae25be1701e0cc22e5fd2f636c21ef2365a537d247277bafb694cae8c5dbd22eb725c1647797ad3e4ac4b3df2084ef07  zabbix_trapper.conf
 a3703641125dda8c13d658ad4e1cf2cde94af01ed953480a37006e354ff58ade4a99b3575e3f095d8639ac9c481be52e25120353d9a4cd2104a68aff4a5596e5  zabbix_proxy.conf
 8a3298cb98787f89b4cc0faa6168a1ab59860c60bec159ecd341db25c0903e89061b40d2b37df9e2df99e08b71b57089bcb25f352e7edf09fbc1b0bd3f1034f6  zabbix_agentd.conf
 74eb86fe665bf16f89683572915829022e816a954076a0faef1367ad4e0f096f54f1cec8e68f0609f8282d63808349a7b1cf67b7f6bcde63f68908f034b2e95a  zabbix-getloadavg.patch
-a2d8d52bacd353363c22f89ca26deffdec722144dab4899987ef4b8479d0b0722007bf3e97f75403e8140153eefac72106985f2bfc0c03ad6d59bc630bf0fd43  res_send.patch
-7aa59336e92d83eddff4bc18038820cfc25dc50f45327a2c0a6aa0e360fa742c9724d25e84152e3a14193c88ea5d6e66fdb99f2900c0bf8199cb2adf9e143415  automake.patch
+24706486ed955da931280d8406bc619e34015d0dbc51e4043759dff05157535a622a4917f29dc860a4a2e05e59a6e5734e5758e53a36330b598d402674601c91  automake.patch
 af0853d8c5a8b33399b87e7958a7ffd692fe18005dcc43af5f58e0fdf6bbee3dd66ec77a3840ae5e526a4c445b04425071f6796d726ff923aba9d3a78ca3c022  zabbix-server.initd
 3ef0fe0c1c94f2f01a0c335a45ee0f3c0cd4b125d96b5eefa869a17efb352087a5dd18ef8e87c35e6816b6fb705b829f0a25452e7285637d3595ff4c103b7c21  zabbix-agentd.initd
-b305ea06641c6a331273f065a4a85fac92c45e107a30e85cb41be4ea36e2efbf5442c69cc6605ea3734a851808f7abba20042058d4b07832d858cdb63e98d405  zabbix-proxy.initd"
+b305ea06641c6a331273f065a4a85fac92c45e107a30e85cb41be4ea36e2efbf5442c69cc6605ea3734a851808f7abba20042058d4b07832d858cdb63e98d405  zabbix-proxy.initd
+5441186215f6e6c9ef7e79bdccb547aac1c8b14636d9c0f93ee4421c6dcec99d3ac296b4d855e48c342ce8ec2e1d4daa361e6bb8e405a603e2d04a0bfba83ed1  002-fix-res_send-on-uclibc.patch"
diff --git a/main/zabbix/automake.patch b/main/zabbix/automake.patch
index e310bfc86d..db7b7d6f02 100644
--- a/main/zabbix/automake.patch
+++ b/main/zabbix/automake.patch
@@ -1,6 +1,6 @@
---- ./configure.in.orig	2013-01-01 12:03:46.707359730 +0000
-+++ ./configure.in	2013-01-01 12:03:56.957459786 +0000
-@@ -26,7 +26,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -27,7 +27,7 @@
  
  AC_PROG_MAKE_SET