Fix permissions (#2275532)

Fix nagiostats permissions #2169033

.gitignore

@@ -17,3 +17,8 @@ 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

nagios-0011-remove-rpmbuild.patch

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

nagios.spec

@@ -5,8 +5,8 @@
 %global selinuxtype targeted
 
 Name:           nagios
-Version:        4.4.6
-Release:        7%{?dist}
+Version:        4.4.14
+Release:        4%{?dist}
 
 Summary: Host/service/network monitoring program
 
@@ -45,7 +45,6 @@ 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,6 +64,7 @@ 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
@@ -72,14 +72,8 @@ 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:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       %{_bindir}/mail
 Requires:       nagios-common
 Requires:       user(nagios)
@@ -277,16 +271,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 0775 %{buildroot}%{_localstatedir}/spool/%{name}/cmd
-install -d -m 0775 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0755 %{buildroot}%{_localstatedir}/spool/%{name}/cmd
+install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
 
 # Make a run directory
-install -d -m 0775 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
 
 # Make logdirs
-install -d -m 0775 %{buildroot}/%{_localstatedir}/log/
-install -d -m 0775 %{buildroot}/%{_localstatedir}/log/%{name}/
-install -d -m 0775 %{buildroot}/%{_localstatedir}/log/%{name}/archives
+install -d -m 0755 %{buildroot}/%{_localstatedir}/log/
+install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/
+install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
 
 # Use systemd unit on rhel7 or any supported Fedora
 %if 0%{?rhel} > 6 || 0%{?fedora} > 20
@@ -301,15 +295,17 @@ chmod -x %{buildroot}%{_unitdir}/%{name}.service
 %endif
 
 # Fix permissions - FIXME remove this when unneeded
-chmod 755 %{buildroot}%{_sbindir}/nagios
+chmod 755 %{buildroot}%{_sbindir}/nagios %{buildroot}%{_bindir}/nagiostats
 
 # Install documentation
 install -d -m 0755 %{buildroot}%{_datadir}/nagios/html/docs
-%{__cp} -a Documentation/html/* %{buildroot}%{_datadir}/nagios/html/docs
+%{__cp} -r 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
@@ -327,6 +323,9 @@ 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}
+
 %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
@@ -439,11 +438,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(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
+%attr(2755,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(0770,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/checkresults
+%attr(0750,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/checkresults
 
 %files common
 %dir %{_sysconfdir}/%{name}
@@ -461,7 +460,8 @@ fi
 %files selinux
 %doc README.SELinux.rst
 %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.*
-%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
+%{_datadir}/selinux/devel/include/distributed/%{name}.if
+%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
 %endif
 
 
@@ -471,6 +471,31 @@ fi
 %{_libdir}/%{name}/cgi/
 
 %changelog
+* Sat Apr 27 2024 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.14-4
+- Fix permissions (#2275532)
+
+* 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
+
+* 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
+
 * Tue Jan 04 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.6-7
 - Require a generic mail program (#2036844)
 

sources

@@ -1 +1 @@
-SHA512 (nagioscore-nagios-4.4.6.tar.gz) = db3a205f1675693301c059b0ecdc767cdc423923cff0729c5584a48e04fb18d6c119d51991dd24290a539eb8578b2cb82316275039b36827871bb028883b495f
+SHA512 (nagioscore-nagios-4.4.14.tar.gz) = 6dfe19887f035f3a3f6774a0f1c515902608934a75b08835fe9a5163812657547c97a20f3df42b89a34cad949eb4b587853b4131718c30703490b11fbee0d0ee