[nagios] Accidentally forgotten patches added back
Peter Lemenkov
peter at fedoraproject.org
Wed Oct 27 09:14:04 UTC 2010
commit a51ad6bc2eff9e6389117e5f0e852cc14e306fdf
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed Oct 27 13:13:53 2010 +0400
Accidentally forgotten patches added back
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
nagios-0001-from-rpm.patch | 6 ++--
nagios-0002-SELinux-relabeling.patch | 6 ++--
nagios-0003-Fix-etc-init.d-nagios-status.patch | 6 ++--
...-installation-of-httpd-conf.d-config-file.patch | 6 ++--
nagios-0005-Install-config-files-too.patch | 6 ++--
nagios-0006-Do-not-start-service-by-default.patch | 25 +++++++++++++++++++
...ript-should-return-2-in-case-of-unknown-c.patch | 26 ++++++++++++++++++++
nagios.spec | 9 ++++++-
8 files changed, 74 insertions(+), 16 deletions(-)
---
diff --git a/nagios-0001-from-rpm.patch b/nagios-0001-from-rpm.patch
index 3ac8b30..df43247 100644
--- a/nagios-0001-from-rpm.patch
+++ b/nagios-0001-from-rpm.patch
@@ -1,7 +1,7 @@
-From 39bd7a9ce40379073b402ea957fe85ad6e883836 Mon Sep 17 00:00:00 2001
+From a31fd52099234e6d9e580f0fcd22774ca2709a65 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/5] from rpm
+Subject: [PATCH 1/7] from rpm
---
daemon-init.in | 4 +++-
@@ -27,5 +27,5 @@ index cdb9b93..f2feb9d 100644
echo " done."
exit 0
--
-1.7.2.3
+1.7.3.1
diff --git a/nagios-0002-SELinux-relabeling.patch b/nagios-0002-SELinux-relabeling.patch
index 0be0f76..8fb3ce0 100644
--- a/nagios-0002-SELinux-relabeling.patch
+++ b/nagios-0002-SELinux-relabeling.patch
@@ -1,7 +1,7 @@
-From 617be0eafc275560796fd1bc43a3ff731f48a159 Mon Sep 17 00:00:00 2001
+From 1dc8b5f6b306e24a66c5e999f7bface07fd2158f 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/5] SELinux relabeling
+Subject: [PATCH 2/7] SELinux relabeling
This patch adds a restorecon call to the init script to label the pid file
correctly.
@@ -22,5 +22,5 @@ index f2feb9d..75aa0b3 100644
pidof nagios > $NagiosRunFile
if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi
--
-1.7.2.3
+1.7.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 38dd30c..e287201 100644
--- a/nagios-0003-Fix-etc-init.d-nagios-status.patch
+++ b/nagios-0003-Fix-etc-init.d-nagios-status.patch
@@ -1,7 +1,7 @@
-From e1dd4ce3a6174e47accff8b4a016bac91e48ddfe Mon Sep 17 00:00:00 2001
+From adc53e77fd938fe350b0a7c3c9a24470679a6134 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/5] Fix /etc/init.d/nagios status
+Subject: [PATCH 3/7] Fix /etc/init.d/nagios status
Fix status return code.
---
@@ -38,5 +38,5 @@ index 75aa0b3..ecd072a 100644
checkconfig)
--
-1.7.2.3
+1.7.3.1
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
index 0cd40b2..20c22e6 100644
--- a/nagios-0004-Fix-installation-of-httpd-conf.d-config-file.patch
+++ b/nagios-0004-Fix-installation-of-httpd-conf.d-config-file.patch
@@ -1,7 +1,7 @@
-From f6c072607a117c033a6065d1bfd5f557e47c6088 Mon Sep 17 00:00:00 2001
+From e35cd91bdb0cd3b7c1adfa942491778c3ba97b79 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
+Subject: [PATCH 4/7] Fix installation of httpd/conf.d config-file
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -21,5 +21,5 @@ index a7f77ca..c6e823d 100644
@echo ""
--
-1.7.2.3
+1.7.3.1
diff --git a/nagios-0005-Install-config-files-too.patch b/nagios-0005-Install-config-files-too.patch
index fb852df..a554794 100644
--- a/nagios-0005-Install-config-files-too.patch
+++ b/nagios-0005-Install-config-files-too.patch
@@ -1,7 +1,7 @@
-From 27b2570200774a1814be185cf7dce73510be8444 Mon Sep 17 00:00:00 2001
+From e0ddbf70a34c00f05d392bb85415163946623d63 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
+Subject: [PATCH 5/7] Install config-files too
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index c6e823d..801a6fd 100644
# Uninstall is too destructive if base install directory is /usr, etc.
#uninstall:
--
-1.7.2.3
+1.7.3.1
diff --git a/nagios-0006-Do-not-start-service-by-default.patch b/nagios-0006-Do-not-start-service-by-default.patch
new file mode 100644
index 0000000..5262f1b
--- /dev/null
+++ b/nagios-0006-Do-not-start-service-by-default.patch
@@ -0,0 +1,25 @@
+From 53ad344a9df8af8c3d59d0b4127201e6f1d19277 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 23 Sep 2010 22:32:46 +0400
+Subject: [PATCH 6/7] Do not start service by default
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ daemon-init.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/daemon-init.in b/daemon-init.in
+index ecd072a..5e52637 100644
+--- a/daemon-init.in
++++ b/daemon-init.in
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-# chkconfig: 345 99 01
++# chkconfig: - 99 01
+ # description: Nagios network monitor
+ #
+ # File : nagios
+--
+1.7.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
new file mode 100644
index 0000000..324dccb
--- /dev/null
+++ b/nagios-0007-The-init-script-should-return-2-in-case-of-unknown-c.patch
@@ -0,0 +1,26 @@
+From be1a5ac3efb5a443c82cbd3ee2e0656d2e7aca52 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Fri, 24 Sep 2010 14:20:54 +0400
+Subject: [PATCH 7/7] The init-script should return 2 in case of unknown command.
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ daemon-init.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/daemon-init.in b/daemon-init.in
+index 5e52637..16b98be 100644
+--- a/daemon-init.in
++++ b/daemon-init.in
+@@ -229,7 +229,7 @@ case "$1" in
+
+ *)
+ echo "Usage: nagios {start|stop|restart|reload|force-reload|status|checkconfig}"
+- exit 1
++ exit 2
+ ;;
+
+ esac
+--
+1.7.3.1
+
diff --git a/nagios.spec b/nagios.spec
index 1ada26f..a2b1711 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,6 +1,6 @@
Name: nagios
Version: 3.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Host/service/network monitoring program
Group: Applications/System
@@ -18,6 +18,8 @@ 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
+Patch6: nagios-0006-Do-not-start-service-by-default.patch
+Patch7: nagios-0007-The-init-script-should-return-2-in-case-of-unknown-c.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gd-devel > 1.8, mailx, libjpeg-devel, libpng-devel
@@ -111,6 +113,8 @@ may compile against.
%patch3 -p1 -b .fix_status_retcode
%patch4 -p1 -b .fix_httpd_conf_d
%patch5 -p1 -b .install_config
+%patch6 -p1 -b .dont_start_by_default
+%patch7 -p1 -b .return_2
%build
@@ -251,6 +255,9 @@ fi
%changelog
+* Wed Oct 27 2010 Peter Lemenkov <lemenkov at gmail.com> - 3.2.3-2
+- Accidentally forgotten patches added back
+
* Tue Oct 26 2010 Peter Lemenkov <lemenkov at gmail.com> - 3.2.3-1
- Ver. 3.2.3
- Further cleanups in spec-file
More information about the scm-commits
mailing list