From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C64CB138334 for ; Sat, 2 Mar 2019 04:38:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB092E086E; Sat, 2 Mar 2019 04:38:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 893DEE0876 for ; Sat, 2 Mar 2019 04:38:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23947335C97 for ; Sat, 2 Mar 2019 04:38:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CAA8557 for ; Sat, 2 Mar 2019 04:38:02 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1551501130.1f117f5e3fa59fa3bf1589ad23227e7c82d741b5.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch X-VCS-Directories: net-analyzer/nagios-core/files/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 1f117f5e3fa59fa3bf1589ad23227e7c82d741b5 X-VCS-Branch: master Date: Sat, 2 Mar 2019 04:38:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7a82addd-cfb9-4609-b437-8278455c45dd X-Archives-Hash: 7c14268fa2221a6e7c715d9a39b32ac4 commit: 1f117f5e3fa59fa3bf1589ad23227e7c82d741b5 Author: Michael Orlitzky gentoo org> AuthorDate: Sat Mar 2 04:32:10 2019 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Sat Mar 2 04:32:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f117f5e net-analyzer/nagios-core: remove a now-unused patch. Signed-off-by: Michael Orlitzky gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../nagios-core/files/nagios-4.4.3-pre.patch | 42 ---------------------- 1 file changed, 42 deletions(-) diff --git a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch deleted file mode 100644 index 3c5eb030547..00000000000 --- a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/Changelog b/Changelog -index c695bd54..4c348894 100644 ---- a/Changelog -+++ b/Changelog -@@ -2,6 +2,11 @@ - Nagios Core 4 Change Log - ######################## - -+4.4.3 - 2018-XX-XX -+------------------ -+FIXES -+* Fixed services sending recovery emails when they recover if host in down state (#572) (Scott Wilkerson) -+ - 4.4.2 - 2018-08-16 - ------------------ - FIXES -diff --git a/base/notifications.c b/base/notifications.c -index d4574c41..58ad140f 100644 ---- a/base/notifications.c -+++ b/base/notifications.c -@@ -591,10 +591,6 @@ int check_service_notification_viability(service *svc, int type, int options) { - return ERROR; - } - -- /***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/ -- if(svc->current_state == STATE_OK) -- return OK; -- - /* don't notify contacts about this service problem again if the notification interval is set to 0 */ - if(svc->no_more_notifications == TRUE) { - log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this service problem.\n"); -@@ -1501,10 +1497,6 @@ int check_host_notification_viability(host *hst, int type, int options) { - return ERROR; - } - -- /***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/ -- if(hst->current_state == HOST_UP) -- return OK; -- - /* check if we shouldn't renotify contacts about the host problem */ - if(hst->no_more_notifications == TRUE) { - log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this host problem.\n");