Fixed failing hunks.

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

diff --git a/xattrs.diff b/xattrs.diff
index d0e72e6..1841956 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -8,17 +8,16 @@ After applying this patch, run these commands for a successful build:
     make proto
     make
 
---- orig/Makefile.in   2004-10-20 06:32:26
-+++ Makefile.in        2005-03-03 01:20:46
-@@ -27,14 +27,14 @@ VERSION=@VERSION@
+--- orig/Makefile.in   2005-07-07 23:11:55
++++ Makefile.in        2005-07-07 23:15:20
+@@ -27,13 +27,13 @@ VERSION=@VERSION@
  
  HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 -      lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
 +      lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattr.o @LIBOBJS@
- ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
-       zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
-       zlib/zutil.o zlib/adler32.o
+ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+       zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
@@ -44,8 +43,8 @@ After applying this patch, run these commands for a successful build:
 +      PUSH_KEEP_BACKUP_XATTR(file, fname, buf);
  
        /* Check to see if this is a device file, or link */
-       if (IS_DEVICE(file->mode)) {
-@@ -264,6 +266,7 @@ static int keep_backup(char *fname)
+       if (IS_DEVICE(file->mode) && am_root && preserve_devices) {
+@@ -265,6 +267,7 @@ static int keep_backup(char *fname)
        }
        set_perms(buf, file, NULL, 0);
        CLEANUP_KEEP_BACKUP_ACL();
@@ -55,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
-@@ -812,6 +812,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
+@@ -821,6 +821,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
    AC_MSG_RESULT(no)
  )
  
@@ -127,7 +126,7 @@ After applying this patch, run these commands for a successful build:
                /* Now send the uid/gid list. This was introduced in
 --- orig/generator.c   2005-05-12 23:34:00
 +++ generator.c        2005-05-12 23:21:08
-@@ -719,6 +719,10 @@ static void recv_generator(char *fname, 
+@@ -720,6 +720,10 @@ static void recv_generator(char *fname, 
                if (f_out == -1)
                        SET_ACL(fname, file);
  #endif
@@ -338,7 +337,7 @@ After applying this patch, run these commands for a successful build:
  /* We have replacement versions of these if they're missing. */
 --- orig/rsync.yo      2004-07-03 20:11:58
 +++ rsync.yo   2005-03-03 01:33:53
-@@ -318,6 +318,7 @@ to the detailed description below for a 
+@@ -307,6 +307,7 @@ to the detailed description below for a 
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -p, --perms                 preserve permissions
   -A, --acls                  preserve ACLs (implies -p) [local option]
@@ -346,7 +345,7 @@ After applying this patch, run these commands for a successful build:
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
-@@ -635,6 +636,11 @@ ACLs to be the same as the local ACLs.  
+@@ -624,6 +625,11 @@ ACLs to be the same as the local ACLs.  
  remote machine's rsync supports this option also. This is a non-standard
  option.