Simplified the build instructions now that we have "prepare-source".

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

diff --git a/acls.diff b/acls.diff
index 0664ab0..5f7528b 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -1,9 +1,7 @@
 After applying this patch, run these commands for a successful build:
 
-    autoconf
-    autoheader
+    ./prepare-source
     ./configure --enable-acl-support
-    make proto
     make
 
 The program currently complains when the --acls (-A) option is used to copy
@@ -11,7 +9,7 @@ from a disk that doesn't support ACLs.  This should be changed to silently
 notice that no ACLs are available to copy.  Of course, trying to write out
 ACLs to a non-ACL-supporting disk should complain.
 
---- orig/Makefile.in   2006-01-14 08:14:29
+--- orig/Makefile.in   2006-02-06 05:03:50
 +++ Makefile.in        2005-11-07 04:31:05
 @@ -25,15 +25,15 @@ VERSION=@VERSION@
  .SUFFIXES:
@@ -4903,9 +4901,9 @@ ACLs to a non-ACL-supporting disk should complain.
                }
  
                /* We now check to see if we are writing file "inplace" */
---- orig/rsync.c       2006-02-05 04:53:34
+--- orig/rsync.c       2006-02-05 15:31:49
 +++ rsync.c    2006-02-04 19:53:13
-@@ -88,7 +88,8 @@ void free_sums(struct sum_struct *s)
+@@ -91,7 +91,8 @@ void free_sums(struct sum_struct *s)
  
  /* This is only called when we aren't preserving permissions.  Figure out what
   * the permissions should be and return them merged back into the mode. */
@@ -4915,7 +4913,7 @@ ACLs to a non-ACL-supporting disk should complain.
  {
        /* If the file already exists, we'll return the local permissions,
         * possibly tweaked by the --executability option. */
-@@ -103,7 +104,7 @@ mode_t dest_mode(mode_t flist_mode, mode
+@@ -106,7 +107,7 @@ mode_t dest_mode(mode_t flist_mode, mode
                                dest_mode |= (dest_mode & 0444) >> 2;
                }
        } else
@@ -4924,7 +4922,7 @@ ACLs to a non-ACL-supporting disk should complain.
        return (flist_mode & ~CHMOD_BITS) | (dest_mode & CHMOD_BITS);
  }
  
-@@ -202,6 +203,14 @@ int set_file_attrs(char *fname, struct f
+@@ -205,6 +206,14 @@ int set_file_attrs(char *fname, struct f
        }
  #endif
  
@@ -4986,7 +4984,7 @@ ACLs to a non-ACL-supporting disk should complain.
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo      2006-02-05 06:58:50
+--- orig/rsync.yo      2006-02-05 15:31:49
 +++ rsync.yo   2006-02-05 06:55:30
 @@ -317,6 +317,7 @@ to the detailed description below for a 
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
@@ -5007,7 +5005,7 @@ ACLs to a non-ACL-supporting disk should complain.
    their special permission bits disabled except in the case where a new
    directory inherits a setgid bit from its parent directory.
  ))
-@@ -718,9 +721,11 @@ The preservation of the destination's se
+@@ -722,9 +725,11 @@ The preservation of the destination's se
  directories when bf(--perms) is off was added in rsync 2.6.7.  Older rsync
  versions erroneously preserved the three special permission bits for
  newly-created files when bf(--perms) was off, while overriding the
@@ -5022,7 +5020,7 @@ ACLs to a non-ACL-supporting disk should complain.
  
  dit(bf(-E, --executability)) This option causes rsync to preserve the
  executability (or non-executability) of regular files when bf(--perms) is
-@@ -738,6 +743,10 @@ quote(itemize(
+@@ -742,6 +747,10 @@ quote(itemize(
  
  If bf(--perms) is enabled, this option is ignored.