[nagios] Fixed rhbz #672074
Peter Lemenkov
peter at fedoraproject.org
Tue Jan 25 12:34:21 UTC 2011
commit 035d61891b04ffaad15e6ef00342516121501b5d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Jan 25 15:34:01 2011 +0300
Fixed rhbz #672074
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
nagios-0001-from-rpm.patch | 4 +-
nagios-0002-SELinux-relabeling.patch | 4 +-
nagios-0003-Fix-etc-init.d-nagios-status.patch | 4 +-
...-installation-of-httpd-conf.d-config-file.patch | 4 +-
nagios-0005-Install-config-files-too.patch | 4 +-
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 +-
...th-to-passwd-file-in-Apache-s-config-file.patch | 4 +-
...Added-several-images-to-the-sample-config.patch | 4 +-
nagios-0011-Fixed-strange-permissions.patch | 35 ++++++++++++++++++++
nagios.spec | 16 ++++++---
12 files changed, 66 insertions(+), 25 deletions(-)
---
diff --git a/nagios-0001-from-rpm.patch b/nagios-0001-from-rpm.patch
index f068975..46c8d75 100644
--- a/nagios-0001-from-rpm.patch
+++ b/nagios-0001-from-rpm.patch
@@ -1,7 +1,7 @@
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 01/10] from rpm
+Subject: [PATCH 01/11] from rpm
---
daemon-init.in | 4 +++-
@@ -27,5 +27,5 @@ index cdb9b93..f2feb9d 100644
echo " done."
exit 0
--
-1.7.3.2
+1.7.3.5
diff --git a/nagios-0002-SELinux-relabeling.patch b/nagios-0002-SELinux-relabeling.patch
index 5bb0436..2658305 100644
--- a/nagios-0002-SELinux-relabeling.patch
+++ b/nagios-0002-SELinux-relabeling.patch
@@ -1,7 +1,7 @@
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 02/10] SELinux relabeling
+Subject: [PATCH 02/11] 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.3.2
+1.7.3.5
diff --git a/nagios-0003-Fix-etc-init.d-nagios-status.patch b/nagios-0003-Fix-etc-init.d-nagios-status.patch
index ad421a7..cbed5e9 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 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 03/10] Fix /etc/init.d/nagios status
+Subject: [PATCH 03/11] Fix /etc/init.d/nagios status
Fix status return code.
---
@@ -38,5 +38,5 @@ index 75aa0b3..ecd072a 100644
checkconfig)
--
-1.7.3.2
+1.7.3.5
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 17e3ecc..76958af 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 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 04/10] Fix installation of httpd/conf.d config-file
+Subject: [PATCH 04/11] 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.3.2
+1.7.3.5
diff --git a/nagios-0005-Install-config-files-too.patch b/nagios-0005-Install-config-files-too.patch
index 65ee598..dcb2d6c 100644
--- a/nagios-0005-Install-config-files-too.patch
+++ b/nagios-0005-Install-config-files-too.patch
@@ -1,7 +1,7 @@
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 05/10] Install config-files too
+Subject: [PATCH 05/11] 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.3.2
+1.7.3.5
diff --git a/nagios-0006-Do-not-start-service-by-default.patch b/nagios-0006-Do-not-start-service-by-default.patch
index 7de9c2c..fffb284 100644
--- a/nagios-0006-Do-not-start-service-by-default.patch
+++ b/nagios-0006-Do-not-start-service-by-default.patch
@@ -1,7 +1,7 @@
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 06/10] Do not start service by default
+Subject: [PATCH 06/11] Do not start service by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -21,5 +21,5 @@ index ecd072a..5e52637 100644
#
# File : nagios
--
-1.7.3.2
+1.7.3.5
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 583c424..e07aa18 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
@@ -1,7 +1,7 @@
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 07/10] The init-script should return 2 in case of unknown command.
+Subject: [PATCH 07/11] The init-script should return 2 in case of unknown command.
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 5e52637..16b98be 100644
esac
--
-1.7.3.2
+1.7.3.5
diff --git a/nagios-0008-Fix-path-to-CGI-executables.patch b/nagios-0008-Fix-path-to-CGI-executables.patch
index 5a7874c..2a7d37d 100644
--- a/nagios-0008-Fix-path-to-CGI-executables.patch
+++ b/nagios-0008-Fix-path-to-CGI-executables.patch
@@ -1,7 +1,7 @@
From 6b4fb54ca91a4c1954da50cb05956c8ec0e0acd0 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 15 Nov 2010 15:07:49 +0300
-Subject: [PATCH 08/10] Fix path to CGI executables
+Subject: [PATCH 08/11] Fix path to CGI executables
See rhbz #653291 for additional details:
@@ -42,5 +42,5 @@ index a8e2c06..bbffb3a 100755
s|\@cgiurl\@|@cgiurl@|g;
s|\@MAIL_PROG\@|@MAIL_PROG@|g;
--
-1.7.3.2
+1.7.3.5
diff --git a/nagios-0009-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch b/nagios-0009-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch
index 3069932..799cda1 100644
--- a/nagios-0009-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch
+++ b/nagios-0009-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch
@@ -1,7 +1,7 @@
From b8c27bebfad2feccfe8b2c375f702502f0bc6048 Mon Sep 17 00:00:00 2001
From: Davide Madrisan <davide.madrisan at gmail.com>
Date: Thu, 18 Nov 2010 18:57:14 +0300
-Subject: [PATCH 09/10] Fixed path to passwd file in Apache's config file
+Subject: [PATCH 09/11] Fixed path to passwd file in Apache's config file
---
sample-config/httpd.conf.in | 4 ++--
@@ -30,5 +30,5 @@ index 1b1e693..0a32781 100644
</Directory>
--
-1.7.3.2
+1.7.3.5
diff --git a/nagios-0010-Added-several-images-to-the-sample-config.patch b/nagios-0010-Added-several-images-to-the-sample-config.patch
index b2c03a9..58d0426 100644
--- a/nagios-0010-Added-several-images-to-the-sample-config.patch
+++ b/nagios-0010-Added-several-images-to-the-sample-config.patch
@@ -1,7 +1,7 @@
From 944f6a71533ee9e3e7f5fde831ad888ac922e30d Mon Sep 17 00:00:00 2001
From: Peter Astakhov <astakhovp at yarbroiler.ru>
Date: Tue, 23 Nov 2010 14:02:28 +0300
-Subject: [PATCH 10/10] Added several images to the sample config
+Subject: [PATCH 10/11] Added several images to the sample config
---
html/images/logos/printer.png | Bin 0 -> 1649 bytes
@@ -165,5 +165,5 @@ index 16a980d..97e4f0f 100644
}
--
-1.7.3.2
+1.7.3.5
diff --git a/nagios-0011-Fixed-strange-permissions.patch b/nagios-0011-Fixed-strange-permissions.patch
new file mode 100644
index 0000000..b1b3c86
--- /dev/null
+++ b/nagios-0011-Fixed-strange-permissions.patch
@@ -0,0 +1,35 @@
+From b7e868f3de5dc612f8f6f6ba259a34696f7d6f28 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Tue, 25 Jan 2011 14:47:44 +0300
+Subject: [PATCH 11/11] Fixed strange permissions
+
+The main executable binaries have strange permissions - 774.
+This patch changes them to mmore sane 755.
+
+See rhbz #672074 for the details:
+
+https://bugzilla.redhat.com/672074
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ base/Makefile.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/Makefile.in b/base/Makefile.in
+index c4a20ba..fc1c9e3 100644
+--- a/base/Makefile.in
++++ b/base/Makefile.in
+@@ -203,8 +203,8 @@ install-unstripped:
+
+ install-basic:
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+
+ strip-post-install:
+ $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
+--
+1.7.3.5
+
diff --git a/nagios.spec b/nagios.spec
index be66091..3e8f19a 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,6 +1,6 @@
Name: nagios
Version: 3.2.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Host/service/network monitoring program
Group: Applications/System
@@ -26,6 +26,7 @@ Patch7: nagios-0007-The-init-script-should-return-2-in-case-of-unknown-c.patch
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.patch
+Patch11: nagios-0011-Fixed-strange-permissions.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gd-devel > 1.8, mailx, libjpeg-devel, libpng-devel
@@ -127,6 +128,7 @@ may compile against.
%patch8 -p1 -b .fix_path_to_cgi
%patch9 -p1 -b .fix_path_to_passwd
%patch10 -p1 -b .more_images
+%patch11 -p1 -b .fix_perms
%build
@@ -250,10 +252,10 @@ fi
%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(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
-%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives
-%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/
-%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/checkresults
+%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}/spool/
+%attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/checkresults
%files common
@@ -268,6 +270,10 @@ fi
%changelog
+* Tue Jan 25 2011 Peter Lemenkov <lemenkov at gmail.com> - 3.2.3-8
+- Fixed strange permission on executables (see rhbz #672074)
+- Dropped permissions on directories with log-files (see rhbz #672074)
+
* Tue Nov 23 2010 Peter Lemenkov <lemenkov at gmail.com> - 3.2.3-7
- Finally fixed path to CGI (rhbz #653291)
- Added runtime dependency - mailx (see rhbz #655541)
More information about the scm-commits
mailing list