Fixed failing hunks.

[rsync/rsync-patches.git] / xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index fc5cf1b..e2b5bd2 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -54,7 +54,7 @@ After applying this patch, run these commands for a successful build:
        if (verbose > 1) {
 --- orig/configure.in  2004-08-19 19:53:27
 +++ configure.in       2005-05-12 22:57:53
-@@ -826,6 +826,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
+@@ -827,6 +827,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
    AC_MSG_RESULT(no)
  )
  
@@ -124,9 +124,9 @@ After applying this patch, run these commands for a successful build:
  
        if (f >= 0) {
                recv_uid_list(f, flist);
---- orig/generator.c   2006-01-31 02:35:44
+--- orig/generator.c   2006-01-31 19:36:04
 +++ generator.c        2005-05-12 23:21:08
-@@ -899,6 +899,10 @@ static void recv_generator(char *fname, 
+@@ -907,6 +907,10 @@ static void recv_generator(char *fname, 
                if (f_out == -1)
                        SET_ACL(fname, file);
  #endif
@@ -193,7 +193,7 @@ After applying this patch, run these commands for a successful build:
 +#else
 +
 +#endif /* No xattrs */
---- orig/options.c     2006-01-31 03:11:18
+--- orig/options.c     2006-02-02 11:45:46
 +++ options.c  2006-01-31 03:16:24
 @@ -45,6 +45,7 @@ int copy_links = 0;
  int preserve_links = 0;
@@ -226,8 +226,8 @@ After applying this patch, run these commands for a successful build:
        rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
--              "%shard links, %sACLs, %ssymlinks, batchfiles, \n",
-+              "%shard links, %sACLs, %sxattrs, %ssymlinks, batchfiles, \n",
+-              "%shard links, %sACLs, %ssymlinks, batchfiles,\n",
++              "%shard links, %sACLs, %sxattrs, %ssymlinks, batchfiles,\n",
                (int) (sizeof (OFF_T) * 8),
 -              got_socketpair, hardlinks, acls, links);
 +              got_socketpair, hardlinks, acls, xattrs, links);
@@ -279,9 +279,9 @@ After applying this patch, run these commands for a successful build:
        if (preserve_uid)
                argstr[x++] = 'o';
        if (preserve_gid)
---- orig/rsync.c       2006-01-31 02:33:51
+--- orig/rsync.c       2006-01-31 19:35:44
 +++ rsync.c    2005-10-16 23:19:27
-@@ -163,12 +163,15 @@ int set_file_attrs(char *fname, struct f
+@@ -162,12 +162,15 @@ int set_file_attrs(char *fname, struct f
        }
  #endif
  
@@ -300,7 +300,7 @@ After applying this patch, run these commands for a successful build:
        }
  
        if (verbose > 1 && flags & ATTRS_REPORT) {
---- orig/rsync.h       2006-01-23 21:24:53
+--- orig/rsync.h       2006-01-31 19:27:00
 +++ rsync.h    2005-10-16 23:19:44
 @@ -688,6 +688,38 @@ struct chmod_mode_struct;
  #endif /* SUPPORT_ACLS */