From sime@data.home.hr  Tue May  9 18:32:31 2006
Return-Path: <sime@data.home.hr>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7360816AA1D
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <numisemis@yahoo.com>
Reply-To: Simun Mikecin <numisemis@yahoo.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: obrien@cs.ucdavis.edu
Subject: [patch] net/rsync: preserving file flags and ACLs
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         97050
>Category:       ports
>Synopsis:       [patch] net/rsync: preserving file flags and ACLs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 09 18:40:19 GMT 2006
>Closed-Date:    Tue May 09 22:27:27 GMT 2006
>Last-Modified:  Tue May 09 22:27:27 GMT 2006
>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 <bsd.port.pre.mk>
+
 .if defined(WITH_POPT_PORT)
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 .endif
@@ -47,7 +56,15 @@
 PATCH_STRIP=	-p1
 .endif
 
-.include <bsd.port.pre.mk>
+.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:
Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue May 9 18:44:16 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97050 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue May 9 22:27:16 UTC 2006 
State-Changed-Why:  
A variation on your patch was committed.  

http://www.freebsd.org/cgi/query-pr.cgi?pr=97050 
>Unformatted:
