aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorOliver Eikemeier <eik@FreeBSD.org>2004-04-30 08:53:34 +0000
committerOliver Eikemeier <eik@FreeBSD.org>2004-04-30 08:53:34 +0000
commit021a2af5b24f6a8742ce871df7ffc5dabd17f165 (patch)
treee086ed97bcc094fb045fe532e6d94687c77c949e /net
parent7252c4fc00700f1d622d2d6bec248e25ccf62f39 (diff)
downloadports-021a2af5b24f6a8742ce871df7ffc5dabd17f165.tar.gz
ports-021a2af5b24f6a8742ce871df7ffc5dabd17f165.zip
Notes
Diffstat (limited to 'net')
-rw-r--r--net/rsync/Makefile2
-rw-r--r--net/rsync/files/patch-flist.c24
2 files changed, 25 insertions, 1 deletions
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
+# <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;
+