Rel 2; apply epl patch for more privacy

diff --git a/do-not-fetch-rss.patch b/do-not-fetch-rss.patch
index 404c13b7a45dd6997d02a1a14310b4648b787285..92fb3d0c6527a52c1dab2a5390a08788f5b5d7eb 100644 (file)
--- a/do-not-fetch-rss.patch
+++ b/do-not-fetch-rss.patch
@@ -6,17 +6,17 @@ more reasonable)
 diff -urNp -x '*.orig' nagios-4.4.6.org/html/main.php nagios-4.4.6/html/main.php
 --- nagios-4.4.6.org/html/main.php     2021-04-19 12:04:15.360473328 +0200
 +++ nagios-4.4.6/html/main.php 2021-04-19 12:04:15.620481061 +0200
-@@ -25,6 +25,10 @@ $this_year = '2020';
-               var vboxText = "<a href=https://www.nagios.com/tours target=_blank> " +
-                                               "Click here to watch the entire Nagios Core 4 Tour!</a>";
-       <?php } ?>
+@@ -19,6 +19,10 @@ $this_year = '2022';
+ 
+ <script type='text/javascript'>
+       var cookie;
 +<?php
 +      $updateinfo=get_update_information();
 +      if ($updateinfo['update_checks_enabled']!==false):
 +?>
        $(document).ready(function() {
-               var user = "<?php echo htmlspecialchars($_SERVER['REMOTE_USER']); ?>";
- 
+               loadRemoteFeed( // Our top banner splash.
+                       '#splashbox0-contents', 'corebanner', 1,
 @@ -47,7 +51,9 @@ $this_year = '2020';
                        '#splashbox5-contents', 'corepromo', 3,
                        '<ul>', processPromoItem, '</ul>'

diff --git a/nagios.spec b/nagios.spec
index 4defe18b0b37a48f122883010e70cd8a868ce8df..08e56a90456343aff196ca3d445e764815cd2cfd 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -13,7 +13,7 @@ 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.4.7
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Networking
 # https://www.nagios.org/downloads/nagios-core/thanks/?product_download=nagioscore-source
@@ -247,6 +247,8 @@ mv %{name}-%{version}/* .
 
 #%patch100 -p1
 
+patch -p1 < ./contrib/epel-patches/nagios-0010-remove-information-leak.patch || exit 1
+
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1