Update "rsync" package to version 3.0.6. Changes since version 3.0.5:

- Fixed a --read-batch hang when rsync is reading a batch file that was
  created from an incremental-recursion transfer.
- Fixed the daemon's socket code to handle the simultaneous arrival of
  multiple connections.
- Fix --safe-links/--copy-unsafe-links to properly handle symlinks that
  have consecutive slashes in the value.
- Fixed the parsing of an [IPv6_LITERAL_ADDR] when a USER@ is prefixed.
- The sender now skips a (bogus) symlink that has a 0-length value, which
  avoids a transfer error in the receiver.
- Fixed a case where the sender could die with a tag-0 error if there was
  an I/O during the sending of the file list.
- Fixed the rrsync script to avoid a server-side problem when -e is at the
  start of the short options.
- Fixed a problem where a vanished directory could turn into an exit code
  23 instead of the proper exit code 24.
- Fixed the --iconv conversion of symlinks when doing a local copy.
- Fixed a problem where --one-file-system was not stopping deletions on the
  receiving side when a mount-point directory did not match a directory in
  the transfer.
- Fixed the dropping of an ACL mask when no named ACL values were present.
- Fixed an ACL/xattr corruption issue where the --backup option could cause
  rsync to associate the wrong ACL/xattr information with received files.
- Fixed the use of --xattrs with --only-write-batch.
- Fixed the use of --dry-run with --read-batch.
- Fixed configure's erroneous use of target.
- Fixed configure's --disable-debug option.
- Fixed a run-time issue for systems that can't find iconv_open() by adding
  the --disable-iconv-open configure option.
- Complain and die if the user tries to combine --remove-source-files (or
  the deprecated --remove-sent-files) with --read-batch.
- Fixed an failure transferring special files from Solaris to Linux.

Approved by Alistair Crooks.

3 files changed, 19 insertions, 18 deletions

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index f76d8bf652f..ee0e0abea9e 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2009/02/21 09:34:17 tron Exp $
+# $NetBSD: Makefile,v 1.82 2009/06/15 16:53:02 tron Exp $
 
-DISTNAME=	rsync-3.0.5
-PKGREVISION=	1
+DISTNAME=	rsync-3.0.6
 CATEGORIES=	net
 MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
 		http://rsync.samba.org/ftp/rsync/old-versions/  \
@@ -11,6 +10,7 @@ MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
 OWNER=		tron@NetBSD.org
 HOMEPAGE=	http://rsync.samba.org/
 COMMENT=	Network file distribution/synchronisation utility
+LICENSE=	gnu-gpl-v3
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -34,5 +34,9 @@ SUBST_FILES.paths=	rsync.1 rsyncd.conf.5
 SUBST_SED.paths=	-e 's|/etc/rsyncd|${PKG_SYSCONFDIR}/rsyncd|g'
 SUBST_SED.paths+=	-e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g'
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/tech_report.tex \
+	  ${PREFIX}/share/doc/rsync
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rsync/distinfo b/net/rsync/distinfo
index b3d2ee1fef4..bd5ee1a32ca 100644
--- a/net/rsync/distinfo
+++ b/net/rsync/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.33 2009/01/28 12:34:00 tron Exp $
+$NetBSD: distinfo,v 1.34 2009/06/15 16:53:02 tron Exp $
 
-SHA1 (rsync-3.0.5.tar.gz) = d95e75af9456b0edca68bde17260c98261b4b8c5
-RMD160 (rsync-3.0.5.tar.gz) = c2a223c7afc29be413b593deaa2187f5d000f7a6
-Size (rsync-3.0.5.tar.gz) = 776613 bytes
-SHA1 (patch-ab) = 3f04da6682e1555604e254f68a7bdae69d01fc65
+SHA1 (rsync-3.0.6.tar.gz) = 8853dfd291b3850aafa60169d2eea8601498f713
+RMD160 (rsync-3.0.6.tar.gz) = 881ecea519b97d1a7f326b021ebac939ac2fe091
+Size (rsync-3.0.6.tar.gz) = 778927 bytes
+SHA1 (patch-ab) = f7895312568d1ff5ca7031cf9b1ddd2b6e0b02d8
diff --git a/net/rsync/patches/patch-ab b/net/rsync/patches/patch-ab
index 040210d8a25..ad25174edf1 100644
--- a/net/rsync/patches/patch-ab
+++ b/net/rsync/patches/patch-ab
@@ -1,22 +1,19 @@
-$NetBSD: patch-ab,v 1.14 2008/07/13 22:18:23 tron Exp $
+$NetBSD: patch-ab,v 1.15 2009/06/15 16:53:02 tron Exp $
 
---- Makefile.in.orig	2008-03-21 06:30:09.000000000 +0000
-+++ Makefile.in
-@@ -62,12 +62,11 @@ CHECK_OBJS=tls.o getgroups.o getfsdev.o 
- all: conf_stop make_stop rsync$(EXEEXT) @MAKE_MAN@
+--- Makefile.in.orig	2009-04-11 00:24:49.000000000 +0100
++++ Makefile.in	2009-06-15 13:55:30.000000000 +0100
+@@ -62,12 +62,9 @@
+ all: Makefile 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
--	if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi
--	if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
 +	${BSD_INSTALL_PROGRAM} rsync$(EXEEXT) ${DESTDIR}${bindir}
-+	if test -f rsync.1; then ${BSD_INSTALL_MAN} rsync.1 ${DESTDIR}${mandir}/man1; fi
+ 	if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi
+-	if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
 +	if test -f rsyncd.conf.5; then ${BSD_INSTALL_MAN} 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
  
  install-strip:
  	$(MAKE) INSTALL_STRIP='-s' install