gentoo resync : 12.08.2018

13 files changed, 479 insertions, 69 deletions

diff --git a/net-analyzer/2ping/2ping-4.1.2.ebuild b/net-analyzer/2ping/2ping-4.1.2.ebuild
new file mode 100644
index 000000000000..688c698a7823
--- /dev/null
+++ b/net-analyzer/2ping/2ping-4.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A bi-directional ping utility"
+HOMEPAGE="https://www.finnie.org/software/2ping/"
+SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="server"
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/2ping.1
+	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
+	use server && {
+		doinitd "${FILESDIR}"/2pingd
+		newconfd "${FILESDIR}"/2pingd.conf 2pingd
+	}
+}
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
index 1b0fd30e8b65..eecef1f4ab32 100644
--- a/net-analyzer/2ping/Manifest
+++ b/net-analyzer/2ping/Manifest
@@ -1,7 +1,9 @@
 AUX 2pingd 692 BLAKE2B f393bc602a4e39f77970946926bae178f9181476f7331b9a91f1dddc689ba360d8479b28e9a0b16d25864954664e6b0915149077620aa9d0fec00a85ef68b257 SHA512 7d898b96e6888233b7628af7a9a0641a4ce2f6ebe38192b88bb7f479d99067f6d34843f1b43746eed03b7512782496534e35240abf8b866a4e8f00ee9421deb1
 AUX 2pingd.conf 57 BLAKE2B 79c2a05661e342d5a5c3903071d42864d3185d6f387a6b73f129a70cadfadf081f43d9bdfea22281170b0ad27ec17f9b3612cf40b570390f44f845d7ca4555d0 SHA512 c8c666116e841b86a1f17a891453e6ea25976ad485b8299062971b45395420dd46ecc9ac36cb1de5000207372f8586850f62c6178ece5f70732bf17ae9ab4af9
 DIST 2ping-4.0.1.tar.gz 67347 BLAKE2B 88ef9b626399682a93892a933ab75ac0caa994e38b11aac287f4114472e9869a2b577f301c4fd036940cfafb62e57ff52382f2413038b433c9ed4fedd87e1696 SHA512 21d3f9f8833d10f7d9f692e0d3a8dbe524ee5ad064122d808aad99f295389efc51c3979ff0dc9533705363be21e0457a886ba0d8a4532705791a4fdf24050eb7
+DIST 2ping-4.1.2.tar.gz 69591 BLAKE2B e96e8ca7907a0a4c7a7cebfd8130469efe00bff96dfaee50f6f2156750a73014054cdfe9d848ad369e3a2dbc52b3b46f262391024f300d48b8d8628573ff5fed SHA512 566acd3638b47b34c06f59f6e7a3793aa1fc60cb6b0ca108f8544afe55a8680c57bcb212fe70433ae99c02d4e8359a91eaeaed4b1d820fa9d072143424c5e54a
 DIST 2ping-4.1.tar.gz 69510 BLAKE2B f7245876bb66ebab55cf0a98f29402dc8dcd9e1e97fbf635ff1232501c7dd23d8a707a378bd6c73084b3c2e946347f24edef6347693015fdb812d78cadab1fef SHA512 926a515156bf0b9e7c09e72f0e557571f3905646eaec2e8c4702a7dd7ed77b9ab298323028beb02c844d719839458f9d056fb5d29443e908b0d927754f856553
 EBUILD 2ping-4.0.1.ebuild 637 BLAKE2B 4ea67a294fa421c23d2979b47c41345a12463bfc13db539708f7f279b04965375c9a8561c3bd2c87e968534976bd395f56a7cdbeb42bfce3aa2ea3f7b011424e SHA512 f9269a4595ff43bb30cb45e64f9113fa0ec39ed3665fc22b283356a79e6c0e4b48048815747af5cb57914c5414210357e5e101fb59a6bfa951a513c8fb0bc475
+EBUILD 2ping-4.1.2.ebuild 633 BLAKE2B da35f0b2a81797580163aacab68d13b8f71896c2172f7e10dcf3b4f052cd71f864d67050cee840ba92cbe3796ad77099ee27cf1bb9041e10ac6620691c414a04 SHA512 8d93bf7be8b3bea47bbbf9505684bc0cb0358c5ce90653dab6e3ad8fe67b106f49b960549560933e82865623a1fe7c2c754390e8e69932f72d3f5c9dc195ddd4
 EBUILD 2ping-4.1.ebuild 633 BLAKE2B 2e3d8ec81374ad4890aef3c2d6d834e653d9c1a2fad4718b40eec5dbe2bdfc5242e626601302351054b223a582d5b055daf78d55099ee2521e4f4392b6126ee9 SHA512 f31e0a9f1e9ffaa3a4b3a1d1360a5038fa479250414e641d04dcf29b798ca05a98a78e18665d850d2d746e554d6ef265b68ae7340a1153f8ac7aa9171dbdeeb2
 MISC metadata.xml 400 BLAKE2B 8de660bda8c58cc5c6e6027c7e52efbd03ef973594e85a90483f0bb0dd2fcdcc4ee7989cf8624e72f0e71f31daf5af05c345126b862cad1007c3a45a8122bcd4 SHA512 9d35147319cbab8e826a2f0a8badee2169e70b8a52065d8639f2326ff0bfe1717a5e8b5422072f71677e2e4a99ec14a7d6e688662f2342d7917499c35a686154
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e5c5d84ae14c..62c7759edc1c 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index fabb97b152e8..ad4a98536722 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,10 +1,13 @@
 AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
+AUX nagios-4.4.2-pre.patch 7936 BLAKE2B 143d1d80ae6d940165f5bff8e27deaee216f2a06b465968060b5a29da79ef2ec5277f3484c9b0774ad62284740b8513571e4df574c82acd03db341b6d5984d80 SHA512 0aa946192ab5f24b22f5c0737d8e2f5764317ee5e1ceab9d9c97b43eb2a4f3a8856c370d3a26d91ea9727b4e17f77876e790e399bf67a01eef3221c116a4558c
 DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4 SHA512 588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f SHA512 8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f
+DIST nagios-4.4.1.tar.gz 11296403 BLAKE2B fdbaec5f913d18d5591f44cd1e0622b9741d7415b591f24f1521f2897b8a1bdbff00e9378ef6b3a6a99ab8d639960abd3d734fd66b665ea88ea1de169b552ace SHA512 d84f22a8fd21a573b4162f232c3a6bb2ba0b7d3a470e5fd80183a1862d2ae666956cfc2dd4c7fe6319ee7ccedb9f8a6920ba39a6b499ed9ff5b8be60a9779fa9
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.3.3.ebuild 7467 BLAKE2B f337eabcfbd918295f437ec735917fda59e0695ee2a6800eea4a15d9f49b1fb63ee135498c8556c0c1a545f7ff0f0141abfb2080a605f19928a5036cac1fdfac SHA512 250b84f3b417756fbb9034af2a909c94c7c2ec7e1539f66590f84b4ff3735314d403b8b6496880c9e0aee2f4052dd7d7829779d1fc4ae78e01f53449abe206ab
 EBUILD nagios-core-4.3.4.ebuild 6642 BLAKE2B c0791a70440fc8cacdd1c84a5d7e2789316554344d6b26654d8595664fdf67a67e2e278c690c666632995f3abcbca920ff612ca34862fe7a34ca69c35c8dfe1d SHA512 8309de23dfa46bb1a31e70c0f28b2d7c2e6719d8d1e0ce2660298d530d1123978814612dfdb9a56103d1209bea9477b4fb81df3c623f6bf8d07a7419a28d4ae3
 EBUILD nagios-core-4.4.0.ebuild 6650 BLAKE2B 71f116cd32789faa2bc1d4cbccf4042043da69dd26c1c561af86cd56a58c0ba5f48e84b2fa50c01a90bfd696787656921793079c97422a336a0483cba556f34a SHA512 701adbe2152b67cde427b279d201bb157d8c700a3457bb45eb50853185e0612b99a385e384b4c6ca0b9667bce68a6dee6b57a47dedaeb4db3398c49b95a06104
+EBUILD nagios-core-4.4.1.ebuild 6701 BLAKE2B 9fbd08043bbe2c31effaa3d01c45bee3d6b485e9d12890ac7463a0859cbbf6c61fe5732a32e33493c2db97c2bde3c8d15b25f1ce175dd72141d9d7d91e47dbfd SHA512 e2aabed02bcc285cfc8e0f117dc59f87c13f14eb61e2ac96361e746a44ce2da856c2af724f7470d58d7976a62df7df8835e383c2e35f17f22ef31abbdf978070
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch b/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
new file mode 100644
index 000000000000..6483b9df9f29
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
@@ -0,0 +1,209 @@
+diff --git a/Changelog b/Changelog
+index 1e1bd9e2..8dd26fec 100644
+--- a/Changelog
++++ b/Changelog
+@@ -2,6 +2,18 @@
+ Nagios Core 4 Change Log
+ ########################
+ 
++4.4.2 - ??????????
++------------------
++FIXES
++* Fix comment data being duplicated after a `service nagios reload` or similar (Bryan Heden)
++* Fix check_interval and retry_interval not changing at the appropriate times (Scott Wilkerson)
++* Fixed passive checks sending recovery email when host was previously UP (Scott Wilkerson)
++* Fixed flapping comments duplication on nagios reload (Christian Jung)
++* Fix for CVE-2018-13441, CVE-2018-13458, CVE-2018-13457 null pointer dereference (Trevor McDonald)
++* Fixed syntax error in file: default-init.in (#558) (Christian Zettel)
++* Reset current notification number and state flags when the host recovers, reset all service variables when they recover fixes (#557) (Scott Wilkerson)
++* Fixed wrong counting of service status totals when showing servicegroup details (#548) (Christian Zettel, Bryan Heden)
++
+ 4.4.1 - 2018-06-25
+ ------------------
+ FIXES
+diff --git a/base/checks.c b/base/checks.c
+index 725dec9d..d45b6ac4 100644
+--- a/base/checks.c
++++ b/base/checks.c
+@@ -911,6 +911,11 @@ static inline void service_state_or_hard_state_type_change(service * svc, int st
+ 
+ 	if (state_or_type_change) {
+ 
++		/* check if service should go into downtime from flexible downtime */
++		if (svc->pending_flex_downtime > 0) {
++			check_pending_flex_service_downtime(svc);
++		}
++
+ 		/* reset notification times and suppression option */
+ 		svc->last_notification = (time_t)0;
+ 		svc->next_notification = (time_t)0;
+@@ -941,7 +946,10 @@ static inline void host_state_or_hard_state_type_change(host * hst, int state_ch
+ 
+ 		log_debug_info(DEBUGL_CHECKS, 2, "Check type passive and passive host checks aren't false\n");
+ 		
+-		hst->current_attempt = 1;
++		if (state_change == TRUE) {
++            hst->current_attempt = 1;
++        }
++        
+ 		hard_state_change = TRUE;
+ 	}
+ 
+@@ -989,6 +997,9 @@ static inline void host_state_or_hard_state_type_change(host * hst, int state_ch
+ 
+ 	if (state_or_type_change) {
+ 
++		/* check if host should go into downtime from flexible downtime */
++		check_pending_flex_host_downtime(hst);
++
+ 		/* reset notification times and suppression option */
+ 		hst->last_notification = (time_t)0;
+ 		hst->next_notification = (time_t)0;
+@@ -1228,7 +1239,7 @@ int handle_async_service_check_result(service *svc, check_result *cr)
+ 	next_check = (time_t)(svc->last_check + (svc->check_interval * interval_length));
+ 
+ 	/***********************************************/
+-	/********** SCHEDULE HOST CHECK LOGIC **********/
++	/********** SCHEDULE SERVICE CHECK LOGIC **********/
+ 	/***********************************************/
+ 	if (svc->current_state == STATE_OK) {
+ 
+@@ -1269,6 +1280,7 @@ int handle_async_service_check_result(service *svc, check_result *cr)
+ 
+ 			svc->host_problem_at_last_check = TRUE;
+ 		}
++        
+ 	}
+ 	else {
+ 
+@@ -1368,6 +1380,9 @@ int handle_async_service_check_result(service *svc, check_result *cr)
+ 		else {
+ 
+ 			log_debug_info(DEBUGL_CHECKS, 1, "Service is a non-OK state (%s)!", service_state_name(svc->current_state));
++            
++            svc->state_type = SOFT_STATE;
++			svc->current_attempt = 1;
+ 
+ 			handle_event = TRUE;
+ 		}
+@@ -1395,6 +1410,21 @@ int handle_async_service_check_result(service *svc, check_result *cr)
+ 
+ 				log_debug_info(DEBUGL_CHECKS, 1, "Service experienced a SOFT recovery.\n");				
+ 			}
++            
++            
++            /* reset all service variables because its okay now... */
++            svc->host_problem_at_last_check = FALSE;
++            svc->current_attempt = 1;
++            svc->state_type = HARD_STATE;
++            svc->last_hard_state = STATE_OK;
++            svc->last_notification = (time_t)0;
++            svc->next_notification = (time_t)0;
++            svc->current_notification_number = 0;
++            svc->problem_has_been_acknowledged = FALSE;
++            svc->acknowledgement_type = ACKNOWLEDGEMENT_NONE;
++            svc->notified_on = 0;
++            
++            hard_state_change = TRUE;
+ 		}
+ 
+ 		/***** SERVICE IS STILL IN PROBLEM STATE *****/
+@@ -1418,6 +1448,14 @@ int handle_async_service_check_result(service *svc, check_result *cr)
+ 			}
+ 		}
+ 	}
++    
++    /* soft states should be using retry_interval */
++    if (svc->state_type == SOFT_STATE) {
++        
++            log_debug_info(DEBUGL_CHECKS, 2, "Service state type is soft, using retry_interval\n");
++            
++            next_check = (unsigned long) (current_time + svc->retry_interval * interval_length);
++    }
+ 
+ 	/* check for a state change */
+ 	if (svc->current_state != svc->last_state || (svc->current_state == STATE_OK && svc->state_type == SOFT_STATE)) {
+@@ -1454,6 +1492,8 @@ int handle_async_service_check_result(service *svc, check_result *cr)
+ 	if (svc->current_attempt >= svc->max_attempts && svc->current_state != svc->last_hard_state) {
+ 
+ 		log_debug_info(DEBUGL_CHECKS, 2, "Service had a HARD STATE CHANGE!!\n");
++        
++        next_check = (unsigned long)(current_time + (svc->check_interval * interval_length));
+ 
+ 		hard_state_change = TRUE;
+ 
+@@ -2197,6 +2237,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
+ 		else {
+ 
+ 			log_debug_info(DEBUGL_CHECKS, 1, "Host is no longer UP (%s)!\n", host_state_name(hst->current_state));
++            
++            hst->state_type = SOFT_STATE;
++            hst->current_attempt = 1;
+ 
+ 			/* propagate checks to immediate parents if they are UP */
+ 			host_propagate_checks_to_immediate_parents(hst, FALSE, current_time);
+@@ -2276,7 +2319,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
+ 	if (hst->current_state != HOST_UP && (hst->check_type == CHECK_TYPE_ACTIVE || translate_passive_host_checks == TRUE)) {
+ 
+ 		hst->current_state = determine_host_reachability(hst);
+-		next_check = (unsigned long)(current_time + (hst->retry_interval * interval_length));
++		if (hst->state_type == SOFT_STATE)
++            next_check = (unsigned long)(current_time + (hst->retry_interval * interval_length));
++        
+ 	}
+ 
+ 	/* check for state change */
+@@ -2310,7 +2355,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
+ 
+ 		log_debug_info(DEBUGL_CHECKS, 2, "Host had a HARD STATE CHANGE!!\n");
+ 
+-		hard_state_change = TRUE;
++		next_check = (unsigned long)(current_time + (hst->check_interval * interval_length));
++        
++        hard_state_change = TRUE;
+ 		send_notification = TRUE;
+ 	}
+ 
+@@ -2372,6 +2419,12 @@ int handle_async_host_check_result(host *hst, check_result *cr)
+ 		}
+ 	}
+ 
++    /* the host recovered, so reset the current notification number and state flags (after the recovery notification has gone out) */
++    if(hst->current_state == HOST_UP && hst->state_type == HARD_STATE && hard_state_change == TRUE) {
++        hst->current_notification_number = 0;
++        hst->notified_on = 0;
++        }
++        
+ 	if (obsess_over_hosts == TRUE) {
+ 		obsessive_compulsive_host_check_processor(hst);
+ 	}
+diff --git a/base/nagios.c b/base/nagios.c
+index 520ba71e..24719647 100644
+--- a/base/nagios.c
++++ b/base/nagios.c
+@@ -878,6 +878,9 @@ int main(int argc, char **argv) {
+ 			/* clean up the scheduled downtime data */
+ 			cleanup_downtime_data();
+ 
++			/* clean up comment data */
++			free_comment_data();
++
+ 			/* clean up the status data if we are not restarting */
+ 			if(sigrestart == FALSE) {
+ 				cleanup_status_data(TRUE);
+diff --git a/cgi/status.c b/cgi/status.c
+index 20c4ed48..8b1c8b31 100644
+--- a/cgi/status.c
++++ b/cgi/status.c
+@@ -873,6 +873,11 @@ void show_service_status_totals(void) {
+ 				count_service = 1;
+ 			}
+ 		else if(display_type == DISPLAY_SERVICEGROUPS) {
++
++			if (is_service_member_of_servicegroup(find_servicegroup(servicegroup_name), temp_service) == FALSE) {
++				continue;
++			}
++
+ 			if(show_all_servicegroups == TRUE) {
+ 				count_service = 1;
+ 				}
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
new file mode 100644
index 000000000000..bfc0aac4a73d
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/"
+
+# 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? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+# sys-devel/libtool dependency is bug #401237.
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="sys-devel/libtool
+	virtual/mailx
+	perl? ( dev-lang/perl:= )
+	web? (
+		app-arch/unzip
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd[php] )
+		apache2? (
+			|| (
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+			|| (
+				dev-lang/php:*[apache2]
+				dev-lang/php:*[cgi]
+				dev-lang/php:*[fpm] )
+		)
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+PATCHES=(
+	"${FILESDIR}/nagios-4.4.2-pre.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_configure() {
+	local myconf
+
+	if use perl; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+		--datadir=/usr/share/nagios/htdocs \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web; then
+		# Only compile the CGIs/HTML when USE=web is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+	fi
+}
+
+src_install() {
+	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
+
+	# There is no way to install the CGIs unstripped from the top-level
+	# makefile, so descend into base/ here. The empty INSTALL_OPTS
+	# ensures that root:root: owns the nagios executables.
+	cd "${S}/base" || die
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+	cd "${S}" || die
+
+	# Otherwise this gets installed as 770 and you get "access denied"
+	# for some reason or other when starting nagios. The permissions
+	# on nagiostats are just for consistency (these should both get
+	# fixed upstream).
+	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
+
+	# INSTALL_OPTS are needed for most of install-basic, but we don't
+	# want them on the LIBEXECDIR, argh.
+	emake DESTDIR="${D}" install-basic
+	fowners root:root /usr/$(get_libdir)/nagios/plugins
+
+	# Don't make the configuration owned by the nagios user, because
+	# then he can edit nagios.cfg and trick nagios into running as root
+	# and doing his bidding.
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
+
+	# No INSTALL_OPTS used in install-commandmode, thankfully.
+	emake DESTDIR="${D}" install-commandmode
+
+	if use web; then
+		# There is no way to install the CGIs unstripped from the
+		# top-level makefile, so descend into cgi/ here. The empty
+		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
+		cd "${S}/cgi" || die
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+		cd "${S}" || die
+
+		# install-html installs the new exfoliation theme
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
+
+		if use classicui; then
+			# This overwrites the already-installed exfoliation theme
+			emake INSTALL_OPTS="" 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.
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+	fi
+
+	newinitd startup/openrc-init nagios
+
+	if use web ; then
+		if use apache2 ; then
+			# Install the Nagios configuration file for Apache.
+			insinto "/etc/apache2/modules.d"
+			doins "${FILESDIR}"/99_nagios4.conf
+		elif use lighttpd ; then
+			# Install the Nagios configuration file for Lighttpd.
+			insinto /etc/lighttpd
+			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+			ewarn "out of the box. Since you are not using one of them, you"
+			ewarn "will have to configure your webserver yourself."
+		fi
+	fi
+}
+
+pkg_postinst() {
+
+	if use web; then
+		if use apache2 || use lighttpd ; then
+			if use apache2; then
+				elog "To enable the Nagios web front-end, please edit"
+				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+				elog "to APACHE2_OPTS. Then Nagios will be available at,"
+				elog
+			elif use lighttpd; then
+				elog "To enable the Nagios web front-end, please add"
+				elog "'include \"nagios.conf\"' to the lighttpd configuration"
+				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
+				elog "will be available at,"
+				elog
+			fi
+
+			elog "  http://localhost/nagios/"
+		fi
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index 764ae619b7ee..9817bc1b49cf 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,4 +1,5 @@
 EBUILD nagios-4.3.3.ebuild 393 BLAKE2B 9698b8a0efcd6930c84611cb9aee6a792dc1555922f93ddd62f546a966cec83e4d03e7b7a4bd18ceb10de91e58fb4dae04f0514be0ca94247059848c95616383 SHA512 d5cb30f16a97bbd59154223e4dbf62bf98d6c2e03d5021bc8f3ed9c11c8a1bc25b0391d1809a5cbb8b2345ce7c5ae88afb3f3c8473c09bee0bec46da5a52639a
 EBUILD nagios-4.3.4.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
 EBUILD nagios-4.4.0.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
+EBUILD nagios-4.4.1.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1
diff --git a/net-analyzer/nagios/nagios-4.4.1.ebuild b/net-analyzer/nagios/nagios-4.4.1.ebuild
new file mode 100644
index 000000000000..a29da55bee71
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.4.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The Nagios metapackage"
+HOMEPAGE="https://www.nagios.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index af06eb2719a8..e9ef68f49455 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,3 @@
-DIST testssl-2.9.5.tar.gz 8955393 BLAKE2B 32518ace02f410ca7b407b51dcdab8a53218e572bec5d9a3ba380152546aaf63d8068f60d6468fbcba84e948e15c5c5769ef1da8ce53aae32978373de098d4e6 SHA512 9b9cc9f4e5d85cb2bd3767f10d0342b65cd9662df2df4d21b838c8f6a904e8e91f0242e7be1a9e0d9532d13d210beacd1b9f189ba6f955f9c4d3a6bde675677c
 DIST testssl-2.9.5_p5.tar.gz 8955523 BLAKE2B dcafb0931ddfb9d653acf79f72d2e30b2acc4a80246ecb3f26eaa35d4a69d5af65123005de34d09c563978593450895bf451b866182fd3ea38bdb121fb8e9385 SHA512 8a26989e1b8f45a2ac25efab500c89eeec2dbdbb9c0af715a61433ce0737ed69221df09a9554b6ae4415081a66ef4f6afd44c92405afefe4a810cb4375988700
-EBUILD testssl-2.9.5.ebuild 1426 BLAKE2B 30cc93e1c03ee6bc48df4fe81e765349af6c94c794e8e6291d2b3580a96a5b55919034ede2cfe5ff8ab8c6b02aa3afec6087ff3d70932f5c099d25ea54f21d80 SHA512 b1ecb8479877f7b92c6b008c5b0bfda6a554a0f22c5806b9b3c1022f058d4ff584570a9dfebe78f790820543ae8d659efa2ad679ae7671d14d62ea7b72c5b22a
-EBUILD testssl-2.9.5_p5.ebuild 1474 BLAKE2B a74f9ade90da190db9ae541cfa712b18311f915af277dffad45ce50a7b6f5989996543243dedb775afd9035296e0cf9397e219b38bccebc3d272b005b8111f57 SHA512 ef436d78eea58571ffb52ae722fe02beb649ccc78150034528adf736eb7e37387e8f97ad87ff5599a0b9a426fdd6397c3b96f1f4af44156163dc86a1f4ee6025
+EBUILD testssl-2.9.5_p5.ebuild 1473 BLAKE2B 326690236316459714585744468d9c8a33b6ca21410a6cdd2b23374b389d1b42fd811cc485d0f6a18a52160bd3ead39cf157b447a3578bdaab15a1602fe0b3e7 SHA512 cee8411954f0d26a94c7e96c07c2de6f65d65720305e288ca9d1acb03ac478aad0479eb9d103d5b90911570cdc269a19a37d780efe29bf8b8e353da813d87271
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5.ebuild b/net-analyzer/testssl/testssl-2.9.5.ebuild
deleted file mode 100644
index e5a5559d687f..000000000000
--- a/net-analyzer/testssl/testssl-2.9.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN}.sh"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="bundled-openssl"
-
-RDEPEND="
-	dev-libs/openssl:0
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
-}
-
-src_prepare() {
-	default
-	sed -i ${PN}.sh \
-		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-}
-
-src_install() {
-	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
-	dodoc openssl-rfc.mappping.html
-
-	dobin ${PN}.sh
-
-	insinto /etc/${PN}
-	doins etc/*
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}
-
-pkg_postinst() {
-	if use bundled-openssl; then
-		einfo "A precompiled version of OpenSSL has been installed into /opt/${PN},"
-		einfo "configured to enable a wider range of features to allow better testing."
-		einfo ""
-		einfo "To use it, call ${PN} appropriately:"
-		einfo "${MY_PN} --openssl /opt/${PN}/${BUNDLED_OPENSSL} example.com"
-	fi
-}
diff --git a/net-analyzer/testssl/testssl-2.9.5_p5.ebuild b/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
index cdd8f511f518..91bc8e35c780 100644
--- a/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
+++ b/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bundled-openssl"
 
 RDEPEND="
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 14ade1411675..7e9758ac8345 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,6 +12,6 @@ AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.6.2.tar.xz 28392140 BLAKE2B 08fb59061f618494ee07ca19cd97ab2ebe7c483419c1932e185dd42a0fe2b6d0070834ae5b7aaea4981f6fbc4baeaadb7c9eee8bf32b823af77e753c468257ce SHA512 e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
 EBUILD wireshark-2.4.5.ebuild 7334 BLAKE2B 8a968571ad9b7ecfca31dab7e22feda54ecd9ca42e244b89cc8e6f024fc767c9bc81d7fa36408c9332381024b6cd75abda7607fa26bca0dccc7a5dc105a24d3d SHA512 08a980bdb34a2929ea2f0d62ff1dbd73328897ddd3c20d529b67e8564e487c216f0fcddddbaaf54f8132fbc2139261217d0c36e0d9c644c01020600e62b7096f
-EBUILD wireshark-2.6.2.ebuild 6563 BLAKE2B 64241a1afc91e18f8bed540a201b66698f7c7c3bcfacd46a2ae240f768a0da80ec2f3c35369002b11569e8aab06cbecaa64425f55d24370f76052f560504a4af SHA512 ce4400fd1add8d0c2c5211c93e9f4a3245865e2a7e63a6377fbc62fc15a0b434e9b875d5af715820dba84a2c0b5d53ef48b6b3a44b13525cd64bf01725aaf3fe
+EBUILD wireshark-2.6.2.ebuild 6562 BLAKE2B 48ef5ef280cde587005a9c682612da089aabdb54a05a972387f82511e8576361ba2579aa017b15aaf290c638a3673b21fe7cca3e40844049b47e8529e26b230d SHA512 c2ee0bd193c80a3e1095c0aec53e37be72398e21aacf12ba200b742167ce6e5dff32b21a1e8b6e592f3eb22f9e2efd924897088511ed52ab4be631201a15177e
 EBUILD wireshark-99999999.ebuild 6375 BLAKE2B 05637feca26d8c5cc2329b5a86a6bef9742e4470309ff569ccc23a9f1da56f30d9ae2bd16fa1862c5a21508d56b467cbf51cf4f3a31ce08894a7a06691284266 SHA512 4cfc11f50a4eddc08b7f526350752cf60bb016f0992f0bafe892ef834def88fe7915ff7d856c27c4d709c4e2d34ad9bd3d6ebb4f1e4e363e60c62b3706f07cac
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/wireshark-2.6.2.ebuild b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
index 611a9be848d1..aab7156ac9fc 100644
--- a/net-analyzer/wireshark/wireshark-2.6.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
 	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink