Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/
Date: Sat, 02 Mar 2019 04:38:07
Message-Id: 1551501130.1f117f5e3fa59fa3bf1589ad23227e7c82d741b5.mjo@gentoo
1 commit: 1f117f5e3fa59fa3bf1589ad23227e7c82d741b5
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 2 04:32:10 2019 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 2 04:32:10 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f117f5e
7
8 net-analyzer/nagios-core: remove a now-unused patch.
9
10 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 .../nagios-core/files/nagios-4.4.3-pre.patch | 42 ----------------------
14 1 file changed, 42 deletions(-)
15
16 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
17 deleted file mode 100644
18 index 3c5eb030547..00000000000
19 --- a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
20 +++ /dev/null
21 @@ -1,42 +0,0 @@
22 -diff --git a/Changelog b/Changelog
23 -index c695bd54..4c348894 100644
24 ---- a/Changelog
25 -+++ b/Changelog
26 -@@ -2,6 +2,11 @@
27 - Nagios Core 4 Change Log
28 - ########################
29 -
30 -+4.4.3 - 2018-XX-XX
31 -+------------------
32 -+FIXES
33 -+* Fixed services sending recovery emails when they recover if host in down state (#572) (Scott Wilkerson)
34 -+
35 - 4.4.2 - 2018-08-16
36 - ------------------
37 - FIXES
38 -diff --git a/base/notifications.c b/base/notifications.c
39 -index d4574c41..58ad140f 100644
40 ---- a/base/notifications.c
41 -+++ b/base/notifications.c
42 -@@ -591,10 +591,6 @@ int check_service_notification_viability(service *svc, int type, int options) {
43 - return ERROR;
44 - }
45 -
46 -- /***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
47 -- if(svc->current_state == STATE_OK)
48 -- return OK;
49 --
50 - /* don't notify contacts about this service problem again if the notification interval is set to 0 */
51 - if(svc->no_more_notifications == TRUE) {
52 - log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this service problem.\n");
53 -@@ -1501,10 +1497,6 @@ int check_host_notification_viability(host *hst, int type, int options) {
54 - return ERROR;
55 - }
56 -
57 -- /***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
58 -- if(hst->current_state == HOST_UP)
59 -- return OK;
60 --
61 - /* check if we shouldn't renotify contacts about the host problem */
62 - if(hst->no_more_notifications == TRUE) {
63 - log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this host problem.\n");