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

3 files changed, 56 insertions, 50 deletions

diff --git a/main/zabbix/res_send.patch b/main/zabbix/002-fix-res_send-on-uclibc.patch
index 6e0592a2a4..da2ca1f428 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.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 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 deebcb2463..c885d1dc5d 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zabbix
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=0
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="http://www.zabbix.com"
 arch="all"
@@ -23,13 +23,13 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	zabbix_proxy.conf
 	zabbix_agentd.conf
 	zabbix-getloadavg.patch
-	res_send.patch
 	automake.patch
 	musl-fix-includes.patch
 	zabbix-server.initd
 	zabbix-server.confd
 	zabbix-agentd.initd
 	zabbix-proxy.initd
+	002-fix-res_send-on-uclibc.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -39,6 +39,18 @@ prepare() {
 	update_config_sub || return 1
 	for i in $source; do
 		case $i in
+		*uclibc*.patch)
+			if [ "$ALPINE_LIBC" != "eglibc" ]; then
+				msg "Applying $i"
+				patch -p1 -i "$srcdir"/$i || return 1
+			fi
+			;;
+		*eglibc*.patch)
+			if [ "$ALPINE_LIBC" = "eglibc" ]; then
+				msg "Applying $i"
+				patch -p1 -i "$srcdir"/$i || return 1
+			fi
+			;;
 		*.patch)
 			msg "Applying $i"
 			patch -p1 -i "$srcdir"/$i || return 1
@@ -51,7 +63,7 @@ prepare() {
 
 build() {
 	# set default configure flags
-	_configure="--prefix=/usr \
+	_configure="--prefix=/usr \i
 			--sysconfdir=/etc/zabbix \
 			--mandir=/usr/share/man \
 			--infodir=/usr/share/info \
@@ -172,42 +184,42 @@ agent() {
 
 }
 
-md5sums="558497839b13a548f533eb2fc951a4e3  zabbix-2.2.1.tar.gz
+md5sums="7f680ad3ef7145840e3de5c7a0f19b7c  zabbix-2.2.2.tar.gz
 26b0401a83bdb1dce29338e5b2786620  zabbix_server.conf
 9832a81e134c8e2c11e2a06b7adbf88f  zabbix_trapper.conf
 0310b92afb3f35c1075fff53db737212  zabbix_proxy.conf
 721c18077fa739f956340afca9f067f4  zabbix_agentd.conf
 3a71e310bd2b38498a7c6830169f7480  zabbix-getloadavg.patch
-b80eca2e260cc9e563f4b7a1b30bb158  res_send.patch
-5f7b1815a309d8dade4a1d15d5048742  automake.patch
+bf62c539870874e11de39c60cb974786  automake.patch
 40c81bdec85815f4ba637eb6528cc5e8  musl-fix-includes.patch
 8fe442b55584dd5ba784a3140bb980aa  zabbix-server.initd
 bd91d0243cf8f72b86b9bf0b91963663  zabbix-server.confd
 1a5c718bcf815fcf659e14fb0b576a1a  zabbix-agentd.initd
-a99978139481e69434f78fc3e8c53441  zabbix-proxy.initd"
-sha256sums="29c9e4cefb527bf929797b26a5a1d8a07c55675bfe6a86ff9ef8e46bd792c7fb  zabbix-2.2.1.tar.gz
+a99978139481e69434f78fc3e8c53441  zabbix-proxy.initd
+c3b399a406f7dd1df0de7b3fae3ed081  002-fix-res_send-on-uclibc.patch"
+sha256sums="e00ef9a1d667284a2bc2ce04966204ee094ade2c0bc6a94efb9436a9aa5cb2be  zabbix-2.2.2.tar.gz
 3b09a8fdc38216d859022c5966c36f0bcb6984974208cf4c69c17129649efdf5  zabbix_server.conf
 3ae307895c9a7189e29c4ebf7479ce08d4c3bbe1a7f0a3554828170dac417bab  zabbix_trapper.conf
 0cd9cab17d1a2f791262b683aeedc5115722478a4847cb438aadb51198f67287  zabbix_proxy.conf
 98343193215c9e1bc79ff332688c684f7023da38583bba800acc404b12c6cc51  zabbix_agentd.conf
 d2c0651c5fa67a1857707552e79ecece7ca95c149042460c40456634bf7611dc  zabbix-getloadavg.patch
-552d14493b97e2ef082d4481bc4b128428ed44d46b63f8dee6e67cf0ab129d19  res_send.patch
-4cd7ab9c6fa95aacab0c1f7b77bad18e9b500feca70b16c866a581775b4ad611  automake.patch
+b347ca77660e69bea353c50e2fce0c7c4cc837f782c9f84f74ba92c1a62b4c1b  automake.patch
 38b4e1a5d5c16c7d9b31347acf710d84b693f6e1df365d1072548e897e034884  musl-fix-includes.patch
 311a29f05a58cfe67c273f7cf25092fab23423feb07e8ee1344141a146f0ccc3  zabbix-server.initd
 ddf75041fb0afc5b211dd79a934341cc9db4325447ad33a42cbf09bdfb5cad42  zabbix-server.confd
 4f93c4868726a3e8fed12a030cfce8911f105217a59187d6b3e1565d8d3e76b5  zabbix-agentd.initd
-60a01c08df054a0c1bcfb71e378544b4c4e489e6a6779d96383387ed34ddc0b0  zabbix-proxy.initd"
-sha512sums="bf897342512c07875b5f473c8b4307d34586306862dd1a31c0bf01776f2c49c066caf3dd95a9bf1ffc9e451733a07a9d9d2acae9f38623a93ad198aef149e1b8  zabbix-2.2.1.tar.gz
+60a01c08df054a0c1bcfb71e378544b4c4e489e6a6779d96383387ed34ddc0b0  zabbix-proxy.initd
+c796e9aa371f50155b396da53504375f35f77bd3941440525dcaf92da33dac99  002-fix-res_send-on-uclibc.patch"
+sha512sums="603bab20c1b37591e4e2b17fdc9e28eff119ae6cc7b9aa2fe1841956c192da56d3c43b9f85deb4268d5d12a698237ffd80c3f596e62f9dbae1a1f316a1dd8016  zabbix-2.2.2.tar.gz
 3170d56a61871e6efadf705c19f864fdecf9420c4263f2a1129245b3b55bd730d1ba5a6a26ea866fc7842c86f7745e51ea28878bb9e9267ed9176499cb75e8bb  zabbix_server.conf
 cd08d907838de646f65316950e8c71deae25be1701e0cc22e5fd2f636c21ef2365a537d247277bafb694cae8c5dbd22eb725c1647797ad3e4ac4b3df2084ef07  zabbix_trapper.conf
 a3703641125dda8c13d658ad4e1cf2cde94af01ed953480a37006e354ff58ade4a99b3575e3f095d8639ac9c481be52e25120353d9a4cd2104a68aff4a5596e5  zabbix_proxy.conf
 8a3298cb98787f89b4cc0faa6168a1ab59860c60bec159ecd341db25c0903e89061b40d2b37df9e2df99e08b71b57089bcb25f352e7edf09fbc1b0bd3f1034f6  zabbix_agentd.conf
 b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700b53d1b7609e6185642650d7edd013c554b2af37fddae771c  zabbix-getloadavg.patch
-a2d8d52bacd353363c22f89ca26deffdec722144dab4899987ef4b8479d0b0722007bf3e97f75403e8140153eefac72106985f2bfc0c03ad6d59bc630bf0fd43  res_send.patch
-7aa59336e92d83eddff4bc18038820cfc25dc50f45327a2c0a6aa0e360fa742c9724d25e84152e3a14193c88ea5d6e66fdb99f2900c0bf8199cb2adf9e143415  automake.patch
+9bff8966cb8b3f1767bfb1b3f3529bca5c9957f2c8179a40ded3b4e43615ba9fb408aef43092fd119b7df80b042555d05c9780fac3760176b95524aa48252fee  automake.patch
 9b87ec1ea4a9cbb501c16012d498cdae82a696f4cd495e1e8cb201d9e31c6e135da5bb264c6273f2de87297bd3e4bd16f66703610686f5d610e3316ee24aac91  musl-fix-includes.patch
 790760ddde503b3cf188fbf58e05587756fbf09c4d3cda8493b3b87b44a9a9ed00d4685045f83249c9714bd8afb6a184412ddfff865c073bbed5c513a78ded1c  zabbix-server.initd
 a91821c6086a1fc0197750cc68073419defcb7d775b11b14a993409a8f61c7a1a0a0af95de27eed9f3b8357f8362640cb1b26b91b56f4f1d714ca6f222d02b80  zabbix-server.confd
 3ef0fe0c1c94f2f01a0c335a45ee0f3c0cd4b125d96b5eefa869a17efb352087a5dd18ef8e87c35e6816b6fb705b829f0a25452e7285637d3595ff4c103b7c21  zabbix-agentd.initd
-b305ea06641c6a331273f065a4a85fac92c45e107a30e85cb41be4ea36e2efbf5442c69cc6605ea3734a851808f7abba20042058d4b07832d858cdb63e98d405  zabbix-proxy.initd"
+b305ea06641c6a331273f065a4a85fac92c45e107a30e85cb41be4ea36e2efbf5442c69cc6605ea3734a851808f7abba20042058d4b07832d858cdb63e98d405  zabbix-proxy.initd
+cc00603b26a4bd49fba5d8b5e2aaaa7c947c888f4970a4a582a201012aee956f926251eb85236014660fe0b3fa1a22a7ac27b4331e00af64d2a658e972d2d7df  002-fix-res_send-on-uclibc.patch"
diff --git a/main/zabbix/automake.patch b/main/zabbix/automake.patch
index e310bfc86d..d92e10b077 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.ac
++++ b/configure.ac
+@@ -27,7 +27,7 @@
  
  AC_PROG_MAKE_SET