The patches for 3.2.3.

[rsync-patches.git] / checksum-xattr.diff

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 40e6795f7680c14f9d9337fd4f849ea2245324db..5883e4dc669f96589b88e7996d8b9ecf9f5da71d 100644 (file)
--- 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: abef92c03767d0c5dc9070eba15805f0f7075e6c
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -1323,7 +1323,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1368,7 +1368,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
  #endif
  
        if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
@@ -25,7 +25,7 @@ diff --git a/flist.c b/flist.c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -587,7 +587,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+@@ -610,7 +610,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
           of the file time to determine whether to sync */
        if (always_checksum > 0 && S_ISREG(st->st_mode)) {
                char sum[MAX_DIGEST_LEN];
@@ -257,7 +257,7 @@ diff --git a/xattrs.c b/xattrs.c
  extern int saw_xattr_filter;
  
  #define RSYNC_XAL_INITIAL 5
-@@ -73,6 +75,10 @@ extern int saw_xattr_filter;
+@@ -72,6 +74,10 @@ extern int saw_xattr_filter;
  #define XACC_ACL_ATTR RSYNC_PREFIX "%" XACC_ACL_SUFFIX
  #define XDEF_ACL_SUFFIX "dacl"
  #define XDEF_ACL_ATTR RSYNC_PREFIX "%" XDEF_ACL_SUFFIX
@@ -268,7 +268,7 @@ diff --git a/xattrs.c b/xattrs.c
  
  typedef struct {
        char *datum, *name;
-@@ -266,7 +272,9 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -259,7 +265,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
@@ -279,7 +279,7 @@ diff --git a/xattrs.c b/xattrs.c
                                continue;
                }
  
-@@ -1138,6 +1146,38 @@ int del_def_xattr_acl(const char *fname)
+@@ -1116,6 +1124,38 @@ int del_def_xattr_acl(const char *fname)
  }
  #endif