commit a83427df67dcccb7795b627442069bce1331d0a4
Author: Elan Ruusamäe <[email protected]>
Date: Wed Sep 7 19:18:03 2016 +0300
Nagios Core 4.2.1
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 | 10 +++++-----
nagios-googlemap.patch | 15 +++++++++------
nagios-iconv-in-libc.patch | 4 ++--
nagios.spec | 10 +++++-----
system-magpierss.patch | 21 +++++++++++++++------
5 files changed, 36 insertions(+), 24 deletions(-)
---
diff --git a/nagios.spec b/nagios.spec
index 1d6015e..cbbc7dd 100644
--- 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/config.patch b/config.patch
index 122bb86..9abd4e4 100644
--- 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 40f5d6e..5ef45c2 100644
--- 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 c4dace9..a62c78b 100644
--- 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/system-magpierss.patch b/system-magpierss.patch
index 89e970a..6d2ec91 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios.git/commitdiff/a83427df67dcccb7795b627442069bce1331d0a4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
