-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

diff -u exim4-4.62/debian/changelog exim4-4.62/debian/changelog
- --- exim4-4.62/debian/changelog
+++ exim4-4.62/debian/changelog
@@ -1,3 +1,9 @@
+exim4 (4.62-3) unstable; urgency=low
+
+  * Improve handling of broken messages (bug #181948)
+
+ -- Daniel van Eeden <launchpad@myname.nl>  Thu, 31 Jan 2008 08:42:39 +0100
+
 exim4 (4.62-2) unstable; urgency=low
 
   * Move explanation about using ";" as separator in lists from debian/NEWS to
only in patch2:
unchanged:
- --- exim4-4.62.orig/src/exiqgrep.src
+++ exim4-4.62/src/exiqgrep.src
@@ -106,7 +106,26 @@
 			# Increment message counter.
 			$count++;
 		} else {
- -			print STDERR "Line mismatch: $line\n"; exit 1;
+                       if ($line =~ /^\s*(\w+)\s+(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) {
+                               my $msg = $2;
+                               $id{$msg}{age} = $1;
+                               $id{$msg}{size} = "0K";
+                               $id{$msg}{from} = $3;
+                               $id{$msg}{birth} = &msg_utc($msg);
+                               $id{$msg}{ages} = time - $id{$msg}{birth};
+                               if ($line =~ /\*\*\* frozen \*\*\*$/) {
+                                       $id{$msg}{frozen} = 1;
+                               } else {
+                                       $id{$msg}{frozen} = 0;
+                               }
+                               while(<QUEUE> =~ /\s+(.*?\@.*)$/) {
+                                       push(@{$id{$msg}{rcpt}},$1);
+                               }
+                               # Increment message counter.
+                               $count++;
+                       } else { 
+                               print STDERR "Line mismatch: $line\n"; exit 1;
+                       }
 		}
 	}
 	close(QUEUE) or die("Error closing pipe: $!\n");
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFHoYbZSTv4ppQVDnwRArpMAJ4uJouckhYay8GEquaqHgefYRqwPwCaAgly
wDmQHGVD5Z/hFGBZlsLeYvU=
=YIzB
-----END PGP SIGNATURE-----