Changed the style of the diff headers (use "patch -p1" now).

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

diff --git a/xattrs.diff b/xattrs.diff
index 0599910..7f8f60c 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -6,8 +6,8 @@ After applying this patch, run these commands for a successful build:
     ./configure --enable-acl-support --enable-xattr-support
     make
 
---- orig/Makefile.in   2005-11-07 04:31:05
-+++ Makefile.in        2005-11-07 04:38:36
+--- old/Makefile.in
++++ new/Makefile.in
 @@ -27,13 +27,13 @@ VERSION=@VERSION@
  
  HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
@@ -24,8 +24,8 @@ After applying this patch, run these commands for a successful build:
  OBJS3=progress.o pipe.o
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
---- orig/backup.c      2004-10-06 00:13:09
-+++ backup.c   2005-03-03 01:20:46
+--- old/backup.c
++++ new/backup.c
 @@ -136,6 +136,7 @@ static int make_bak_dir(char *fullpath)
                                do_lchown(fullpath, st.st_uid, st.st_gid);
                                do_chmod(fullpath, st.st_mode);
@@ -50,8 +50,8 @@ After applying this patch, run these commands for a successful build:
        free(file);
  
        if (verbose > 1) {
---- orig/configure.in  2004-08-19 19:53:27
-+++ configure.in       2005-05-12 22:57:53
+--- old/configure.in
++++ new/configure.in
 @@ -810,6 +810,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
    AC_MSG_RESULT(no)
  )
@@ -83,8 +83,8 @@ After applying this patch, run these commands for a successful build:
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  
---- orig/flist.c       2006-01-31 02:37:33
-+++ flist.c    2005-10-16 23:03:04
+--- old/flist.c
++++ new/flist.c
 @@ -969,6 +969,8 @@ static struct file_struct *send_file_nam
                return NULL;
        if (MAKE_ACL(file, fname) < 0)
@@ -122,8 +122,8 @@ After applying this patch, run these commands for a successful build:
  
        if (f >= 0) {
                recv_uid_list(f, flist);
---- orig/generator.c   2006-02-04 22:26:45
-+++ generator.c        2005-05-12 23:21:08
+--- old/generator.c
++++ new/generator.c
 @@ -908,6 +908,10 @@ static void recv_generator(char *fname, 
                if (f_out == -1)
                        SET_ACL(fname, file);
@@ -135,8 +135,8 @@ After applying this patch, run these commands for a successful build:
                if (delete_during && f_out != -1 && !phase && dry_run < 2
                    && (file->flags & FLAG_DEL_HERE))
                        delete_in_dir(the_file_list, fname, file, &st);
---- orig/lib/sysxattr.c        2005-05-12 23:23:15
-+++ lib/sysxattr.c     2005-05-12 23:23:15
+--- old/lib/sysxattr.c
++++ new/lib/sysxattr.c
 @@ -0,0 +1,41 @@
 +/* Extended attribute support for rsync. */
 +/* This file Copyright (C) 2004 Red Hat, Inc. */
@@ -179,8 +179,8 @@ After applying this patch, run these commands for a successful build:
 +#else
 +
 +#endif /* No xattrs */
---- orig/lib/sysxattr.h        2005-05-12 23:56:31
-+++ lib/sysxattr.h     2005-05-12 23:56:31
+--- old/lib/sysxattr.h
++++ new/lib/sysxattr.h
 @@ -0,0 +1,9 @@
 +#if defined(HAVE_LINUX_XATTRS)
 +
@@ -191,8 +191,8 @@ After applying this patch, run these commands for a successful build:
 +#else
 +
 +#endif /* No xattrs */
---- orig/options.c     2006-02-04 19:58:53
-+++ options.c  2006-02-04 20:05:35
+--- old/options.c
++++ new/options.c
 @@ -45,6 +45,7 @@ int copy_links = 0;
  int preserve_links = 0;
  int preserve_hard_links = 0;
@@ -281,8 +281,8 @@ After applying this patch, run these commands for a successful build:
        if (preserve_uid)
                argstr[x++] = 'o';
        if (preserve_gid)
---- orig/rsync.c       2006-02-04 19:53:13
-+++ rsync.c    2005-10-16 23:19:27
+--- old/rsync.c
++++ new/rsync.c
 @@ -206,12 +206,15 @@ int set_file_attrs(char *fname, struct f
        }
  #endif
@@ -302,8 +302,8 @@ After applying this patch, run these commands for a successful build:
        }
  
        if (verbose > 1 && flags & ATTRS_REPORT) {
---- orig/rsync.h       2006-01-31 19:27:00
-+++ rsync.h    2005-10-16 23:19:44
+--- old/rsync.h
++++ new/rsync.h
 @@ -695,6 +695,38 @@ struct chmod_mode_struct;
  #endif /* SUPPORT_ACLS */
  #include "smb_acls.h"
@@ -343,8 +343,8 @@ After applying this patch, run these commands for a successful build:
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo      2006-02-05 06:55:30
-+++ rsync.yo   2006-01-31 03:16:46
+--- old/rsync.yo
++++ new/rsync.yo
 @@ -318,6 +318,7 @@ to the detailed description below for a 
   -p, --perms                 preserve permissions
   -E, --executability         preserve executability
@@ -365,8 +365,8 @@ After applying this patch, run these commands for a successful build:
  dit(bf(--chmod)) This option tells rsync to apply one or more
  comma-separated "chmod" strings to the permission of the files in the
  transfer.  The resulting value is treated as though it was the permissions
---- orig/xattr.c       2005-10-16 23:25:12
-+++ xattr.c    2005-10-16 23:25:12
+--- old/xattr.c
++++ new/xattr.c
 @@ -0,0 +1,540 @@
 +/* Extended Attribute support for rsync */
 +/* Copyright (C) 2004 Red Hat, Inc */