X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/checksum-xattr.diff

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 9b5d729..1f8d6bc 100644
--- a/checksum-xattr.diff
+++ b/checksum-xattr.diff
@@ -8,11 +8,11 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/flist.c b/flist.c
-index 09b4fc5..3295724 100644
 --- a/flist.c
 +++ b/flist.c
-@@ -1268,7 +1268,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1277,7 +1277,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
  #endif
  
  	if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
@@ -23,7 +23,6 @@ index 09b4fc5..3295724 100644
  			extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
  	}
 diff --git a/generator.c b/generator.c
-index 12007a1..2587bc9 100644
 --- a/generator.c
 +++ b/generator.c
 @@ -531,7 +531,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
@@ -38,7 +37,6 @@ index 12007a1..2587bc9 100644
  
 diff --git a/support/xsums b/support/xsums
 new file mode 100644
-index 0000000..31d2537
 --- /dev/null
 +++ b/support/xsums
 @@ -0,0 +1,118 @@
@@ -161,7 +159,6 @@ index 0000000..31d2537
 +EOT
 +}
 diff --git a/xattrs.c b/xattrs.c
-index 2d0e050..f364a2a 100644
 --- a/xattrs.c
 +++ b/xattrs.c
 @@ -34,6 +34,8 @@ extern int read_only;
@@ -184,7 +181,7 @@ index 2d0e050..f364a2a 100644
  
  typedef struct {
  	char *datum, *name;
-@@ -239,7 +245,9 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -241,7 +247,9 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
  			 || (am_root < 0
  			  && (strcmp(name+RPRE_LEN+1, XSTAT_SUFFIX) == 0
  			   || strcmp(name+RPRE_LEN+1, XACC_ACL_SUFFIX) == 0
@@ -195,7 +192,7 @@ index 2d0e050..f364a2a 100644
  				continue;
  		}
  
-@@ -895,6 +903,39 @@ int del_def_xattr_acl(const char *fname)
+@@ -914,6 +922,39 @@ int del_def_xattr_acl(const char *fname)
  }
  #endif