[nagios] Ver. 3.2.3
Peter Lemenkov
peter at fedoraproject.org
Tue Oct 26 11:33:25 UTC 2010
commit 909da5acdd0999fcfa587ee1c2770e08a28ea351
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Oct 26 15:33:21 2010 +0400
Ver. 3.2.3
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
nagios-0001-from-rpm.patch | 6 +-
nagios-0002-SELinux-relabeling.patch | 9 +--
nagios-0003-Fix-etc-init.d-nagios-status.patch | 9 +--
...-installation-of-httpd-conf.d-config-file.patch | 25 +++++++
nagios-0005-Install-config-files-too.patch | 26 +++++++
nagios.spec | 75 ++++++++++----------
sources | 2 +-
8 files changed, 101 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a75df8..e35c6df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
nagios-3.2.1.tar.gz
/nagios-3.2.2.tar.gz
+/nagios-3.2.3.tar.gz
diff --git a/nagios-0001-from-rpm.patch b/nagios-0001-from-rpm.patch
index 404d4bd..3ac8b30 100644
--- a/nagios-0001-from-rpm.patch
+++ b/nagios-0001-from-rpm.patch
@@ -1,7 +1,7 @@
-From 407c6e16ee99b2e12de526285f4ca74990ea2503 Mon Sep 17 00:00:00 2001
+From 39bd7a9ce40379073b402ea957fe85ad6e883836 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Thu, 25 Feb 2010 14:21:30 +0300
-Subject: [PATCH 1/3] from rpm
+Subject: [PATCH 1/5] from rpm
---
daemon-init.in | 4 +++-
@@ -27,5 +27,5 @@ index cdb9b93..f2feb9d 100644
echo " done."
exit 0
--
-1.6.6.1
+1.7.2.3
diff --git a/nagios-0002-SELinux-relabeling.patch b/nagios-0002-SELinux-relabeling.patch
index 733ef3a..0be0f76 100644
--- a/nagios-0002-SELinux-relabeling.patch
+++ b/nagios-0002-SELinux-relabeling.patch
@@ -1,17 +1,16 @@
-From 53ddfdb8b51b0164e71240aadbfba489158849c3 Mon Sep 17 00:00:00 2001
+From 617be0eafc275560796fd1bc43a3ff731f48a159 Mon Sep 17 00:00:00 2001
From: Daniel Walsh <dwalsh at redhat.com>
Date: Thu, 25 Feb 2010 14:24:00 +0300
-Subject: [PATCH 2/3] SELinux relabeling
+Subject: [PATCH 2/5] SELinux relabeling
This patch adds a restorecon call to the init script to label the pid file
correctly.
-
---
daemon-init.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/daemon-init.in b/daemon-init.in
-index f2feb9d..d544eb4 100644
+index f2feb9d..75aa0b3 100644
--- a/daemon-init.in
+++ b/daemon-init.in
@@ -129,6 +129,7 @@ case "$1" in
@@ -23,5 +22,5 @@ index f2feb9d..d544eb4 100644
pidof nagios > $NagiosRunFile
if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi
--
-1.6.6.1
+1.7.2.3
diff --git a/nagios-0003-Fix-etc-init.d-nagios-status.patch b/nagios-0003-Fix-etc-init.d-nagios-status.patch
index 5a49c96..38dd30c 100644
--- a/nagios-0003-Fix-etc-init.d-nagios-status.patch
+++ b/nagios-0003-Fix-etc-init.d-nagios-status.patch
@@ -1,16 +1,15 @@
-From c149a6dc2fe9cddd0986fad9cb654774692bb499 Mon Sep 17 00:00:00 2001
+From e1dd4ce3a6174e47accff8b4a016bac91e48ddfe Mon Sep 17 00:00:00 2001
From: Ricky Zhou <rzhou at redhat.com>
Date: Thu, 25 Feb 2010 14:27:08 +0300
-Subject: [PATCH 3/3] Fix /etc/init.d/nagios status
+Subject: [PATCH 3/5] Fix /etc/init.d/nagios status
Fix status return code.
-
---
daemon-init.in | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/daemon-init.in b/daemon-init.in
-index d544eb4..460370d 100644
+index 75aa0b3..ecd072a 100644
--- a/daemon-init.in
+++ b/daemon-init.in
@@ -52,12 +52,14 @@ status_nagios ()
@@ -39,5 +38,5 @@ index d544eb4..460370d 100644
checkconfig)
--
-1.6.6.1
+1.7.2.3
diff --git a/nagios-0004-Fix-installation-of-httpd-conf.d-config-file.patch b/nagios-0004-Fix-installation-of-httpd-conf.d-config-file.patch
new file mode 100644
index 0000000..0cd40b2
--- /dev/null
+++ b/nagios-0004-Fix-installation-of-httpd-conf.d-config-file.patch
@@ -0,0 +1,25 @@
+From f6c072607a117c033a6065d1bfd5f557e47c6088 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 23 Sep 2010 18:46:50 +0400
+Subject: [PATCH 4/5] Fix installation of httpd/conf.d config-file
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ Makefile.in | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a7f77ca..c6e823d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -264,6 +264,7 @@ install-config:
+ @echo ""
+
+ install-webconf:
++ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTTPD_CONF)
+ $(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf
+
+ @echo ""
+--
+1.7.2.3
+
diff --git a/nagios-0005-Install-config-files-too.patch b/nagios-0005-Install-config-files-too.patch
new file mode 100644
index 0000000..fb852df
--- /dev/null
+++ b/nagios-0005-Install-config-files-too.patch
@@ -0,0 +1,26 @@
+From 27b2570200774a1814be185cf7dce73510be8444 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 23 Sep 2010 21:21:28 +0400
+Subject: [PATCH 5/5] Install config-files too
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c6e823d..801a6fd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -291,7 +291,7 @@ install-commandmode:
+ @echo ""
+
+
+-fullinstall: install install-init install-commandmode install-webconf
++fullinstall: install install-init install-commandmode install-webconf install-config
+
+ # Uninstall is too destructive if base install directory is /usr, etc.
+ #uninstall:
+--
+1.7.2.3
+
diff --git a/nagios.spec b/nagios.spec
index 24a0a92..1ada26f 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,6 +1,6 @@
Name: nagios
-Version: 3.2.2
-Release: 2%{?dist}
+Version: 3.2.3
+Release: 1%{?dist}
Summary: Host/service/network monitoring program
Group: Applications/System
@@ -16,6 +16,8 @@ Source6: nagios.upgrade_to_v3.sh
Patch1: nagios-0001-from-rpm.patch
Patch2: nagios-0002-SELinux-relabeling.patch
Patch3: nagios-0003-Fix-etc-init.d-nagios-status.patch
+Patch4: nagios-0004-Fix-installation-of-httpd-conf.d-config-file.patch
+Patch5: nagios-0005-Install-config-files-too.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gd-devel > 1.8, mailx, libjpeg-devel, libpng-devel
@@ -107,6 +109,8 @@ may compile against.
%patch1 -p1 -b .fedora
%patch2 -p1 -b .selinux_relabel
%patch3 -p1 -b .fix_status_retcode
+%patch4 -p1 -b .fix_httpd_conf_d
+%patch5 -p1 -b .install_config
%build
@@ -133,13 +137,11 @@ may compile against.
--with-template-extinfo
make %{?_smp_mflags} all
-sed -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora
-sed -e "s/# chkconfig: 345/# chkconfig: - /" \
- -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < daemon-init > daemon-init.fedora
-sed -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 > sample-config/nagios.cfg.fedora
+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
sed -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess
-mv -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
cp -f %{SOURCE5} UpgradeToVersion3.ReadMe
cp -f %{SOURCE6} UpgradeToVersion3.sh
echo >> html/stylesheets/common.css
@@ -147,39 +149,32 @@ echo >> html/stylesheets/common.css
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config
-install -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd
-install -d -m 0755 %{buildroot}/%{_prefix}/include/%{name}
-install -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}
-install -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private
-install -D -m 0755 base/nagios %{buildroot}/%{_sbindir}/nagios
-install -D -m 0755 base/nagiostats %{buildroot}/%{_bindir}/nagiostats
-install -d -m 0755 cgi/ %{buildroot}/%{_libdir}/%{name}/cgi-bin/
-install -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
-install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
-install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
-install -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
-install -D -m 0644 %{name}.htaccess %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
-install -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
-install -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
-install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
-install -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl
-install -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/objects
-install -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/conf.d
-install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/%{name}/conf.d/internet.cfg
-install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/%{name}/passwd
-install -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl
-install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/spool/checkresults
-mkdir -p %{buildroot}/%{_initrddir}
-mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-cp -a html/* %{buildroot}/%{_datadir}/%{name}/html/
-rm -f %{buildroot}/%{_datadir}/%{name}/html/*in
-rm -f %{buildroot}/%{_datadir}/%{name}/html/Makefile
-mv %{buildroot}/%{_sysconfdir}/%{name}/resource.cfg %{buildroot}/%{_sysconfdir}/%{name}/private/resource.cfg
+make DESTDIR=%{buildroot} INIT_OPTS="" INSTALL_OPTS="" COMMAND_OPTS="" CGIDIR="%{_libdir}/%{name}/cgi-bin" CFGDIR="%{_sysconfdir}/%{name}" fullinstall
+
+# relocated to sbin (Fedora-specific)
+install -d -m 0755 %{buildroot}%{_bindir}
+mv %{buildroot}%{_sbindir}/nagiostats %{buildroot}%{_bindir}/nagiostats
+
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/private
+mv %{buildroot}%{_sysconfdir}/%{name}/resource.cfg %{buildroot}%{_sysconfdir}/%{name}/private/resource.cfg
+
+install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/conf.d/internet.cfg
+install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/passwd
+
+# Install header-file
+install -D -m 0644 include/locations.h %{buildroot}%{_includedir}/%{name}/locations.h
+
+# Install logrotate rule
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+# Make room for event-handlers
+install -d -m 0755 %{buildroot}%{_libdir}/%{name}/plugins/eventhandlers
+
+install -d -m 0775 %{buildroot}%{_localstatedir}/spool/%{name}/cmd
%clean
-rm -rf %{buildroot} > /dev/null 2>&1
+rm -rf %{buildroot}
%pre common
@@ -256,6 +251,10 @@ fi
%changelog
+* Tue Oct 26 2010 Peter Lemenkov <lemenkov at gmail.com> - 3.2.3-1
+- Ver. 3.2.3
+- Further cleanups in spec-file
+
* Wed Sep 29 2010 jkeating - 3.2.2-2
- Rebuilt for gcc bug 634757
diff --git a/sources b/sources
index aee3eda..c0b9167 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e73004f401bfd680631ba900b5a8e60a nagios-3.2.2.tar.gz
+fe1be46e6976a52acdb021a782b5d04b nagios-3.2.3.tar.gz
More information about the scm-commits
mailing list