[packages/nagios] Up to 4.5.9
arekm
arekm at pld-linux.org
Tue Mar 18 12:45:09 CET 2025
commit bd4abc30726e0caa5029188968ca72ed7b652d5c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Mar 18 11:49:09 2025 +0100
Up to 4.5.9
nagios-googlemap.patch | 11 ++++------
nagios.spec | 26 +++++++++++-----------
remove-information-leak.patch | 50 ++++---------------------------------------
3 files changed, 21 insertions(+), 66 deletions(-)
---
diff --git a/nagios.spec b/nagios.spec
index 75aebe0..966a325 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.5.3
-Release: 5
+Version: 4.5.9
+Release: 1
License: GPL v2+
Group: Networking
# https://www.nagios.org/downloads/nagios-core/thanks/?product_download=nagioscore-source
Source0: https://assets.nagios.com/downloads/nagioscore/releases/%{name}-%{version}.tar.gz
-# Source0-md5: b77fd2fb656245dd0097c8e7b1310d3e
+# Source0-md5: dea21ad245e301fb05d3e8408499e001
Source1: %{name}-apache.conf
Source2: %{name}.init
Source3: %{name}.sysconfig
@@ -253,18 +253,18 @@ mv %{name}-%{version}/* .
#%patch100 -p1
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P0 -p0
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
#fixed
-#%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+#%%patch -P4 -p1
+%patch -P5 -p1
+%patch -P6 -p1
+%patch -P7 -p1
+%patch -P8 -p1
-%patch10 -p1
+%patch -P10 -p1
find -name .cvsignore -o -name .gitignore | xargs rm
diff --git a/nagios-googlemap.patch b/nagios-googlemap.patch
index 9ee880f..f8165b4 100644
--- a/nagios-googlemap.patch
+++ b/nagios-googlemap.patch
@@ -82,18 +82,15 @@ diff -urNp -x '*.orig' nagios-4.4.6.org/cgi/statusmap.c nagios-4.4.6/cgi/statusm
printf("<body CLASS='statusmap' name='mappage' id='mappage'>\n");
/* include user SSI header */
-@@ -718,9 +745,9 @@ void display_page_header(void) {
+@@ -728,7 +728,7 @@ void display_page_header(void) {
+ /* right hand column of top row */
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);
- #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("<form name=\"layoutform\" method=\"POST\" action=\"%s\">\n", STATUSMAP_CGI);
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));
@@ -743,6 +770,7 @@ void display_page_header(void) {
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/remove-information-leak.patch b/remove-information-leak.patch
index d9b9633..95c13cd 100644
--- a/remove-information-leak.patch
+++ b/remove-information-leak.patch
@@ -89,7 +89,7 @@ diff -ur nagios-4.5.3.org/cgi/tac.c nagios-4.5.3/cgi/tac.c
diff -ur nagios-4.5.3.org/html/main.php nagios-4.5.3/html/main.php
--- nagios-4.5.3.org/html/main.php 2024-06-11 16:50:20.000000000 +0200
+++ nagios-4.5.3/html/main.php 2024-08-01 12:21:25.903304305 +0200
-@@ -19,35 +19,7 @@
+@@ -23,21 +23,7 @@ if ($theme != 'dark' && $theme != 'light
<script type='text/javascript'>
var cookie;
@@ -100,60 +100,18 @@ diff -ur nagios-4.5.3.org/html/main.php nagios-4.5.3/html/main.php
- "Click here to watch the entire Nagios Core 4 Tour!</a>";
- <?php } ?>
$(document).ready(function() {
-- var user = "<?php echo htmlspecialchars($_SERVER['REMOTE_USER']); ?>";
+- var user = "<?php echo htmlspecialchars($_SERVER['REMOTE_USER'] ?? ''); ?>";
-
- <?php if ($cfg["enable_page_tour"]) { ?>
- vBoxId += ";" + user;
- vbox = new vidbox({pos:'lr',vidurl:'https://www.youtube.com/embed/2hVBAet-XpY',
- text:vboxText,vidid:vBoxId});
- <?php } ?>
-- loadRemoteFeed( // Our top banner splash.
-- '#splashbox0-contents', 'corebanner', 1,
-- '', processBannerItem, ''
-- );
--
-- loadRemoteFeed( // "Latest News"
-- '#splashbox4-contents', 'frontpage', 3,
-- '<ul>', processNewsItem, '<li><a href="https://www.nagios.org/news" target="_blank">More news...</a></li></ul>'
-- );
--
-- loadRemoteFeed( // "Don't Miss..."
-- '#splashbox5-contents', 'corepromo', 3,
-- '<ul>', processPromoItem, '</ul>'
-- );
-
getCoreStatus();
});
-@@ -59,7 +31,6 @@
- crossDomain: true,
- success: function(d, status, jqXHR) {
- // We should have Internet access, set the playlist HTML.
-- initializePlaylist();
-
- var text = ''; // Start with empty text by default.
-
-@@ -94,19 +65,6 @@
- : '';
- }
-
--
-- // Set our playlist HTML when we know we have Internet access.
-- var playlistInitialized = false;
-- function initializePlaylist() {
-- if (!playlistInitialized) {
-- playlistInitialized = true;
-- $('#splashbox3')
-- .addClass('splashbox3-full')
-- .removeClass('splashbox3-empty')
-- .html('<iframe width="100%" height="100%" src="//www.youtube.com/embed/videoseries?list=PLN-ryIrpC_mCUW1DFwZpxpAk00i60lSkE&iv_load_policy=3&rel=0" frameborder="0" allowfullscreen></iframe>');
-- }
-- }
--
- // Get the daemon status JSON.
- function getCoreStatus() {
- setCoreStatusHTML('passiveonly', 'Checking process status...');
-@@ -152,12 +110,11 @@
+@@ -81,12 +67,11 @@ if ($theme != 'dark' && $theme != 'light
<div id="updateversioninfo">
<?php
@@ -167,4 +125,4 @@ diff -ur nagios-4.5.3.org/html/main.php nagios-4.5.3/html/main.php
+ <div class="submessage">Disabling update checks presents a possible security risk. Visit <a href="https://www.nagios.org/" target="_blank">nagios.org</a> to check for updates manually.</a></div>
</div>
<?php
- } else if (
+ } else if ($updateinfo['update_available'] && $this_version < $updateinfo['update_version']) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios.git/commitdiff/bd4abc30726e0caa5029188968ca72ed7b652d5c
More information about the pld-cvs-commit
mailing list