[squirrelmail/el6] fix possible php warning

[Michal Hlavinka]

commit a4e60d8afacebb7764d78e5dccef6661c9c5bbb9
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Jul 13 12:59:21 2011 +0200

    fix possible php warning

 .gitignore                      |    1 +
 sources                         |    2 +-
 squirrelmail-1.4.22-prfix.patch |   30 ++++++++++++++++++++++++++++++
 squirrelmail.spec               |   19 +++++++++++++++----
 4 files changed, 47 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 862f3d3..50747ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 squirrelmail-1.4.21.tar.bz2
 all_locales-1.4.18-20090526.tar.bz2
+/squirrelmail-webmail-1.4.22.tar.bz2
diff --git a/sources b/sources
index 5d30703..cc9e4c7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-44d2fe85d6fc3092bf4f11e6e928f9dc  squirrelmail-1.4.21.tar.bz2
+494016b82762e57dca009fd9cc77ac2e  squirrelmail-webmail-1.4.22.tar.bz2
 ddb51e99e87b2aa8180cebe07de89fa2  all_locales-1.4.18-20090526.tar.bz2
diff --git a/squirrelmail-1.4.22-prfix.patch b/squirrelmail-1.4.22-prfix.patch
new file mode 100644
index 0000000..2a5babc
--- /dev/null
+++ b/squirrelmail-1.4.22-prfix.patch
@@ -0,0 +1,30 @@
+--- squirrelmail/functions/mime.php.orig	2011-07-12 22:21:59 UTC (rev 14132)
++++ squirrelmail/functions/mime.php	2011-07-13 08:36:01 UTC (rev 14133)
+@@ -2159,15 +2159,17 @@
+             list($free_content, $curpos) =
+                 sq_fixstyle($body, $gt+1, $message, $id, $mailbox);
+             if ($free_content != FALSE){
+-                $attary = sq_fixatts($tagname,
+-                                     $attary,
+-                                     $rm_attnames,
+-                                     $bad_attvals,
+-                                     $add_attr_to_tag,
+-                                     $message,
+-                                     $id,
+-                                     $mailbox
+-                                     );
++                if ( !empty ($attary) ) {
++                    $attary = sq_fixatts($tagname,
++                                         $attary,
++                                         $rm_attnames,
++                                         $bad_attvals,
++                                         $add_attr_to_tag,
++                                         $message,
++                                         $id,
++                                         $mailbox
++                                         );
++                }
+                 $trusted .= sq_tagprint($tagname, $attary, $tagtype);
+                 $trusted .= $free_content;
+                 $trusted .= sq_tagprint($tagname, false, 2);
+
diff --git a/squirrelmail.spec b/squirrelmail.spec
index 040fbf5..4b0407e 100644
--- a/squirrelmail.spec
+++ b/squirrelmail.spec
@@ -5,12 +5,12 @@
 
 Summary: webmail client written in php
 Name: squirrelmail
-Version: 1.4.21
-Release: 3%{?dist}
+Version: 1.4.22
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-webmail-%{version}.tar.bz2
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
@@ -33,6 +33,9 @@ Patch4: squirrelmail-1.4.17-biguid.patch
 # bug #508631 - use hunspell instead of aspell
 Patch5: squirrelmail-1.4.19-hunspell.patch
 
+# fix issues found post release
+Patch6: squirrelmail-1.4.22-prfix.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -47,12 +50,13 @@ compatibility across browsers.  It has very few requirements and is very
 easy to configure and install.
 
 %prep
-%setup -q
+%setup -q -n %{name}-webmail-%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 mkdir locale_tempdir
 pushd locale_tempdir
@@ -264,6 +268,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Jul 13 2011 Michal Hlavinka <mhlavink at redhat.com> - 1.4.22-2
+- fix possible php warning
+
+* Wed Jul 13 2011 Michal Hlavinka <mhlavink at redhat.com> - 1.4.22-1
+- squirrelmail updated to 1.4.22
+- fixes CVE-2010-4554, CVE-2010-4555, CVE-2011-2023
+
 * Fri Jul 23 2010 Michal Hlavinka <mhlavink at redhat.com> - 1.4.21-1
 - updated to 1.4.21
 - fixes CVE-2010-2813 : literal processing of 8-bit usernames/passwords