diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-05-21 11:31:31 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-05-21 11:31:31 +0000 |
| commit | 763da90905fa334162d07f22942a56d004fab01e (patch) | |
| tree | 5753eceb5bc06e87f25a08411199d2f24dbbb52b /net | |
| parent | - Fix incomplete replacement of a keyword "@prefix@". (diff) | |
- 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
Notes
Notes:
svn path=/head/; revision=135752
Diffstat (limited to 'net')
| -rw-r--r-- | net/rsync/Makefile | 1 | ||||
| -rw-r--r-- | net/rsync/files/patch-exclude.c | 11 |
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); |