Update to rsync 3.0.1. Changes between 2.6.9 and 3.0.0 are just too many,

mostly improvements in speed of execution (usually up by around factor 10)
and memory use (the same factor down). Please see <http://samba.rsync.org/>
or ${WRKSRC}/CHANGES for more detailed information.

Changes between 3.0.0 and 3.0.1:
 - New flag "c" for itemizing non-regular files.
 - Fix crash when running rsyncd without --config-file= .
 - Fix crash when backing up a directory which has default ACLs.
 - Fixed the working of --fake-super with --link-dest and --xattrs.
 - Fixed a hang when combining --dry-run with --remove-source-files.
 - Fixed a bug with --iconv preventing gobbled file names from causing
   transfer failures.
 - Fixed the use of the --protect-args (-s) option when talking to a daemon.
 - Fixed the --ignore-existing symlink problems.
 - Avoid setting the mtime on a directory that already has the right one.
 - Improved the daemon-exclude handling.
 - Fixed a glitch in the itemizing of permissions with the -E option.
 - Various other bugfixes.
 - Fixed a couple minor bugs in the included popt library.
 - Fixed a stat() call that should have been do_stat() for 64-bit
   functionality.
 - Changed the file-glob code to do a more memory efficient directory scan.

Approved-by: tron

4 files changed, 15 insertions, 79 deletions

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index e95db1d1cf1..9bab3c72d6a 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2008/03/11 10:16:42 tron Exp $
+# $NetBSD: Makefile,v 1.72 2008/04/08 11:54:31 tonnerre Exp $
 
-DISTNAME=	rsync-2.6.9
+DISTNAME=	rsync-3.0.1
 CATEGORIES=	net
-PKGREVISION=	1
 MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
 		http://rsync.samba.org/ftp/rsync/old-versions/  \
 		ftp://ftp.sunet.se/pub/unix/admin/rsync/  \
diff --git a/net/rsync/distinfo b/net/rsync/distinfo
index 5122fb0958b..380a44b6f70 100644
--- a/net/rsync/distinfo
+++ b/net/rsync/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.28 2008/03/11 10:16:43 tron Exp $
+$NetBSD: distinfo,v 1.29 2008/04/08 11:54:31 tonnerre Exp $
 
-SHA1 (rsync-2.6.9.tar.gz) = 341618e230ea2e0e551d0ccf06f840d4f824c843
-RMD160 (rsync-2.6.9.tar.gz) = 36d270d9f01e9a8e808f426196796001bdd3d5d2
-Size (rsync-2.6.9.tar.gz) = 811841 bytes
-SHA1 (patch-aa) = f8193d10197d44f78d923b9c2e4809072d25e988
-SHA1 (patch-ab) = 1666dbc37c04c219886b2e5d160792e9b9e2b97d
+SHA1 (rsync-3.0.1.tar.gz) = e76b6ed0b8f59dfb30123228b8495578019181d7
+RMD160 (rsync-3.0.1.tar.gz) = ff5bb3d17b9f159d75752d464e183cf91c7f77e0
+Size (rsync-3.0.1.tar.gz) = 765881 bytes
+SHA1 (patch-ab) = b5afcb96dc3fc85722d5b8f8e1542676abab450a
diff --git a/net/rsync/patches/patch-aa b/net/rsync/patches/patch-aa
deleted file mode 100644
index 2e275761f68..00000000000
--- a/net/rsync/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2008/03/11 10:16:43 tron Exp $
-
---- sender.c.orig	2006-09-20 02:53:32.000000000 +0100
-+++ sender.c	2007-08-23 14:43:38.000000000 +0100
-@@ -123,6 +123,7 @@
- 	char fname[MAXPATHLEN];
- 	struct file_struct *file;
- 	unsigned int offset;
-+	size_t l = 0;
- 
- 	if (ndx < 0 || ndx >= the_file_list->count)
- 		return;
-@@ -133,6 +134,20 @@
- 				    file->dir.root, "/", NULL);
- 	} else
- 		offset = 0;
-+
-+	l = offset + 1;
-+	if (file) {
-+		if (file->dirname)
-+			l += strlen(file->dirname);
-+		if (file->basename)
-+			l += strlen(file->basename);
-+	}
-+
-+	if (l >= sizeof(fname)) {
-+		rprintf(FERROR, "Overlong pathname\n");
-+		exit_cleanup(RERR_FILESELECT);
-+	}
-+
- 	f_name(file, fname + offset);
- 	if (remove_source_files) {
- 		if (do_unlink(fname) == 0) {
-@@ -224,6 +239,7 @@
- 	enum logcode log_code = log_before_transfer ? FLOG : FINFO;
- 	int f_xfer = write_batch < 0 ? batch_fd : f_out;
- 	int i, j;
-+	size_t l = 0;
- 
- 	if (verbose > 2)
- 		rprintf(FINFO, "send_files starting\n");
-@@ -259,6 +275,20 @@
- 				fname[offset++] = '/';
- 		} else
- 			offset = 0;
-+
-+		l = offset + 1;
-+		if (file) {
-+			if (file->dirname)
-+				l += strlen(file->dirname);
-+			if (file->basename)
-+				l += strlen(file->basename);
-+		}
-+
-+		if (l >= sizeof(fname)) {
-+			rprintf(FERROR, "Overlong pathname\n");
-+			exit_cleanup(RERR_FILESELECT);
-+		}
-+
- 		fname2 = f_name(file, fname + offset);
- 
- 		if (verbose > 2)
diff --git a/net/rsync/patches/patch-ab b/net/rsync/patches/patch-ab
index d88cd3310c2..f1203768866 100644
--- a/net/rsync/patches/patch-ab
+++ b/net/rsync/patches/patch-ab
@@ -1,20 +1,20 @@
-$NetBSD: patch-ab,v 1.12 2008/03/11 10:16:43 tron Exp $
+$NetBSD: patch-ab,v 1.13 2008/04/08 11:54:31 tonnerre Exp $
 
---- Makefile.in.orig	2004-08-12 14:59:03.000000000 -0400
+--- Makefile.in.orig	2008-03-21 06:30:09.000000000 +0000
 +++ Makefile.in
-@@ -59,12 +59,11 @@ CHECK_OBJS=getgroups.o getfsdev.o t_stub
- all: rsync$(EXEEXT)
+@@ -62,12 +62,11 @@ CHECK_OBJS=tls.o getgroups.o getfsdev.o 
+ all: conf_stop make_stop rsync$(EXEEXT) @MAKE_MAN@
  
  install: all
 -	-mkdir -p ${DESTDIR}${bindir}
 -	${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
 -	-mkdir -p ${DESTDIR}${mandir}/man1
 -	-mkdir -p ${DESTDIR}${mandir}/man5
--	${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
--	${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5
+-	if test -f $(srcdir)/rsync.1; then ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1; fi
+-	if test -f $(srcdir)/rsyncd.conf.5; then ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
 +	${BSD_INSTALL_PROGRAM} rsync$(EXEEXT) ${DESTDIR}${bindir}
-+	${BSD_INSTALL_MAN} $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
-+	${BSD_INSTALL_MAN} $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5
++	if test -f $(srcdir)/rsync.1; then ${BSD_INSTALL_MAN} $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1; fi
++	if test -f $(srcdir)/rsyncd.conf.5; then ${BSD_INSTALL_MAN} $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
 +	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/rsync
 +	${BSD_INSTALL_DATA} README tech_report.tex ${DESTDIR}${PREFIX}/share/doc/rsync