Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25223

Modified Files:
        rsync.info rsync.patch 
Log Message:
Patches for preserving Mac OS X metadata. Thanks to Andrew Davis for the 
pointer.

Index: rsync.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/rsync.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- rsync.info  3 Sep 2010 13:34:47 -0000       1.18
+++ rsync.info  9 Nov 2010 10:06:25 -0000       1.19
@@ -1,6 +1,6 @@
 Package: rsync
 Version: 3.0.7
-Revision: 3
+Revision: 4
 Maintainer: Remi Mommsen <[email protected]>
 CustomMirror: <<
 A: http://samba.org/ftp/rsync/
@@ -11,11 +11,11 @@
 Source2: mirror:custom:%n-patches-%v.tar.gz
 Source2-MD5: 48222e00a9a75873aee3bfceb2b2aa41
 PatchFile: %n.patch
-PatchFile-MD5: ecb159073aeea81c36effc097f939f22
+PatchFile-MD5: f20d4ffc8846eb834cb39d6842b50dde
 PatchScript: <<
- patch -p1 < %{PatchFile}
  patch -p1 < patches/fileflags.diff
  patch -p1 < patches/crtimes.diff
+ patch -p1 < %{PatchFile}
  ./prepare-source
 <<
 SetCFLAGS: -Os
@@ -41,6 +41,9 @@
 
 Workaround for ACL bug (https://bugzilla.samba.org/show_bug.cgi?id=7382)
 by John Lillibridge and Remko Scharroo.
+
+Patches for preserving Mac OS X metadata are taken from
+http://www.bombich.com/rsync.html. Thanks to Andrew Davis for the pointer.
 <<
 Homepage: http://rsync.samba.org/
 License: GPL

Index: rsync.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/rsync.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rsync.patch 3 Sep 2010 13:34:47 -0000       1.2
+++ rsync.patch 9 Nov 2010 10:06:25 -0000       1.3
@@ -1,25 +1,3 @@
---- old/patches/crtimes.diff   2009-12-31 22:20:28.000000000 +0100
-+++ new/patches/crtimes.diff   2010-08-25 17:59:00.000000000 +0200
-@@ -469,14 +469,17 @@
- diff --git a/syscall.c b/syscall.c
- --- a/syscall.c
- +++ b/syscall.c
--@@ -37,6 +37,11 @@ extern int force_change;
-+@@ -37,6 +37,14 @@ extern int force_change;
-  extern int preserve_perms;
-  extern int preserve_executability;
-  
[...1818 lines suppressed...]
+                       else if (sys_lsetxattr(fname, name, ptr, len) < 0) {
+@@ -831,7 +870,7 @@
+ 
+               if (sys_lsetxattr(fname, name, rxas[i].datum, 
rxas[i].datum_len) < 0) {
+                       rsyserr(FERROR_XFER, errno,
+-                              "rsync_xal_set: lsetxattr(\"%s\",\"%s\") 
failed",
++                              "rsync_xal_set: sys_lsetxattr failed: 
>>%s>>%s>>",
+                               fname, name);
+                       ret = -1;
+               } else /* make sure caller sets mtime */
+@@ -869,6 +908,9 @@
+               }
+       }
+ 
++      // Memory leak?
++      rsync_xal_free(xalp);
++
+       return ret;
+ }
+ 


------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a 
Billion" shares his insights and actions to help propel your 
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to