Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 947193 Details for
Bug 1075867
Upgrade to Nagios 4.x
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Update to nagios 4.0.8
0001-update-to-nagios-4.0.8.patch (text/plain), 8.47 KB, created by
Xavier Bachelot
on 2014-10-15 11:53:42 UTC
(
hide
)
Description:
Update to nagios 4.0.8
Filename:
MIME Type:
Creator:
Xavier Bachelot
Created:
2014-10-15 11:53:42 UTC
Size:
8.47 KB
patch
obsolete
>From 9d928f03a77cd013e5321b1de0c308187a7c3eeb Mon Sep 17 00:00:00 2001 >From: Xavier Bachelot <xavier@bachelot.org> >Date: Wed, 15 Oct 2014 11:31:41 +0200 >Subject: [PATCH] update to nagios 4.0.8 > >--- > nagios-0002-SELinux-relabeling.patch | 18 ++++++++-------- > nagios-0003-Fix-etc-init.d-nagios-status.patch | 15 ++++++------- > nagios-0005-Install-config-files-too.patch | 8 +++---- > nagios-0006-Do-not-start-service-by-default.patch | 4 ++-- > ...ript-should-return-2-in-case-of-unknown-c.patch | 4 ++-- > nagios-0008-Fix-path-to-CGI-executables.patch | 4 ++-- > nagios.spec | 25 ++++++++++++++++------ > 7 files changed, 45 insertions(+), 33 deletions(-) > >diff --git a/nagios-0002-SELinux-relabeling.patch b/nagios-0002-SELinux-relabeling.patch >index 49d9dc7..73dd1f6 100644 >--- a/nagios-0002-SELinux-relabeling.patch >+++ b/nagios-0002-SELinux-relabeling.patch >@@ -13,14 +13,14 @@ diff --git a/daemon-init.in b/daemon-init.in > index 057424b..c17b30c 100644 > --- a/daemon-init.in > +++ b/daemon-init.in >-@@ -134,6 +134,7 @@ case "$1" in >- rm -f $NagiosCommandFile >- touch $NagiosRunFile >- chown $NagiosUser:$NagiosGroup $NagiosRunFile >-+ [ -x /sbin/restorecon ] && /sbin/restorecon $NagiosRunFile >- $NagiosBin -d $NagiosCfgFile >- if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi >- echo " done." >+@@ -187,6 +187,7 @@ >+ rm -f $NagiosCommandFile >+ touch $NagiosRunFile >+ chown $NagiosUser:$NagiosGroup $NagiosRunFile $NagiosVarDir/nagios.log $NagiosRetentionFile >++ [ -x /sbin/restorecon ] && /sbin/restorecon $NagiosRunFile >+ $NagiosBin -d $NagiosCfgFile >+ if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi >+ > -- > 1.8.3.1 >- >+ >diff --git a/nagios-0003-Fix-etc-init.d-nagios-status.patch b/nagios-0003-Fix-etc-init.d-nagios-status.patch >index 9e7b157..e2ec131 100644 >--- a/nagios-0003-Fix-etc-init.d-nagios-status.patch >+++ b/nagios-0003-Fix-etc-init.d-nagios-status.patch >@@ -12,13 +12,12 @@ diff --git a/daemon-init.in b/daemon-init.in > index c17b30c..baf4d6b 100644 > --- a/daemon-init.in > +++ b/daemon-init.in >-@@ -57,12 +57,14 @@ status_nagios () >+@@ -128,11 +128,14 @@ > >- printstatus_nagios() >+ printstatus_nagios () > { >-- >-- if status_nagios $1 $2; then >-+ status_nagios $1 $2 >+- if status_nagios; then >++ status_nagios > + RETVAL=$? > + if [ $RETVAL = 0 ]; then > echo "nagios (pid $NagiosPID) is running..." >@@ -28,11 +27,11 @@ index c17b30c..baf4d6b 100644 > + return $RETVAL > } > >- >-@@ -178,6 +180,7 @@ case "$1" in >+ killproc_nagios () >+@@ -227,6 +230,7 @@ > status) > pid_nagios >- printstatus_nagios nagios >+ printstatus_nagios > + exit $? > ;; > >diff --git a/nagios-0005-Install-config-files-too.patch b/nagios-0005-Install-config-files-too.patch >index a7e1532..7862d39 100644 >--- a/nagios-0005-Install-config-files-too.patch >+++ b/nagios-0005-Install-config-files-too.patch >@@ -12,12 +12,12 @@ diff --git a/Makefile.in b/Makefile.in > index 588109e..df4d450 100644 > --- a/Makefile.in > +++ b/Makefile.in >-@@ -329,7 +329,7 @@ install-commandmode: >- @echo "" >+@@ -356,7 +356,7 @@ >+ doxygen doxy.conf > > >--fullinstall: install install-init install-commandmode install-webconf >-+fullinstall: install install-init install-commandmode install-webconf install-config >+-fullinstall: install install-init install-commandmode install-webconf install-devel >++fullinstall: install install-init install-commandmode install-webconf install-devel install-config > > # Uninstall is too destructive if base install directory is /usr, etc. > #uninstall: >diff --git a/nagios-0006-Do-not-start-service-by-default.patch b/nagios-0006-Do-not-start-service-by-default.patch >index 9346006..bdef059 100644 >--- a/nagios-0006-Do-not-start-service-by-default.patch >+++ b/nagios-0006-Do-not-start-service-by-default.patch >@@ -14,11 +14,11 @@ index baf4d6b..8d460d4 100644 > +++ b/daemon-init.in > @@ -1,6 +1,6 @@ > #!/bin/sh >- # >+ # > -# chkconfig: 345 99 01 > +# chkconfig: - 99 01 > # description: Nagios network monitor >- # >+ # processname: nagios > # File : nagios > -- > 1.8.3.1 >diff --git a/nagios-0007-The-init-script-should-return-2-in-case-of-unknown-c.patch b/nagios-0007-The-init-script-should-return-2-in-case-of-unknown-c.patch >index 0c09319..2655342 100644 >--- a/nagios-0007-The-init-script-should-return-2-in-case-of-unknown-c.patch >+++ b/nagios-0007-The-init-script-should-return-2-in-case-of-unknown-c.patch >@@ -13,10 +13,10 @@ diff --git a/daemon-init.in b/daemon-init.in > index 8d460d4..57b1a86 100644 > --- a/daemon-init.in > +++ b/daemon-init.in >-@@ -233,7 +233,7 @@ case "$1" in >+@@ -284,7 +284,7 @@ > > *) >- echo "Usage: nagios {start|stop|restart|reload|force-reload|status|checkconfig}" >+ echo "Usage: nagios {start|stop|restart|reload|force-reload|status|checkconfig|configtest}" > - exit 1 > + exit 2 > ;; >diff --git a/nagios-0008-Fix-path-to-CGI-executables.patch b/nagios-0008-Fix-path-to-CGI-executables.patch >index 83fd09f..a646c47 100644 >--- a/nagios-0008-Fix-path-to-CGI-executables.patch >+++ b/nagios-0008-Fix-path-to-CGI-executables.patch >@@ -33,8 +33,8 @@ diff --git a/subst.in b/subst.in > index a8e2c06..bbffb3a 100755 > --- a/subst.in > +++ b/subst.in >-@@ -31,6 +31,7 @@ while ($f = shift @ARGV) { >- s|\@datadir\@|@datadir@|g; >+@@ -35,6 +35,7 @@ >+ s|\@datarootdir\@|@datarootdir@|g; > s|\@sbindir\@|@sbindir@|g; > s|\@bindir\@|@bindir@|g; > + s|\@cgidir\@|@libdir@/cgi-bin/|g; >diff --git a/nagios.spec b/nagios.spec >index d8e4ef3..c303c09 100644 >--- a/nagios.spec >+++ b/nagios.spec >@@ -1,8 +1,8 @@ > %global _hardened_build 1 > > Name: nagios >-Version: 3.5.1 >-Release: 7%{?dist} >+Version: 4.0.8 >+Release: 1%{?dist} > Summary: Host/service/network monitoring program > > Group: Applications/System >@@ -22,7 +22,7 @@ Source10: printer.png > Source11: router.png > Source12: switch.png > >-Patch1: nagios-0001-from-rpm.patch >+#Patch1: nagios-0001-from-rpm.patch > Patch2: nagios-0002-SELinux-relabeling.patch > # Sent upstream > Patch3: nagios-0003-Fix-etc-init.d-nagios-status.patch >@@ -132,8 +132,8 @@ may compile against. > > > %prep >-%setup -q -n %{name} >-%patch1 -p1 -b .fedora >+%setup -q >+#patch1 -p1 -b .fedora > %patch2 -p1 -b .selinux_relabel > %patch3 -p1 -b .fix_status_retcode > %patch4 -p1 -b .fix_httpd_conf_d >@@ -178,7 +178,6 @@ cp /usr/share/libtool/*/config.sub . > STRIP=/bin/true > make %{?_smp_mflags} all > >-sed -i -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" p1.pl > sed -i -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" daemon-init > sed -i -e "s|resource.cfg|private/resource.cfg|" \ > -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" sample-config/nagios.cfg >@@ -219,11 +218,17 @@ install -D -m 0644 -p %{S:7} %{buildroot}%{_unitdir}/%{name}.service > install -D -m 0644 -p %{S:8} %{buildroot}%{_tmpfilesdir}/%{name}.conf > # Remove SystemV init-script > rm -f %{buildroot}%{_initrddir}/nagios >+%else >+# git commit 723102ae (systemd support) moved the pid file to /var/run/nagios/nagios.pid >+install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name} > %endif > > # Fix permissions - FIXME remove this when unneeded > chmod 755 %{buildroot}%{_sbindir}/nagios > >+# FIXME : Missing dir for query handler >+install -d -m 0755 %{buildroot}%{_localstatedir}/log/nagios/rw >+ > > %pre common > getent group nagios >/dev/null || groupadd -r nagios >@@ -292,11 +297,13 @@ fi > %{_sbindir}/* > %{_bindir}/* > %{_libdir}/%{name}/cgi-bin/*cgi >+%{_libdir}/%{name}/libnagios.a > %if 0%{?el7}%{?fc20}%{?fc21}%{?fc22} > %{_unitdir}/%{name}.service > %{_tmpfilesdir}/%{name}.conf > %else > %{_initrddir}/nagios >+%attr(0755,nagios,nagios) %dir %{_localstatedir}/run/nagios/ > %endif > %config(noreplace) %{_sysconfdir}/httpd/conf.d/nagios.conf > %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} >@@ -311,6 +318,7 @@ fi > %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd > %attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name} > %attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives >+%attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name}/rw/ > %attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/ > %attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/checkresults > >@@ -327,6 +335,11 @@ fi > > > %changelog >+* Tue Oct 14 2014 Xavier Bachelot <xavier@bachelot.org> - 4.0.8-1 >+- Update to 4.0.8. >+- Disable patch1, not needed anymore. >+- Rebase patch 2, 3, 5, 6, 7 and 8. >+ > * Thu Aug 28 2014 Jitka Plesnikova <jplesnik@redhat.com> - 3.5.1-7 > - Perl 5.20 rebuild > >-- >1.9.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1075867
: 947193