From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 21 10:20:03 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B23BC16A4D0 for ; Sat, 21 May 2005 10:20:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A00F543D54 for ; Sat, 21 May 2005 10:20:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4LAK24n043498 for ; Sat, 21 May 2005 10:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4LAK2uB043495; Sat, 21 May 2005 10:20:02 GMT (envelope-from gnats) Resent-Date: Sat, 21 May 2005 10:20:02 GMT Resent-Message-Id: <200505211020.j4LAK2uB043495@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KIMURA Yasuhiro Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54E7C16A4CF for ; Sat, 21 May 2005 10:17:17 +0000 (GMT) Received: from utahime.as.wakwak.ne.jp (utahime.as.wakwak.ne.jp [61.205.238.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id C785743D75 for ; Sat, 21 May 2005 10:17:16 +0000 (GMT) (envelope-from yasu@home.utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) by utahime.as.wakwak.ne.jp (Postfix) with ESMTP id E8294B84C for ; Sat, 21 May 2005 19:17:15 +0900 (JST) Received: from localhost.home.utahime.org (localhost.home.utahime.org [127.0.0.1])B4B3654C8; Sat, 21 May 2005 19:17:15 +0900 (JST) Received: from eastasia.home.utahime.org (localhost.home.utahime.org [127.0.0.1])33885-7A5BCB6C; Sat, 21 May 2005 19:17:15 +0900 Received: by eastasia.home.utahime.org (Postfix, from userid 1000) id 925C654B7; Sat, 21 May 2005 19:17:15 +0900 (JST) Message-Id: <20050521101715.925C654B7@eastasia.home.utahime.org> Date: Sat, 21 May 2005 19:17:15 +0900 (JST) From: KIMURA Yasuhiro To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/81337: [PATCH] net/rsync: fix incompatibility with older version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 May 2005 10:20:03 -0000 >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: