commit 3199e473c89643d09933be0d2b00626896b08cdb
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Wed Jun 1 13:39:54 2022 +0200
Rel 2; apply epl patch for more privacy
do-not-fetch-rss.patch | 12 ++++++------
nagios.spec | 4 +++-
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/nagios.spec b/nagios.spec
index 4defe18..08e56a9 100644
--- 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
diff --git a/do-not-fetch-rss.patch b/do-not-fetch-rss.patch
index 404c13b..92fb3d0 100644
--- 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>'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios.git/commitdiff/3199e473c89643d09933be0d2b00626896b08cdb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
