4 files changed, 3 insertions, 52 deletions

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 180d0793a158..52dbbec8ce07 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	rsync
-PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTVERSION=	2.6.2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://rsync.samba.org/ftp/%SUBDIR%/ \
 		ftp://rsync.samba.org/pub/%SUBDIR%/ \
diff --git a/net/rsync/distinfo b/net/rsync/distinfo
index e6a61eaddca3..579857711242 100644
--- a/net/rsync/distinfo
+++ b/net/rsync/distinfo
@@ -1,2 +1,2 @@
-MD5 (rsync-2.6.1.tar.gz) = 6b1ee6a5878569215204f322ad128775
-SIZE (rsync-2.6.1.tar.gz) = 511395
+MD5 (rsync-2.6.2.tar.gz) = bcacd9a9108a9e4760832212ec3d658d
+SIZE (rsync-2.6.2.tar.gz) = 515402
diff --git a/net/rsync/files/patch-flist.c b/net/rsync/files/patch-flist.c
deleted file mode 100644
index 340769bd8eed..000000000000
--- a/net/rsync/files/patch-flist.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Fix sorting bug when --relative is used
-#  <http://lists.samba.org/archive/rsync-announce/2004/000015.html>
-#
---- flist.c	27 Apr 2004 01:36:10 -0000	1.217
-+++ flist.c	29 Apr 2004 19:37:15 -0000	1.218
-@@ -1517,11 +1517,17 @@ int f_name_cmp(struct file_struct *f1, s
- 	if (!(c1 = (uchar*)f1->dirname)) {
- 		state1 = fnc_BASE;
- 		c1 = (uchar*)f1->basename;
-+	} else if (!*c1) {
-+		state1 = fnc_SLASH;
-+		c1 = (uchar*)"/";
- 	} else
- 		state1 = fnc_DIR;
- 	if (!(c2 = (uchar*)f2->dirname)) {
- 		state2 = fnc_BASE;
- 		c2 = (uchar*)f2->basename;
-+	} else if (!*c2) {
-+		state2 = fnc_SLASH;
-+		c2 = (uchar*)"/";
- 	} else
- 		state2 = fnc_DIR;
- 
diff --git a/net/rsync/files/patch-uidlist.c b/net/rsync/files/patch-uidlist.c
deleted file mode 100644
index 914398766d5c..000000000000
--- a/net/rsync/files/patch-uidlist.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Fixed the use of an uninitialized variable in map_uid() and map_gid().
-# <http://lists.samba.org/archive/rsync/2004-April/009334.html>
-#
---- uidlist.c	20 Feb 2004 17:09:30 -0000	1.23
-+++ uidlist.c	28 Apr 2004 17:04:55 -0000
-@@ -81,7 +81,7 @@ static char *gid_to_name(gid_t gid)
- static int map_uid(int id, char *name)
- {
- 	uid_t uid;
--	if (uid != 0 && name_to_uid(name, &uid))
-+	if (id != 0 && name_to_uid(name, &uid))
- 		return uid;
- 	return id;
- }
-@@ -89,7 +89,7 @@ static int map_uid(int id, char *name)
- static int map_gid(int id, char *name)
- {
- 	gid_t gid;
--	if (gid != 0 && name_to_gid(name, &gid))
-+	if (id != 0 && name_to_gid(name, &gid))
- 		return gid;
- 	return id;
- }