Permalink
Browse files

1.446

  • Loading branch information...
Nick Bebout
Nick Bebout committed Jun 14, 2011
1 parent b403439 commit fac5b926d2859395bdca942adc813398b09d5581
Showing with 740 additions and 251 deletions.
  1. +8 −1 CREDITS
  2. +54 −4 ChangeLog
  3. +34 −7 FAQ
  4. +44 −6 Makefile
  5. +2 −2 README
  6. +2 −0 TIME
  7. +3 −1 TODO
  8. +1 −1 VERSION
  9. +1 −1 VERSION_EXE
  10. +12 −3 build_exe.bat
  11. +322 −134 imapsync
  12. +11 −14 index.shtml
  13. +133 −52 learn/rpm/imapsync.spec
  14. +10 −12 paypal_return.shtml
  15. +2 −2 paypal_return_support.shtml
  16. +6 −5 test2.bat
  17. +95 −6 tests.sh
View
@@ -1,5 +1,5 @@
#!/bin/cat
-# $Id: CREDITS,v 1.157 2011/05/07 02:30:05 gilles Exp gilles $
+# $Id: CREDITS,v 1.159 2011/05/30 21:58:46 gilles Exp gilles $
If you want to make a donation to the author, Gilles LAMIRAL,
use any of the following ways:
@@ -30,6 +30,13 @@ 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.
+Dex Kelson.
+Contributed by his patch for a better good_date() with --idatefromheader over 100000 messages.
+
+Unknow (@baccari.it)
+Contributed by giving the book
+32.65 "Metamagical Themas: Questing For The Essence Of Mind And Pattern"
+
Unknow
Contributed by giving the book
20.31 "Fluid Concepts And Creative Analogies: Computer Models Of The Fundamental Mechanisms Of Thought"
View
@@ -1,17 +1,67 @@
RCS file: RCS/imapsync,v
Working file: imapsync
-head: 1.434
+head: 1.446
branch:
locks: strict
- gilles: 1.434
+ gilles: 1.446
access list:
symbolic names:
keyword substitution: kv
-total revisions: 434; selected revisions: 434
+total revisions: 446; selected revisions: 446
description:
----------------------------
-revision 1.434 locked by: gilles;
+revision 1.446 locked by: gilles;
+date: 2011/05/31 09:11:18; author: gilles; state: Exp; lines: +17 -17
+Bugfix. Try to handle Markus bug in foldersizes() when select_msgs() returns a list of undef.
+----------------------------
+revision 1.445
+date: 2011/05/31 08:00:45; author: gilles; state: Exp; lines: +53 -46
+Check if uidexpunge is supported at the beginning of execution, not when needed.
+Set --uidexpunge2 if --delete2 or --expunge2 if uidexpunge not supported.
+Changed all warn() calls (STDERR) to print calls (STDOUT)
+----------------------------
+revision 1.444
+date: 2011/05/30 15:16:46; author: gilles; state: Exp; lines: +10 -7
+good_date() "24 Aug 77" -> "24-Aug-1977"
+----------------------------
+revision 1.443
+date: 2011/05/28 16:50:27; author: gilles; state: Exp; lines: +125 -41
+ Patched tests_good_date() and good_date() with Dax Kelson patches.
+----------------------------
+revision 1.442
+date: 2011/05/28 16:14:31; author: gilles; state: Exp; lines: +28 -8
+Started code to deal with epoch of messages.
+----------------------------
+revision 1.441
+date: 2011/05/26 01:01:25; author: gilles; state: Exp; lines: +14 -11
+Handle better folder creation, not a failure when folder "already exists" during its creation.
+----------------------------
+revision 1.440
+date: 2011/05/26 00:40:51; author: gilles; state: Exp; lines: +28 -28
+Replaced default setting. Now --delete2 sets --uidexpunge2 instead of --expunge2 (unless --nouidexpunge2 is set)
+----------------------------
+revision 1.439
+date: 2011/05/25 03:11:41; author: gilles; state: Exp; lines: +65 -9
+Added epoch() routine to prepare the safe bidirectional sync (maybe...)
+----------------------------
+revision 1.438
+date: 2011/05/25 00:47:27; author: gilles; state: Exp; lines: +9 -8
+Adapted the usage output multiline character to Unix or Win, \ or ^
+----------------------------
+revision 1.437
+date: 2011/05/25 00:29:04; author: gilles; state: Exp; lines: +8 -7
+Bugfix. Avoid a "no number" warning when size is null.
+----------------------------
+revision 1.436
+date: 2011/05/23 23:30:20; author: gilles; state: Exp; lines: +8 -12
+Added "Date" in the default --useheader list. ("Message-Id", "Message-ID", "Date")
+----------------------------
+revision 1.435
+date: 2011/05/23 23:06:31; author: gilles; state: Exp; lines: +29 -12
+Bugfix. Bad header beginning with a blank character.
+----------------------------
+revision 1.434
date: 2011/05/16 07:16:19; author: gilles; state: Exp; lines: +142 -57
Bugfix. Made --usecache work with --maxage or --maxsize or --min*
----------------------------
View
41 FAQ
@@ -1,10 +1,34 @@
#!/bin/cat
-# $Id: FAQ,v 1.86 2011/05/16 16:43:12 gilles Exp gilles $
+# $Id: FAQ,v 1.88 2011/05/26 00:53:26 gilles Exp gilles $
+------------------+
| FAQ for imapsync |
+------------------+
+Unix versus Windows syntax.
+On Unix shells you can write a single command on multiple lines
+by using the escape character \ at the end of each line
+(except the last one).
+
+./imapsync \
+ --host1 imap.truc.org --user1 foo --password1 secret1 \
+ --host2 imap.trac.org --user2 bar --password2 secret2
+
+
+On Windows this character is ^
+
+imapsync ^
+ --host1 imap.truc.org --user1 foo --password1 secret1 ^
+ --host2 imap.trac.org --user2 bar --password2 secret2
+
+
+Of course you can write the command on one only line without
+characters \ nor ^. I use them because the output is
+better, no truncation, pretty print. It's just sugar.
+
+In this FAQ I use \ for examples. Transcript to ^ if
+you're on a Windows system.
+
=======================================================================
Q. How to install imapsync?
@@ -519,12 +543,11 @@ Q. I want the --folder 'MyFolder' option be recursive.
Two solutions:
-R. Use
+R1. Use
--folderrec 'MyFolder'
-R. Do not use the --folder option.
- Instead, use --include '^MyFolder'
+R2. Use --include '^MyFolder'
Then the folder "MyFolder" and all its subfolders will be handled
and only them.
@@ -1192,6 +1215,10 @@ R. imapsync ... \
======================================================================
Q: How can I write an .rpm with imapsync
-R: I don't know but Neil Brown wrote one rpm package and you'll find
- his .spec file here :
- http://www.linux-france.org/prj/imapsync/learn/rpm/
+
+R. You'll find an RPM imapsync.spec file in the directory learn/rpm/
+ It has been downloaded from
+ https://svn.fysik.dtu.dk/projects/rpmbuild/trunk/SPECS/imapsync.spec
+ It has been tested with imapsync 1.434 (May 2011) on CentOS5
+ and RedHat RHEL5 Linux. (Thanks to Ole Holm Nielsen).
+ This imapsync.spec is derivated from Neil Brown work in 2007.
View
@@ -1,5 +1,5 @@
-# $Id: Makefile,v 1.74 2011/05/16 17:25:22 gilles Exp gilles $
+# $Id: Makefile,v 1.79 2011/05/31 21:32:16 gilles Exp gilles $
.PHONY: help usage all
@@ -25,6 +25,12 @@ DIST_NAME=imapsync-$(VERSION)
DIST_FILE=$(DIST_NAME).tgz
DEB_FILE=$(DIST_NAME).deb
VERSION=$(shell perl -I./Mail-IMAPClient-2.2.9 ./imapsync --version)
+VERSION_EXE=$(shell cat ./VERSION_EXE)
+
+HELLO=$(shell date;uname -a)
+
+hello:
+ echo "$(HELLO)"
all: ChangeLog README VERSION
@@ -48,7 +54,7 @@ VERSION: imapsync
clean: clean_tilde clean_man
clean_test:
- rm -f .test .test_3xx .test_229
+ rm -f .test_3xx .test_229
clean_tilde:
rm -f *~
@@ -93,8 +99,9 @@ test_quick_229: imapsync tests.sh
test_quick_3xx: imapsync tests.sh
CMD_PERL='perl -I./Mail-IMAPClient-3.28/lib' /usr/bin/time sh -x tests.sh locallocal
-testv:
- sh -x tests.sh
+testv2:
+ CMD_PERL='perl -I./Mail-IMAPClient-2.2.9' /usr/bin/time sh tests.sh
+ touch .test_229
testv3:
CMD_PERL='perl -I./Mail-IMAPClient-3.28/lib' sh -x tests.sh
@@ -155,6 +162,7 @@ imapsync.exe: imapsync build_exe.bat test_exe.bat .dosify_bat
ssh Admin@c 'C:/msys/1.0/home/Admin/imapsync/test_exe.bat'
scp Admin@c:'C:/msys/1.0/home/Admin/imapsync/imapsync.exe' .
ssh Admin@c 'C:/msys/1.0/home/Admin/imapsync/imapsync.exe --version' > VERSION_EXE
+ dos2unix VERSION_EXE
(date "+%s"| tr "\n" " "; echo -n "END " $(VERSION) ": "; date) >> .BUILD_EXE_TIME
@@ -191,7 +199,7 @@ imapsync_elf_x86.bin: imapsync
lfo: cidone niouze_lfo upload_lfo
-dist: cidone test clean all INSTALL tarball
+dist: cidone test clean all INSTALL dist_prepa dist_prepa_exe
tarball: cidone all
echo making tarball $(DIST_FILE)
@@ -205,6 +213,36 @@ tarball: cidone all
cd ../prepa_dist && md5sum -c $(DIST_FILE).md5.txt
ls -l ../prepa_dist/$(DIST_FILE)
+
+DO_IT := $(shell test -f ./dist/path_$(VERSION).txt || makepasswd --chars 4 > ./dist/path_$(VERSION).txt)
+DIST_SECRET := $(shell cat ./dist/path_$(VERSION).txt)
+DIST_PATH := ./dist/$(DIST_SECRET)
+
+lalala:
+ echo $(DIST_SECRET)
+
+dist_prepa: tarball dist_dir
+ ln -f ../prepa_dist/$(DIST_FILE) $(DIST_PATH)/
+ #cd $(DIST_PATH)/ && md5sum $(DIST_FILE) > $(DIST_FILE).md5.txt
+ #cd $(DIST_PATH)/ && md5sum -c $(DIST_FILE).md5.txt
+ ls -l $(DIST_PATH)/
+
+dist_dir:
+ @echo $(DIST_SECRET)
+ @echo $(DIST_PATH)
+ mkdir -p $(DIST_PATH)
+ ln -f ./dist/path_$(VERSION).txt ./dist/path_last.txt
+
+
+dist_prepa_exe: imapsync.exe
+ mkdir -p $(DIST_PATH)
+ ln -f ./imapsync.exe $(DIST_PATH)/
+ #cd $(DIST_PATH)/ && md5sum ./imapsync.exe > ./imapsync.exe.md5.txt
+ #cd $(DIST_PATH)/ && md5sum -c ./imapsync.exe.md5.txt
+
+
+
+
ks:
rsync -avz --delete . imapsync@ks.lamiral.info:public_html/imapsync
{ cd /g/var/paypal_reply/ &&\
@@ -221,7 +259,7 @@ PUBLIC_FILES = ./ChangeLog ./COPYING ./CREDITS ./FAQ \
upload_ks:
rsync -lptvHz $(PUBLIC_FILES) \
root@ks.lamiral.info:/var/www/imapsync/
- rsync -lptvHz ./dist/index.shtml \
+ rsync -lptvHzr ./dist/ \
root@ks.lamiral.info:/var/www/imapsync/dist/
upload_lfo:
View
4 README
@@ -3,7 +3,7 @@ NAME
Synchronise mailboxes between two imap servers. Good at IMAP migration.
More than 36 different IMAP server softwares supported with success.
- $Revision: 1.434 $
+ $Revision: 1.446 $
SYNOPSIS
To synchronise imap account "foo" on "imap.truc.org" to imap account
@@ -424,5 +424,5 @@ SIMILAR SOFTWARES
Feedback (good or bad) will often be welcome.
- $Id: imapsync,v 1.434 2011/05/16 07:16:19 gilles Exp gilles $
+ $Id: imapsync,v 1.446 2011/05/31 09:11:18 gilles Exp gilles $
View
2 TIME
@@ -1,3 +1,5 @@
+ 30 Patched tests_good_date() and good_date() with Dax Kelson patches.
+120 Added a good reply for buying support.
540 (1.434) (1.433) (1.432)
180 Tests of mkpath very long path > 300 char. Win32 fails on them. (1.431)
Added special case for Inbox vs INBOX bug creation. (1.430)
View
4 TODO
@@ -1,5 +1,5 @@
#!/bin/cat
-# $Id: TODO,v 1.97 2011/05/16 16:39:38 gilles Exp gilles $
+# $Id: TODO,v 1.98 2011/05/30 21:59:06 gilles Exp gilles $
TODO file for imapsync
----------------------
@@ -23,6 +23,8 @@ Evaluate
http://www.rackspace.com/apps/email_hosting/migrations
http://www.yippiemove.com/
+Find a way to avoid passwords in --debugimap unless needed.
+
Fix long path over than 256 character on Win32.
Think about Digest::SHA or Digest::SHA::PurePerl.
View
@@ -1 +1 @@
-1.434
+1.446
View
@@ -1 +1 @@
-1.434
+1.446
View
@@ -1,10 +1,19 @@
-REM $Id: build_exe.bat,v 1.8 2010/11/09 01:22:29 gilles Exp gilles $
+REM $Id: build_exe.bat,v 1.9 2011/05/31 08:28:29 gilles Exp gilles $
echo Building imapsync.exe
cd C:\msys\1.0\home\Admin\imapsync
-perl -mMail::IMAPClient -mDigest::MD5 -mTerm::ReadKey -mIO::Socket::SSL -mFile::Spec -mDigest::HMAC_MD5 -mAuthen::NTLM -e ''
+perl -mMail::IMAPClient -mIO::Socket -mIO::Socket::SSL ^
+ -mDigest::MD5 -mDigest::HMAC_MD5 ^
+ -mTerm::ReadKey -mFile::Spec -mAuthen::NTLM ^
+ -mTime::Local ^
+ -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 Term::ReadKey -M Authen::NTLM imapsync
+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 Term::ReadKey -M Authen::NTLM ^
+ -M Time::Local ^
+ imapsync
echo Done building imapsync.exe
Oops, something went wrong.

0 comments on commit fac5b92

Please sign in to comment.