ports/81337: [PATCH] net/rsync: fix incompatibility with older version

[KIMURA Yasuhiro]

>Number:         81337
>Category:       ports
>Synopsis:       [PATCH] net/rsync: fix incompatibility with older version
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 21 10:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KIMURA Yasuhiro
>Release:        FreeBSD 4.11-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD xxxx 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #0: Sat May 14 11:16:09 JST 2005 xxxx i386


	
>Description:
	Version 2.6.4 has an incompatibility issue with older version 
	when used with --exclude option (and without --delete option).
	See following URL for detail.

	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=306368
	http://lists.samba.org/archive/rsync/2005-April/012314.html
	http://lists.samba.org/archive/rsync/2005-April/012317.html

	
>How-To-Repeat:
	
>Fix:

	

--- patch-rsync begins here ---
Index: Makefile
===================================================================
RCS file: /net/cvsup/cvsroot/ports/net/rsync/Makefile,v
retrieving revision 1.101
diff -u -r1.101 Makefile
--- Makefile	16 May 2005 21:07:54 -0000	1.101
+++ Makefile	21 May 2005 10:00:25 -0000
@@ -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%/ \
Index: files/patch-exclude.c
===================================================================
RCS file: files/patch-exclude.c
diff -N files/patch-exclude.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-exclude.c	21 May 2005 09:59:49 -0000
@@ -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);
--- patch-rsync ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: