fixes for CVE-2014-1878 bug 501690

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 35 insertions, 28 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 3a648c6c8c47..0fa82b05bdbd 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/icinga
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.43 2013/12/18 01:57:44 prometheanfire Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.44 2014/02/19 18:16:45 prometheanfire Exp $
+
+*icinga-1.9.5 (19 Feb 2014)
+*icinga-1.10.3 (19 Feb 2014)
+
+  19 Feb 2014; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.10.3.ebuild,
+  +icinga-1.9.5.ebuild, -icinga-1.10.2.ebuild, -icinga-1.9.4.ebuild:
+  fixes for CVE-2014-1878 bug 501690
 
 *icinga-1.10.2 (18 Dec 2013)
 *icinga-1.9.4 (18 Dec 2013)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 6599936f27a9..f65adf68b586 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -8,26 +8,26 @@ AUX icinga-init.d 1467 SHA256 a580420fc38d9674797452354d1f9ae544a40af0cd941817ea
 AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44 SHA512 2a8783945330c54eaa331587f2e7291bdddb8c6717c659ac8dfec7c14ab762a01a870f5fb35d91bb54f36c867eb56c13dce11b5ab13d6e5b6fc9049ce5f57372 WHIRLPOOL 3634d30b9e4841f4424ce36983a88e56ccf3385ab5c9f8e27f322a0ebc59985cb618dbe70d8f67ab641e8a6151721f70cc0f104c905b4da0c35af6ceb899eca1
 AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f WHIRLPOOL 7816a44592582b65bb05b7c568af29885ab547b0164582d939e37b937ddc0cfa3dfc503b8673042b5ce60e0b19ba96dcfe08e13882c8bbae80d9750411945966
 AUX ido2db-init.d 936 SHA256 4e978d54b9b5efde1e4474d865d6283eeafa2a57a2ad19ec85a710e79698c456 SHA512 913e923f297281e6a429ac446a20f6b8e8fadbc5dc5b1a01f1b5d73694ebd43e0931e655194593c8335bfc6505bb47b7321b8d6530c869f1bd8b262ad030faaa WHIRLPOOL 0da5e0702535cb9e07f98cabfad9f6ce0999d5d7a60e66494ca3d4167537343d3d750d48145856affc43d404318c88b98078a8c08b369c6829f5e68555cb7dc5
-DIST icinga-1.10.2.tar.gz 15295911 SHA256 fa50e249b75022f49104f98c0d35ff66e33bd937db6255ae79c0728344efce0f SHA512 e8227a877d92984328e2a2344089ac291bfd71272ecaa8c55780e542568980311925ea39eae19276f2ec327e2e0a2b61d0de1a83756f75042d4de7769e21f37d WHIRLPOOL e5063380e8625e1db3f50bf7dd4af6ce2c6b435578faa95222cc2a1653154bf8ae091a238152adaecfca1fbd44c12d328d05cd451b137f816d9bad29a9134e12
-DIST icinga-1.9.4.tar.gz 17082569 SHA256 5fb8a79bf9fa49446e48e07a92323af507f9b7dece8c16bf48c36eeb2009bd36 SHA512 973c752ec8547f840445678ef94434209d243d4cef200700d9f774148623531260a90591b27db06d8f46ec50e3f55fc060fbbc90016626298645b6430ba5126f WHIRLPOOL 3398850403b8ec342d4f07de17915e54445c865a63c4390117c69508eec9e44c9f64b5ef7824160dfcf925d38e6fb276fd5a55e31167877cb07216e1126dfc51
-EBUILD icinga-1.10.2.ebuild 7732 SHA256 702265226fdba08c6a8f0a18d738038ba1375fcd05ea8ad963eca2d4877168ea SHA512 a28ffbc4f9efbd77adffa8fe8e3ae346f26d6a779131ae956845563578b4f1a5128a54c61e4f50319989f323d2e7237f8d6441e2e1c5785501404fd2ec1656fc WHIRLPOOL a4e7414b253f6578c0e2fa80bcb488bef3d2da2229ce10050cd68d73b8132189babca0ce37329de0666172076be3de158345a557d279e1dabf18ae9323b3cbcf
-EBUILD icinga-1.9.4.ebuild 7731 SHA256 6c13d48a65b18cdb4b24c894820dfdd9825cb7738d14c8a1c8c38fdecc700c5a SHA512 dae6a181c5ca0e0ef97e329d06cd11715f168af2f2b1adebc01f40560a1b1bae95ccf1dc827050b10cfcae318bba60c8eb1f0bab8887ddf068bc4889d084b6a7 WHIRLPOOL f717bbb63c8420b77dc82e1b44de4fcc505d8e049036a565e7d91d0cf90aeca5e50679de53a139ef4f5d5b75ea2dd3a8877670ec42d0516c46136544fd56ed60
-MISC ChangeLog 7807 SHA256 2214f6d9941c9fa674ad782fd9921db5f611532fd094e844677a48823ebb9d70 SHA512 42b91d3d7f61616b608303055743f7998ded9f55f9c88df96cb5e8c4eccc20bca88814c57708ab4a077dee27512f12d042f66535c4c4880e397d7049522f5411 WHIRLPOOL 4915608bec978a9c9431d980a8224c325e9581dc3b62b8733c5a2cdb26e1ebbbab11b03bf18d7795cc3887dac9524c94a0e62d548caa8784b7ca0406a41c874c
+DIST icinga-1.10.3.tar.gz 15390851 SHA256 0befd5484b73964fc10d8ea09fe0b80f51539714e7063f4f8c1e3b994bd65431 SHA512 7536f4707e14c9289e2913b4d8e52c1d6d36153e15f4e580acf71c37e3e3b53dbb2f5f27f187f269707ce227669aa032d8f1356ae24474b0a38699291328a800 WHIRLPOOL b08b395017ef8ea69b8dd257ea1c70a6fc6779c8be73a2f10bf02e1d826bdbeb64b17dc13ffeb75975605866bfb6745af8a0e6356d1cee5a5f82a77bd06eeed2
+DIST icinga-1.9.5.tar.gz 17082606 SHA256 ae139c5e1054d014c294cc64b9053bba32240763fd4b3d72faa3197771240cba SHA512 1a902b24e28a2a4eb7e4f2e7274629f4d2c55463e1d8139b46c064d4d6ec99032a5e96ad8fe8d11b3c337b0eee2a1a35c798f0bee2cb2e6a03e70a17b6a21609 WHIRLPOOL ef28921e971a3b92edb984a39324ee42a9853367aa1e646f4f36fb9dbb6b98421553bcc684af29c289444722cef98fff9026cae24316971f586f2c4361335774
+EBUILD icinga-1.10.3.ebuild 7795 SHA256 026321444bf5eeabd4e44f0377ff738a697e73fcf162c490301b97c0075a3637 SHA512 6b15ac09a366eb9eea8b0dacf250988cac6e63aaa5eff64a7c17abfd5372cba6982f977f289cf9b20e4ceeeffa4128882d248d5a73e6b7b89bd36efdfe2613c0 WHIRLPOOL 52fc0ce16c76253e750e45af8ba4b2a2fa55658087b19d7299405a2024754731a69365a482769df0af4d70e0844155d9cdb0dc828128fb7d390f1887ea97a021
+EBUILD icinga-1.9.5.ebuild 7794 SHA256 49fae017c08c7e1c081566e6056457fda14b5ff5255669ae4cd05aecf846865e SHA512 aae5f3e946011c076dbf720b47e1360c81b261c8f04059c333023be42df6bc5f55e07596315b0a5a34426cd3efa186183ddf331e7649d26eaff2e919a3009b51 WHIRLPOOL 7ac49f9a9879b02b6b85166a8198d288921c72ebe8911d0f855e1244f9c3ee0450c8c6ce6b70500c541489aab7d7a4a58d336f4fcc22ba64615dc8a01a809589
+MISC ChangeLog 8052 SHA256 bd7ed7c3f77bc55882065076e4bcab62f3cc030401e3e8aed0168e9d750be211 SHA512 87531573dceff9f4c7a3696fac8f971ea2167e753fc824791b4e17925aabf4b6ffaa7f9f2f2ff641bbb62b1445fd86d3cd85b1bb15872786e434134e70e8f628 WHIRLPOOL 4d70feba1412cbc24ce9426760bbb3fb71282d2387e3b66bd52fd2a7ab1d9809e866f864224995def1f6a01532f46538d1a1b02037a839a25c2e1b9b68043a5f
 MISC metadata.xml 705 SHA256 6433fd0f1d22d5abb31534b5e8b0804dcfec87e5f385b1a8726a9dba818233e0 SHA512 19385ac0dceb5319793c492b4687a0ce4b9fc6e00dc0aa76efa54280d8901f9738fdafd8c307a394aab89ca6c1aac03092b99c512dd1dc47241fe7db08f074d1 WHIRLPOOL 9e0341411d01328e4243d4db6342e0df648a56b648520cb68987f04432a7a59556fa5dfa1770b461668bf3692d5ffff0377b551c5680be607d9d8d2cae010efc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSsQE+AAoJECRx6z5ArFrDHUcQAL1UfUsHaCoVx5W7E6hYKVh3
-Bz9o7RNfGm9RGnfJdBsb+eJYQ1JmeBDc8RzfiQESVcLWPhlayg1YwSoV6MvFwHC5
-zli7B1pgm7eqMYyRz2q9UEWBiyB3wxSldRXkuvi15tIb1/+GF524FTcmW4+HfHGH
-tgzzp0waRu9+SI0kIZL2t2Cb0tX+oAICgCyEMX5wW9ZTnIItmgVMMhZvSEXsdQ+c
-CTOcYoPPuo3zSAorLj4e7Cch6MBipPRcHzsXI/yuwsEZ4eL2mFbSjf/jbUn9uA6M
-gPQShViK2Df0sOjC6kolHf7ZwPOobryzRJDm4VhYFpu1y7BU1+6mkhH0QKDMU5Ta
-8ty7b0dzsfxrmmtq0pD1Z20C+ZodQWC2QVYaWt+jVwEfOjc/1Co7mqiqHu1F2+dX
-TBm/ogjYWdq2zX5FjFkNq1/UirBUTVq2j1SsfJ/8FzDsJIe9nF00uxzaNJFWpvSN
-/yp05UrfU9Bbx0eGzKR+9/8uh9dDpe1EvJsuSD/X4lw/imbMSMi1t7ep94dAijny
-H/ZOIqnc1EJJZzl5/aBHmXBLzor5y4yG9oARpVrp3AqNzlBB6zbV7RFhRfHy8wCq
-/sTFsj1PRLwBP0rgGIsNCz8i8CGDpzW2pSacFEdpIcBaAJBWM/HbD+sD45pCkBsc
-VyF5vrNfbjvh3rFKdE7b
-=kzjV
+iQIcBAEBCAAGBQJTBPUiAAoJECRx6z5ArFrDDq0P/iXNFWnuRcGFVg6iyMb35B9S
+bitiEr5coA0EQDPCp/a8kZumdnrQNx2LPPAu54uUovw4jZz9GaaX3ENcudcDPexD
+aYCqqJFusAwdAjjJsDdGhhqQUQTyofWIbRN/I3zrYPa4U+od/HLkvB7oZI3N7Kzz
+it1YyMWrrF/vq+WqTRKolnxVQHVrdsBYm4x0669J9I6POkwQKJBjzTqnKvQTOKDU
+0e4cYfuU1CQDChI/ZeYSx67rd4lTAyLAEeA3PKAe7JOFhJQVaO0xjZGHNBfjKmxs
+mIcwpMXgOJu+rJ2lG9pSWIXEyDE/Bb425NH2gl+Vj9JaK3Tm/c8fcK8wVJ8RDdd+
+4ifG1Aa9EF9dTOGFe12UhegfDdDXvdyU3xnniT0h6Q67LKSRgLDZpvTmd8YB1YNe
+SqTOx1+d2ct9gcBBxWEsrHxHRZJeRhwbBfxC3H1ojBp/Iumemd9ZDklzXvpn2fv8
+stuMaWsDzzzKNv78vPaQalX3HcN8257/Eo5gRUghlYwubVFYvyKLVz9KJTO3Sfte
+N9/BaFJfH08CVc3SIYJ79JQUWxQTxLkotmlHG3Tf6o/eqGXvwuy2jWXOa2YqsnSu
+R/VP1I8h+mtqCPnHqb0jfyEhW3Q/UyMEN2zTRJ9UMgBP9sPR2AsIE72QnP/oaCtK
+dYHFKY1I7ac1Ux9o2ldP
+=2KMj
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.9.4.ebuild b/net-analyzer/icinga/icinga-1.10.3.ebuild
index 5de5e710f88e..b7a930a59ce5 100644
--- a/net-analyzer/icinga/icinga-1.9.4.ebuild
+++ b/net-analyzer/icinga/icinga-1.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.9.4.ebuild,v 1.1 2013/12/18 01:57:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.10.3.ebuild,v 1.1 2014/02/19 18:16:45 prometheanfire Exp $
 
 EAPI=5
 
@@ -11,7 +11,8 @@ HOMEPAGE="http://www.icinga.org/"
 #MY_PV=$(delete_version_separator 3)
 #SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 #S=${WORKDIR}/${PN}-${MY_PV}
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -49,7 +50,6 @@ src_configure() {
 	$(use_with perl perlcache)
 	$(use_enable idoutils)
 	$(use_enable ssl)
-	--disable-statusurl
 	--with-cgiurl=/icinga/cgi-bin
 	--with-log-dir=/var/log/icinga
 	--libdir=/usr/$(get_libdir)
diff --git a/net-analyzer/icinga/icinga-1.10.2.ebuild b/net-analyzer/icinga/icinga-1.9.5.ebuild
index 5366f3f80b2d..6d3067950601 100644
--- a/net-analyzer/icinga/icinga-1.10.2.ebuild
+++ b/net-analyzer/icinga/icinga-1.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.10.2.ebuild,v 1.1 2013/12/18 01:57:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.9.5.ebuild,v 1.1 2014/02/19 18:16:45 prometheanfire Exp $
 
 EAPI=5
 
@@ -11,7 +11,8 @@ HOMEPAGE="http://www.icinga.org/"
 #MY_PV=$(delete_version_separator 3)
 #SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 #S=${WORKDIR}/${PN}-${MY_PV}
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -49,7 +50,6 @@ src_configure() {
 	$(use_with perl perlcache)
 	$(use_enable idoutils)
 	$(use_enable ssl)
-	--disable-statusurl
 	--with-cgiurl=/icinga/cgi-bin
 	--with-log-dir=/var/log/icinga
 	--libdir=/usr/$(get_libdir)