diff --git a/CREDITS b/CREDITS index c21a86d..13f6b5f 100644 --- a/CREDITS +++ b/CREDITS @@ -2,6 +2,9 @@ I thank very much all of these people. +J.R. Taisto +For syntax faults detection in the documentation. + Stephen Weir Made a successful migration from "Scalix" to "Eudora WorldMail v2" diff --git a/ChangeLog b/ChangeLog index 5781e8d..a470767 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,23 @@ RCS file: RCS/imapsync,v Working file: imapsync -head: 1.175 +head: 1.177 branch: locks: strict access list: symbolic names: keyword substitution: kv -total revisions: 175; selected revisions: 175 +total revisions: 177; selected revisions: 177 description: ---------------------------- +revision 1.177 +date: 2006/06/13 20:03:21; author: gilles; state: Exp; lines: +14 -14 +typos +---------------------------- +revision 1.176 +date: 2006/06/08 23:00:56; author: gilles; state: Exp; lines: +6 -6 +typo +---------------------------- revision 1.175 date: 2006/06/08 00:52:00; author: gilles; state: Exp; lines: +28 -9 Added --regexflag option to remove "bad" flags when needed. diff --git a/README b/README index 61761a2..e52caff 100644 --- a/README +++ b/README @@ -1,8 +1,8 @@ NAME - imapsync - IMAP synchronization, copy or migration tool. Synchronize + imapsync - IMAP synchronisation, copy or migration tool. Synchronise mailboxes between two imap servers. Good at IMAP migration. - $Revision: 1.175 $ + $Revision: 1.177 $ INSTALL imapsync works fine under any Unix OS. @@ -103,7 +103,7 @@ EXAMPLE To synchronize the imap account "buddy" on host "imap.src.fr" to the imap account "max" on host "imap.dest.fr" (the passwords are located in - too files "/etc/secret1" for "buddy", "/etc/secret2" for "max") : + two files "/etc/secret1" for "buddy", "/etc/secret2" for "max") : imapsync --host1 imap.src.fr --user1 buddy --passfile1 /etc/secret1 \ --host2 imap.dest.fr --user2 max --passfile2 /etc/secret2 @@ -288,5 +288,5 @@ AUTHOR teaching free open and gratis softwares. Don't hesitate to pay him for that services. - $Id: imapsync,v 1.175 2006/06/08 00:52:00 gilles Exp $ + $Id: imapsync,v 1.177 2006/06/13 20:03:21 gilles Exp $ diff --git a/VERSION b/VERSION index 896daa7..922aeba 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.175 +1.177 diff --git a/freshmeat_submition b/freshmeat_submition deleted file mode 100644 index 37a6022..0000000 --- a/freshmeat_submition +++ /dev/null @@ -1,8 +0,0 @@ -Project: imapsync -Version: 1.171 -Release-Focus: Minor bugfixes -Hide: Y -Home-Page-URL: http://www.linux-france.org/prj/imapsync/ -Gzipped-Tar-URL: http://www.linux-france.org/prj/imapsync/dist/ - -Code cleanup. diff --git a/freshmeat_submition.inp b/freshmeat_submition.inp new file mode 100644 index 0000000..ba74427 --- /dev/null +++ b/freshmeat_submition.inp @@ -0,0 +1,6 @@ + +# +RELEASE_FOCUS="Minor bugfixes" +TEXT_BODY="Syntax cleanup" + + diff --git a/imapsync b/imapsync index 3b965f7..5ac346c 100755 --- a/imapsync +++ b/imapsync @@ -2,11 +2,11 @@ =head1 NAME -imapsync - IMAP synchronization, copy or migration -tool. Synchronize mailboxes between two imap servers. Good +imapsync - IMAP synchronisation, copy or migration +tool. Synchronise mailboxes between two imap servers. Good at IMAP migration. -$Revision: 1.175 $ +$Revision: 1.177 $ =head1 INSTALL @@ -119,7 +119,7 @@ option. Nothing bad can be done this way. To synchronize the imap account "buddy" on host "imap.src.fr" to the imap account "max" on host -"imap.dest.fr" (the passwords are located in too files +"imap.dest.fr" (the passwords are located in two files "/etc/secret1" for "buddy", "/etc/secret2" for "max") : imapsync --host1 imap.src.fr --user1 buddy --passfile1 /etc/secret1 \ @@ -338,7 +338,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.175 2006/06/08 00:52:00 gilles Exp $ +$Id: imapsync,v 1.177 2006/06/13 20:03:21 gilles Exp $ =cut @@ -395,7 +395,7 @@ my( use vars qw ($opt_G); # missing code for this will be option. -$rcs = ' $Id: imapsync,v 1.175 2006/06/08 00:52:00 gilles Exp $ '; +$rcs = ' $Id: imapsync,v 1.177 2006/06/13 20:03:21 gilles Exp $ '; $rcs =~ m/,v (\d+\.\d+)/; $VERSION = ($1) ? $1 : "UNKNOWN"; @@ -432,8 +432,8 @@ $error=0; my $banner = join("", '$RCSfile: imapsync,v $ ', - '$Revision: 1.175 $ ', - '$Date: 2006/06/08 00:52:00 $ ', + '$Revision: 1.177 $ ', + '$Date: 2006/06/13 20:03:21 $ ', "\n", "Mail::IMAPClient version used here is ", $VERSION_IMAPClient,"\n" @@ -1404,16 +1404,16 @@ Several options are mandatory. add also the safe options --dry --justfolders Then, when happy, remove --dry, remove --justfolders --regexmess : Apply the whole regex to each message before transfer. - Exemple : 's/\\000/ /g' # to replace null by space. + Example : 's/\\000/ /g' # to replace null by space. --regexmess : and this one. --regexmess : and this one, etc. --regexflag : Apply the whole regex to each flags list. - Exemple : 's/\"Junk"//g' # to remove "Junk" flag. + Example : 's/\"Junk"//g' # to remove "Junk" flag. --regexflag : and this one, etc. --sep1 : separator in case namespace is not supported. --sep2 : idem. --delete : delete messages on source imap server after - a successful transfert. Useful in case you + a successful transfer. Useful in case you want to migrate from one server to another one. With imap, delete tags messages as deleted, they are not really deleted. See expunge. @@ -1421,7 +1421,7 @@ Several options are mandatory. are not on the source server. --expunge : expunge messages on source account. expunge really deletes messages marked deleted. - expunge is made at the begining on the + expunge is made at the beginning on the source server only. newly transfered messages are expunged if option --expunge is given. no expunge is done on destination account but @@ -1456,11 +1456,11 @@ Several options are mandatory. and message counts. Meant to be used with --justfoldersizes. Turned on by default. --justfoldersizes : exit after printed the folder sizes. ---syncacls : Synchronizes acls (Access Control Lists). ---nosyncacls : Does not synchronize acls. This is the default. +--syncacls : Synchronises acls (Access Control Lists). +--nosyncacls : Does not synchronise acls. This is the default. --debug : debug mode. --debugimap : imap debug mode. ---version : print sotfware version. +--version : print software version. --justconnect : just connect to both servers and print useful information. Need only --host1 and --host2 options. --justfolders : just do things about folders (ignore messages). diff --git a/memo b/memo index a02154b..3f273da 100644 --- a/memo +++ b/memo @@ -35,23 +35,41 @@ niouzes_compil } +fm_read_param() { + +# read definitions +. $NEWS_FILE_FM_INP + +} + fm_announce() { software_version NEWS_FILE_FM="/home/gilles/public_html/imapsync/freshmeat_submition" -if ! newer VERSION $NEWS_FILE_FM; then - echo "$VERSION already announced" +NEWS_FILE_FM_INP=${NEWS_FILE_FM}.inp +NEWS_FILE_FM_OUT=${NEWS_FILE_FM}.out + +if ! newer VERSION $NEWS_FILE_FM_OUT; then + echo "$VERSION already submitted on freshmeat" else - cat > $NEWS_FILE_FM << EOF + if newer VERSION $NEWS_FILE_FM_INP; then + echo "Update $NEWS_FILE_FM_INP please" + return + fi + + fm_read_param + cat > $NEWS_FILE_FM_OUT << EOF Project: imapsync Version: $VERSION -Release-Focus: Major bugfixes +Release-Focus: $RELEASE_FOCUS Hide: Y Home-Page-URL: http://www.linux-france.org/prj/imapsync/ Gzipped-Tar-URL: http://www.linux-france.org/prj/imapsync/dist/ -Code cleanup. +$TEXT_BODY + EOF -freshmeat-submit < $NEWS_FILE_FM +return +freshmeat-submit < $NEWS_FILE_FM_OUT fi }