From 021a2af5b24f6a8742ce871df7ffc5dabd17f165 Mon Sep 17 00:00:00 2001 From: Oliver Eikemeier Date: Fri, 30 Apr 2004 08:53:34 +0000 Subject: Fix sorting bug when --relative is used --- net/rsync/Makefile | 2 +- net/rsync/files/patch-flist.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 net/rsync/files/patch-flist.c (limited to 'net') diff --git a/net/rsync/Makefile b/net/rsync/Makefile index eedb34082479..180d0793a158 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 000000000000..340769bd8eed --- /dev/null +++ b/net/rsync/files/patch-flist.c @@ -0,0 +1,24 @@ +# +# Fix sorting bug when --relative is used +# +# +--- 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; + -- cgit v1.2.3