fix for bug 494510 CVE-2013-7108

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

6 files changed, 29 insertions, 306 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 6709bcbb8098..3a648c6c8c47 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,14 @@
 # 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.42 2013/11/18 21:29:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.43 2013/12/18 01:57:44 prometheanfire Exp $
+
+*icinga-1.10.2 (18 Dec 2013)
+*icinga-1.9.4 (18 Dec 2013)
+
+  18 Dec 2013; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.10.2.ebuild,
+  +icinga-1.9.4.ebuild, -files/fix-prestripped-binaries.patch,
+  -icinga-1.10.0.ebuild, -icinga-1.10.1.ebuild, -icinga-1.9.3.ebuild:
+  fix for bug 494510 CVE-2013-7108
 
 *icinga-1.10.1 (18 Nov 2013)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 5a3489996ec9..6599936f27a9 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -2,35 +2,32 @@
 Hash: SHA256
 
 AUX fix-prestripped-binaries-1.7.0.patch 857 SHA256 dba024fff1934a44e7f3e20e93c121aa251ef1286c8971247e45509c31aaf3ad SHA512 4a01ff3cf8569cfeadad283d1085b7af4f5703f6ad066aa5eb61f06f79ca54a4fd29375dd9a120a1a649c7e76019298e9e99ee1360717db227ff63c0a9cc021c WHIRLPOOL 5029ccefc5e66ca363dbed33ce8df99c6993a0f82942143e9c8ada45481f6bcaecfa62380bb69802fb0d0b3910e4501ec2378423d8b72b5cd93822e60a993e22
-AUX fix-prestripped-binaries.patch 775 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957 SHA512 a5db714d24e1d2fabc9d30d6156f84ba87db05fa6c1ba76543f646d31a16542abf19ffed89766b51a15c24f8fe4c74ce5e24e3ee76826ef324e11d98e3528cb6 WHIRLPOOL 82609265990b25673c71956ef6dd7f50b124918c45aa54716ff9d50fa9e429f94b82af4ef2df27781450b416ed2dca90a5818c5e216c74804efc01ac0af2bd9f
 AUX icinga-apache.conf 465 SHA256 aefcc8b674d2fdd0a721247d2a3156811af6b2fbe6a91642ff19eb13ee2f0a65 SHA512 8f08f6938f2c233e230b45afdc634653cd971bf26fab60252f8633f2b1609f724575f256b018b6016852279ff3ddd12341825f0489be3266c3c096fe983e5841 WHIRLPOOL a692969be97751fc7f1a98d786e7070b450b6f1d66b6947f7834763550519af72cc5a5ce6a614c556ae861625e80a886b2a4143df6f0a4bab74ed9c355fddb33
 AUX icinga-conf.d 178 SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db SHA512 96411175c488423c61f45fc9c76131a9807a36f08c9f73c6a6fb50e432d951d3e4ab42b456732b48cb009944faff4af472eb76fbefd75fd61978dfc6d199e9cd WHIRLPOOL acf6b66165c227515099f25b6db38c5cce86a50844983123a136f6cf63ce744f49fde1d243c2dcadbceaf62154e3fbc8eadca8933c80fc0501aaaf52c5e0266a
 AUX icinga-init.d 1467 SHA256 a580420fc38d9674797452354d1f9ae544a40af0cd941817ea4b71cc3333988d SHA512 0ee13fe6f38e7cfeaad3b519d63ce1217f316eb6ed5a48343b88adfb2d69439f0d3394370fdb325e1a50bd2143b690e0058453381c65fbedd431c6ee9bf7d1f5 WHIRLPOOL 1891d9b9e81d1fa2e6e7f19f3e482ed8110d00a557c2c9021a8b068cd7b06c114da17e0f085c94215d93224a84105d57e05201144f27fc09d4f0595d1ee86256
 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.0.tar.gz 15294322 SHA256 204b6798bfcd4035a48fd8880feb705046c976c81cb35c24a627e7ebea6c04a3 SHA512 e444b0624dc274971d11ee7f2bdbf5517602db570b0fea12cc609ad4ea8db64af925ea5e0a54e5f8f30c20240c1b5352d57ce3de76af7d78c2751c96ae932b24 WHIRLPOOL 3ab53eff23a87196a4933409c8ce43b8f056ce83f4533b9ada3c0d04b356097eed10879e51c88398722aed28da18a5fd8ae754f53fd6f0f1514c93fbf187c576
-DIST icinga-1.10.1.tar.gz 15295501 SHA256 32a209ffe3f267703c13577e5bf556532d5ee276b636be985f08abe571fe5e2b SHA512 f5ef221eee14fe499b101540f6d00c68b43e51b5d42552961631242be271bb50e8561757b12e0bf61296fff390cc9bf8be8ca61e0a87c4d35abc2678d9b79f58 WHIRLPOOL 7134db028a9651a926ba4ec381f6de95a1902becbb929d16b289d334cc61774bb81775f8bbf757f48dc2a957e4e0047d97afdc75715eb97d547592ab50b0adcc
-DIST icinga-1.9.3.tar.gz 17082275 SHA256 2dfef14225e8b671145d4816999bf57842d379b2e5e18d2af69cf0c5b93376db SHA512 5361b1a6ee40484ee85f32ba4a2dbd811f4776dc646c70adaf2597d85b0c9011049f8c7d057ff67de645d4edd0a3377d32c62c0c3d95eab1db9d9e0e3c636a91 WHIRLPOOL 98e5be7ce9cf8e82f202fe9f5ef163ef33afc1dcac76aae7aa022b0597fae9a71f470a4bb3022d7a45f358a72b2deea29e86cf11a7a77a65ce21947df2870f73
-EBUILD icinga-1.10.0.ebuild 7732 SHA256 60be1d38073e9e841146b1bf0b7aada483de97a107292d83197c59b87c78659d SHA512 97de31aee77d86199a3332c1d77697820b93bfe8012aa7b43ded08e39a869e4cbdfa4be8d4db3a6e997c4b73b0f8a32adbc1697cd3de665744899ead8cab3655 WHIRLPOOL 34cb674d286cc6ae925ca6ac5367c16c1fc1b8599750d88023f0f629ca4edae58184c270edb74d4180806a6daa1b2a0336e6d692275915ea4a793e83309487de
-EBUILD icinga-1.10.1.ebuild 7732 SHA256 3b32f8330096af56219949680513a1fda042b14ec23b5cad2add571195be776d SHA512 155dca9cff96289831272c9c5040f8a13b01f513ce2dcf55c18d2f5fe8d31068f81ad548c692b4c1caf9afd164bf6673ae39d934c8a397b6362f3277922caed6 WHIRLPOOL a69588cd626a43f4e9fbef3eb853923d581c0157e475195f6206ae63d43b40807d9227a3c8ec678ba85a006d183583262c52c9a7faa8afc491f263edf4cad339
-EBUILD icinga-1.9.3.ebuild 7731 SHA256 f05779cfd095b6de0765d9f4e5c0201779b4ba7e22bd9a30775f6b2b02fcd675 SHA512 73bc218c855c94cc64948b443c20118a1c41c50ad397d2a0b51d91474897fd9ed5050b6feb7fa433f8559c67735194a5320bc187a4fedbf7eaf3a1f34ba59e67 WHIRLPOOL c451a9944338fd9229d8fa8b82ed22d49177253aaf3168f3492cc820ca4513415b3db3122abfe561cb2a20e9ce42f4d049855a5d29ec8140de34a2912264bfcd
-MISC ChangeLog 7500 SHA256 fd3c9c502de8320fd5b0ba1764e8797a6dd87290c2431da9e4d826e4b5ab4316 SHA512 fcd515fb8cd0e33fc14326e522d726e474ae7b62185353580d33662d16b67833938a76e203f0051acb8c33e00135db68f91b18209c98dd3f087d380d622715d5 WHIRLPOOL 4bf2446ab55e705e115b29615b26b7d64ea0f2df399475016af4ea1bb875ef73b6e6c620fc76952f5325bea014db68aa8a42c5bf981264e89046cc4f2e01c85f
+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
 MISC metadata.xml 705 SHA256 6433fd0f1d22d5abb31534b5e8b0804dcfec87e5f385b1a8726a9dba818233e0 SHA512 19385ac0dceb5319793c492b4687a0ce4b9fc6e00dc0aa76efa54280d8901f9738fdafd8c307a394aab89ca6c1aac03092b99c512dd1dc47241fe7db08f074d1 WHIRLPOOL 9e0341411d01328e4243d4db6342e0df648a56b648520cb68987f04432a7a59556fa5dfa1770b461668bf3692d5ffff0377b551c5680be607d9d8d2cae010efc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSiodcAAoJECRx6z5ArFrDnpcQANClrFIdR+AAF2hndsjiAX+8
-Iwk7AhDPBFK/ADs5C76Qwc+Nc+F+dXaNK2zUMWfPseA94+e6uf1V/P+vThh+UxOs
-/IpHjj/FX0kf5Pi2jyIt03uwQ94dKA0j1OLt54r6ngg0rL+CrTa2egE6ofUudWEF
-NJ4hZNErs8yGqZ79jqP+bDkap/NwCDUhfGjrYwSxkgtxdVQvEjGZyCqFEYlMreQk
-ciAoLTpyh5F5u/kskvVjmvLQHw0Pb+ybkXMaWfTl3a0XLDbakfuUuofD2rYHDT86
-ODGo/vMvYmclKewiTNJM8umqEmramJ8Y3dI3jld3O40rY4oLIzuGYCHj+oY38MuN
-UYfpW8UhrXyJbMT0glUf141PA9qHeSNi/7P/ng1RteEF4pNRp8jOZWj1Xy0UblLY
-3+w4bzIG4K0Ik9yW8oABTPXqDY1YoAh+EHSNJGSVORKLHQ6Ll/DImv7xO+plBKR/
-wFhVO/Lbsmk/9z2BpWEuSVA7YRJ/SgV8vxIZ2nHXHd7tmlJx1icCxrZ4cjXsnh1w
-9o36VYOh+9DmKSm1NuC4DLrCkIvt4RS5c8ztuIc8dpWguumpBkThL5dSIhmtwReI
-NfLgfjp5rmnFVs1HWc9JuAn/HATolArVRT6wJfG8nhA3k8mNH6QJx/oTPwPBGrkz
-z+eGcd5dyHgdfjhSagyn
-=voBc
+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
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries.patch b/net-analyzer/icinga/files/fix-prestripped-binaries.patch
deleted file mode 100644
index 1ee52c55a933..000000000000
--- a/net-analyzer/icinga/files/fix-prestripped-binaries.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur icinga-1.5.1.orig//base/Makefile.in icinga-1.5.1/base/Makefile.in
---- icinga-1.5.1.orig//base/Makefile.in	2011-09-09 11:50:53.000000000 -0400
-+++ icinga-1.5.1/base/Makefile.in	2011-11-14 19:45:36.000000000 -0500
-@@ -39,7 +39,7 @@
- INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
- COMMAND_OPTS=@COMMAND_OPTS@
--STRIP=@STRIP@
-+STRIP=/bin/true
- 
- CGIURL=@cgiurl@
- HTMURL=@htmurl@
-diff -Naur icinga-1.5.1.orig//cgi/Makefile.in icinga-1.5.1/cgi/Makefile.in
---- icinga-1.5.1.orig//cgi/Makefile.in	2011-09-09 11:50:53.000000000 -0400
-+++ icinga-1.5.1/cgi/Makefile.in	2011-11-14 19:45:47.000000000 -0500
-@@ -20,7 +20,7 @@
- INSTALL_OPTS=@INSTALL_OPTS@
- INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
- COMMAND_OPTS=@COMMAND_OPTS@
--STRIP=@STRIP@
-+STRIP=/bin/true
- 
- CGIEXTRAS=@CGIEXTRAS@
diff --git a/net-analyzer/icinga/icinga-1.10.1.ebuild b/net-analyzer/icinga/icinga-1.10.1.ebuild
deleted file mode 100644
index 96b717de1f38..000000000000
--- a/net-analyzer/icinga/icinga-1.10.1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.10.1.ebuild,v 1.1 2013/11/18 21:29:39 prometheanfire Exp $
-
-EAPI=5
-
-inherit depend.apache eutils multilib toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(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)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.10.0.ebuild b/net-analyzer/icinga/icinga-1.10.2.ebuild
index 3ad8beb38365..5366f3f80b2d 100644
--- a/net-analyzer/icinga/icinga-1.10.0.ebuild
+++ b/net-analyzer/icinga/icinga-1.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.10.0.ebuild,v 1.1 2013/11/10 23:20:10 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.10.2.ebuild,v 1.1 2013/12/18 01:57:44 prometheanfire Exp $
 
 EAPI=5
 
diff --git a/net-analyzer/icinga/icinga-1.9.3.ebuild b/net-analyzer/icinga/icinga-1.9.4.ebuild
index de54d6becdf2..5de5e710f88e 100644
--- a/net-analyzer/icinga/icinga-1.9.3.ebuild
+++ b/net-analyzer/icinga/icinga-1.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.9.3.ebuild,v 1.1 2013/07/08 04:27:17 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.9.4.ebuild,v 1.1 2013/12/18 01:57:44 prometheanfire Exp $
 
 EAPI=5