This commit is contained in:
Nick Bebout 2011-03-12 02:44:48 +00:00
parent 5cdcc66e9c
commit be15a96297
10 changed files with 73 additions and 27 deletions

37
CREDITS
View file

@ -1,5 +1,5 @@
#!/bin/cat #!/bin/cat
# $Id: CREDITS,v 1.122 2009/05/04 01:08:32 gilles Exp gilles $ # $Id: CREDITS,v 1.123 2009/07/24 17:22:32 gilles Exp gilles $
If you want to make a donation to the author, Gilles LAMIRAL: If you want to make a donation to the author, Gilles LAMIRAL:
@ -20,6 +20,28 @@ to remove one.
I thank very much all of these people. I thank very much all of these people.
Kelsey Cummings
Contributed by giving the book
64.12 "Computer Architecture: Concepts and Evolution 2-Volume Set"
Gabriel Gonzalez
Contributed by giving the book
29.69 "Network Warrior"
Dr Wolfram Haupt
Contributed by giving the book
8.00 "In the Beginning...was the Command Line"
Peter Kooiman
Contributed by giving the book
19.79 "Illustrated Guide to Home Chemistry Experiments"
William David Pooser
Contributed by giving the books
12.89 "How to Solve It: A New Aspect of Mathematical Method "
23.39 "How to Prove It: A Structured Approach"
Edward Blackburne Edward Blackburne
Contributed by giving the book Contributed by giving the book
26.95 "Mathematics and Plausible Reasoning (vol 1)" 26.95 "Mathematics and Plausible Reasoning (vol 1)"
@ -701,6 +723,17 @@ Eric Yung
Total amount of book prices : Total amount of book prices :
c \ c \
64.12+\
\
29.69+\
\
8+\
\
19.79+\
\
12.89+\
23.39+\
\
26.95+\ 26.95+\
21.86+\ 21.86+\
\ \
@ -764,4 +797,4 @@ c \
31.20+\ 31.20+\
40.00 40.00
=1668.02 =1825.90

View file

@ -1,17 +1,21 @@
RCS file: RCS/imapsync,v RCS file: RCS/imapsync,v
Working file: imapsync Working file: imapsync
head: 1.285 head: 1.286
branch: branch:
locks: strict locks: strict
gilles: 1.285 gilles: 1.286
access list: access list:
symbolic names: symbolic names:
keyword substitution: kv keyword substitution: kv
total revisions: 285; selected revisions: 285 total revisions: 286; selected revisions: 286
description: description:
---------------------------- ----------------------------
revision 1.285 locked by: gilles; revision 1.286 locked by: gilles;
date: 2009/07/24 15:53:04; author: gilles; state: Exp; lines: +10 -7
Bug fix: allow3x is on by default (was badly done after check_lib_version())
----------------------------
revision 1.285
date: 2009/07/03 00:59:20; author: gilles; state: Exp; lines: +38 -17 date: 2009/07/03 00:59:20; author: gilles; state: Exp; lines: +38 -17
Applied "patch -p0 < patches/imapsync.1.284.patch" Applied "patch -p0 < patches/imapsync.1.284.patch"
Attached is a patch against 1.284 with the following changes: Attached is a patch against 1.284 with the following changes:

View file

@ -103,7 +103,7 @@ tarball:
mkdir -p dist mkdir -p dist
mkdir -p ../prepa_dist/$(DIST_NAME) mkdir -p ../prepa_dist/$(DIST_NAME)
rsync -aCv --delete --exclude dist/ ./ ../prepa_dist/$(DIST_NAME) rsync -aCv --delete --exclude dist/ ./ ../prepa_dist/$(DIST_NAME)
cd ../prepa_dist && tar czfv $(DIST_FILE) $(DIST_NAME) cd ../prepa_dist && tar czfv --verify $(DIST_FILE) $(DIST_NAME)
ln -f ../prepa_dist/$(DIST_FILE) dist/ ln -f ../prepa_dist/$(DIST_FILE) dist/
cd dist && md5sum $(DIST_FILE) > $(DIST_FILE).md5.txt cd dist && md5sum $(DIST_FILE) > $(DIST_FILE).md5.txt
cd dist && md5sum -c $(DIST_FILE).md5.txt cd dist && md5sum -c $(DIST_FILE).md5.txt

4
README
View file

@ -3,7 +3,7 @@ NAME
Synchronise mailboxes between two imap servers. Good at IMAP migration. Synchronise mailboxes between two imap servers. Good at IMAP migration.
More than 32 different IMAP server softwares supported with success. More than 32 different IMAP server softwares supported with success.
$Revision: 1.285 $ $Revision: 1.286 $
INSTALL INSTALL
imapsync works fine under any Unix OS with perl. imapsync works fine under any Unix OS with perl.
@ -362,5 +362,5 @@ SIMILAR SOFTWARES
Feedback (good or bad) will always be welcome. Feedback (good or bad) will always be welcome.
$Id: imapsync,v 1.285 2009/07/03 00:59:20 gilles Exp gilles $ $Id: imapsync,v 1.286 2009/07/24 15:53:04 gilles Exp gilles $

4
TODO
View file

@ -1,9 +1,11 @@
#!/bin/cat #!/bin/cat
# $Id: TODO,v 1.64 2009/03/22 18:39:57 gilles Exp gilles $ # $Id: TODO,v 1.65 2009/07/24 17:22:13 gilles Exp gilles $
TODO file for imapsync TODO file for imapsync
---------------------- ----------------------
Add more information about skipped messages.
There was a time imapsync took the whole message when the There was a time imapsync took the whole message when the
header was bad (empty). But it was bad for speed with big header was bad (empty). But it was bad for speed with big
messages (nowadays there are always big messages in messages (nowadays there are always big messages in

View file

@ -1 +1 @@
1.285 1.286

View file

@ -9,7 +9,7 @@ tool. Synchronise mailboxes between two imap servers. Good
at IMAP migration. More than 32 different IMAP server softwares at IMAP migration. More than 32 different IMAP server softwares
supported with success. supported with success.
$Revision: 1.285 $ $Revision: 1.286 $
=head1 INSTALL =head1 INSTALL
@ -418,7 +418,7 @@ Entries for imapsync:
Feedback (good or bad) will always be welcome. Feedback (good or bad) will always be welcome.
$Id: imapsync,v 1.285 2009/07/03 00:59:20 gilles Exp gilles $ $Id: imapsync,v 1.286 2009/07/24 15:53:04 gilles Exp gilles $
=cut =cut
@ -484,7 +484,7 @@ my(
use vars qw ($opt_G); # missing code for this will be option. use vars qw ($opt_G); # missing code for this will be option.
$rcs = '$Id: imapsync,v 1.285 2009/07/03 00:59:20 gilles Exp gilles $ '; $rcs = '$Id: imapsync,v 1.286 2009/07/24 15:53:04 gilles Exp gilles $ ';
$rcs =~ m/,v (\d+\.\d+)/; $rcs =~ m/,v (\d+\.\d+)/;
$VERSION = ($1) ? $1: "UNKNOWN"; $VERSION = ($1) ? $1: "UNKNOWN";
@ -547,8 +547,8 @@ while (@argv_copy) {
my $banner = join("", my $banner = join("",
'$RCSfile: imapsync,v $ ', '$RCSfile: imapsync,v $ ',
'$Revision: 1.285 $ ', '$Revision: 1.286 $ ',
'$Date: 2009/07/03 00:59:20 $ ', '$Date: 2009/07/24 15:53:04 $ ',
"\n",localhost_info(), "\n",localhost_info(),
" and the module Mail::IMAPClient version used here is ", " and the module Mail::IMAPClient version used here is ",
$VERSION_IMAPClient,"\n", $VERSION_IMAPClient,"\n",
@ -563,6 +563,10 @@ unless(defined(&_SYSEXITS_H)) {
get_options(); get_options();
# allow Mail::IMAPClient 3.0.xx by default
$allow3xx = defined($allow3xx) ? $allow3xx : 1;
check_lib_version() or check_lib_version() or
die "imapsync needs perl lib Mail::IMAPClient release 2.2.9, or 3.0.19 or superior \n"; die "imapsync needs perl lib Mail::IMAPClient release 2.2.9, or 3.0.19 or superior \n";
@ -586,8 +590,7 @@ $port1 ||= defined $ssl1 ? 993 : 143;
$host2 || missing_option("--host2") ; $host2 || missing_option("--host2") ;
$port2 ||= defined $ssl2 ? 993 : 143; $port2 ||= defined $ssl2 ? 993 : 143;
# allow Mail::IMAPClient 3.0.xx by default
$allow3xx = defined($allow3xx) ? $allow3xx : 1;
sub connect_imap { sub connect_imap {
my($host, $port, $debugimap, $ssl) = @_; my($host, $port, $debugimap, $ssl) = @_;

View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# $Id: tests.sh,v 1.92 2009/07/03 01:00:42 gilles Exp gilles $ # $Id: tests.sh,v 1.93 2009/07/24 17:20:41 gilles Exp gilles $
# Example: # Example:
# CMD_PERL='perl -I./Mail-IMAPClient-3.14/lib' sh -x tests.sh # CMD_PERL='perl -I./Mail-IMAPClient-3.14/lib' sh -x tests.sh
@ -808,13 +808,7 @@ gmail_gmail2() {
allow3xx() { allow3xx() {
if can_send; then perl -I./Mail-IMAPClient-3.19/lib ./imapsync \
#echo3 Here is plume
sendtestmessage
else
:
fi
$CMD_PERL ./imapsync \
--host1 $HOST1 --user1 tata \ --host1 $HOST1 --user1 tata \
--passfile1 ../../var/pass/secret.tata \ --passfile1 ../../var/pass/secret.tata \
--host2 $HOST2 --user2 titi \ --host2 $HOST2 --user2 titi \
@ -822,6 +816,14 @@ allow3xx() {
--allow3xx --allow3xx
} }
noallow3xx() {
! perl -I./Mail-IMAPClient-3.19/lib ./imapsync \
--host1 $HOST1 --user1 tata \
--passfile1 ../../var/pass/secret.tata \
--host2 $HOST2 --user2 titi \
--passfile2 ../../var/pass/secret.titi \
--noallow3xx
}
archiveopteryx_1() { archiveopteryx_1() {
@ -1102,6 +1104,7 @@ test $# -eq 0 && run_tests \
option_version \ option_version \
option_tests \ option_tests \
option_bad_delete2 \ option_bad_delete2 \
first_sync_dry \
first_sync \ first_sync \
locallocal \ locallocal \
ll_timeout \ ll_timeout \
@ -1149,6 +1152,7 @@ test $# -eq 0 && run_tests \
archiveopteryx_1 \ archiveopteryx_1 \
ssl_justconnect \ ssl_justconnect \
allow3xx \ allow3xx \
noallow3xx \
justlogin \ justlogin \
# msw # msw