[nagios/el6] * Update to 2.5.0 (and sync relevant patches from F18+)
Jose Pedro Oliveira
jpo at fedoraproject.org
Thu Apr 25 01:00:52 UTC 2013
commit a00ca25ec46c56200f5815a43f1763b4f70436b9
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date: Thu Apr 25 02:53:18 2013 +0100
* Update to 2.5.0 (and sync relevant patches from F18+)
.gitignore | 1 +
nagios-3.4.3-spaces-to-plus-signs.patch | 11 +++++++++++
nagios-3.5.0-conf.d-configuration-directory.patch | 12 ++++++++++++
nagios.spec | 21 ++++++++++++++++++---
sources | 2 +-
5 files changed, 43 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19d1678..7232c74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ nagios-3.2.1.tar.gz
/nagios-3.4.2.tar.gz
/nagios-3.4.3.tar.gz
/nagios-3.4.4.tar.gz
+/nagios-3.5.0.tar.gz
diff --git a/nagios-3.4.3-spaces-to-plus-signs.patch b/nagios-3.4.3-spaces-to-plus-signs.patch
new file mode 100644
index 0000000..2fa0117
--- /dev/null
+++ b/nagios-3.4.3-spaces-to-plus-signs.patch
@@ -0,0 +1,11 @@
+diff -ruN nagios/common/macros.c nagios-modified/common/macros.c
+--- nagios/common/macros.c 2013-03-09 21:46:35.000000000 +0000
++++ nagios-modified/common/macros.c 2013-04-20 10:03:38.913715634 +0100
+@@ -2585,6 +2585,7 @@
+ for(x = 0; x < MACRO_X_COUNT; x++) {
+ macro_keys[x].code = x;
+ macro_keys[x].name = macro_x_names[x];
++ macro_keys[x].clean_options = 0;
+
+ /* host/service output/perfdata and author/comment macros should get cleaned */
+ if((x >= 16 && x <= 19) || (x >= 49 && x <= 52) || (x >= 99 && x <= 100) || (x >= 124 && x <= 127)) {
diff --git a/nagios-3.5.0-conf.d-configuration-directory.patch b/nagios-3.5.0-conf.d-configuration-directory.patch
new file mode 100644
index 0000000..12662fb
--- /dev/null
+++ b/nagios-3.5.0-conf.d-configuration-directory.patch
@@ -0,0 +1,12 @@
+diff -ruN nagios/sample-config/nagios.cfg.in nagios-modified/sample-config/nagios.cfg.in
+--- nagios/sample-config/nagios.cfg.in 2012-11-12 18:33:37.000000000 +0000
++++ nagios-modified/sample-config/nagios.cfg.in 2013-04-24 00:59:54.380245378 +0100
+@@ -54,6 +54,8 @@
+ #cfg_dir=@sysconfdir@/switches
+ #cfg_dir=@sysconfdir@/routers
+
++cfg_dir=@sysconfdir@/conf.d
++
+
+
+
diff --git a/nagios.spec b/nagios.spec
index f8f94f5..8f4f340 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,5 +1,5 @@
Name: nagios
-Version: 3.4.4
+Version: 3.5.0
Release: 1%{?dist}
Summary: Host/service/network monitoring program
@@ -32,6 +32,8 @@ Patch8: nagios-0008-Fix-path-to-CGI-executables.patch
Patch9: nagios-0009-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch
Patch10: nagios-0010-Added-several-images-to-the-sample-config-revb.patch
Patch11: nagios-0011-Fixed-strange-permissions.patch
+Patch13: nagios-3.4.3-spaces-to-plus-signs.patch
+Patch14: nagios-3.5.0-conf.d-configuration-directory.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +138,8 @@ may compile against.
%patch9 -p1 -b .fix_path_to_passwd
%patch10 -p1 -b .more_images
%patch11 -p1 -b .fix_perms
+%patch13 -p1 -b .plus_signs
+%patch14 -p1 -b .conf_d
install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} html/images/logos/
@@ -170,6 +174,7 @@ sed -i -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}
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
+cp -f %{SOURCE3} internet.cfg
cp -f %{SOURCE5} UpgradeToVersion3.ReadMe
cp -f %{SOURCE6} UpgradeToVersion3.sh
echo >> html/stylesheets/common.css
@@ -186,7 +191,7 @@ 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 0755 %{buildroot}%{_sysconfdir}/%{name}/conf.d/
install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/passwd
# Install header-file
@@ -240,6 +245,7 @@ fi
%dir %{_datadir}/%{name}/html
%doc %{_datadir}/%{name}/html/docs
%doc Changelog INSTALLING LICENSE README UPGRADING UpgradeToVersion3.ReadMe UpgradeToVersion3.sh
+%doc internet.cfg
%{_datadir}/%{name}/html/[^d]*
%{_sbindir}/*
%{_bindir}/*
@@ -251,8 +257,8 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/objects/*cfg
%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private
%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/objects
+%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/conf.d
%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg
-%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/conf.d/internet.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
@@ -274,6 +280,15 @@ fi
%changelog
+* Thu Apr 25 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.5.0-1
+- Update to 3.5.0
+- Patch nagios-3.4.3-spaces-to-plus-signs.patch (#952139)
+ (upstream http://tracker.nagios.org/view.php?id=407)
+- Add cfg_dir=/etc/nagios/conf.d to the main nagios configuration file
+ (nagios-3.5.0-conf.d-configuration-directory.patch) (#907145#c5)
+- Own the configuration directory /etc/nagios/conf.d (#907145#c5)
+- Ship the internet.cfg configuration file as documentation (#907145#c5)
+
* Sun Jan 13 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.4-1
- Update to 3.4.4; CVE-2012-6096 (#893269)
- Refactored the patch nagios-0010-Added-several-images-to-the-sample-config.patch
diff --git a/sources b/sources
index 1fcae9e..e50e6d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e001ce47fa5b20985d14d539715ba13b nagios-3.4.4.tar.gz
+aeef195d2033cc362bf6cb972bcc8f07 nagios-3.5.0.tar.gz
More information about the scm-commits
mailing list