From ba3d92b804d2444f17f97147eb0d375e040a1839 Mon Sep 17 00:00:00 2001
From: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date: Sep 13 2011 13:36:35 +0000
Subject: Merge branch 'master' into el6


---

diff --git a/pnp4nagios-php53.patch b/pnp4nagios-php53.patch
new file mode 100644
index 0000000..88b6c5f
--- /dev/null
+++ b/pnp4nagios-php53.patch
@@ -0,0 +1,29 @@
+--- share/pnp/include/function.inc.php.old	2009-08-27 23:40:59.000000000 +0200
++++ share/pnp/include/function.inc.php	2010-03-12 08:43:28.000000000 +0100
+@@ -1029,7 +1029,7 @@
+ 		}
+ 	}
+ 
+-	$pdf =& new PDF('P', 'mm', 'A4');
++	$pdf = new PDF('P', 'mm', 'A4');
+ 	$pdf->AliasNbPages();
+         $pdf->SetAutoPageBreak('off');
+ 	$pdf->SetMargins(12.5,25,10);
+@@ -1538,7 +1538,7 @@
+                 $NAGIOS['RRD'][$tag][$dsl] = urldecode($value);
+             }
+ 
+-            if($level == 2 && $type == "complete" && eregi("^NAGIOS_",$tag)){
++            if($level == 2 && $type == "complete" && preg_match("/^NAGIOS_/i",$tag)){
+                 if(isset($xml_elem['value'])){
+                     $value = $xml_elem['value'];
+                 }else{
+@@ -1569,7 +1569,7 @@
+ 	$PAGE="";
+ 	$allowed_tags = array("page", "graph");
+ 	foreach($data as $line){
+-		if(ereg('(^#|^;)',$line)) {
++		if(preg_match('/(^#|^;)/',$line)) {
+ 			continue;
+ 		}
+ 
diff --git a/pnp4nagios.spec b/pnp4nagios.spec
index 4d48e61..4601348 100644
--- a/pnp4nagios.spec
+++ b/pnp4nagios.spec
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
 Version:        0.4.14
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -12,6 +12,7 @@ Source2:        pnp4nagios-npcd.sysvinit
 Source3:        pnp4nagios-README.fedora
 Patch1:         pnp4nagios-0.4.14-change_broker_install_location.patch
 Patch2:         pnp4nagios-0.4.14-verify_pnp_config.in_rev654.patch
+Patch3:         pnp4nagios-php53.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  rrdtool-perl
@@ -38,6 +39,9 @@ and stores them automatically into RRD-databases.
 # Update verify_pnp_config script for bugfixes
 %patch2 -p1
 
+# Fix PHP deprecated warnings with php 5.3
+%patch3 -p0
+
 # Fix file encoding and end of line
 pushd contrib
 iconv -f iso8859-1 -t utf-8 verify_pnp_config.txt > verify_pnp_config.txt.utf8
@@ -124,6 +128,16 @@ fi
 
 
 %changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.14-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Sep 27 2010 Xavier Bachelot <xavier@bachelot.org> 0.4.14-4
+- Bump release for rebuild.
+
+* Sun Jul 18 2010 Xavier Bachelot <xavier@bachelot.org> 0.4.14-3
+- Add patch to fix PHP deprecated warnings with PHP 5.3.
+  (Patch from Jan Ondrej - RHBZ#572851)
+
 * Tue Aug 27 2009 Xavier Bachelot <xavier@bachelot.org> 0.4.14-2
 - Ship contrib directory as doc.