From f66d0cf0dce9cb06dadbba85790c23ee3973d82f Mon Sep 17 00:00:00 2001
From: Nick Bebout <nb@fedoraproject.org>
Date: Sat, 12 Mar 2011 02:43:54 +0000
Subject: [PATCH] 1.84

---
 CREDITS   |  2 +-
 ChangeLog |  8 ++++++--
 README    |  4 ++--
 VERSION   |  2 +-
 imapsync  | 15 ++++++++-------
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/CREDITS b/CREDITS
index 0e6b98f..5fa800e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,6 +1,6 @@
 
 Christophe Labouisse
-Add a pb with dbmail headers (first blank added)
+Add a pb with dbmail headers (first blank added, sort "Received:")
 
 William Hernandez (fromESS/PR Webmasters)
 Wrote patch for --timeout
diff --git a/ChangeLog b/ChangeLog
index dd2944a..e11bcd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,19 @@
 
 RCS file: RCS/imapsync,v
 Working file: imapsync
-head: 1.83
+head: 1.84
 branch:
 locks: strict
 access list:
 symbolic names:
 keyword substitution: kv
-total revisions: 83;	selected revisions: 83
+total revisions: 84;	selected revisions: 84
 description:
 ----------------------------
+revision 1.84
+date: 2004/03/13 03:43:34;  author: gilles;  state: Exp;  lines: +8 -7
+Sort also same type headers (like Received)
+----------------------------
 revision 1.83
 date: 2004/03/12 02:29:00;  author: gilles;  state: Exp;  lines: +8 -5
 Do not parse first blanks in headers (dbmail bug, thanks to
diff --git a/README b/README
index 430c6a0..837f3d1 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME
     imapsync - IMAP sync or copy tool. Synchronize mailboxes between two
     imap servers.
 
-    $Revision: 1.83 $
+    $Revision: 1.84 $
 
 INSTALL
      imapsync works fine under any Unix OS.
@@ -211,5 +211,5 @@ AUTHOR
     teaching free open and gratis softwares. Don't hesitate to pay him for
     that services.
 
-    $Id: imapsync,v 1.83 2004/03/12 02:29:00 gilles Exp $
+    $Id: imapsync,v 1.84 2004/03/13 03:43:34 gilles Exp $
 
diff --git a/VERSION b/VERSION
index 74c280f..40671b9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.83
+1.84
diff --git a/imapsync b/imapsync
index a11ce0a..050d450 100755
--- a/imapsync
+++ b/imapsync
@@ -4,7 +4,7 @@
 
 imapsync - IMAP sync or copy tool. Synchronize mailboxes between two imap servers.
 
-$Revision: 1.83 $
+$Revision: 1.84 $
 
 =head1 INSTALL
 
@@ -249,7 +249,7 @@ Gilles LAMIRAL earn his living writing, installing,
 configuring and teaching free open and gratis
 softwares. Don't hesitate to pay him for that services.
 
-$Id: imapsync,v 1.83 2004/03/12 02:29:00 gilles Exp $
+$Id: imapsync,v 1.84 2004/03/13 03:43:34 gilles Exp $
 
 =cut
 
@@ -286,7 +286,7 @@ my(
 use vars qw ($opt_G); # missing code for this will be option.
 
 
-$rcs = ' $Id: imapsync,v 1.83 2004/03/12 02:29:00 gilles Exp $ ';
+$rcs = ' $Id: imapsync,v 1.84 2004/03/13 03:43:34 gilles Exp $ ';
 $rcs =~ m/,v (\d+\.\d+)/;
 $VERSION = ($1) ? $1 : "UNKNOWN";
 
@@ -322,8 +322,8 @@ $error=0;
 
 my $banner = join("", 
 		  '$RCSfile: imapsync,v $ ',
-		  '$Revision: 1.83 $ ',
-		  '$Date: 2004/03/12 02:29:00 $ ',
+		  '$Revision: 1.84 $ ',
+		  '$Date: 2004/03/13 03:43:34 $ ',
 		  "\n",
 		  "Mail::IMAPClient version used here is ",
 		  $VERSION_IMAPClient, " auth md5 : $md5_supported",
@@ -774,12 +774,13 @@ sub parse_header_msg {
 	my $head = $imap->parse_headers($m,"ALL");
 	my $headstr;
 	$debug and print "Head NUM:", scalar(keys(%$head)), "\n";
+	# no header -> return
 	return unless(scalar(keys(%$head)));	    
 	foreach my $h (sort keys(%$head)){
-		foreach my $val ( @{$head->{$h}}) {
+		foreach my $val (sort @{$head->{$h}}) {
 			# no 8-bit data in headers !
 			$val =~ s/[\x80-\xff]/X/g;
-			# remove the first blanks (dbmail bug)
+			# remove the first blanks (dbmail bug ?)
 			$val =~ s/^\s+//;
 			# show stuff in debug mode
 			$debug and print "${s}H $h:", $val, "\n";