[packages/nagios] - up to 4.4.1
arekm
arekm at pld-linux.org
Fri Jul 13 14:45:28 CEST 2018
commit 667f63042cd5ebf41cf44f4e79e98e9775aa325d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Jul 13 14:45:22 2018 +0200
- up to 4.4.1
config.patch | 8 ++++----
do-not-fetch-rss.patch | 8 ++++----
nagios-doc-usermacros.patch | 21 ---------------------
nagios-webapps.patch | 7 ++++---
nagios.spec | 10 +++++-----
system-jquery.patch | 4 ++--
6 files changed, 19 insertions(+), 39 deletions(-)
---
diff --git a/nagios.spec b/nagios.spec
index 4ab5c66..687ad87 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -12,13 +12,13 @@ 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.3.4
+Version: 4.4.1
Release: 1
License: GPL v2+
Group: Networking
# https://www.nagios.org/downloads/nagios-core/
Source0: https://assets.nagios.com/downloads/nagioscore/releases/%{name}-%{version}.tar.gz
-# Source0-md5: e2229f9a98c2577d51576daf19713e4d
+# Source0-md5: c133c31316322e481289b642e2974be7
Source1: %{name}-apache.conf
Source2: %{name}.init
Source3: %{name}.sysconfig
@@ -39,7 +39,7 @@ Patch2: %{name}-webapps.patch
Patch4: %{name}-cmd-typo.patch
Patch5: config.patch
Patch6: %{name}-googlemap.patch
-Patch7: %{name}-doc-usermacros.patch
+
Patch8: archivelog-timeformat.patch
Patch10: system-jquery.patch
@@ -257,7 +257,7 @@ mv %{name}-%{version}/* .
#%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
+
%patch8 -p1
%patch10 -p1
@@ -571,7 +571,7 @@ EOF
%{htmldir}/nagioswall.php
%{htmldir}/angularjs
-%{htmldir}/bootstrap-3.3.0
+%{htmldir}/bootstrap-3.3.7
%{htmldir}/d3
%{htmldir}/spin
%{htmldir}/graph-header.html
diff --git a/config.patch b/config.patch
index d9bcaa3..3ca3d7b 100644
--- a/config.patch
+++ b/config.patch
@@ -57,10 +57,10 @@ diff -ur nagios.org/html/config.inc.php.in nagios/html/config.inc.php.in
-@@ -394,3 +394,5 @@ navbar_search_for_aliases=1
- # Set to 1 to show only HARD states. Defaults to 0 (HARD+SOFT).
-
- #tac_cgi_hard_only=0
+@@ -420,3 +420,5 @@ navbar_search_for_aliases=1
+ #CMT_ACKNOWLEDGE_HOST_PROBLEM=2,"Problem is being looked into"
+ #CMT_SCHEDULE_SVC_CHECK=1
+ #CMT_SCHEDULE_HOST_DOWNTIME=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/do-not-fetch-rss.patch b/do-not-fetch-rss.patch
index f4da559..2997824 100644
--- a/do-not-fetch-rss.patch
+++ b/do-not-fetch-rss.patch
@@ -5,10 +5,10 @@ more reasonable)
--- nagios/html/main.php~ 2012-05-29 00:04:23.000000000 +0300
+++ nagios/html/main.php 2012-05-29 00:08:36.419474072 +0300
-@@ -22,6 +22,10 @@ $this_year = '2017';
- var vBoxId = "main";
- var vboxText = "<a href=https://www.nagios.com/tours target=_blank> " +
- "Click here to watch the entire Nagios Core 4 Tour!</a>";
+@@ -25,6 +25,10 @@ $this_year = '2018';
+ var vboxText = "<a href=https://www.nagios.com/tours target=_blank> " +
+ "Click here to watch the entire Nagios Core 4 Tour!</a>";
+ <?php } ?>
+<?php
+ $updateinfo=get_update_information();
+ if ($updateinfo['update_checks_enabled']!==false):
diff --git a/nagios-doc-usermacros.patch b/nagios-doc-usermacros.patch
deleted file mode 100644
index 5d6ef47..0000000
--- a/nagios-doc-usermacros.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Bring doc up to date:
-
-include/macros.h:
-#define MAX_COMMAND_ARGUMENTS 32 /* maximum number of $ARGx$ macros */
-#define MAX_USER_MACROS 256 /* maximum number of $USERx$ macros */
-
----
-Signed-Off-By: Elan Ruusamäe <glen at delfi.ee>
-
---- nagios-3.2.3/sample-config/resource.cfg.in 2003-09-12 02:57:51.000000000 +0300
-+++ nagios-3.2.3/sample-config/resource.cfg.in 2010-10-07 16:33:41.616639353 +0300
-@@ -15,7 +15,7 @@
- # The CGIs will not attempt to read the contents of resource files, so
- # you can set restrictive permissions (600 or 660) on them.
- #
--# Nagios supports up to 32 $USERx$ macros ($USER1$ through $USER32$)
-+# Nagios supports up to 256 $USERx$ macros ($USER1$ through $USER256$)
- #
- # Resource files may also be used to store configuration directives for
- # external data sources like MySQL...
diff --git a/nagios-webapps.patch b/nagios-webapps.patch
index 0af1479..6ea6355 100644
--- a/nagios-webapps.patch
+++ b/nagios-webapps.patch
@@ -1,11 +1,12 @@
--- nagios-2.0b4/include/locations.h.in~ 2003-08-15 04:34:10.000000000 +0300
+++ nagios-2.0b4/include/locations.h.in 2005-11-30 22:23:59.000000000 +0200
-@@ -32,7 +32,7 @@
+@@ -34,7 +34,7 @@
#define DEFAULT_URL_HTML_PATH "@htmurl@"
#define DEFAULT_PHYSICAL_CGIBIN_PATH "@sbindir@"
#define DEFAULT_URL_CGIBIN_PATH "@cgiurl@"
-#define DEFAULT_CGI_CONFIG_FILE "@sysconfdir@/cgi.cfg"
+#define DEFAULT_CGI_CONFIG_FILE "/etc/webapps/nagios/cgi.cfg"
- #define DEFAULT_LOCK_FILE "@lockfile@"
+ #define DEFAULT_LOCK_FILE "@subsyslockfile@"
#define DEFAULT_OBJECT_CACHE_FILE "@localstatedir@/objects.cache"
- #define DEFAULT_EVENT_BROKER_FILE "@localstatedir@/broker.socket"
+ #define DEFAULT_PRECACHED_OBJECT_FILE "@localstatedir@/objects.precache"
+
diff --git a/system-jquery.patch b/system-jquery.patch
index 102ba99..74fdf29 100644
--- a/system-jquery.patch
+++ b/system-jquery.patch
@@ -4,7 +4,7 @@
<title>Nagios Core</title>
<link rel="stylesheet" type="text/css" href="stylesheets/common.css?<?php echo $this_version; ?>" />
<link rel="stylesheet" type="text/css" href="stylesheets/nag_funcs.css?<?php echo $this_version; ?>" />
--<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
+-<script type="text/javascript" src="js/jquery-1.12.4.min.js"></script>
+<script type="text/javascript" src="/js/jquery/jquery.js"></script>
<script type="text/javascript" src="js/nag_funcs.js"></script>
@@ -15,7 +15,7 @@
#define NAGFUNCS_CSS "nag_funcs.css"
/********************************* JAVASCRIPT INCLUDES **********************/
--#define JQUERY_JS "jquery-1.7.1.min.js"
+-#define JQUERY_JS "jquery-1.12.4.min.js"
+#define JQUERY_JS "/js/jquery/jquery.js"
#define NAGFUNCS_JS "nag_funcs.js"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios.git/commitdiff/667f63042cd5ebf41cf44f4e79e98e9775aa325d
More information about the pld-cvs-commit
mailing list