- up to 4.3.3

diff --git a/config.patch b/config.patch
index 9abd4e49ca3329c6400ce98040434fbaa80e96e9..d9bcaa306ac6719932fc72b922263b630d994b16 100644 (file)
--- 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
  
  
  
  
  
  

-@@ -402,3 +402,5 @@
+@@ -394,3 +394,5 @@ navbar_search_for_aliases=1
+ # Set to 1 to show only HARD states. Defaults to 0 (HARD+SOFT).

  
  

- #ack_no_sticky=0
- #ack_no_send=0
+ #tac_cgi_hard_only=0

 +
 +# vim:ts=8:sw=8:ft=cfg
 --- nagios.org/sample-config/nagios.cfg.in     2013-09-20 21:01:20.000000000 +0200
 +
 +# 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 87927452956913a1e3683d03ece025dfc96beffa..f4da5590fb370ef81b896133f64bfb22a2f6c4c2 100644 (file)
--- a/do-not-fetch-rss.patch
+++ b/do-not-fetch-rss.patch
@@ -5,19 +5,17 @@ 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
 
 --- nagios/html/main.php~      2012-05-29 00:04:23.000000000 +0300
 +++ nagios/html/main.php       2012-05-29 00:08:36.419474072 +0300

-@@ -14,8 +14,11 @@ $this_year = '2014';
- <title>Nagios Core</title>
- <link rel="stylesheet" type="text/css" href="stylesheets/common.css?<?php echo $this_version; ?>" />
- <script type="text/javascript" src="/js/jquery/jquery.js"></script>
--
- <script type='text/javascript'>
+@@ -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>";

 +<?php
 +      $updateinfo=get_update_information();
 +      if ($updateinfo['update_checks_enabled']!==false):
 +?>
        $(document).ready(function() {
 +<?php
 +      $updateinfo=get_update_information();
 +      if ($updateinfo['update_checks_enabled']!==false):
 +?>
        $(document).ready(function() {

-               loadRemoteFeed( // Our top banner splash.
-                       '#splashbox0-contents', 'corebanner', 1,
+               var user = "<?php echo $_SERVER['REMOTE_USER']; ?>";
+ 

 @@ -31,7 +34,9 @@ $this_year = '2014';
                        '#splashbox5-contents', 'corepromo', 3,
                        '<ul>', processPromoItem, '</ul>'
 @@ -31,7 +34,9 @@ $this_year = '2014';
                        '#splashbox5-contents', 'corepromo', 3,
                        '<ul>', processPromoItem, '</ul>'

diff --git a/nagios.spec b/nagios.spec
index 05c3bb5431c9ec6c83cef3bdedf0a3cd4aca56b7..19b21aa3166b4517f48bf191e7a54941b0b63a8b 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
 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.2.4
+Version:       4.3.3

 Release:       1
 License:       GPL v2+
 Group:         Networking
 Source0:       https://assets.nagios.com/downloads/nagioscore/releases/%{name}-%{version}.tar.gz
 Release:       1
 License:       GPL v2+
 Group:         Networking
 Source0:       https://assets.nagios.com/downloads/nagioscore/releases/%{name}-%{version}.tar.gz

-# Source0-md5: 02a4d396eb3efe689e19b0405be00ad4
+# Source0-md5: b733310c87b8eb6ce0f7a5768829c94c

 Source1:       %{name}-apache.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source1:       %{name}-apache.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig

diff --git a/system-jquery.patch b/system-jquery.patch
index 9dcf29589f6948048f2d57d4aae04b4aca8ba79d..102ba99790158416a3b7fb5515a696dfdc172615 100644 (file)
--- a/system-jquery.patch
+++ b/system-jquery.patch
@@ -1,36 +1,36 @@
 --- nagios-3.4.1/html/main.php~        2012-05-12 03:00:53.000000000 +0300
 +++ nagios-3.4.1/html/main.php 2012-05-28 23:55:54.310721306 +0300
 --- nagios-3.4.1/html/main.php~        2012-05-12 03:00:53.000000000 +0300
 +++ nagios-3.4.1/html/main.php 2012-05-28 23:55:54.310721306 +0300

-@@ -13,7 +13,7 @@ $this_year = '2014';
- <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+@@ -14,7 +14,7 @@ $this_year = '2017';

  <title>Nagios Core</title>
  <link rel="stylesheet" type="text/css" href="stylesheets/common.css?<?php echo $this_version; ?>" />
  <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/jquery.js"></script>
 -<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
 +<script type="text/javascript" src="/js/jquery/jquery.js"></script>

+ <script type="text/javascript" src="js/nag_funcs.js"></script>

  
  <script type='text/javascript'>
  
  <script type='text/javascript'>

-       $(document).ready(function() {

 --- nagios-3.4.1/include/cgiutils.h~   2012-05-24 17:15:30.000000000 +0300
 +++ nagios-3.4.1/include/cgiutils.h    2012-05-28 23:56:18.921757228 +0300
 --- nagios-3.4.1/include/cgiutils.h~   2012-05-24 17:15:30.000000000 +0300
 +++ nagios-3.4.1/include/cgiutils.h    2012-05-28 23:56:18.921757228 +0300

-@@ -77,7 +77,7 @@
- #define SUMMARY_CSS             "summary.css"
+@@ -93,7 +93,7 @@ NAGIOS_BEGIN_DECL
+ #define NAGFUNCS_CSS       "nag_funcs.css"

  
        /********************************* JAVASCRIPT INCLUDES **********************/
  
        /********************************* JAVASCRIPT INCLUDES **********************/

--#define JQUERY_JS             "jquery-1.7.1.min.js"
-+#define JQUERY_JS             "/js/jquery/jquery.js"
+-#define JQUERY_JS          "jquery-1.7.1.min.js"
++#define JQUERY_JS          "/js/jquery/jquery.js"
+ #define NAGFUNCS_JS        "nag_funcs.js"

  
        /********************************* ICONS ************************************/
  
        /********************************* ICONS ************************************/

- 

 --- nagios-3.4.1/cgi/status.c~ 2012-05-24 17:15:30.000000000 +0300
 +++ nagios-3.4.1/cgi/status.c  2012-05-28 23:57:04.933694000 +0300
 --- nagios-3.4.1/cgi/status.c~ 2012-05-24 17:15:30.000000000 +0300
 +++ nagios-3.4.1/cgi/status.c  2012-05-28 23:57:04.933694000 +0300

-@@ -525,7 +525,7 @@
+@@ -531,7 +531,7 @@ void document_header(int use_stylesheet)

                }
  
        /* added jquery library 1/31/2012 */
                }
  
        /* added jquery library 1/31/2012 */

--      printf("<script type='text/javascript' src='%s%s'></script>\n",url_js_path, JQUERY_JS);
+-      printf("<script type='text/javascript' src='%s%s'></script>\n", url_js_path, JQUERY_JS);

 +      printf("<script type='text/javascript' src='%s'></script>\n",JQUERY_JS);
 +      printf("<script type='text/javascript' src='%s'></script>\n",JQUERY_JS);

+       printf("<script type='text/javascript' src='%s%s'></script>\n", url_js_path, NAGFUNCS_JS);

        /* JS function to append content to elements on page */
        printf("<script type='text/javascript'>\n");
        /* JS function to append content to elements on page */
        printf("<script type='text/javascript'>\n");

-       printf("$(document).ready(function() { $('#top_page_numbers').append($('#bottom_page_numbers').html() ); });");

 --- nagios-3.4.1/html/Makefile.in~     2012-05-28 23:52:30.000000000 +0300
 +++ nagios-3.4.1/html/Makefile.in      2012-05-28 23:59:43.973722231 +0300
 @@ -61,8 +61,6 @@
 --- nagios-3.4.1/html/Makefile.in~     2012-05-28 23:52:30.000000000 +0300
 +++ nagios-3.4.1/html/Makefile.in      2012-05-28 23:59:43.973722231 +0300
 @@ -61,8 +61,6 @@