rpms/squirrelmail/F-10 squirrelmail-1.4.18-aspamids.patch, NONE, 1.1 squirrelmail.spec, 1.63, 1.64

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25740

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.18-aspamids.patch 
Log Message:
fix undefined variable aSpamIds (#501260)


squirrelmail-1.4.18-aspamids.patch:

--- NEW FILE squirrelmail-1.4.18-aspamids.patch ---
diff -up squirrelmail/plugins/filters/filters.php.orig squirrelmail/plugins/filters/filters.php
--- squirrelmail/plugins/filters/filters.php.orig	2009-05-19 08:38:20.756736040 +0200
+++ squirrelmail/plugins/filters/filters.php	2009-05-19 08:38:20.792605106 +0200
@@ -415,7 +415,7 @@ function spam_filters($imap_stream) {
     $messages = parseFetch($read, $search_array);
     
     $bulkquery = (strlen($SpamFilters_BulkQuery) > 0 ? true : false);
-
+    $aSpamIds = array();
     foreach($messages as $id=>$message) {
         if (isset($message['UID'])) {
             $MsgNum = $message['UID'];


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-10/squirrelmail.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- squirrelmail.spec	12 May 2009 08:23:02 -0000	1.63
+++ squirrelmail.spec	19 May 2009 07:48:44 -0000	1.64
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -33,6 +33,9 @@ Patch4: squirrelmail-1.4.15-tr-fix.patch
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1855717&group_id=311&atid=100311
 Patch5: squirrelmail-1.4.17-biguid.patch
 
+#sent upstream, for squirrelmail <= 1.4.18, rhbz#501260
+Patch6: squirrelmail-1.4.18-aspamids.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -50,9 +53,9 @@ easy to configure and install.
 
 %prep
 %setup -q -n squirrelmail-%{version}
-%patch1 -p1 -b .zenkaku
-%patch2 -p1 -b .jpmbtext
-%patch3 -p1 -b .jpmbbody
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 mkdir locale_tempdir
 pushd locale_tempdir
@@ -60,7 +63,8 @@ tar xfj %SOURCE4
 %patch4 -p2
 popd
 
-%patch5 -p1 -b .biguid
+%patch5 -p1
+%patch6 -p1
 
 %build
 rm -f plugins/make_archive.pl
@@ -266,6 +270,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue May 19 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.18-2
+- fix undefined variable aSpamIds (#501260)
+
 * Tue May 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.18-1
 - updated to 1.4.18