[nagios/f17] * Update to 3.4.4; CVE-2012-6096 (#893269) * Refactored the patch nagios-0010-Added-several-images

[Jose Pedro Oliveira]

commit e7addb0276fcd86b5d6e65c5b7b2db5ed440a2e1
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Sun Jan 13 14:51:06 2013 +0000

     * Update to 3.4.4; CVE-2012-6096 (#893269)
     * Refactored the patch nagios-0010-Added-several-images-to-the-sample-config.patch
       as patch can't create binary files (#875362).
       The old patch10 was replaced by nagios-0010-Added-several-images-to-the-sample-config-revb.patch
       and the PNG files included as sources 10, 11, and 12.

 nagios.spec |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/nagios.spec b/nagios.spec
index b111fe5..f8f94f5 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,5 +1,5 @@
 Name: nagios
-Version: 3.4.3
+Version: 3.4.4
 Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
@@ -13,6 +13,11 @@ Source3: nagios.internet.cfg
 Source4: nagios.htpasswd
 Source5: nagios.upgrade_to_v3.ReadMe
 Source6: nagios.upgrade_to_v3.sh
+# PNG files from the old nagios-0010-Added-several-images-to-the-sample-config.patch
+Source10: printer.png
+Source11: router.png
+Source12: switch.png
+
 Patch1: nagios-0001-from-rpm.patch
 Patch2: nagios-0002-SELinux-relabeling.patch
 # Sent upstream
@@ -25,7 +30,7 @@ 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
 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
+Patch10: nagios-0010-Added-several-images-to-the-sample-config-revb.patch
 Patch11: nagios-0011-Fixed-strange-permissions.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -132,6 +137,8 @@ may compile against.
 %patch10 -p1 -b .more_images
 %patch11 -p1 -b .fix_perms
 
+install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} html/images/logos/
+
 
 %build
 %configure \
@@ -267,6 +274,13 @@ fi
 
 
 %changelog
+* 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
+  as patch can't create binary files (#875362).
+  The old patch10 was replaced by nagios-0010-Added-several-images-to-the-sample-config-revb.patch
+  and the PNG files included as sources 10, 11, and 12.
+
 * Tue Dec  4 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.3-1
 - Upgrade to 3.4.3