[packages/nagios] Up to 4.5.3

Thu Aug 1 12:03:03 CEST 2024

commit e0100dea56ed3383f2d30700d798afdc015da983
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Aug 1 11:01:36 2024 +0200

    Up to 4.5.3

 config.patch        | 28 ++++++++++++++++++----------
 nagios.spec         | 41 +++++++++++++----------------------------
 system-jquery.patch | 21 ++++++++++++++++-----
 3 files changed, 47 insertions(+), 43 deletions(-)
---

diff --git a/nagios.spec b/nagios.spec
index 039878c..b18f474 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.4.14
+Version:	4.5.3
 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:	90187ec0cb2eeace142680e3918cc44d
+# Source0-md5:	b77fd2fb656245dd0097c8e7b1310d3e
 Source1:	%{name}-apache.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -42,7 +42,8 @@ Patch3:		long-output.patch
 Patch4:		%{name}-cmd-typo.patch
 Patch5:		config.patch
 Patch6:		%{name}-googlemap.patch
-
+# rediffed and fixed contrib/epel-patches/nagios-0010-remove-information-leak.patch
+Patch7:		remove-information-leak.patch
 Patch8:		archivelog-timeformat.patch
 
 Patch10:	system-jquery.patch
@@ -152,7 +153,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-imagepaks
 Requires:	%{name}-theme
 Requires:	group(http)
-Requires:	jquery
+Requires:	jquery >= 3.7.1
 Requires:	webapps
 Requires:	webserver
 Requires:	webserver(access)
@@ -211,6 +212,8 @@ Requires:	nagios-theme
 Suggests:	nagios-theme-classicui
 Suggests:	nagios-theme-exfoliation
 Suggests:	nagios-theme-nuvola
+Conflicts:	nagios-theme-classicui < %{version}-%{release}
+Conflicts:	nagios-theme-exfoliation < %{version}-%{release}
 Obsoletes:	nagios-theme-default < 3.3.1-1.4
 BuildArch:	noarch
 
@@ -247,8 +250,6 @@ mv %{name}-%{version}/* .
 
 #%patch100 -p1
 
-patch -p1 < ./contrib/epel-patches/nagios-0010-remove-information-leak.patch || exit 1
-
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
@@ -257,7 +258,7 @@ patch -p1 < ./contrib/epel-patches/nagios-0010-remove-information-leak.patch ||
 #%patch4 -p1
 %patch5 -p1
 %patch6 -p1
-
+%patch7 -p1
 %patch8 -p1
 
 %patch10 -p1
@@ -381,6 +382,8 @@ done
 install -d $RPM_BUILD_ROOT%{_docdir}/%{name}
 %{?with_doc:%{__cp} -a Documentation/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}}
 
+rm $RPM_BUILD_ROOT%{htmldir}/js/jquery-*.min.js
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -560,6 +563,7 @@ EOF
 %dir %{htmldir}
 %dir %{htmldir}/includes
 %dir %{htmldir}/images
+%dir %{htmldir}/js
 %dir %{htmldir}/stylesheets
 %{htmldir}/robots.txt
 %{htmldir}/contexthelp
@@ -569,29 +573,10 @@ EOF
 %{htmldir}/images/favicon.ico
 %{htmldir}/images/marker.png
 %{htmldir}/images/shadow50.png
+%{htmldir}/js/jsonquery.js
+%{htmldir}/js/nag_funcs.js
 %{htmldir}/nagioswall.php
 
-%{htmldir}/angularjs
-%{htmldir}/bootstrap-3.3.7
-%{htmldir}/d3
-%{htmldir}/spin
-%{htmldir}/graph-header.html
-%{htmldir}/histogram-form.html
-%{htmldir}/histogram-graph.html
-%{htmldir}/histogram-links.html
-%{htmldir}/histogram.html
-%{htmldir}/infobox.html
-%{htmldir}/map-directive.html
-%{htmldir}/map-form.html
-%{htmldir}/map-links.html
-%{htmldir}/map-popup.html
-%{htmldir}/trends-form.html
-%{htmldir}/trends-graph.html
-%{htmldir}/trends-host-yaxis.html
-%{htmldir}/trends-links.html
-%{htmldir}/trends-service-yaxis.html
-%{htmldir}/trends.html
-
 %files theme-classicui
 %defattr(644,root,root,755)
 %exclude %{htmldir}/nagioswall.php
diff --git a/config.patch b/config.patch
index 555d318..8018422 100644
--- a/config.patch
+++ b/config.patch
@@ -1,18 +1,26 @@
-diff -urNp -x '*.orig' nagios-4.4.6.org/Makefile.in nagios-4.4.6/Makefile.in
---- nagios-4.4.6.org/Makefile.in	2020-04-28 22:48:29.000000000 +0200
-+++ nagios-4.4.6/Makefile.in	2021-04-19 12:03:30.865816616 +0200
-@@ -276,14 +276,14 @@ install:
- 	cd $(SRC_BASE) && $(MAKE) $@
- 	cd $(SRC_CGI) && $(MAKE) $@
- 	cd $(SRC_HTM) && $(MAKE) $@
+--- nagios-4.5.3/Makefile.in~	2024-06-11 16:50:20.000000000 +0200
++++ nagios-4.5.3/Makefile.in	2024-08-01 10:46:49.579971168 +0200
+@@ -275,7 +275,7 @@ coverage: test
+ 
+ install-html:
+ 	cd $(BLD_HTM) && $(MAKE) install
+-	$(MAKE) install-exfoliation
++	$(MAKE) install-classicui
+ 
+ install-base:
+ 	cd $(BLD_BASE) && $(MAKE) install
+@@ -287,14 +287,14 @@ install:
+ 	cd $(BLD_BASE) && $(MAKE) $@
+ 	cd $(BLD_CGI) && $(MAKE) $@
+ 	cd $(BLD_HTM) && $(MAKE) $@
 -	$(MAKE) install-exfoliation
 +	$(MAKE) install-classicui
  	$(MAKE) install-basic
  
  install-unstripped:
- 	cd $(SRC_BASE) && $(MAKE) $@
- 	cd $(SRC_CGI) && $(MAKE) $@
- 	cd $(SRC_HTM) && $(MAKE) $@
+ 	cd $(BLD_BASE) && $(MAKE) $@
+ 	cd $(BLD_CGI) && $(MAKE) $@
+ 	cd $(BLD_HTM) && $(MAKE) $@
 -	$(MAKE) install-exfoliation
 +	$(MAKE) install-classicui
  	$(MAKE) install-basic
diff --git a/system-jquery.patch b/system-jquery.patch
index 74fdf29..dff7516 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.12.4.min.js"></script>
+-<script type="text/javascript" src="js/jquery-3.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>
  
@@ -15,7 +15,7 @@
  #define NAGFUNCS_CSS       "nag_funcs.css"
  
  	/********************************* JAVASCRIPT INCLUDES **********************/
--#define JQUERY_JS          "jquery-1.12.4.min.js"
+-#define JQUERY_JS          "jquery-3.7.1.min.js"
 +#define JQUERY_JS          "/js/jquery/jquery.js"
  #define NAGFUNCS_JS        "nag_funcs.js"
  
@@ -31,13 +31,24 @@
  	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");
+--- nagios-4.5.3/html/jsonquery.html~	2024-06-11 16:50:20.000000000 +0200
++++ nagios-4.5.3/html/jsonquery.html	2024-08-01 10:44:22.443304502 +0200
+@@ -4,7 +4,7 @@
+ 	<head>
+ 		<title>JSON Query Generator</title>
+ 		<link rel="stylesheet" type="text/css" href="stylesheets/jsonquery.css"/>
+-		<script type="text/javascript" src="js/jquery-3.7.1.min.js"></script>
++		<script type="text/javascript" src="js/jquery/jquery.js"></script>
+ 		<script type="text/javascript" src="js/jsonquery.js"></script>
+ 	</head>
+ 	<body>
 --- 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 @@
+@@ -106,8 +106,6 @@ install:
  	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
- 	for file in contexthelp/*.html; \
+ 	for file in $(srcdir)/contexthelp/*.html; \
  	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
--	for file in js/*.js; \
+-	for file in $(srcdir)/js/*.js; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
  #	for file in docs/*.html; \
  #	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios.git/commitdiff/e0100dea56ed3383f2d30700d798afdc015da983

