[squirrelmail] suppress strict php 5.4 warnings (#789575)

Michal Hlavinka mhlavink at fedoraproject.org
Thu Feb 23 11:39:55 UTC 2012


commit 85a5f8746e5cdcedf161227ddbaaf162fb7643b8
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Feb 23 12:39:51 2012 +0100

    suppress strict php 5.4 warnings (#789575)

 squirrelmail-1.4.22-php54strict.patch |   11 +++++++++++
 squirrelmail.spec                     |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/squirrelmail-1.4.22-php54strict.patch b/squirrelmail-1.4.22-php54strict.patch
new file mode 100644
index 0000000..f40691e
--- /dev/null
+++ b/squirrelmail-1.4.22-php54strict.patch
@@ -0,0 +1,11 @@
+diff -up squirrelmail-webmail-1.4.22/functions/global.php.php54strict squirrelmail-webmail-1.4.22/functions/global.php
+--- squirrelmail-webmail-1.4.22/functions/global.php.php54strict	2012-02-23 10:57:51.355460623 +0100
++++ squirrelmail-webmail-1.4.22/functions/global.php	2012-02-23 10:58:16.201649682 +0100
+@@ -21,6 +21,7 @@ define('SQ_SERVER',5);
+ define('SQ_FORM',6);
+ 
+ /** First code that should be executed before other files are loaded */
++ini_set('error_reporting', E_ALL & ~E_NOTICE & ~E_STRICT);
+ 
+ /**
+  * Must be executed before any other scripts are loaded.
diff --git a/squirrelmail.spec b/squirrelmail.spec
index fefb1da..e564899 100644
--- a/squirrelmail.spec
+++ b/squirrelmail.spec
@@ -6,7 +6,7 @@
 Summary: webmail client written in php
 Name: squirrelmail
 Version: 1.4.22
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -35,6 +35,7 @@ Patch5: squirrelmail-1.4.19-hunspell.patch
 
 # fix issues found post release
 Patch6: squirrelmail-1.4.22-prfix.patch
+Patch7: squirrelmail-1.4.22-php54strict.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -57,6 +58,7 @@ easy to configure and install.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 mkdir locale_tempdir
 pushd locale_tempdir
@@ -271,6 +273,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Thu Feb 23 2012 Michal Hlavinka <mhlavink at redhat.com> - 1.4.22-5
+- suppress strict php 5.4 warnings (#789575)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.22-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list