[97835] trunk/dports/net/rsync

[ciserlohn at macports.org]

Revision: 97835
          http://trac.macports.org//changeset/97835
Author:   ciserlohn at macports.org
Date:     2012-09-17 03:07:28 -0700 (Mon, 17 Sep 2012)
Log Message:
-----------
rsync: add advanced error-logging for ACL unpack errors (maintainer update; see #36169)

Modified Paths:
--------------
    trunk/dports/net/rsync/Portfile

Added Paths:
-----------
    trunk/dports/net/rsync/files/patch-acls-unpack-error.diff

Modified: trunk/dports/net/rsync/Portfile
===================================================================
--- trunk/dports/net/rsync/Portfile	2012-09-17 08:29:15 UTC (rev 97834)
+++ trunk/dports/net/rsync/Portfile	2012-09-17 10:07:28 UTC (rev 97835)
@@ -5,7 +5,7 @@
 
 name                rsync
 version             3.0.9
-revision            1
+revision            2
 categories          net
 license             GPL-3+
 installs_libs       no
@@ -33,7 +33,8 @@
 patchfiles          patch-fileflags.diff \
                     patch-crtimes.diff \
                     patch-hfs-compression.diff \
-                    patch-hfs-compression-options.diff
+                    patch-hfs-compression-options.diff \
+                    patch-acls-unpack-error.diff
 patch.pre_args      -p1
 
 configure.args      --with-rsyncd-conf=${prefix}/etc/rsyncd.conf

Added: trunk/dports/net/rsync/files/patch-acls-unpack-error.diff
===================================================================
--- trunk/dports/net/rsync/files/patch-acls-unpack-error.diff	                        (rev 0)
+++ trunk/dports/net/rsync/files/patch-acls-unpack-error.diff	2012-09-17 10:07:28 UTC (rev 97835)
@@ -0,0 +1,26 @@
+This patch causes rsync to report which files caused the unpack_smb_acl()
+error, instead of just noting that one happened. This allows the end
+use to check the ACL of the reported file by hand.
+
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/fileflags.diff
+    patch -p1 <patches/crtimes.diff
+    patch -p1 <patches/hfs-compression.diff
+    patch -p1 <patches/hfs-compression-options.diff
+    patch -p1 <patches/acls-unpack-error.diff
+    ./prepare-source
+    ./configure
+    make
+
+diff --git a/acls.c b/acls.c
+--- a/acls.c
++++ b/acls.c
+@@ -526,6 +526,7 @@
+ 
+ 		sys_acl_free_acl(sacl);
+ 		if (!ok) {
++			rsyserr(FERROR_XFER, errno, "get_acl: unpack_smb_acl(%s)", fname);
+ 			return -1;
+ 		}
+ 	} else if (no_acl_syscall_error(errno)) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120917/6824aa0e/attachment-0001.html>