aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2005-05-21 19:31:31 +0800
committerpav <pav@FreeBSD.org>2005-05-21 19:31:31 +0800
commit89dd52dda1179a35b79a301407ef744592bb333e (patch)
tree98d3c4361cc670e4772d833b78b8c772b9d0dec3 /net
parentca3f9275ff6c1e83434d943446bf3869cf126066 (diff)
downloadfreebsd-ports-gnome-89dd52dda1179a35b79a301407ef744592bb333e.tar.gz
freebsd-ports-gnome-89dd52dda1179a35b79a301407ef744592bb333e.tar.zst
freebsd-ports-gnome-89dd52dda1179a35b79a301407ef744592bb333e.zip
- Fix incompatibility with older version when used with --exclude option
without --delete option PR: ports/81337 Submitted by: KIMURA Yasuhiro <yasu@utahime.org> Obtained from: author via http://lists.samba.org/archive/rsync/2005-April/012317.html
Diffstat (limited to 'net')
-rw-r--r--net/rsync/Makefile1
-rw-r--r--net/rsync/files/patch-exclude.c11
2 files changed, 12 insertions, 0 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index edb4fdd7aef3..54db820b15c9 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rsync
PORTVERSION= 2.6.4
+PORTREVISION= 1
CATEGORIES= net ipv6
MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \
ftp://ftp.samba.org//pub/%SUBDIR%/ \
diff --git a/net/rsync/files/patch-exclude.c b/net/rsync/files/patch-exclude.c
new file mode 100644
index 000000000000..e6c08712362c
--- /dev/null
+++ b/net/rsync/files/patch-exclude.c
@@ -0,0 +1,11 @@
+--- exclude.c.orig Sun Feb 27 16:34:27 2005
++++ exclude.c Sat May 21 18:52:41 2005
+@@ -1109,7 +1109,7 @@
+ && !(ent->match_flags & MATCHFLG_MERGE_FILE)) {
+ int f = am_sender || protocol_version < 29 ? f_out : -1;
+ send_rules(f, &cvs_filter_list);
+- if (f >= 0)
++ if (f >= 0 || f_out < 0)
+ continue;
+ }
+ p = get_rule_prefix(ent->match_flags, ent->pattern, 1, &plen);