Update to 2.6.4:

  OUTPUT CHANGES:

    - When rsync deletes a directory and outputs a verbose message about
      it, it now appends a trailing slash to the name instead of (only
      sometimes) outputting a preceding "directory " string.

    - The --stats output will contain file-list time-statistics if both
      sides are 2.6.4, or if the local side is 2.6.4 and the files are
      being pushed (since the stats come from the sending side).
      (Requires protocol 29 for a pull.)

    - The "%o" (operation) log-format escape now has a third value (besides
      "send" and "recv"):  "del." (with trailing dot to make it 4 chars).
      This changes the way deletions are logged in the daemon's log file.

    - When the --log-format option is combined with --verbose, rsync now
      avoids outputting the name of the file twice in most circumstances.
      As long as the --log-format item does not refer to any post-transfer
      items (such as %b or %c), the --log-format message is output prior to
      the transfer, so --verbose is now the equivalent of a --log-format of
      '%n%L' (which outputs the name and any link info).  If the log output
      must occur after the transfer to be complete, the only time the name
      is also output prior to the transfer is when --progress was specified
      (so that the name will precede the progress stats, and the full
      --log-format output will come after).

  BUG FIXES:

    - Restore the list-clearing behavior of "!" in a .cvsignore file (2.6.3
      was only treating it as a special token in an rsync include/exclude
      file).

    - The combination of --verbose and --dry-run now mentions the full list
      of changes that would be output without --dry-run.

    - Avoid a mkdir warning when removing a directory in the destination
      that already exists in the --backup-dir.

    - An OS that has a binary mode for its files (such as cygwin) needed
      setmode(fd, O_BINARY) called on the temp-file we opened with
      mkstemp().  (Fix derived from the cygwin's 2.6.3 rsync package.)

    - Fixed a potential hang when verbosity is high, the client side is
      the sender, and the file-list is large.

    - Fixed a potential protocol-corrupting bug where the generator could
      merge a message from the receiver into the middle of a multiplexed
      packet of data if only part of that data had been written out to the
      socket when the message from the generator arrived.

    - We now check if the OS doesn't support using mknod() for creating
      FIFOs and sockets, and compile-in some compatibility code using
      mkfifo() and socket() when necessary.

    - Fixed an off-by-one error in the handling of --max-delete=N.  Also,
      if the --max-delete limit is exceeded during a run, we now output a
      warning about this at the end of the run and exit with a new error
      code (25).

    - One place in the code wasn't checking if fork() failed.

    - The "ignore nonreadable" daemon parameter used to erroneously affect
      readable symlinks that pointed to a non-existent file.

    - If the OS does not have lchown() and a chown() of a symlink will
      affect the referent of a symlink (as it should), we no longer try
      to set the user and group of a symlink.

    - The generator now properly runs the hard-link loop and the dir-time
      rewriting loop after we're sure that the redo phase is complete.

    - When --backup was specified with --partial-dir=DIR, where DIR is a
      relative path, the backup code was erroneously trying to backup a
      file that was put into the partial-dir.

    - If a file gets resent in a single transfer and the --backup option is
      enabled along with --inplace, rsync no longer performs a duplicate
      backup (it used to overwrite the first backup with the failed file).

    - One call to flush_write_file() was not being checked for an error.

    - The --no-relative option was not being sent from the client to a
      server sender.

    - If an rsync daemon specified "dont compress = ..." for a file and the
      client tried to specify --compress, the libz code was not handling a
      compression level of 0 properly.  This could cause a transfer failure
      if the block-size for a file was large enough (e.g. rsync might have
      exited with an error for large files).

    - Fixed a bug that would sometimes surface when using --compress and
      sending a file with a block-size larger than 64K (either manually
      specified, or computed due to the file being really large).  Prior
      versions of rsync would sometimes fail to decompress the data
      properly, and thus the transferred file would fail its verification.

    - If a daemon can't open the specified log file (i.e. syslog is not
      being used), die without crashing.  We also output an error about
      the failure on stderr (which will only be seen if --no-detach was
      specified) and exit with a new error code (6).

    - A local transfer no longer duplicates all its include/exclude options
      (since the forked process already has a copy of the exclude list,
      there's no need to send them a set of duplicates).

    - When --progress is specified, the output of items that the generator
      is creating (e.g. dirs, symlinks) is now integrated into the progress
      output without overlapping it.  (Requires protocol 29.)

    - When --timeout is specified, lulls that occur in the transfer while
      the generator is doing work that does not generate socket traffic
      (looking for changed files, deleting files, doing directory-time
      touch-ups, etc.) will cause a new keep-alive packet to be sent that
      should keep the transfer going as long as the generator continues to
      make progress.  (Requires protocol 29.)

    - The stat size of a device is not added to the total file size of the
      items in the transfer (the size might be undefined on some OSes).

    - Fixed a problem with refused-option messages sometimes not making it
      back to the client side when a remote --files-from was in effect and
      the daemon was the receiver.

    - The --compare-dest option was not updating a file that differred in
      (the preserved) attributes from the version in the compare-dest DIR.

    - When rsync is copying files into a write-protected directory, fixed
      the change-report output for the directory so that we don't report
      an identical directory as changed.

  ENHANCEMENTS:

    - Rsync now supports popt's option aliases, which means that you can
      use /etc/popt and/or ~/.popt to create your own option aliases.

    - Added the --delete-during (--del) option which will delete files
      from the receiving side incrementally as each directory in the
      transfer is being processed.  This makes it more efficient than the
      default, before-the-transfer behavior, which is now also available as
      --delete-before (and is still the default --delete-WHEN option that
      will be chosen if --delete or --delete-excluded is specified without
      a --delete-WHEN choice).  All the --del* options infer --delete, so
      an rsync daemon that refuses "delete" will still refuse to allow any
      file-deleting options (including the new --remove-sent-files option).

    - All the --delete-WHEN options are now more memory efficient:
      Previously an duplicate set of file-list objects was created on the
      receiving side for the entire destination hierarchy.  The new
      algorithm only creates one directory of objects at a time (for files
      inside the transfer).

    - Added the --copy-dest option, which works like --link-dest except
      that it locally copies identical files instead of hard-linking them.

    - Added support for specifying multiple --compare-dest, --copy-dest, or
      --link-dest options, but only of a single type. (Promoted from the
      patches dir and enhanced.) (Requires protocol 29.)

    - Added the --max-size option. (Promoted from the patches dir.)

    - The daemon-mode options are now separated from the normal rsync
      options so that they can't be mixed together.  This makes it
      impossible to start a daemon that has improper default option values
      (which could cause problems when a client connects, such as hanging
      or crashing).

    - The --bwlimit option may now be used in combination with --daemon
      to specify both a default value for the daemon side and a value
      that cannot be exceeded by a user-specified --bwlimit option.

    - Added the "port" parameter to the rsyncd.conf file. (Promoted from
      the patches dir.)  Also added "address".  The command-line options
      take precedence over a config-file option, as expected.

    - In _exit_cleanup(): when we are exiting with a partially-received
      file, we now flush any data in the write-cache before closing the
      partial file.

    - The --inplace support was enhanced to work with --compare-dest,
      --link-dest, and (the new) --copy-dest options. (Requires protocol
      29.)

    - Added the --dirs (-d) option for an easier way to copy directories
      without recursion.

    - Added the --list-only option, which is mainly a way for the client to
      put the server into listing mode without needing to resort to any
      internal option kluges (e.g. the age-old use of "-r --exclude="/*/*"
      for a non-recursive listing).  This option is used automatically
      (behind the scenes) when a modern rsync speaks to a modern daemon,
      but may also be specified manually if you want to force the use of
      the --list-only option over a remote-shell connection.

    - Added the --omit-dir-times (-O) option, which will avoid updating
      the modified time for directories when --times was specified.  This
      option will avoid an extra pass through the file-list at the end of
      the transfer (to tweak all the directory times), which may provide
      an appreciable speedup for a really large transfer. (Promoted from
      the patches dir.)

    - Added the --filter (-f) option and its helper option, -F.  Filter
      rules are an extension to the existing include/exclude handling
      that also supports nested filter files as well as per-directory
      filter files (like .cvsignore, but with full filter-rule parsing).
      This new option was chosen in order to ensure that all existing
      include/exclude processing remained 100% compatible with older
      versions.  Protocol 29 is needed for full filter-rule support, but
      backward-compatible rules work with earlier protocol versions.
      (Promoted from the patches dir and enhanced.)

    - Added the --delay-updates option that puts all updated files into
      a temporary directory (by default ".~tmp~", but settable via the
      --partial-dir=DIR option) until the end of the transfer.  This
      makes the updates a little more atomic for a large transfer.

    - If rsync is put into the background, any output from --progress is
      reduced.

    - Documented the "max verbosity" setting for rsyncd.conf.  (This
      setting was added a couple releases ago, but left undocumented.)

    - The sender and the generator now double-check the file-list index
      they are given, and refuse to try to do a file transfer on a
      non-file index (since that would indicate that something had gone
      very wrong).

    - Added the --itemize-changes (-i) option, which is a way to output a
      more detailed list of what files changed and in what way.  The effect
      is the same as specifying a --log-format of "%i %n%L" (see both the
      rsync and rsyncd.conf manpages).  Works with --dry-run too.

    - Added the --fuzzy (-y) option, which attempts to find a basis file
      for a file that is being created from scratch.  The current algorithm
      only looks in the destination directory for the created file, but it
      does attempt to find a match based on size/mod-time (in case the file
      was renamed with no other changes) as well as based on a fuzzy
      name-matching algorithm.  This option requires protocol 29 because it
      needs the new file-sorting order.  (Promoted from patches dir and
      enhanced.) (Requires protocol 29.)

    - Added the --remove-sent-files option, which lets you move files
      between systems.

    - The hostname in HOST:PATH or HOST::PATH may now be an IPv6 literal
      enclosed in '[' and ']' (e.g. "[::1]").  (We already allowed IPv6
      literals in the rsync://HOST:PORT/PATH format.)

    - When rsync recurses to build the file list, it no longer keeps open
      one or more directory handles from the dir's parent dirs.

    - When building under windows, the default for --daemon is now to
      avoid detaching, requiring the new --detach option to force rsync
      to detach.

    - The --dry-run option can now be combined with either --write-batch or
      --read-batch, allowing you to run a do-nothing test command to see
      what would happen without --dry-run.

    - The daemon's "read only" config item now sets an internal read_only
      variable that makes extra sure that no write/delete calls on the
      read-only side can succeed.

    - The log-format % escapes can now have a numeric field width in
      between the % and the escape letter (e.g. "%-40n %08p").

    - Improved the option descriptions in the --help text.

  BUILD CHANGES:

    - Handle an operating system that use mkdev() in place of makedev().

    - Improved configure to better handle cross-compiling.

3 files changed, 6 insertions, 22 deletions

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 381cfd90716..0d0f1c48c1f 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2004/10/21 19:54:26 tv Exp $
+# $NetBSD: Makefile,v 1.57 2005/05/25 10:55:16 wiz Exp $
 
-DISTNAME=	rsync-2.6.3
+DISTNAME=	rsync-2.6.4
 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 165b6bc8d5a..3749afa35fc 100644
--- a/net/rsync/distinfo
+++ b/net/rsync/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.19 2005/02/24 12:14:03 agc Exp $
+$NetBSD: distinfo,v 1.20 2005/05/25 10:55:16 wiz Exp $
 
-SHA1 (rsync-2.6.3.tar.gz) = 4e96255bd01d6529bcdb6be3e211fdc5603e5a2e
-RMD160 (rsync-2.6.3.tar.gz) = fabb36543a7c18b06d9322c05080a9df451ae392
-Size (rsync-2.6.3.tar.gz) = 583453 bytes
+SHA1 (rsync-2.6.4.tar.gz) = e3288062ac87c44dfdc17eff5299bbb261f193bc
+RMD160 (rsync-2.6.4.tar.gz) = 19b6fff5d852696b746a11c590b8d5acec93d874
+Size (rsync-2.6.4.tar.gz) = 627680 bytes
 SHA1 (patch-ab) = 1666dbc37c04c219886b2e5d160792e9b9e2b97d
-SHA1 (patch-ad) = e611bac6de1dabdd497f3228193e395920048891
diff --git a/net/rsync/patches/patch-ad b/net/rsync/patches/patch-ad
deleted file mode 100644
index 6c68d0da358..00000000000
--- a/net/rsync/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2004/10/08 20:03:43 tv Exp $
-
---- flist.c.orig	Fri Aug 20 10:16:28 2004
-+++ flist.c
-@@ -27,6 +27,10 @@
- 
- #include "rsync.h"
- 
-+#if !defined(makedev) && defined(mkdev)
-+#define makedev mkdev
-+#endif
-+
- extern struct stats stats;
- 
- extern int verbose;