Fix permissions (#2275532 )

Update to 4.4.14
Update to 4.4.10
2024-04-27 23:09:40 +02:00 · 2023-08-18 08:19:03 +02:00 · 2023-03-30 23:54:45 +02:00 · 2023-03-30 23:01:36 +02:00 · 2022-12-25 10:25:49 +01:00 · 2022-12-25 10:25:49 +01:00
4 changed files with 72 additions and 66 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,4 +22,3 @@ nagios-3.2.1.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
--- a/nagios-0010-remove-information-leak.patch
+++ b/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>
--- a/nagios.spec
+++ b/nagios.spec
@ -5,13 +5,12 @@
 %global selinuxtype targeted

 Name:           nagios
-Version:        4.5.9
-Release:        2%{?dist}
+Version:        4.4.14
+Release:        4%{?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
@ -126,6 +125,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 +184,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 +218,6 @@ EOF
    --with-template-objects \
    --with-template-extinfo \
    --enable-event-broker \
-    --disable-static \
    STRIP=/bin/true

 %make_build all
@ -259,9 +253,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
@ -334,8 +326,10 @@ install -p -m 644 contrib/eventhandlers/redundancy-scenario1/handle-master-proc-
 # 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 +417,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
@ -458,7 +450,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
@ -480,33 +471,9 @@ 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

@ -517,9 +484,6 @@ fi
 - 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

@ -532,15 +496,6 @@ fi
 * 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)

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (nagioscore-nagios-4.5.9.tar.gz) = 90bd71f772b6686b32fbe5f543468938f0dfc9c5bade1d41c27d63b1971d5000d16d6ca843b3eccab5550daa1bc649f16e8d68890052149126601a060ac9230d
+SHA512 (nagioscore-nagios-4.4.14.tar.gz) = 6dfe19887f035f3a3f6774a0f1c515902608934a75b08835fe9a5163812657547c97a20f3df42b89a34cad949eb4b587853b4131718c30703490b11fbee0d0ee
Author	SHA1	Message	Date
Guido Aulisi	d76577aee1	Fix permissions (#2275532 )	2024-04-27 23:09:40 +02:00
Guido Aulisi	5eed83bafc	Update to 4.4.14	2023-08-18 08:19:03 +02:00
Guido Aulisi	72c8b75113	Update to 4.4.10 Fix nagiostats permissions #2169033	2023-03-30 23:54:45 +02:00
Jitka Plesnikova	84c9d90ca6	Remove perl(MODULE_COMPAT), it will be replaced by generators	2023-03-30 23:01:36 +02:00
Florian Weimer	1078689c00	Port configure script to C99 Related to: <https://fedoraproject.org/wiki/Changes/PortingToModernC> <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>	2022-12-25 10:25:49 +01:00
Guido Aulisi	7ab35d3535	Update to 4.4.9	2022-12-25 10:25:49 +01:00
Nikola Knazekova	39bc78cf64	selinux: Update based on latest packaging guide https://fedoraproject.org/wiki/SELinux/IndependentPolicy Start shipping nagios interface file Exclude installed policy module file from RPM verification Signed-off-by: Nikola Knazekova <nknazeko@redhat.com>	2022-12-25 10:25:49 +01:00
Guido Aulisi	dbfc385c1f	Disable package bootstrapping	2022-10-23 21:05:25 +02:00
Guido Aulisi	6825d5488b	Update to 4.4.8	2022-10-23 20:45:53 +02:00
Guido Aulisi	e69074f499	Update to 4.4.7	2022-10-23 20:45:44 +02:00
Guido Aulisi	d9a6cdfd4d	Bootstrap package because plugins are not yet buildable on epel9	2022-01-04 12:58:30 +01:00