Fix failing hunks.

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

diff --git a/acls.diff b/acls.diff
index fc1950d..b8e0ae1 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -1149,7 +1149,7 @@ After applying this patch, run these commands for a successful build:
 +
 +
 +#endif /* SUPPORT_ACLS */
---- orig/backup.c      2004-06-11 07:47:42
+--- orig/backup.c      2004-07-26 06:19:04
 +++ backup.c   2004-07-03 20:11:58
 @@ -105,6 +105,7 @@ static int make_bak_dir(char *fullpath)
                        } else {
@@ -1159,7 +1159,7 @@ After applying this patch, run these commands for a successful build:
                        }
                }
                *p = '/';
-@@ -167,6 +168,8 @@ static int keep_backup(char *fname)
+@@ -168,6 +169,8 @@ static int keep_backup(char *fname)
                return 0;
        }
  
@@ -1168,7 +1168,7 @@ After applying this patch, run these commands for a successful build:
  #ifdef HAVE_MKNOD
        /* Check to see if this is a device file, or link */
        if (IS_DEVICE(file->mode)) {
-@@ -237,6 +240,7 @@ static int keep_backup(char *fname)
+@@ -242,6 +245,7 @@ static int keep_backup(char *fname)
                }
        }
        set_perms(backup_dir_buf, file, NULL, 0);
@@ -1265,7 +1265,7 @@ 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       2004-07-15 02:21:10
+--- orig/flist.c       2004-07-17 15:20:05
 +++ flist.c    2004-07-03 20:11:58
 @@ -942,6 +942,8 @@ void send_file_name(int f, struct file_l
  
@@ -1305,12 +1305,12 @@ After applying this patch, run these commands for a successful build:
        if (f != -1) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */
---- orig/generator.c   2004-07-16 19:35:29
+--- orig/generator.c   2004-07-28 10:05:29
 +++ generator.c        2004-07-03 20:11:58
-@@ -327,6 +327,10 @@ static void recv_generator(char *fname, 
+@@ -335,6 +335,10 @@ static void recv_generator(char *fname, 
                if (set_perms(fname, file, statret ? NULL : &st, 0)
                    && verbose && f_out != -1)
-                       rprintf(FINFO,"%s/\n",fname);
+                       rprintf(FINFO, "%s/\n", safe_fname(fname));
 +#if SUPPORT_ACLS
 +              if (f_out == -1)
 +                      SET_ACL(fname, file);
@@ -1329,7 +1329,7 @@ After applying this patch, run these commands for a successful build:
    next;
  }
  
---- orig/options.c     2004-07-16 20:07:22
+--- orig/options.c     2004-07-23 17:16:13
 +++ options.c  2004-07-15 16:53:42
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
@@ -1370,7 +1370,7 @@ After applying this patch, run these commands for a successful build:
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
-@@ -247,6 +253,7 @@ void usage(enum logcode F)
+@@ -248,6 +254,7 @@ void usage(enum logcode F)
    rprintf(F,"     --safe-links            ignore \"unsafe\" symlinks\n");
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
@@ -1378,7 +1378,7 @@ After applying this patch, run these commands for a successful build:
    rprintf(F," -o, --owner                 preserve owner (root only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
-@@ -355,6 +362,7 @@ static struct poptOption long_options[] 
+@@ -356,6 +363,7 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
    {"copy-unsafe-links", 0, POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
@@ -1386,7 +1386,7 @@ After applying this patch, run these commands for a successful build:
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
-@@ -601,6 +609,31 @@ int parse_arguments(int *argc, const cha
+@@ -602,6 +610,31 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -1418,7 +1418,7 @@ After applying this patch, run these commands for a successful build:
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off (opt-BASE is its index). */
-@@ -867,6 +900,8 @@ void server_options(char **args,int *arg
+@@ -873,6 +906,8 @@ void server_options(char **args,int *arg
  
        if (preserve_hard_links)
                argstr[x++] = 'H';
@@ -1427,7 +1427,7 @@ After applying this patch, run these commands for a successful build:
        if (preserve_uid)
                argstr[x++] = 'o';
        if (preserve_gid)
---- orig/rsync.c       2004-07-16 20:07:23
+--- orig/rsync.c       2004-07-26 16:06:53
 +++ rsync.c    2004-07-03 20:11:58
 @@ -205,6 +205,14 @@ int set_perms(char *fname,struct file_st
        }
@@ -1444,9 +1444,9 @@ After applying this patch, run these commands for a successful build:
        if (verbose > 1 && flags & PERMS_REPORT) {
                if (updated)
                        rprintf(FINFO,"%s\n",fname);
---- orig/rsync.h       2004-07-16 20:07:23
+--- orig/rsync.h       2004-07-23 17:16:13
 +++ rsync.h    2004-07-03 20:11:58
-@@ -540,6 +540,40 @@ static inline int flist_up(struct file_l
+@@ -538,6 +538,40 @@ static inline int flist_up(struct file_l
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
  
@@ -1487,7 +1487,7 @@ 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      2004-07-16 20:07:23
+--- orig/rsync.yo      2004-07-24 16:52:10
 +++ rsync.yo   2004-07-03 20:11:58
 @@ -297,6 +297,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks
@@ -1497,7 +1497,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)
-@@ -539,6 +540,11 @@ source file's permissions and the umask 
+@@ -542,6 +543,11 @@ source file's permissions and the umask 
  other files (including updated files) retain their existing permissions
  (which is the same behavior as other file-copy utilities, such as cp).