]> git.pld-linux.org Git - packages/nagios.git/commitdiff
projects / packages / nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f944f0b)
Nagios Core 4.2.1
authorElan Ruusamäe <glen@delfi.ee>
Wed, 7 Sep 2016 16:18:03 +0000 (19:18 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Wed, 7 Sep 2016 16:26:17 +0000 (19:26 +0300)
We made small functional changes to the user interface and fixed a few
bugs, including:

- Fixed several problems in the UI
- $ARGn$ Macros can now be used in perfdata commands
- Running nagios -v on takes 90+ seconds
- Missing Image for Host and Service State Trends
- Maintain non-persistent comments through reload

config.patch patch | blob | blame | history
nagios-googlemap.patch patch | blob | blame | history
nagios-iconv-in-libc.patch patch | blob | blame | history
nagios.spec patch | blob | blame | history
system-magpierss.patch patch | blob | blame | history

diff --git a/config.patch b/config.patch
index 122bb86e818c4d611279c57b507637c44cf5ad9b..9abd4e49ca3329c6400ce98040434fbaa80e96e9 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -29,8 +29,8 @@ diff -ur nagios.org/html/config.inc.php.in nagios/html/config.inc.php.in
        $(MAKE) install-basic
  
  install-basic:
---- nagios.org/sample-config/cgi.cfg.in        2013-09-20 21:01:20.000000000 +0200
-+++ nagios/sample-config/cgi.cfg.in    2013-10-01 21:52:32.937634398 +0200
+--- nagios-4.2.1/sample-config/cgi.cfg.in~     2016-09-07 19:22:34.000000000 +0300
++++ nagios-4.2.1/sample-config/cgi.cfg.in      2016-09-07 19:22:52.152175332 +0300
 @@ -1,6 +1,6 @@
  #################################################################
  #
@@ -57,10 +57,10 @@ diff -ur nagios.org/html/config.inc.php.in nagios/html/config.inc.php.in
  
  
  
-@@ -370,3 +370,5 @@
+@@ -402,3 +402,5 @@
  
- navbar_search_for_addresses=1
- navbar_search_for_aliases=1
+ #ack_no_sticky=0
+ #ack_no_send=0
 +
 +# vim:ts=8:sw=8:ft=cfg
 --- nagios.org/sample-config/nagios.cfg.in     2013-09-20 21:01:20.000000000 +0200
diff --git a/nagios-googlemap.patch b/nagios-googlemap.patch
index 40f5d6e3e1e0d52d9685b3923749401c30b4a41f..5ef45c291f78997eb76c94e63367a699b94d1f55 100644 (file)
--- a/nagios-googlemap.patch
+++ b/nagios-googlemap.patch
@@ -1,5 +1,5 @@
---- nagios-3.2.0/cgi/statusmap.c       2009-10-22 18:19:21.913340828 +0300
-+++ nagios-3.2.0.googlemap/cgi/statusmap.c     2009-10-22 18:19:06.830007817 +0300
+--- nagios-4.2.1/cgi/statusmap.c~      2016-09-07 19:23:29.000000000 +0300
++++ nagios-4.2.1/cgi/statusmap.c       2016-09-07 19:24:13.969747452 +0300
 @@ -27,6 +27,10 @@
   *
   *****************************************************************************/
@@ -81,15 +81,18 @@
                printf("<body CLASS='statusmap' name='mappage' id='mappage'>\n");
  
                /* include user SSI header */
-@@ -703,7 +729,7 @@
-               /* right hand column of top row */
+@@ -745,9 +745,9 @@
                printf("<td align=right valign=top>\n");
  
+ #ifdef LEGACY_GRAPHICAL_CGIS
 -              printf("<form method=\"POST\" action=\"%s\">\n", STATUSMAP_CGI);
-+              printf("<form name=\"layoutform\" method=\"POST\" action=\"%s\">\n",STATUSMAP_CGI);
++              printf("<form name=\"layoutform\" method=\"POST\" action=\"%s\">\n", STATUSMAP_CGI);
+ #else
+-              printf("<form method=\"POST\" action=\"%s\">\n", LEGACY_STATUSMAP_CGI);
++              printf("<form name=\"layoutform\" method=\"POST\" action=\"%s\">\n", LEGACY_STATUSMAP_CGI);
+ #endif
                printf("<table border=0 CLASS='optBox'>\n");
                printf("<tr><td valign=top>\n");
-               printf("<input type='hidden' name='host' value='%s'>\n",escape_string(host_name));
 @@ -725,6 +751,7 @@
                printf("<option value=%d %s>Circular\n", LAYOUT_CIRCULAR, (layout_method == LAYOUT_CIRCULAR) ? "selected" : "");
                printf("<option value=%d %s>Circular (Marked Up)\n", LAYOUT_CIRCULAR_MARKUP, (layout_method == LAYOUT_CIRCULAR_MARKUP) ? "selected" : "");
diff --git a/nagios-iconv-in-libc.patch b/nagios-iconv-in-libc.patch
index c4dace9ac1bbbd89c156b04967997888bdf49f65..a62c78b799583fba0e7cfae3c2e5a75e4ddbcd56 100644 (file)
--- a/nagios-iconv-in-libc.patch
+++ b/nagios-iconv-in-libc.patch
@@ -1,5 +1,5 @@
---- nagios-1.2/configure.in.orig       Tue Feb  3 05:45:08 2004
-+++ nagios-1.2/configure.in    Fri May  7 11:28:28 2004
+--- nagios-1.2/configure.ac.orig       Tue Feb  3 05:45:08 2004
++++ nagios-1.2/configure.ac    Fri May  7 11:28:28 2004
 @@ -533,7 +533,7 @@
  if test x$TRYGD = xyep; then
  
diff --git a/nagios.spec b/nagios.spec
index 1d6015e651f7cdb3ce2020c947638146b488a578..cbbc7dd78e1b89ad4558afcefa535677974855c9 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -12,12 +12,12 @@ Summary:    Open Source host, service and network monitoring program
 Summary(pl.UTF-8):     Program do monitorowania serwerów/usług/sieci
 Summary(pt_BR.UTF-8):  Programa para monitoração de máquinas e serviços
 Name:          nagios
-Version:       4.0.8
-Release:       5
+Version:       4.2.1
+Release:       0.1
 License:       GPL v2+
 Group:         Networking
-Source0:       http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz
-# Source0-md5: 4bba4eef427cfb113fb513b6166a6af6
+Source0:       https://assets.nagios.com/downloads/nagioscore/releases/%{name}-%{version}.tar.gz
+# Source0-md5: 96a71803c10afe1a7d2b05e61e35578a
 Source1:       %{name}-apache.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -43,7 +43,7 @@ Patch8:               archivelog-timeformat.patch
 Patch9:                system-magpierss.patch
 Patch10:       system-jquery.patch
 Patch11:       do-not-fetch-rss.patch
-URL:           http://www.nagios.org/
+URL:           https://www.nagios.org/projects/nagios-core/
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_doc:BuildRequires:     doxygen}
diff --git a/system-magpierss.patch b/system-magpierss.patch
index 89e970a47a9d0baa1a034b340dabd94c059d66e0..6d2ec91da420f71c3aff5b22d657133672942b83 100644 (file)
--- a/system-magpierss.patch
+++ b/system-magpierss.patch
@@ -30,9 +30,18 @@
  
  
  //build splash divs to ajax load 
---- nagios-3.4.1/html/Makefile.in~     2012-02-13 22:40:42.000000000 +0200
-+++ nagios-3.4.1/html/Makefile.in      2012-05-28 23:52:30.828823727 +0300
-@@ -79,10 +79,6 @@
+--- nagios-4.2.1/html/Makefile.in~     2016-09-06 17:59:22.000000000 +0300
++++ nagios-4.2.1/html/Makefile.in      2016-09-07 19:25:18.613096481 +0300
+@@ -54,8 +54,6 @@
+       $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+       $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+       $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
+-      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
+-      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
+       $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
+ # Directories for new CGI pages
+       $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs
+@@ -120,10 +120,6 @@
        do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
        for file in includes/*.*; \
        do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
@@ -40,6 +49,6 @@
 -      do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
 -      for file in includes/rss/extlib/*.*; \
 -      do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
- 
- install-unstripped:
-       $(MAKE) install
+ # Support files for new graphical CGIs
+       $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/angular-1.3.9/angular.min.js  $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
+       $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/angular-1.3.9/angular.min.js.map  $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
Open Source host, service and network monitoring program
This page took 0.284626 seconds and 4 git commands to generate.