From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 9 18:40:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 AAB1616A7FD for ; Tue, 9 May 2006 18:40:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2276C43D6D for ; Tue, 9 May 2006 18:40:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k49IeJEq061649 for ; Tue, 9 May 2006 18:40:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k49IeJN4061648; Tue, 9 May 2006 18:40:19 GMT (envelope-from gnats) Resent-Date: Tue, 9 May 2006 18:40:19 GMT Resent-Message-Id: <200605091840.k49IeJN4061648@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, Simun Mikecin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7360816AA1D for ; Tue, 9 May 2006 18:32:31 +0000 (UTC) (envelope-from sime@data.home.hr) Received: from data.home.hr (dh77-105.xnet.hr [83.139.77.105]) by mx1.FreeBSD.org (Postfix) with ESMTP id D219743D67 for ; Tue, 9 May 2006 18:32:30 +0000 (GMT) (envelope-from sime@data.home.hr) Received: by data.home.hr (Postfix, from userid 34062) id AD2935F4D2; Tue, 9 May 2006 20:32:28 +0200 (CEST) Message-Id: <20060509183228.AD2935F4D2@data.home.hr> Date: Tue, 9 May 2006 20:32:28 +0200 (CEST) From: Simun Mikecin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: obrien@cs.ucdavis.edu Subject: ports/97050: [patch] net/rsync: preserving file flags and ACLs X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Simun Mikecin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 18:40:37 -0000 >Number: 97050 >Category: ports >Synopsis: [patch] net/rsync: preserving file flags and ACLs >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue May 09 18:40:19 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Simun Mikecin >Release: FreeBSD 6.1-STABLE amd64 >Organization: >Environment: System: FreeBSD data.home.hr 6.1-STABLE FreeBSD 6.1-STABLE #0: Mon May 8 23:06:36 CEST 2006 root@data.home.hr:/var/obj/usr/src.6/sys/DATA amd64 >Description: This patch brings some new options: --flags --acls for preserving filesystem flags (see chflags(1)) and access-lists (see acl(3)). >How-To-Repeat: >Fix: diff -urN rsync.orig/Makefile rsync/Makefile --- rsync.orig/Makefile Tue Apr 25 00:47:27 2006 +++ rsync/Makefile Tue May 9 20:27:16 2006 @@ -7,6 +7,7 @@ PORTNAME= rsync PORTVERSION= 2.6.8 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \ ftp://ftp.samba.org//pub/%SUBDIR%/ \ @@ -20,6 +21,14 @@ MAINTAINER= pav@FreeBSD.org COMMENT= A network file distribution/synchronization utility +OPTIONS= POPT_PORT "Use popt from ports" off \ + TIMELIMIT "Include time limit support" on \ + FLAGS "Include file flags support" on \ + ACLS "Include ACL support" on \ + SSH "Use ssh instead of rsh" on + +.include + .if defined(WITH_POPT_PORT) LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt .endif @@ -47,7 +56,15 @@ PATCH_STRIP= -p1 .endif -.include +.if !defined(WITHOUT_FLAGS) +EXTRA_PATCHES+= ${WRKSRC}/patches/flags.diff +PATCH_STRIP= -p1 +.endif + +.if !defined(WITHOUT_ACLS) +EXTRA_PATCHES+= ${WRKSRC}/patches/acls.diff +PATCH_STRIP= -p1 +.endif SUB_LIST+= NAME=rsyncd @@ -67,13 +84,6 @@ MAN1= rsync.1 MAN5= rsyncd.conf.5 - -.if !defined(WITH_POPT_PORT) -pre-everything:: - @${ECHO_CMD} "rsync comes with an included version of popt." - @${ECHO_CMD} "To build rsync with devel/popt instead," - @${ECHO_CMD} "hit Ctrl-C now and define WITH_POPT_PORT" -.endif pre-configure: @${REINPLACE_CMD} -e 's:/etc/:${PREFIX}/etc/:g' \ >Release-Note: >Audit-Trail: >Unformatted: