The patches for 3.1.1pre1.

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

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index b465ad0e275c673d0537b1381b9227da7a53bf63..0fef5523b4a1af439d82561d28c817361680fce8 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: a01e3b490eb36ccf9e704840e1b6683dab867550
+based-on: 8946cfc6f8018e30740ee1db4cc2e2008e4f7e7e
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -1310,7 +1310,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1303,7 +1303,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
-@@ -530,7 +530,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+@@ -572,7 +572,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];
@@ -247,16 +247,16 @@ new file mode 100755
 diff --git a/xattrs.c b/xattrs.c
 --- a/xattrs.c
 +++ b/xattrs.c
-@@ -34,6 +34,8 @@ extern int read_only;
- extern int list_only;
- extern int preserve_xattrs;
+@@ -37,6 +37,8 @@ extern int preserve_links;
+ extern int preserve_devices;
+ extern int preserve_specials;
  extern int checksum_seed;
 +extern int checksum_len;
 +extern int protocol_version;
  
  #define RSYNC_XAL_INITIAL 5
  #define RSYNC_XAL_LIST_INITIAL 100
-@@ -69,6 +71,10 @@ extern int checksum_seed;
+@@ -72,6 +74,10 @@ extern int checksum_seed;
  #define XACC_ACL_ATTR RSYNC_PREFIX "%" XACC_ACL_SUFFIX
  #define XDEF_ACL_SUFFIX "dacl"
  #define XDEF_ACL_ATTR RSYNC_PREFIX "%" XDEF_ACL_SUFFIX
@@ -267,7 +267,7 @@ diff --git a/xattrs.c b/xattrs.c
  
  typedef struct {
        char *datum, *name;
-@@ -241,7 +247,9 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -247,7 +253,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
@@ -278,7 +278,7 @@ diff --git a/xattrs.c b/xattrs.c
                                continue;
                }
  
-@@ -947,6 +955,39 @@ int del_def_xattr_acl(const char *fname)
+@@ -958,6 +966,39 @@ int del_def_xattr_acl(const char *fname)
  }
  #endif