.gitignore

@@ -17,9 +17,3 @@ nagios-3.2.1.tar.gz
 /nagioscore-nagios-4.4.3.tar.gz
 /nagioscore-nagios-4.4.5.tar.gz
 /nagioscore-nagios-4.4.6.tar.gz
-/nagioscore-nagios-4.4.7.tar.gz
-/nagioscore-nagios-4.4.8.tar.gz
-/nagioscore-nagios-4.4.9.tar.gz
-/nagioscore-nagios-4.4.10.tar.gz
-/nagioscore-nagios-4.4.14.tar.gz
-/nagioscore-nagios-4.5.9.tar.gz

nagios-0010-remove-information-leak.patch

@@ -32,7 +32,7 @@ diff -up ./cgi/extinfo.c.remove_3rdparty_links ./cgi/extinfo.c
 diff -up ./cgi/status.c.remove_3rdparty_links ./cgi/status.c
 --- ./cgi/status.c.remove_3rdparty_links	2019-08-20 15:29:34.000000000 +0000
 +++ ./cgi/status.c	2019-08-29 18:17:32.322544264 +0000
-@@ -556,31 +556,8 @@ void document_header(int use_stylesheet)
+@@ -555,31 +555,8 @@ void document_header(int use_stylesheet)
  	/* JS function to append content to elements on page */
  	printf("<script type='text/javascript'>\n");
  	if (enable_page_tour == TRUE) {
@@ -86,11 +86,10 @@ diff -up ./cgi/tac.c.remove_3rdparty_links ./cgi/tac.c
  
  
  
-diff --git a/html/main.php b/html/main.php
-index 15713f8d..91cb1266 100644
---- a/html/main.php
-+++ b/html/main.php
-@@ -23,21 +23,7 @@ if ($theme != 'dark' && $theme != 'light') {
+diff -up ./html/main.php.remove_3rdparty_links ./html/main.php
+--- ./html/main.php.remove_3rdparty_links	2019-08-20 15:29:34.000000000 +0000
++++ ./html/main.php	2019-08-29 18:20:16.216716704 +0000
+@@ -19,20 +19,7 @@ $this_year = '2019';
  
  <script type='text/javascript'>
  	var cookie;
@@ -101,14 +100,67 @@ index 15713f8d..91cb1266 100644
 -						"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 } ?>
--
- 		getCoreStatus();
- 	});
+ 		loadRemoteFeed( // Our top banner splash.
+ 			'#splashbox0-contents', 'corebanner', 1,
+ 			'', processBannerItem, ''
+@@ -59,7 +46,6 @@ $this_year = '2019';
+ 			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 +80,6 @@ $this_year = '2019';
+ 			: '';
+ 	}
+ 
+-
+-	// 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...');
+diff -up ./html/map.php.remove_3rdparty_links ./html/map.php
+--- ./html/map.php.remove_3rdparty_links	2019-08-29 18:17:32.324544303 +0000
++++ ./html/map.php	2019-08-29 18:20:48.488341376 +0000
+@@ -71,22 +71,6 @@
+ 		<script type="text/javascript" src="js/jquery-1.12.4.min.js"></script>
+ 		<script type="text/javascript" src="js/nag_funcs.js"></script>
+ 
+-		<?php if ($cfg["enable_page_tour"]) { ?>
+-			<script type='text/javascript'>
+-				var vbox;
+-				var vBoxId = "map";
+-				var vboxText = "<a href=https://www.nagios.com/tours target=_blank>" +
+-							"Click here to watch the entire Nagios Core 4 Tour!</a>";
+-				$(document).ready(function() {
+-					var user = "<?php echo htmlspecialchars($_SERVER['REMOTE_USER']); ?>";
+-
+-					vBoxId += ";" + user;
+-					vbox = new vidbox({pos:'lr',vidurl:'https://www.youtube.com/embed/leaRdb3BElI',
+-										text:vboxText,vidid:vBoxId});
+-				});
+-			</script>
+-		<?php } ?>
+-
+ 	</head>
+ 	<body ng-controller="mapCtrl" <?php echo $img; ?>>
+ 		<div id="image-cache" style="display: none;"></div>

nagios-0011-remove-rpmbuild.patch

@@ -8,7 +8,7 @@ index 72e4d4a9..62415152 100644
  	$(CC) $(CFLAGS) $(LDFLAGS) $< $(CGI_O) -o $@
 -
 -##############################################################################
--# making similar EPEL rpm for Fedora/RHEL/CentOS 
+-# making similiar EPEL rpm for Fedora/RHEL/CentOS 
 -
 -ifneq ("$(wildcard /etc/redhat-release)","")
 -

nagios.spec

@@ -1,17 +1,16 @@
-# Set %%bcond_without bootstrap to build without depending on plugins for localhost monitoring
-%bcond_with bootstrap
+# Set bootstrap = 1 to build without depending on plugins for localhost monitoring
+%global bootstrap 0
 
 %global with_selinux 1
 %global selinuxtype targeted
 
 Name:           nagios
-Version:        4.5.9
-Release:        2%{?dist}
+Version:        4.4.6
+Release:        6%{?dist}
 
 Summary: Host/service/network monitoring program
 
-# Automatically converted from old format: GPLv2 - review is highly recommended.
-License:        GPL-2.0-only
+License:        GPLv2
 URL:            https://www.nagios.org/projects/nagios-core/
 Source0:        https://github.com/NagiosEnterprises/nagioscore/archive/nagios-%{version}.tar.gz#/nagioscore-nagios-%{version}.tar.gz
 Source1: nagios.logrotate
@@ -46,6 +45,7 @@ Patch11: nagios-0011-remove-rpmbuild.patch
 Patch12: nagios-0012-fix-spool.patch
 Patch13: nagios-0013-fix-plugin.patch
 Patch14: nagios-0014-fix-uidgid.patch
+Patch15: %{name}-0015-Changelog.patch
 
 BuildRequires:  make
 BuildRequires:  doxygen
@@ -65,7 +65,6 @@ BuildRequires:  perl(Test::HTML::Lint)
 %endif
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Simple)
-BuildRequires:  openssl-devel
 
 # For up-to-date config.sub and config.guess
 BuildRequires:  libtool
@@ -73,15 +72,21 @@ BuildRequires:  libtool
 # For selinux tools
 BuildRequires: checkpolicy, selinux-policy-devel
 
+%if 0%{?rhel} > 6 || 0%{?fedora} > 20
+# For necessary macros
+BuildRequires:  systemd
+%endif
+
 Requires:       httpd
 Requires:       php
-Requires:       %{_bindir}/mail
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       mailx
 Requires:       nagios-common
 Requires:       user(nagios)
 Requires:       group(nagios)
 
 # This plugins are required for localhost monitoring
-%if %{without bootstrap}
+%if ! 0%{?bootstrap}
 Requires:       nagios-plugins-ping
 Requires:       nagios-plugins-load
 Requires:       nagios-plugins-users
@@ -126,6 +131,7 @@ files for Nagios. Development files are built as a separate package.
 
 %package common
 Summary:        Provides common directories, uid and gid among nagios-related packages
+Requires(pre):  shadow-utils
 Requires(post): shadow-utils
 Provides:       user(nagios)
 Provides:       group(nagios)
@@ -184,11 +190,6 @@ Various contributed items used by plugins and other tools.
 
 install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} html/images/logos/
 
-# Create a sysusers.d config file
-cat >nagios.sysusers.conf <<EOF
-u nagios - - %{_localstatedir}/spool/%{name} -
-EOF
-
 
 %build
 %configure \
@@ -223,7 +224,6 @@ EOF
     --with-template-objects \
     --with-template-extinfo \
     --enable-event-broker \
-    --disable-static \
     STRIP=/bin/true
 
 %make_build all
@@ -259,9 +259,7 @@ bzip2 -9 %{name}.pp
 
 # relocated to sbin (Fedora-specific)
 install -d -m 0755 %{buildroot}%{_bindir}
-%if 0%{?fedora} < 42 && 0%{?rhel} < 11
 mv %{buildroot}%{_sbindir}/nagiostats %{buildroot}%{_bindir}/nagiostats
-%endif
 
 install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/private
 mv %{buildroot}%{_sysconfdir}/%{name}/resource.cfg %{buildroot}%{_sysconfdir}/%{name}/private/resource.cfg
@@ -279,16 +277,16 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name}/plugins/eventhandlers
 install -d -m 0755 %{buildroot}%{_libdir}/%{name}/plugins/eventhandlers/distributed-monitoring/
 install -d -m 0755 %{buildroot}%{_libdir}/%{name}/plugins/eventhandlers/redundancy-scenario1/
 
-install -d -m 0755 %{buildroot}%{_localstatedir}/spool/%{name}/cmd
-install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0775 %{buildroot}%{_localstatedir}/spool/%{name}/cmd
+install -d -m 0775 %{buildroot}%{_localstatedir}/run/%{name}
 
 # Make a run directory
-install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0775 %{buildroot}%{_localstatedir}/run/%{name}
 
 # Make logdirs
-install -d -m 0755 %{buildroot}/%{_localstatedir}/log/
-install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/
-install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
+install -d -m 0775 %{buildroot}/%{_localstatedir}/log/
+install -d -m 0775 %{buildroot}/%{_localstatedir}/log/%{name}/
+install -d -m 0775 %{buildroot}/%{_localstatedir}/log/%{name}/archives
 
 # Use systemd unit on rhel7 or any supported Fedora
 %if 0%{?rhel} > 6 || 0%{?fedora} > 20
@@ -303,17 +301,15 @@ chmod -x %{buildroot}%{_unitdir}/%{name}.service
 %endif
 
 # Fix permissions - FIXME remove this when unneeded
-chmod 755 %{buildroot}%{_sbindir}/nagios %{buildroot}%{_bindir}/nagiostats
+chmod 755 %{buildroot}%{_sbindir}/nagios
 
 # Install documentation
 install -d -m 0755 %{buildroot}%{_datadir}/nagios/html/docs
-%{__cp} -r Documentation/html/* %{buildroot}%{_datadir}/nagios/html/docs
+%{__cp} -a Documentation/html/* %{buildroot}%{_datadir}/nagios/html/docs
 
 %if 0%{?with_selinux}
 install -pm 0644 %{SOURCE13} README.SELinux.rst
 install -D -m 0644 %{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
-install -D -p -m 0644 selinux/%{name}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if
-
 %endif
 
 ### CONTRIB ITEMS TAKEN FROM UPSTREAM NAGIOS SPEC
@@ -331,11 +327,10 @@ install -p -m 644 contrib/eventhandlers/redundancy-scenario1/handle-master-proc-
 
 %{__mv} contrib/README contrib/README.contrib
 
-# Fix permissions #2275532
-chmod -R g-w %{buildroot}%{_datadir}/%{name} %{buildroot}%{_libdir}/%{name} %{buildroot}%{_sysconfdir} %{buildroot}%{_sbindir}
-
-install -m0644 -D nagios.sysusers.conf %{buildroot}%{_sysusersdir}/nagios.conf
-
+%pre common
+getent group nagios >/dev/null || groupadd -r nagios
+getent passwd nagios >/dev/null || useradd -r -g nagios -d %{_localstatedir}/spool/%{name} -s /sbin/nologin nagios
+exit 0
 
 
 %post
@@ -423,11 +418,9 @@ fi
 %license LICENSE
 %{_datadir}/%{name}/html/[^cd]*
 %{_datadir}/%{name}/html/contexthelp/
+%{_datadir}/%{name}/html/d3/
 
-%if 0%{?fedora} < 42 && 0%{?rhel} < 11
 %{_sbindir}/*
-%endif
-
 %{_bindir}/*
 %{_libdir}/%{name}/cgi-bin/*cgi
 %if 0%{?rhel} > 6 || 0%{?fedora} > 20
@@ -446,11 +439,11 @@ fi
 %attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/passwd
 %attr(0640,root,apache) %config(noreplace) %{_datadir}/%{name}/html/config.inc.php
-%attr(2755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
+%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
 %attr(0750,nagios,nagios) %dir %{_localstatedir}/run/%{name}
 %attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name}
 %attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives
-%attr(0750,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/checkresults
+%attr(0770,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/checkresults
 
 %files common
 %dir %{_sysconfdir}/%{name}
@@ -458,7 +451,6 @@ fi
 %attr(0755,root,root) %dir %{_libdir}/%{name}/plugins
 %attr(0755,root,root) %dir %{_libdir}/%{name}/plugins/eventhandlers/
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
-%{_sysusersdir}/nagios.conf
 
 
 %files devel
@@ -469,8 +461,7 @@ fi
 %files selinux
 %doc README.SELinux.rst
 %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.*
-%{_datadir}/selinux/devel/include/distributed/%{name}.if
-%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
+%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
 %endif
 
 
@@ -480,70 +471,6 @@ fi
 %{_libdir}/%{name}/cgi/
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue May 13 2025 Guido Aulisi <guido.aulisi@inps.it> - 4.5.9-1
-- Update to 4.5.9
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.14-8
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.14-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 4.4.14-6
-- convert license to SPDX
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.14-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Apr 27 2024 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.14-4
-- Fix permissions (#2275532)
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.14-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Aug 16 2023 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.14-1
-- Update to 4.4.14
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Feb 13 2023 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.10-1
-- Update to 4.4.10
-- Fix nagiostats permissions #2169033
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Dec 10 2022 Florian Weimer <fweimer@redhat.com> - 4.4.9-2
-- Port configure script to C99
-
-* Thu Nov 17 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.9-1
-- Update to 4.4.9
-
-* Sun Oct 23 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.8-1
-- Update to 4.4.8
-
-* Sun Sep 25 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.7-1
-- Update to 4.4.7
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.6-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.4.6-9
-- Perl 5.36 rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.6-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jan 04 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.6-7
-- Require a generic mail program (#2036844)
-
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (nagioscore-nagios-4.5.9.tar.gz) = 90bd71f772b6686b32fbe5f543468938f0dfc9c5bade1d41c27d63b1971d5000d16d6ca843b3eccab5550daa1bc649f16e8d68890052149126601a060ac9230d
+SHA512 (nagioscore-nagios-4.4.6.tar.gz) = db3a205f1675693301c059b0ecdc767cdc423923cff0729c5584a48e04fb18d6c119d51991dd24290a539eb8578b2cb82316275039b36827871bb028883b495f