Revbump to fix bugs #388323 and #530640.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x6F48D3DA05C2DADB!

4 files changed, 82 insertions, 20 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 2dca36e9aa02..f4713c6114d4 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.200 2014/11/22 21:29:34 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.201 2014/11/26 14:31:54 mjo Exp $
+
+*nagios-core-4.0.8-r1 (26 Nov 2014)
+
+  26 Nov 2014; Michael Orlitzky <mjo@gentoo.org>
+  +files/fix-bogus-perf-data-warnings.patch, +nagios-core-4.0.8-r1.ebuild,
+  -nagios-core-4.0.8.ebuild:
+  Revbump to fix bugs #388323 and #530640.
 
 *nagios-core-4.0.8 (22 Nov 2014)
 
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index a9f52dc80259..4ea6c97c7a0d 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX 99_nagios3.conf 377 SHA256 0bfa88db78ab036d177c68da20a8fd2f567ba8c9f54c14cfb8e1fc121641051b SHA512 53ceae12cf19d2dda1298e9faaa3ddab9b4d95163df87ccfaa0a58e54d60cf8e005ea32ed827348f1b43aee53258896972b72727145f9a20f6a4e1ce1e56ea3f WHIRLPOOL 63d6c403ff09a5365a42bd3d59e37f67a8af7fef41cb52cfb5facf1a2ff48e53c5c82096a5e3df0f5f58b5e2aac55ee7efbf6de9da2ff475c80285d9b61ea3c1
 AUX 99_nagios4.conf 368 SHA256 cae38c4b5f298c72807e14b66e8cb69bbcbca56edb127c37acf719d26f016fe8 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161 WHIRLPOOL 62994852b142363847273b3d101d36929df5727f8d65ac4984a712ffbf5698e4dfc8806a170c832249cf4e9374c85c424e4cd9eb327866011e874cac52dec744
 AUX conf.d 409 SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a SHA512 29b8ea1ce1a293591d49a6f25a31263b476e06b6e2e8ff06f64299f9c8ddc8cce96bd09d16b8abcd71c933f1a2d51e1fae1876db2042b0ce863279be0466b7bd WHIRLPOOL 8f4a092e9b04c493cef164e792ae2b2c1e08c3b7a5c2195b0155bd59b41d07e0f718dbd97fae3f40698e7655e737fc17ee83a0386638a28bd773ae39a9bfbacd
+AUX fix-bogus-perf-data-warnings.patch 970 SHA256 bb38937fb769a81ff4d576d7714912619dcf0a001cd8fee98b7d6f757cb855bd SHA512 60a7d1e577944fd19ca61b23ee964d0ed79f321174009a388a43e6a2111bd9409d2b100a9f9046af606a39a96bc5de9f409d497f478b2e792ec561c7baa8c6f0 WHIRLPOOL 05b844e1113b80d09c2bf796a53d4aa8569daf88728f3f6be3b5b800116119bfc0947c95f22631d59833e45467f34bc2c703ba5530086f21a2b89d1e92ff431b
 AUX lighttpd_nagios3-r1.conf 482 SHA256 0cbe138afb954ee434dd3ea3146fc0677533085c2f2f8fa7faebe0bb3a64e172 SHA512 8a6811432034f97aa136b4d2c4cf1382c8cb13388eec67a2112034aa1331e08fa73e5822ef78634cf25581b068280736a9efd15848fecaa7215364104778194b WHIRLPOOL a9f53e9eada7efbd4f5f538597d9040fb68c65a3f6b5b728bfa1fa83cf16ab50d8893d80a7d5ebd74352108a56e6add4b39e0f1fe37f4fbc263ad9ec434a36e3
 AUX lighttpd_nagios4.conf 325 SHA256 0326b4d25315e3c446cb98f10e0cc47eadfacae2916c59d5aa2829643f3805ae SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9 WHIRLPOOL 3aff58f01e9ce76b471c757b983eb6c1f3bb1a9d870b5d7f32ba1419082c23403ad01f7ffe87e1bc8ea81eb392a88e37f7be0fd229333a535f062e321d3948b5
 AUX nagios 1459 SHA256 3281e938efd5bb6967334bf99dd99ee726f1320c6048c5f335c94bda2992cc8d SHA512 dddbdb3cb2a594792298051adb79a548f9cb2cfe85ecb6c2443cfe401bd13cd013827dce2ed12dcce20502b29aa9b5126bf449f1236b74415b052a676f8616fe WHIRLPOOL 9aaa832f81bdc7f8a1d16277d7274622f39b03e669c64bb992ea725110c186835e9ef1528cf231757fb75b7f7c257c3f4c3c9bcb9df0eb4117597130bdfd0d61
@@ -18,28 +19,29 @@ DIST nagios-3.2.3.tar.gz 3249447 SHA256 7ec850a4d1d8d8ee36b06419ac912695e2996264
 DIST nagios-3.3.1.tar.gz 1714630 SHA256 c4e39cd31a8a9ee814df848fd933b8611465f749b48432672aef4ae5849d9652 SHA512 e786b45ca926699843786db2662ceeeda30a5d127e9e04a579482ea78fba51bbc764f386d3e1b48f1c30b8871de1047adc9449c155215733cbbad83380c1ad7c WHIRLPOOL b0b9fe3b7defcdd3a5c5236a0aafafdee4f70c49f9f5265be8086be18ec6b53b718492db686617159d48556bb28f74e1d394145e783a5867c461999ef37340f7
 DIST nagios-3.5.1.tar.gz 1763584 SHA256 ca9dd68234fa090b3c35ecc8767b2c9eb743977eaf32612fa9b8341cc00a0f99 SHA512 48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d WHIRLPOOL 2c02584702c64dbb0e353e34b758fab079eee0dc7a401e7b5947a21733758d3596401e5519e2dd7f05c89ee4835c21965d2718157fd9d6d3d20af9c853d688ca
 DIST nagios-4.0.8.tar.gz 1805059 SHA256 8b268d250c97851775abe162f46f64724f95f367d752ae4630280cc5d368ca4b SHA512 d72fdbcc0beb2de72e5aa788b4ccc83aa30c7f4a4460edaa831f012db04647e4836b876bb7dc235e2a1b525827e9a2a0f4d348919f69fbfbfdaa4d13e968e18c WHIRLPOOL bdd9c63e0e495073b7b046952baa50b9e448fa56cda167806546a3b58fdd8fad328c9285ebb6d07da81786676d805671cad7295be389c4b8a4f3971264c97f74
+DIST nagios-core-gentoo-icons-20141125.tar 40960 SHA256 68b715f636eb291343cab3259862bbed8b6b898520b58df522438524de3d8761 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 WHIRLPOOL 7ec3a944b2a659b456d3168818ca5b1af3a427436e6af2f3e5d6cba6fc7b1c7bad6f552301f064df31988865b3b32fd117d9e6f61c630d6d817a51cbbbcb331d
 EBUILD nagios-core-3.2.3.ebuild 6016 SHA256 bd684c476d6692ec3b8defc590f123afb45d0a38ea8eb70c2a64b6a1379e77ba SHA512 a7e996ac8fcc9614f87e721a8ca63a12cd33d21b646b8d43f76d472b20d58afef312afff5e6ec068c18f2f4e016197e69507f6aaee3c7af7a5937173fc38b0dd WHIRLPOOL 6ab8d171818a30616ac00802d91e51cf7909879c6fc954f1234f2657669ec632f03e5997820fd55136bc40939afe403d028205705c051363243c5f631040d52f
 EBUILD nagios-core-3.3.1.ebuild 6169 SHA256 ba1d11d9e86d9bf8f504da22bd9f7125623897bb5ba447c1382729279db1ac9a SHA512 95a2e1be5118bce27b9ed81aa5d7441d9ca5362e4a947158bcdf114c015d0ae52d4a616decbd3dba845579c1747a9e1471f7a00647d31f8854d331aa2b2b1867 WHIRLPOOL 19b38fbdde2cb0fae7179bad4d8958fcf1057f6f5286bd75d0006cdceafb1752973c8d5c6ae513ba2b87e787ff60dc961bf3e065864e148be02a4ee0d9274676
 EBUILD nagios-core-3.5.1.ebuild 6169 SHA256 afdba4cc8a5dd563d4c7f9f64a5c278a180e65de8b34489f1412d9bfa82c3c2e SHA512 dc96c0d4bdb074eea990b18473a231a65ed6b83f6215434b1dc3ea72f14d62b14c68dceb4eada8d967feb14d42b8f6cd3d8cef23ffdee7417302a5b3cb5206ae WHIRLPOOL e0fefb4f68a53f81d4db7f1c21f4da8223b55eb368423331d5a4982e2df6f7878e4a1a50b778b5a0c018f0a8fe5c7669d0687f0ec62c61cb515e4b34592bab0f
-EBUILD nagios-core-4.0.8.ebuild 7210 SHA256 3341e17f152ad1dad6d98402c842940e99f1851dde9c1e7fff2ad76211df0ca3 SHA512 d9c2882c26771682720dbcf06216e7cbb14206411527a3a5884564492116bc8fd5613901600ebe85626684341bfc99d27b1089bd2e4e88e6e4c1fa0b4101faaa WHIRLPOOL e26b51d0b9437f0de73f2a3a1de0f63f7e6c60f28e43afce0685815d46aaebc90c7b60da1ef94bdedbab8056d34069b67518c607f60d8cdcd3430115e89c12f0
-MISC ChangeLog 32770 SHA256 86353062eee79b25624c7989698d2a4f3ba8050697085d4d4d0ff1748d9ca1dc SHA512 01f89c57e2126edb139cf99a522107fb66237a16109d1cd7c4503ccff446ccb2ad91c8f183a1d4557c68e873906211d5fc8359d64e51a093633c985b3796df74 WHIRLPOOL 558305fbaf02869083b88a310bb6757f29f7df66f44c15887966d82472f12b1fb1ea530575cf40781353d18fe3bb996e84fb0c676ecf30af0dc4be5bdae13bb1
+EBUILD nagios-core-4.0.8-r1.ebuild 7987 SHA256 a5f83ba59d0951db06a7aeb1e394fb921c54cfec9663fa2260d935dc36c2d41d SHA512 3d3272f4adab2ec75a09599fb004f520eda0c13c8985f5ce0a9d5a166175c9d268fd79db5b90b6c8a3f60f32a6a1022fb2922c9e0e3ffb58fc7fbfe035f5acf8 WHIRLPOOL bf66c2fce26634c2a7c4fe4938ed400429ac4e5d815504ebf312dfe4047287f7bf4ef92dd8f6f40a1307823cd9f7bc3ed0aac7f4e1a55775c5bfe1834102925b
+MISC ChangeLog 33004 SHA256 9f04e3204e4fd8f8e363534753a30bc771e4eda00e9cd07c379ad6a74182ff94 SHA512 95b5c63c6e5c181c0afef79001c8b9aabd23afc96ecb68c702e0bbf2e374a4e3b3d9aed8ddfe39bfec65c9192064b1acfb75eb73412b1c3a7ba2469af0a59da6 WHIRLPOOL 64267e86e9ca59a1c04f4dff337b3e94f20ceb30f559d14d7595c2db651e5e1a90c15b1f9ffcd4c3286b79beb727c23c037f66ca08a5dec9b348653f7f5baf50
 MISC metadata.xml 1478 SHA256 9099b3eb50d6ab4894f46a32083c6defc29a5ce613123faf458c062e7c72c1b9 SHA512 fa58ee32c763c1569163dc44b9523cac9bcae87743ee254023c073b82c0eec82b9ba1994420e1df3ffbd3f09cd64a8a115f96c248d7aecef0df742ff3ac478a3 WHIRLPOOL daa602b1587bd1925c9b90fcaced294a3ae620dff3d11d037e20919fee079aec950aefc6188b2b9aca069dfdf820390f792e78081faf4442cedfb8d71ec896bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUcQBDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUdeReXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
-RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrb+xEP/37mTdBEHlPCuLD7X04I/GgJ
-mUctLOdpBMnfkugSL6Ne5p6wbia/ztFr0H9Rlp4Zv4qyHF/2Byai6/sbjGcjxUaa
-1RfJrg2QhpnBF7Wx5Q/v9k8Jx1Gw1WB/eil34N2Pnp+1/nURc9aGN2Sj9vuXAjke
-GmfZ6WpGfBSuXcIvmZV4t2kVgR45QYxSqU7QtGcDrWLx69PFgFErGWtBBw2D39wA
-FIzDycM3ztDzJnUD43nx89CAC8PjuWzvUfiw/NHe3Eu1NN9mGURDWtN3rP6eKIlG
-Wg1F5nR3T2nMJWMtwEqZJY2zUOmc0LldcTFPQiL9UiF9c5xPuzftzqcxer7GSoeL
-ibICvKD2k7DrJNzjzG99HHdXg4Q4T4LagTpTvbD/8x8exviPSgzFxyoUEDO9xNqa
-odJoUFFuVkqEfsJ1iHUZj8yieDtJ9MvuWSvFqDjBtuXLzt09ZFXBSZqCjHQZZJUm
-szqXHmHp/eMLmL9NDLebBVulhjxNJxFEefUyrUMV1xp4taQvCvsj6CGRKQ4ThVpk
-XyaS+fg6q/IKDYA/3gmzijccvRcUws3SEWFYbtqqfsx6Ss8wnH1maRhqgX7ZET+G
-kwbqoCPvCEe0URIqdGgUDL5WWU3Ptu1SoeFzfARAYmFDDKux6S0zKITZ1XLFX9dJ
-do3AMc3+gELkfyneHftl
-=ZSGR
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbt48P/i2yhsMwg7OYhOtGPJQYtYFa
+gWFQ7Kut+CWtm35xJZR88aVjyKD4u8UhHDPx7CK1aPk0WOeXAIiKYyM8R4CpTyXP
+5UX3aLVIPpxJEeghW37eWrwUm9J6WgWwgX4Mew7/BmOB4nZI7f9kWRPhZEbJx3P5
+kCXUf4JnZXQEkf3nplzBkiAa1Aamy8V/+jeZaCTQmzU5VqABM41LL4hNzEgzE0qm
+5gqKoU4/kivUTxw30Pjo2d0NfZCGnH8ap2v481rw7X1eb3u4AkjT1ChkB1Qj4MZS
+LhE3EgVJ5tt5vJ1jyCpH02PChZKRdqoyBUPlwLZfV1X7ms7wia65fOEVhSiR10FM
+pPft4lz8oOonj96dR8kp76zrrylXWcbWR/wAgzobos+xIZGTl7qOHQ0vJVnyln/o
+YMY66DCPfw2NxqHLBCiqw2YoKmY+ibQGQpMg73BrGY5k1NMu+7cwozcfOJemtWAx
+MB5ZN5L0wq97P+n1rqiwM6kFTOldlDto0zmMr9X98eSTwX9Zy3mq/PtPZfkRTXnF
+kaqofhqRFHxzVdAZc9Aelrp35C40QAQ22GTtnc/E1dCV6bS5fragj9afN3psASBQ
+9E+eiRQrku3aSfXrPLtaSs0lGCdhKMfpYy6xau1JpUDb4fHYqpC1L+oeqO1AXJEC
+OHaEwoTCiy85zOM+ST1x
+=fyn+
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-core/files/fix-bogus-perf-data-warnings.patch b/net-analyzer/nagios-core/files/fix-bogus-perf-data-warnings.patch
new file mode 100644
index 000000000000..8f589e8013b7
--- /dev/null
+++ b/net-analyzer/nagios-core/files/fix-bogus-perf-data-warnings.patch
@@ -0,0 +1,32 @@
+Patch submitted upstream at,
+
+  http://tracker.nagios.org/view.php?id=534
+
+by user ovidiu_stanila. Confirmed to work by at least one other user,
+travissidelinger. Applied to fix Gentoo bug #530640.
+
+diff --git a/base/workers.c b/base/workers.c
+index 881e434..d1e1f8d 100644
+--- a/base/workers.c
++++ b/base/workers.c
+@@ -285,6 +285,8 @@ static void destroy_job(struct wproc_job *job)
+ 	case WPJOB_SVC_EVTHANDLER:
+ 	case WPJOB_GLOBAL_HOST_EVTHANDLER:
+ 	case WPJOB_HOST_EVTHANDLER:
++	case WPJOB_HOST_PERFDATA:
++	case WPJOB_SVC_PERFDATA:
+ 		/* these require nothing special */
+ 		break;
+ 	case WPJOB_CALLBACK:
+@@ -763,6 +765,11 @@ static int handle_worker_result(int sd, int events, void *arg)
+ 			run_job_callback(job, &wpres, 0);
+ 			break;
+ 
++		case WPJOB_HOST_PERFDATA:
++		case WPJOB_SVC_PERFDATA:
++			/* these require nothing special */
++			break;
++
+ 		default:
+ 			logit(NSLOG_RUNTIME_WARNING, TRUE, "Worker %d: Unknown jobtype: %d\n", wp->pid, job->type);
+ 			break;
diff --git a/net-analyzer/nagios-core/nagios-core-4.0.8.ebuild b/net-analyzer/nagios-core/nagios-core-4.0.8-r1.ebuild
index 9ff70a438af0..9642aee954cb 100644
--- a/net-analyzer/nagios-core/nagios-core-4.0.8.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-4.0.8.ebuild,v 1.1 2014/11/22 21:29:34 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-4.0.8-r1.ebuild,v 1.1 2014/11/26 14:31:54 mjo Exp $
 
 EAPI=5
 
@@ -9,7 +9,12 @@ inherit depend.apache eutils multilib toolchain-funcs user
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
 HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	web? ( http://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -85,6 +90,13 @@ src_prepare(){
 	# Gentoo bug #388321.
 	#
 	epatch "${FILESDIR}"/use-INSTALL-to-install-themes.patch
+
+	# Upstream bug:
+	#
+	# http://tracker.nagios.org/view.php?id=534
+	#
+	# Gentoo bug #530640.
+	epatch "${FILESDIR}"/fix-bogus-perf-data-warnings.patch
 }
 
 src_configure() {
@@ -142,6 +154,14 @@ src_install() {
 			# This overwrites the already-installed exfoliation theme
 			emake DESTDIR="${D}" install-classicui
 		fi
+
+		# Install cute Gentoo icons (bug #388323), setting their
+		# owner, group, and mode to match those of the rest of Nagios's
+		# images.
+		insopts --group=nagios --owner=nagios --mode=0664
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+		insopts --mode=0644 # Back to the default...
 	fi
 
 	newinitd "${FILESDIR}"/nagios4 nagios
@@ -168,7 +188,8 @@ src_install() {
 			|| die "failed chown of ${D}/${dir}"
 	done
 
-	chown -R root:root "${D}/usr/$(get_libdir)/nagios"
+	chown -R root:root "${D}/usr/$(get_libdir)/nagios" \
+		|| die "failed chown of ${D}/usr/$(get_libdir)/nagios"
 
 	# The following two find...exec statements will die properly as long
 	# as chmod is only called once (that is, as long as the argument