The branch, master has been updated via 807f3a4 Mention latest changes. via 2791e0b Be a little clearer about full-line comments. via d6a7ed9 Get GPL name right. via 4066d61 Mention right option when using --delete-delay. from 70d4a94 Support rsync daemon over SSL via stunnel.
;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 807f3a44ba7f65a78c92174b77e13193ad56bed3 Author: Wayne Davison <way...@samba.org> Date: Sun Jun 16 16:59:24 2013 -0700 Mention latest changes. commit 2791e0b54297565704916b1c5a6e4d5cdbb8386e Author: Wayne Davison <way...@samba.org> Date: Sun Jun 16 16:43:14 2013 -0700 Be a little clearer about full-line comments. commit d6a7ed99c1d37614638802375de50c5df4ca5496 Author: Wayne Davison <way...@samba.org> Date: Sun Jun 16 16:36:27 2013 -0700 Get GPL name right. commit 4066d61a9dcc8a3c50d42fb9fbdd679c6ed0b3b0 Author: Wayne Davison <way...@samba.org> Date: Sun Jun 16 16:33:32 2013 -0700 Mention right option when using --delete-delay. ----------------------------------------------------------------------- Summary of changes: NEWS | 13 ++++++++++++- flist.c | 3 ++- rsync.yo | 2 +- rsyncd.conf.yo | 7 ++++--- 4 files changed, 19 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index 8d9ec4f..040ac2d 100644 --- a/NEWS +++ b/NEWS @@ -147,6 +147,13 @@ Changes since 3.0.9: - Allow --password-file=- to read the password from stdin (filename "-"). + - Rsync now comes packaged with an rsync-ssl helper script that can be + used to contact a remote rsync daemon using a piped-stunnel command. + It also includes an stunnel config file to run the server side to + support ssl daemon connections. See the packaging/lsb/rsync.spec + file for one way to package the resulting files. (Suggestions for + how to make this even easier to install & use are welcomed.) + - Added the --outbuf=N|L|B option for chosing the output buffering. - Repating the --fuzzy option now causes the code to look for fuzzy matches @@ -212,7 +219,11 @@ Changes since 3.0.9: - The included zlib was upgraded from 1.2.3 to 1.2.8. - Rsync can now be compiled to use an unmodified zlib library instead of - the tweaked one that is included with rsync. + the tweaked one that is included with rsync. This will eventually + become the default, at which point we'll start the countdown to removing + the included zlib. Until then, feel free to configure using: + + ./configure --with-included-zlib=no DEVELOPER RELATED: diff --git a/flist.c b/flist.c index a814bd0..bf8d124 100644 --- a/flist.c +++ b/flist.c @@ -1877,7 +1877,8 @@ static NORETURN void fatal_unsafe_io_error(void) /* This (sadly) can only happen when pushing data because * the sender does not know about what kind of delete * is in effect on the receiving side when pulling. */ - rprintf(FERROR_XFER, "FATAL I/O ERROR: dying to avoid a --delete-during issue with a pre-3.0.7 receiver.\n"); + rprintf(FERROR_XFER, "FATAL I/O ERROR: dying to avoid a --delete-%s issue with a pre-3.0.7 receiver.\n", + delete_during == 2 ? "delay" : "during"); exit_cleanup(RERR_UNSUPPORTED); } diff --git a/rsync.yo b/rsync.yo index 2f68e47..ab3f458 100644 --- a/rsync.yo +++ b/rsync.yo @@ -3375,7 +3375,7 @@ ssh login. manpagesection(CREDITS) -rsync is distributed under the GNU public license. See the file +rsync is distributed under the GNU General Public License. See the file COPYING for details. A WEB site is available at diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo index 0118864..32549b0 100644 --- a/rsyncd.conf.yo +++ b/rsyncd.conf.yo @@ -28,8 +28,9 @@ whitespace in module and parameter names is irrelevant. Leading and trailing whitespace in a parameter value is discarded. Internal whitespace within a parameter value is retained verbatim. -Any line beginning with a hash (#) is ignored, as are lines containing -only whitespace. +Any line bf(beginning) with a hash (#) is ignored, as are lines containing +only whitespace. (If a hash occurs after anything other than leading +whitespace, it is considered a part of the line's content.) Any line ending in a \ is "continued" on the next line in the customary UNIX fashion. @@ -897,7 +898,7 @@ This man page is current for version 3.0.3 of rsync. manpagesection(CREDITS) -rsync is distributed under the GNU public license. See the file +rsync is distributed under the GNU General Public License. See the file COPYING for details. The primary ftp site for rsync is -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs