From 7b710f06fd53453f3a8d85c01c3b36aaad7b7d29 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 12 Mar 2006 18:51:23 +0000 Subject: [PATCH] Update to 2.6.7, tron@ ok: NEWS for rsync 2.6.7 (11 Mar 2006) Protocol: 29 (unchanged) Changes since 2.6.6: OUTPUT CHANGES: - The letter 'D' in the itemized output was being used for both devices (character or block) as well as other special files (such as fifos and named sockets). This has changed to separate non-device special files under the 'S' designation (e.g. "cS+++++++ path/fifo"). See also the "--specials" option, below. - The way rsync escapes unreadable characters has changed. First, rsync now has support for recognizing valid multibyte character sequences in your current locale, allowing it to escape fewer characters than before for a locale such as UTF-8. Second, it now uses an escape idiom of "\#123", which is the literal string "\#" followed by exactly 3 octal digits. Rsync no longer doubles a backslash character in a filename (e.g. it used to output "foo\\bar" when copying "foo\bar") -- now it only escapes a backslash that is followed by a hash-sign and 3 digits (0-9) (e.g. it will output "foo\#134#789" when copying "foo\#789"). See also the --8-bit-output (-8) option, mentioned below. Script writers: the local rsync is the one that outputs escaped names, so if you need to support unescaping of filenames for older rsyncs, I'd suggest that you parse the output of "rsync --version" and only use the old unescaping rules for 2.6.5 and 2.6.6. BUG FIXES: (LOTS) ENHANCEMENTS: - Added the --append option that makes rsync append data onto files that are longer on the source than the destination (this includes new files). - Added the --min-size=SIZE option to exclude small files from the transfer. - Added the --compress-level option to allow you to set how aggressive rsync's compression should be (this option implies --compress). - Enhanced the parsing of the SIZE value for --min-size and --max-size to allow easy entry of multiples of 1000 (instead of just multiples of 1024) and off-by-one values too (e.g. --max-size=8mb-1). - Added the --8-bit-output (-8) option, which tells rsync to avoid escaping high-bit characters that it thinks are unreadable in the current locale. - The new option --human-readable (-h) changes the output of --progress, --stats, and the end-of-run summary to be easier to read. If repeated, the units become powers of 1024 instead of powers of 1000. (The old meaning of -h, as a shorthand for --help, still works as long as you just use it on its own, as in "rsync -h".) - If lutimes() and/or lchmod() are around, use them to allow the preservation of attributes on symlinks. - The --link-dest option now affects symlinks and devices (when possible). - Added two config items to the rsyncd.conf parsing: "pre-xfer exec" and "post-xfer exec". These allow a command to be specified on a per-module basis that will be run before and/or after a daemon-mode transfer. (See the man page for a list of the environment variables that are set with information about the transfer.) - When using the --relative option, you can now insert a dot dir in the source path to indicate where the replication of the source dirs should start. For example, if you specify a source path of rsync://host/module/foo/bar/./baz/dir with -R, rsync will now only replicate the "baz/dir" part of the source path (note: a trailing dot dir is unaffected unless it also has a trailing slash). - Added some new --no-FOO options that make it easier to override unwanted implied or default options. For example, "-a --no-o" (aka "--archive --no-owner") can be used to turn off the preservation of file ownership that is implied by -a. - Added the --chmod=MODE option that allows the destination permissions to be changed from the source permissions. E.g. --chmod=g+w,o-rwx - Added the "incoming chmod" and "outgoing chmod" daemon options that allow a module to specify what permissions changes should be applied to all files copied to and from the daemon. - Allow the --temp-dir option to be specified when starting a daemon, which sets the default temporary directory for incoming files. - If --delete is combined with --dirs without --recursive, rsync will now delete in any directory whose content is being synchronized. - If --backup is combined with --delete without --backup-dir (and without --delete-excluded), we add a "protect" filter-rule to ensure that files with the backup suffix are not deleted. - The file-count stats that are output by --progress were improved to better indicate what the numbers mean. For instance, the output: "(xfer#5, to-check=8383/9999)" indicates that this was the fifth file to be transferred, and we still need to check 8383 more files out of a total of 9999. - The include/exclude code now allows a dir/*** directive (with 3 trailing stars) to match both the dir itself as well as all the content below the dir (dir/** would not match the dir). - Added the --prune-empty-dirs (-m) option that makes the receiving rsync discard empty chains of directories from the file-list. This makes it easier to selectively copy files from a source hierarchy and end up with just the directories needed to hold the resulting files. - If the --itemize-changes (-i) option is repeated, rsync now includes unchanged files in the itemized output (similar to -vv, but without all the other verbose messages that can get in the way). Of course, the client must be version 2.6.7 for this to work, but the remote rsync only needs to be 2.6.7 if you're pushing files. - Added the --specials option to tell rsync to copy non-device special files (which rsync now attempts even as a normal user). The --devices option now requests the copying of just devices (character and block). The -D option still requests both (e.g. --devices and --specials), -a still implies -D, and non-root users still get a silent downgrade that omits device copying. - Added the --super option to make the receiver always attempt super-user activities. This is useful for systems that allow things such as devices to be created or ownership to be set without being UID 0, and is also useful for someone who wants to ensure that errors will be output if the receiving rsync isn't being run as root. - Added the --sockopts option for those few who want to customize the TCP options used to contact a daemon rsync. - Added a way for the --temp-dir option to be combined with a partial-dir setting that lets rsync avoid non-atomic updates (for those times when --temp-dir is not being used because space is tight). - A new support script, files-to-excludes, will transform a list of files into a set of include/exclude directives that will copy those files. - A new option, --executability (-E) can be used to preserve just the execute bit on files, for those times when using the --perms option is not desired. - The daemon now logs each connection and also each module-list request that it receives. - New log-format options: %M (modtime), %U (uid), %G (gid), and %B (permission bits, e.g. "rwxr-xrwt"). - The --dry-run option no longer forces the enabling of --verbose. - The --remove-sent-files option now does a better job of incrementally removing the sent files on the sending side (older versions tended to clump up all the removals at the end). - A daemon now supersedes its minimal SIGCHLD handler with the standard PID-remembering version after forking. This ensures that the generator can get the child-exit status from the receiver. - Use of the --bwlimit option no longer interferes with the remote rsync sending error messages about invalid/refused options. - Rsync no longer returns a usage error when used with one local source arg and no destination: this now implies the --list-only option, just like the comparable situation with a remote source arg. - Added the --copy-dirlinks option, a more limited version of --copy-links. - Various documentation improvements, including: a better synopsis, some improved examples, a better discussion of the presence and absence of --perms (including how it interacts with the new --executability and --chmod options), an extended discussion of --temp-dir, an improved discussion of --partial-dir, a better description of rsync's pattern matching characters, an improved --no-implied-dirs section, and the documenting of what the --stats option outputs. - Various new and updated diffs in the patches dir, including: acls.diff, xattrs.diff, atimes.diff, detect-renamed.diff, and slp.diff. --- net/rsync/Makefile | 5 ++--- net/rsync/distinfo | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 63332b56a17b..dfd6e5e19631 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.62 2005/12/29 06:22:02 jlam Exp $ +# $NetBSD: Makefile,v 1.63 2006/03/12 18:51:23 wiz Exp $ -DISTNAME= rsync-2.6.6 -PKGREVISION= 1 +DISTNAME= rsync-2.6.7 CATEGORIES= net MASTER_SITES= http://rsync.samba.org/ftp/rsync/ \ ftp://rsync.samba.org/pub/rsync/ \ diff --git a/net/rsync/distinfo b/net/rsync/distinfo index 871238c565cf..c2b71d0b0ff2 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.22 2005/08/03 17:30:56 wiz Exp $ +$NetBSD: distinfo,v 1.23 2006/03/12 18:51:23 wiz Exp $ -SHA1 (rsync-2.6.6.tar.gz) = 46b4d296b41d0d7ece667b704f809168dd9f3843 -RMD160 (rsync-2.6.6.tar.gz) = ae86def849af8938732e3323db5b07e2cabf26d8 -Size (rsync-2.6.6.tar.gz) = 690066 bytes +SHA1 (rsync-2.6.7.tar.gz) = 0081125bfb7cc67fb4dd4d63fcb62739d701f67e +RMD160 (rsync-2.6.7.tar.gz) = 455bbd64a3ccb6de620e4e746e580dde6633d322 +Size (rsync-2.6.7.tar.gz) = 757572 bytes SHA1 (patch-ab) = 1666dbc37c04c219886b2e5d160792e9b9e2b97d