1.542

CREDITS

@@ -1,5 +1,5 @@
 #!/bin/cat
-# $Id: CREDITS,v 1.172 2013/01/29 09:31:00 gilles Exp gilles $
+# $Id: CREDITS,v 1.173 2013/05/06 08:16:53 gilles Exp gilles $
 
 If you want to make a donation to the author, Gilles LAMIRAL,
 use any of the following ways:
@@ -30,6 +30,9 @@ I thank very much all of these people.
 I thank also very much all people who bought imapsync from the homepage
 but I don't cite them here.
 
+Eduardo Bortoluzzi Junior
+Write the XOAUTH code and FAQ item.
+
 Marc Weber
 Suggested --mark-as-deleted1 --mark-as-deleted2
 

ChangeLog

@@ -1,17 +1,41 @@
 
 RCS file: RCS/imapsync,v
 Working file: imapsync
-head: 1.536
+head: 1.542
 branch:
 locks: strict
-	gilles: 1.536
+	gilles: 1.542
 access list:
 symbolic names:
 keyword substitution: kv
-total revisions: 536;	selected revisions: 536
+total revisions: 542;	selected revisions: 542
 description:
 ----------------------------
-revision 1.536	locked by: gilles;
+revision 1.542	locked by: gilles;
+date: 2013/05/06 08:30:35;  author: gilles;  state: Exp;  lines: +7 -7
+Syntax with "" fix.
+----------------------------
+revision 1.541
+date: 2013/05/06 07:10:29;  author: gilles;  state: Exp;  lines: +111 -74
+Started perlcritic corrections. Left 4 eval at level 5.
+----------------------------
+revision 1.540
+date: 2013/04/22 11:05:51;  author: gilles;  state: Exp;  lines: +11 -982
+Removed old 2.2.9 Mail::IMAPClient patch stuff.
+----------------------------
+revision 1.539
+date: 2013/04/22 00:54:22;  author: gilles;  state: Exp;  lines: +12 -12
+Fixed require namespace with uri_escape() calls.
+----------------------------
+revision 1.538
+date: 2013/04/22 00:46:54;  author: gilles;  state: Exp;  lines: +94 -9
+Added XOAUTH authentication. Thanks to Eduardo Bortoluzzi Junior.
+----------------------------
+revision 1.537
+date: 2013/04/19 06:59:17;  author: gilles;  state: Exp;  lines: +9 -9
+MDaemon 9.6.5, Surgemail 6.3d-72
+----------------------------
+revision 1.536
 date: 2013/04/17 14:33:12;  author: gilles;  state: Exp;  lines: +7 -7
 Added --delete1 as an alias for --delete
 ----------------------------

FAQ

@@ -1,5 +1,5 @@
 #!/bin/cat
-# $Id: FAQ,v 1.130 2013/04/17 12:46:10 gilles Exp gilles $
+# $Id: FAQ,v 1.133 2013/05/06 08:17:13 gilles Exp gilles $
 
 +------------------+
 | FAQ for imapsync |
@@ -359,16 +359,18 @@ Q. We have found that the sent time and date have been changed to the
 
 R. This is the case with:
    - Eudora
-   - Zimbra
    - Outlook 2003
-   - Gmail
-   but not with 
+ but not with 
    - Mutt
    - Thunderbird
+ and no longer with
+   - Zimbra
+   - Gmail
+
 
 Eurora shows by default  the time the imap server received the email. I
 think   it is  quite   a  wrong  behavior  since  the messages can have
-travelled some time before the reception.
+traveled some time before the reception.
 
 The sent time and date are given by the "Date:" header and it is set
 most of the time by the MUA (Mail User Agent, Mutt, Eudora,
@@ -1448,7 +1450,6 @@ R. Gmail needs SSL
 ./imapsync \
            --host1 imap.gmail.com \
            --ssl1 \
-           --authmech1 LOGIN \
            --user1 [email protected] \
            --password1 gmailsecret \
            --exitwhenover 2500000000 \
@@ -1470,6 +1471,43 @@ exceed maximum limit.
 See http://support.google.com/a/bin/answer.py?hl=en&answer=1071518
 
 
+=======================================================================
+Q. How to use XOAUTH to globally authenticate gmail users?
+   The XOAUTH code and this FAQ item come from Eduardo Bortoluzzi
+   Thanks Eduardo!
+
+R. The goal of OAUTH is to migrate all users from/to Google Apps 
+   Premier Edition without knowing their passwords.
+
+   The global password is available at the Google Apps control panel, 
+   at Advanced Tools -> Manage OAuth domain key.
+
+./imapsync \
+    --host1 imap.gmail.com --ssl1 \
+    --user1 [email protected] \
+    --password1 secret1 \
+    --authmech1 XOAUTH \
+    --host2 imap.gmail.com --ssl2 \
+    --user2 [email protected] \
+    --password2 secret2 \
+    --authmech2 XOAUTH
+
+Google Apps is a paid service, but you can try it for 30 days without any cost.
+
+Some notes about configuring the Google Apps XOAUTH:
+
+ On "Advanced Tools > Manage OAuth domain key > Two-legged OAuth access control" 
+    the "Allow access to all APIs" must be checked 
+    (https://support.google.com/a/bin/answer.py?answer=162105)
+
+ OR
+
+ On "Advanced Tools > Manage third party OAuth client access", 
+    the configured costumer key must have the scope 
+    "https://mail.google.com/" configured 
+    (https://support.google.com/a/bin/answer.py?answer=162106).
+
+
 =======================================================================
 Q. migrate email from gmail to google apps
 

INSTALL

@@ -1,4 +1,4 @@
-# $Id: INSTALL,v 1.27 2013/04/17 12:35:18 gilles Exp gilles $
+# $Id: INSTALL,v 1.28 2013/05/14 08:19:08 gilles Exp gilles $
 # 
 # INSTALL file for imapsync 
 # imapsync : IMAP sync or copy tool.
@@ -30,16 +30,32 @@ WINDOWS
 a) Simplest way:
 
 - Buy imapsync.exe at http://imapsync.lamiral.info/
+
 - Run imapsync.exe in a command prompt (execute cmd.exe).
 
+- Or simpler, look at the batch file at
+  http://imapsync.lamiral.info/examples/imapsync_example.bat
+  and replace the parameters with your values
+  then run the batch file with a double-click.
+  It is simpler to edit a batch file with notepad than 
+  the command line in dos mode.
+
 b) Hard way:
 
 - Get imapsync-x.xx.tgz
 - Install Perl if it isn't already installed.
-  Strawberry Perl is a good candidate
-- Use PPM to install modules listed in the PREREQUISITES section.
-  PPM is Perl Package Manager.
+  Strawberry Perl is a very good candidate
+  http://strawberryperl.com/
+
+- Use the command CPAN to install modules listed in the PREREQUISITES section.
+  There is also a batch file that does this install for you
+  It is called install_modules.bat available at
+  http://imapsync.lamiral.info/examples/install_modules.bat
 
+c) How to build imapsync.exe?
+
+- Do the hard stuff in b)
+- Run W/build_exe.bat (found in the tarball)
 
 PREREQUISITES 
 -------------
@@ -118,36 +134,51 @@ Here is some individual module help:
 - Perl Time::HiRes
   perl -mTime::HiRes  -e ""
 
+- Perl Data::Uniqid
+  perl -mData::Uniqid  -e ""
+
+- Perl URI::Escape
+  perl -mURI::Escape  -e ""
+
+
 Test everything in one command:
 
   perl -mMail::IMAPClient -mDigest::MD5 -mTerm::ReadKey -mIO::Socket::SSL \
-       -mFile::Spec -mDigest::HMAC_MD5 -mAuthen::NTLM -e -mTime::HiRes ''
+       -mFile::Spec -mDigest::HMAC_MD5 -mAuthen::NTLM -e -mTime::HiRes \
+       -mData::Uniqid -mURI::Escape  ""
 
 You can install easily those Perl modules in latest release via the
 following commands (with root permissions)
 
-  perl -MCPAN -e 'install Mail::IMAPClient' 
-  perl -MCPAN -e 'install Digest::MD5' 
-  perl -MCPAN -e 'install Term::ReadKey' 
-  perl -MCPAN -e 'install IO::Socket::SSL' 
-  perl -MCPAN -e 'install File::Spec' 
-  perl -MCPAN -e 'install Digest::HMAC_MD5' 
-  perl -MCPAN -e 'install Authen::NTLM' 
-  perl -MCPAN -e 'install Time::HiRes' 
+  perl -MCPAN -e "install Mail::IMAPClient"
+  perl -MCPAN -e "install Digest::MD5"
+  perl -MCPAN -e "install Term::ReadKey"
+  perl -MCPAN -e "install IO::Socket::SSL"
+  perl -MCPAN -e "install File::Spec"
+  perl -MCPAN -e "install Digest::HMAC_MD5"
+  perl -MCPAN -e "install Authen::NTLM"
+  perl -MCPAN -e "install Time::HiRes"
+  perl -MCPAN -e "install Data::Uniqid"
+  perl -MCPAN -e "install URI::Escape"
+
 
 You can install them easily too by using the standard install
 command on your system if the packages have been made on it
 (so you may not have the latest but most of the time it
-doesn't care).
+doesn't care). 
+
+Modules Authen::NTLM, Data::Uniqid may be not available 
+this way since I haven't find them on Ubuntu.
+
 Example on Debian/Ubuntu:
 
-  aptitude install  libmail-imapclient-perl # Mail::IMAPClient'
-  aptitude install  libdigest-md5-file-perl # Digest::MD5' 
-  aptitude install  libterm-readkey-perl    # Term::ReadKey' 
-  aptitude install  libio-socket-ssl-perl   # IO::Socket::SSL' 
-  aptitude install  libfile-spec-perl       # File::Spec' 
-  aptitude install  libdigest-hmac-perl     # Digest::HMAC_MD5'
-  aptitude install  ?  # (not free?)        # Authen::NTLM
+  aptitude install  libmail-imapclient-perl # Mail::IMAPClient
+  aptitude install  libdigest-md5-file-perl # Digest::MD5
+  aptitude install  libterm-readkey-perl    # Term::ReadKey
+  aptitude install  libio-socket-ssl-perl   # IO::Socket::SSL
+  aptitude install  libfile-spec-perl       # File::Spec
+  aptitude install  libdigest-hmac-perl     # Digest::HMAC_MD5 Digest::HMAC_SHA1
+
 
 INSTALLING on Unix
 ------------------

Makefile

@@ -1,5 +1,5 @@
 
-# $Id: Makefile,v 1.116 2013/04/18 01:24:25 gilles Exp gilles $	
+# $Id: Makefile,v 1.118 2013/05/14 05:59:55 gilles Exp gilles $	
 
 .PHONY: help usage all
 
@@ -13,13 +13,15 @@ usage:
 	@echo "make test_quick # few tests verbosely"
 	@echo "make tests_win32 # run tests on win32"
 	@echo "make tests_win32_dev # run test2.bat on win32"
+	@echo "make prereq_win32 # run W/install_modules.bat on win32"
 	@echo "make all     "
 	@echo "make upload_index"
 	@echo "make upload_ks"
 	@echo "make imapsync.exe"
 	@echo "make imapsync_elf_x86.bin"
 	@echo "make publish"
 
+
 PREFIX ?= /usr
 DIST_NAME=imapsync-$(VERSION)
 DIST_FILE=$(DIST_NAME).tgz
@@ -145,6 +147,9 @@ test_imapsync_exe: dosify_bat
 	scp W/test_exe.bat Admin@c:'C:/msys/1.0/home/Admin/imapsync/'
 	time ssh Admin@c 'C:/msys/1.0/home/Admin/imapsync/test_exe.bat'
 
+prereq_win32: imapsync examples/install_modules.bat .dosify_bat
+	scp examples/install_modules.bat Admin@c:'C:/msys/1.0/home/Admin/imapsync/'
+	time ssh Admin@c 'C:/msys/1.0/home/Admin/imapsync/install_modules.bat'
 
 imapsync.exe: imapsync W/build_exe.bat .dosify_bat
 	rcsdiff imapsync
@@ -257,7 +262,7 @@ ksa:
 	rsync -avHz --delete -P \
 	  . [email protected]:public_html/imapsync/
 
-publish: upload_ks ksa ml
+publish: ksa upload_ks ml
 
 PUBLIC_FILES = ./ChangeLog ./NOLIMIT ./LICENSE ./CREDITS ./FAQ \
 ./index.shtml ./INSTALL \

README

@@ -4,7 +4,7 @@ NAME
     More than 52 different IMAP server softwares supported with success, few
     failures.
 
-    $Revision: 1.536 $
+    $Revision: 1.542 $
 
 SYNOPSIS
     To synchronize imap account "foo" on "imap.truc.org" to imap account
@@ -191,6 +191,11 @@ SECURITY
     --proxyauth1 to enable administrative user to masquerade as another
     user. Can also be used on destination server with --proxyauth2
 
+    You can authenticate with OAUTH when transfering from Google Apps. The
+    consumer key will be the domain part of the --user, and the --password
+    will be used as the consumer secret. It does not work with Google Apps
+    free edition.
+
 EXIT STATUS
     imapsync will exit with a 0 status (return code) if everything went
     good. Otherwise, it exits with a non-zero status.
@@ -351,8 +356,8 @@ IMAP SERVERS
      - Kerio 7.2.0 Patch 1 [host1] [host2]
      - Mail2World IMAP4 Server 2.5 [host1] (http://www.mail2world.com/)
      - MailEnable 4.23 [host1] [host2], 4.26 [host1][host2], 5 [host1]
-     - MDaemon 7.0.1, 8.0.2, 8.1, 9.5.4 (Windows server 2003 R2 platform), 12 [host2],
-       12.0.3 [host1], 12.5.5 [host1],
+     - MDaemon 7.0.1, 8.0.2, 8.1, 9.5.4 (Windows server 2003 R2 platform), 
+       9.6.5 [host1], 12 [host2], 12.0.3 [host1], 12.5.5 [host1],
      - Mercury 4.1 (Windows server 2000 platform)
      - Microsoft Exchange Server 5.5, 6.0.6249.0[host1], 6.0.6487.0[host1], 
        6.5.7638.1 [host2], 6.5 [host1], Exchange 2007 SP1 (with Update Rollup 2), 
@@ -374,7 +379,7 @@ IMAP SERVERS
      - Softalk Workgroup Mail 7.6.4 [host1].
      - SunONE Messaging server 5.2, 6.0 (SUN JES - Java Enterprise System)
      - Sun Java(tm) System Messaging Server 6.2-2.05,  6.2-7.05, 6.3
-     - Surgemail 3.6f5-5
+     - Surgemail 3.6f5-5, 6.3d-72 [host2]
      - UW-imap servers (imap-2000b) rijkkramer IMAP4rev1 2000.287
        (RedHat uses UW like 2003.338rh), v12.264 Solaris 5.7 (OSI Approved) 
        (http://www.washington.edu/imap/)
@@ -458,5 +463,5 @@ SIMILAR SOFTWARES
 
     Feedback (good or bad) will often be welcome.
 
-    $Id: imapsync,v 1.536 2013/04/17 14:33:12 gilles Exp gilles $
+    $Id: imapsync,v 1.542 2013/05/06 08:30:35 gilles Exp gilles $
 

VERSION

@@ -1 +1 @@
-1.536
+1.542

VERSION_EXE

@@ -1 +1 @@
-1.536
+1.542

W/.BUILD_EXE_TIME

@@ -184,3 +184,7 @@
 1366203902 END    1.535 : mercredi 17 avril 2013, 15:05:02 (UTC+0200)
 1366209307 BEGIN  1.536 : mercredi 17 avril 2013, 16:35:07 (UTC+0200)
 1366210370 END    1.536 : mercredi 17 avril 2013, 16:52:50 (UTC+0200)
+1366591668 BEGIN  1.538 : lundi 22 avril 2013, 02:47:48 (UTC+0200)
+1366592337 END    1.538 : lundi 22 avril 2013, 02:58:57 (UTC+0200)
+1367829058 BEGIN  1.542 : lundi 6 mai 2013, 10:30:58 (UTC+0200)
+1367829799 END    1.542 : lundi 6 mai 2013, 10:43:19 (UTC+0200)

W/TIME

@@ -1,3 +1,4 @@
+ 90 Added XOATH FAQ item, thanks to Eduardo, email feedback, amazon gift.
 120 Fixed Scott issue, took long time (all messages list) even with --useuid --delete --nousecache --maxage 1
 240 Fixed long names in invoices. + january invoices.
 180 Release 1.476 --addheader

W/build_exe.bat

@@ -1,20 +1,20 @@
 
-REM $Id: build_exe.bat,v 1.11 2012/12/24 02:25:55 gilles Exp gilles $
+REM $Id: build_exe.bat,v 1.12 2013/05/06 08:16:26 gilles Exp gilles $
 REM
 
 echo Building imapsync.exe
 cd C:\msys\1.0\home\Admin\imapsync
 perl -mMail::IMAPClient -mIO::Socket -mIO::Socket::SSL ^
-     -mDigest::MD5 -mDigest::HMAC_MD5 ^
+     -mDigest::MD5 -mDigest::HMAC_MD5 -mDigest::HMAC_SHA1 ^
      -mTerm::ReadKey  -mFile::Spec -mAuthen::NTLM ^
-     -mTime::Local ^
+     -mTime::Local -mURI::Escape -mData::Uniqid^
      -e ''
 
 pp -o imapsync.exe  --link libeay32_.dll --link libssl32_.dll ^
      -M Mail::IMAPClient -M IO::Socket -M IO::Socket::SSL ^
-     -M Digest::MD5 -M Digest::HMAC_MD5 ^
+     -M Digest::MD5 -M Digest::HMAC_MD5 -M Digest::HMAC_SHA1 ^
      -M Term::ReadKey -M Authen::NTLM ^
-     -M Time::Local ^
+     -M Time::Local -M URI::Escape -M Data::Uniqid ^
    imapsync
 
 echo Done building imapsync.exe 

W/paypal_reply/memo

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: memo,v 1.13 2013/02/08 15:01:18 gilles Exp gilles $
+# $Id: memo,v 1.14 2013/04/29 08:15:35 gilles Exp gilles $
 
 
 echo paypal_bilan_todo