diff options
| author | eik <eik@FreeBSD.org> | 2004-04-30 08:53:34 +0000 |
|---|---|---|
| committer | eik <eik@FreeBSD.org> | 2004-04-30 08:53:34 +0000 |
| commit | 8899a8c368b795b8964a386af6f95677e7f30cad (patch) | |
| tree | 9ed2b236056bc66790fc5de664597a5752679239 /net | |
| parent | f8b2c97d8fffbf0937b9080fb2656fb96b66d614 (diff) | |
| download | FreeBSD-ports-8899a8c368b795b8964a386af6f95677e7f30cad.zip FreeBSD-ports-8899a8c368b795b8964a386af6f95677e7f30cad.tar.gz | |
Fix sorting bug when --relative is used
<http://lists.samba.org/archive/rsync-announce/2004/000015.html>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rsync/Makefile | 2 | ||||
| -rw-r--r-- | net/rsync/files/patch-flist.c | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index eedb340..180d079 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -8,7 +8,7 @@ PORTNAME= rsync PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \ ftp://rsync.samba.org/pub/%SUBDIR%/ \ diff --git a/net/rsync/files/patch-flist.c b/net/rsync/files/patch-flist.c new file mode 100644 index 0000000..340769b --- /dev/null +++ b/net/rsync/files/patch-flist.c @@ -0,0 +1,24 @@ +# +# 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; + |
