Fixed failing hunks.

diff --git a/atimes.diff b/atimes.diff
index 818958a..51eae2b 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -7,7 +7,7 @@ After applying this patch, run these commands for a successful build:
 
 --- old/flist.c
 +++ new/flist.c
-@@ -50,6 +50,7 @@ extern int preserve_devices;
+@@ -46,6 +46,7 @@ extern int preserve_devices;
  extern int preserve_specials;
  extern int preserve_uid;
  extern int preserve_gid;
@@ -15,7 +15,7 @@ After applying this patch, run these commands for a successful build:
  extern int relative_paths;
  extern int implied_dirs;
  extern int prune_empty_dirs;
-@@ -84,7 +85,13 @@ void init_flist(void)
+@@ -79,7 +80,13 @@ void init_flist(void)
        struct file_struct f;
  
        /* Figure out how big the file_struct is without trailing padding */
@@ -30,7 +30,7 @@ After applying this patch, run these commands for a successful build:
        checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
  }
  
-@@ -140,16 +147,18 @@ static void list_file_entry(struct file_
+@@ -135,16 +142,18 @@ static void list_file_entry(struct file_
  
  #ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(f->mode)) {
@@ -51,7 +51,7 @@ After applying this patch, run these commands for a successful build:
                        f_name(f, NULL));
        }
  }
-@@ -311,6 +320,7 @@ static void send_file_entry(struct file_
+@@ -306,6 +315,7 @@ static void send_file_entry(struct file_
  {
        unsigned short flags;
        static time_t modtime;
@@ -59,7 +59,7 @@ After applying this patch, run these commands for a successful build:
        static mode_t mode;
        static int64 dev;
        static dev_t rdev;
-@@ -326,7 +336,7 @@ static void send_file_entry(struct file_
+@@ -321,7 +331,7 @@ static void send_file_entry(struct file_
  
        if (!file) {
                write_byte(f, 0);
@@ -68,7 +68,7 @@ After applying this patch, run these commands for a successful build:
                dev = 0, rdev = makedev(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;
-@@ -338,7 +348,7 @@ static void send_file_entry(struct file_
+@@ -331,7 +341,7 @@ static void send_file_entry(struct file_
  
        f_name(file, fname);
  
@@ -77,7 +77,7 @@ After applying this patch, run these commands for a successful build:
  
        if (file->mode == mode)
                flags |= XMIT_SAME_MODE;
-@@ -374,6 +384,12 @@ static void send_file_entry(struct file_
+@@ -367,6 +377,12 @@ static void send_file_entry(struct file_
                flags |= XMIT_SAME_TIME;
        else
                modtime = file->modtime;
@@ -90,7 +90,7 @@ After applying this patch, run these commands for a successful build:
  
  #ifdef SUPPORT_HARD_LINKS
        if (file->link_u.idev) {
-@@ -427,6 +443,8 @@ static void send_file_entry(struct file_
+@@ -420,6 +436,8 @@ static void send_file_entry(struct file_
                write_int(f, modtime);
        if (!(flags & XMIT_SAME_MODE))
                write_int(f, to_wire_mode(mode));
@@ -99,7 +99,7 @@ After applying this patch, run these commands for a successful build:
        if (preserve_uid && !(flags & XMIT_SAME_UID)) {
                if (!numeric_ids)
                        add_uid(uid);
-@@ -495,6 +513,7 @@ static struct file_struct *receive_file_
+@@ -486,6 +504,7 @@ static struct file_struct *receive_file_
                                              unsigned short flags, int f)
  {
        static time_t modtime;
@@ -107,7 +107,7 @@ After applying this patch, run these commands for a successful build:
        static mode_t mode;
        static int64 dev;
        static dev_t rdev;
-@@ -513,7 +532,7 @@ static struct file_struct *receive_file_
+@@ -504,7 +523,7 @@ static struct file_struct *receive_file_
        struct file_struct *file;
  
        if (!flist) {
@@ -116,7 +116,7 @@ After applying this patch, run these commands for a successful build:
                dev = 0, rdev = makedev(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;
-@@ -569,6 +588,8 @@ static struct file_struct *receive_file_
+@@ -560,6 +579,8 @@ static struct file_struct *receive_file_
                modtime = (time_t)read_int(f);
        if (!(flags & XMIT_SAME_MODE))
                mode = from_wire_mode(read_int(f));
@@ -125,7 +125,7 @@ After applying this patch, run these commands for a successful build:
  
        if (chmod_modes && !S_ISLNK(mode))
                mode = tweak_mode(mode, chmod_modes);
-@@ -624,6 +645,8 @@ static struct file_struct *receive_file_
+@@ -615,6 +636,8 @@ static struct file_struct *receive_file_
        file->mode = mode;
        file->uid = uid;
        file->gid = gid;
@@ -134,7 +134,7 @@ After applying this patch, run these commands for a successful build:
  
        if (dirname_len) {
                file->dirname = lastdir = bp;
-@@ -649,12 +672,12 @@ static struct file_struct *receive_file_
+@@ -640,12 +663,12 @@ static struct file_struct *receive_file_
                            && lastname[del_hier_name_len-1] == '.'
                            && lastname[del_hier_name_len-2] == '/')
                                del_hier_name_len -= 2;
@@ -149,7 +149,7 @@ After applying this patch, run these commands for a successful build:
                        else
                                in_del_hier = 0;
                }
-@@ -870,12 +893,14 @@ struct file_struct *make_file(char *fnam
+@@ -861,12 +884,14 @@ struct file_struct *make_file(char *fnam
        memset(bp, 0, file_struct_len);
        bp += file_struct_len;
  
@@ -165,7 +165,7 @@ After applying this patch, run these commands for a successful build:
  
  #ifdef SUPPORT_HARD_LINKS
        if (flist && flist->hlink_pool) {
-@@ -988,7 +1013,7 @@ static void send_if_directory(int f, str
+@@ -979,7 +1004,7 @@ static void send_if_directory(int f, str
        char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/');
  
        if (S_ISDIR(file->mode)
@@ -174,7 +174,7 @@ After applying this patch, run these commands for a successful build:
                void *save_filters;
                unsigned int len = strlen(fbuf);
                if (len > 1 && fbuf[len-1] == '/')
-@@ -1594,8 +1619,9 @@ static void clean_flist(struct file_list
+@@ -1585,8 +1610,9 @@ static void clean_flist(struct file_list
                        }
                        /* Make sure we don't lose track of a user-specified
                         * top directory. */
@@ -186,7 +186,7 @@ After applying this patch, run these commands for a successful build:
  
                        clear_file(flist->files[drop], flist);
  
-@@ -1719,7 +1745,7 @@ static void output_flist(struct file_lis
+@@ -1710,7 +1736,7 @@ static void output_flist(struct file_lis
                        file->dirname ? file->dirname : "",
                        file->dirname ? "/" : "", NS(file->basename),
                        S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
@@ -213,7 +213,7 @@ After applying this patch, run these commands for a successful build:
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -184,7 +186,7 @@ static int delete_item(char *fname, int 
+@@ -182,7 +184,7 @@ static int delete_item(char *fname, int 
        for (j = dirlist->count; j--; ) {
                struct file_struct *fp = dirlist->files[j];
  
@@ -222,7 +222,7 @@ After applying this patch, run these commands for a successful build:
                        continue;
  
                strlcpy(p, fp->basename, remainder);
-@@ -262,7 +264,7 @@ static void delete_in_dir(struct file_li
+@@ -260,7 +262,7 @@ static void delete_in_dir(struct file_li
        filt_array[cur_depth] = push_local_filters(fbuf, dlen);
  
        if (one_file_system) {
@@ -231,7 +231,7 @@ After applying this patch, run these commands for a successful build:
                        filesystem_dev = stp->st_dev;
                else if (filesystem_dev != stp->st_dev)
                        return;
-@@ -274,7 +276,7 @@ static void delete_in_dir(struct file_li
+@@ -272,7 +274,7 @@ static void delete_in_dir(struct file_li
         * from the filesystem. */
        for (i = dirlist->count; i--; ) {
                struct file_struct *fp = dirlist->files[i];
@@ -240,7 +240,7 @@ After applying this patch, run these commands for a successful build:
                        continue;
                if (flist_find(flist, fp) < 0) {
                        f_name(fp, delbuf);
-@@ -300,11 +302,11 @@ static void do_delete_pass(struct file_l
+@@ -298,11 +300,11 @@ static void do_delete_pass(struct file_l
        for (j = 0; j < flist->count; j++) {
                struct file_struct *file = flist->files[j];
  
@@ -254,7 +254,7 @@ After applying this patch, run these commands for a successful build:
                        rprintf(FINFO, "deleting in %s\n", fbuf);
  
                if (link_stat(fbuf, &st, keep_dirlinks) < 0
-@@ -348,6 +350,9 @@ void itemize(struct file_struct *file, i
+@@ -346,6 +348,9 @@ void itemize(struct file_struct *file, i
                     && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
                    || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
                        iflags |= ITEM_REPORT_TIME;
@@ -264,7 +264,7 @@ After applying this patch, run these commands for a successful build:
                if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
                        iflags |= ITEM_REPORT_PERMS;
                if (preserve_uid && am_root && file->uid != st->st_uid)
-@@ -549,7 +554,7 @@ static int find_fuzzy(struct file_struct
+@@ -547,7 +552,7 @@ static int find_fuzzy(struct file_struct
                uint32 dist;
  
                if (!S_ISREG(fp->mode) || !fp->length
@@ -273,7 +273,7 @@ After applying this patch, run these commands for a successful build:
                        continue;
  
                name = fp->basename;
-@@ -658,6 +663,8 @@ static int try_dests_reg(struct file_str
+@@ -656,6 +661,8 @@ static int try_dests_reg(struct file_str
                                          itemizing && verbose > 1,
                                          code) < 0)
                                goto try_a_copy;
@@ -282,7 +282,7 @@ After applying this patch, run these commands for a successful build:
                        if (preserve_hard_links && file->link_u.links)
                                hard_link_cluster(file, ndx, itemizing, code);
                } else if (itemizing)
-@@ -906,7 +913,7 @@ static void recv_generator(char *fname, 
+@@ -922,7 +929,7 @@ static void recv_generator(char *fname, 
                    && verbose && code && f_out != -1)
                        rprintf(code, "%s/\n", fname);
                if (delete_during && f_out != -1 && !phase && dry_run < 2
@@ -291,7 +291,7 @@ After applying this patch, run these commands for a successful build:
                        delete_in_dir(the_file_list, fname, file, &st);
                return;
        }
-@@ -1188,7 +1195,7 @@ static void recv_generator(char *fname, 
+@@ -1211,7 +1218,7 @@ static void recv_generator(char *fname, 
        if (fuzzy_dirlist) {
                int j = flist_find(fuzzy_dirlist, file);
                if (j >= 0) /* don't use changing file as future fuzzy basis */
@@ -302,7 +302,7 @@ After applying this patch, run these commands for a successful build:
        /* open the file */
 --- old/hlink.c
 +++ new/hlink.c
-@@ -25,6 +25,7 @@ extern int link_dest;
+@@ -28,6 +28,7 @@ extern int link_dest;
  extern int make_backups;
  extern int log_format_has_i;
  extern char *basis_dir[];
@@ -310,7 +310,7 @@ After applying this patch, run these commands for a successful build:
  extern struct file_list *the_file_list;
  
  #ifdef SUPPORT_HARD_LINKS
-@@ -85,10 +86,10 @@ static void link_idev_data(void)
+@@ -88,10 +89,10 @@ static void link_idev_data(void)
                        FPTR(cur)->link_u.links = pool_talloc(hlink_pool,
                            struct hlink, 1, "hlink_list");
  
@@ -323,7 +323,7 @@ After applying this patch, run these commands for a successful build:
                        hlink_list[to++] = head;
                } else
                        FPTR(cur)->link_u.links = NULL;
-@@ -174,7 +175,7 @@ int hard_link_check(struct file_struct *
+@@ -177,7 +178,7 @@ int hard_link_check(struct file_struct *
  {
  #ifdef SUPPORT_HARD_LINKS
        int head;
@@ -332,7 +332,7 @@ After applying this patch, run these commands for a successful build:
                head = hlink_list[file->F_HLINDEX] = file->F_NEXT;
        else
                head = hlink_list[file->F_HLINDEX];
-@@ -269,8 +270,8 @@ void hard_link_cluster(struct file_struc
+@@ -272,8 +273,8 @@ void hard_link_cluster(struct file_struc
        file->F_HLINDEX = FINISHED_LINK;
        if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
                return;
@@ -343,7 +343,7 @@ After applying this patch, run these commands for a successful build:
                        ndx = file->F_NEXT;
                        file = FPTR(ndx);
                }
-@@ -285,6 +286,6 @@ void hard_link_cluster(struct file_struc
+@@ -288,6 +289,6 @@ void hard_link_cluster(struct file_struc
                maybe_hard_link(file, ndx, hlink2, statret, &st2,
                                hlink1, &st1, itemizing, code);
                file->F_HLINDEX = FINISHED_LINK;
@@ -353,7 +353,7 @@ After applying this patch, run these commands for a successful build:
  }
 --- old/log.c
 +++ new/log.c
-@@ -42,6 +42,7 @@ extern int msg_fd_out;
+@@ -37,6 +37,7 @@ extern int msg_fd_out;
  extern int allow_8bit_chars;
  extern int protocol_version;
  extern int preserve_times;
@@ -361,7 +361,7 @@ After applying this patch, run these commands for a successful build:
  extern int log_format_has_i;
  extern int log_format_has_o_or_i;
  extern int daemon_log_format_has_o_or_i;
-@@ -608,7 +609,8 @@ static void log_formatted(enum logcode c
+@@ -603,7 +604,8 @@ static void log_formatted(enum logcode c
                        n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
                        n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
                        n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
@@ -373,7 +373,7 @@ After applying this patch, run these commands for a successful build:
                        if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
 --- old/options.c
 +++ new/options.c
-@@ -53,6 +53,7 @@ int preserve_uid = 0;
+@@ -55,6 +55,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
  int omit_dir_times = 0;
@@ -403,7 +403,7 @@ After applying this patch, run these commands for a successful build:
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
    {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
    {"super",            0,  POPT_ARG_VAL,    &am_root, 2, 0, 0 },
-@@ -1519,6 +1524,8 @@ void server_options(char **args,int *arg
+@@ -1518,6 +1523,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
@@ -513,7 +513,7 @@ After applying this patch, run these commands for a successful build:
       --super                 receiver attempts super-user activities
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
-@@ -851,6 +852,12 @@ it is preserving modification times (see
+@@ -858,6 +859,12 @@ it is preserving modification times (see
  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).
  
@@ -526,7 +526,7 @@ After applying this patch, run these commands for a successful build:
  dit(bf(--super)) This tells the receiving side to attempt super-user
  activities even if the receiving rsync wasn't run by the super-user.  These
  activities include: preserving users via the bf(--owner) option, preserving
-@@ -1366,7 +1373,7 @@ with older versions of rsync, but that a
+@@ -1373,7 +1380,7 @@ with older versions of rsync, but that a
  verbose messages).
  
  The "%i" escape has a cryptic output that is 9 letters long.  The general
@@ -535,7 +535,7 @@ After applying this patch, run these commands for a successful build:
  type of update being done, bf(X) is replaced by the file-type, and the
  other letters represent attributes that may be output if they are being
  modified.
-@@ -1406,7 +1413,7 @@ quote(itemize(
+@@ -1413,7 +1420,7 @@ quote(itemize(
    by the file transfer.
    it() A bf(t) means the modification time is different and is being updated
    to the sender's value (requires bf(--times)).  An alternate value of bf(T)
@@ -544,7 +544,7 @@ After applying this patch, run these commands for a successful build:
    anytime a symlink is transferred, or when a file or device is transferred
    without bf(--times).
    it() A bf(p) means the permissions are different and are being updated to
-@@ -1415,7 +1422,10 @@ quote(itemize(
+@@ -1422,7 +1429,10 @@ quote(itemize(
    sender's value (requires bf(--owner) and super-user privileges).
    it() A bf(g) means the group is different and is being updated to the
    sender's value (requires bf(--group) and the authority to set the group).
@@ -558,7 +558,7 @@ After applying this patch, run these commands for a successful build:
  One other output is possible:  when deleting files, the "%i" will output
 --- old/sender.c
 +++ new/sender.c
-@@ -38,6 +38,7 @@ extern int do_progress;
+@@ -41,6 +41,7 @@ extern int do_progress;
  extern int inplace;
  extern int batch_fd;
  extern int write_batch;
@@ -566,7 +566,7 @@ After applying this patch, run these commands for a successful build:
  extern struct stats stats;
  extern struct file_list *the_file_list;
  extern char *log_format;
-@@ -126,7 +127,7 @@ void successful_send(int ndx)
+@@ -129,7 +130,7 @@ void successful_send(int ndx)
  
        file = the_file_list->files[ndx];
        /* The generator might tell us about symlinks we didn't send. */
@@ -575,7 +575,7 @@ After applying this patch, run these commands for a successful build:
                return;
        if (file->dir.root) {
                offset = stringjoin(fname, sizeof fname,
-@@ -370,7 +371,7 @@ void send_files(struct file_list *flist,
+@@ -373,7 +374,7 @@ void send_files(struct file_list *flist,
                        rprintf(FINFO, "sender finished %s\n", fname);
  
                /* Flag that we actually sent this entry. */
@@ -645,23 +645,24 @@ After applying this patch, run these commands for a successful build:
  
 --- old/tls.c
 +++ new/tls.c
-@@ -39,6 +39,7 @@
- 
+@@ -34,6 +34,7 @@
+  * change. */
  
  #include "rsync.h"
 +#include "popt.h"
  
  #define PROGRAM "tls"
  
-@@ -48,6 +49,7 @@ int read_only = 1;
+@@ -43,6 +44,8 @@ int read_only = 1;
  int list_only = 0;
  int preserve_perms = 0;
  
 +static int display_atime = 0;
- 
++ 
  static void failed(char const *what, char const *where)
  {
-@@ -56,14 +58,29 @@ static void failed(char const *what, cha
+       fprintf(stderr, PROGRAM ": %s %s: %s\n",
+@@ -50,12 +53,29 @@ static void failed(char const *what, cha
        exit(1);
  }
  
@@ -669,7 +670,7 @@ After applying this patch, run these commands for a successful build:
 +{
 +      if (t) {
 +              struct tm *mt = gmtime(&t);
- 
++
 +              sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
 +                      (int)mt->tm_year + 1900,
 +                      (int)mt->tm_mon + 1,
@@ -680,8 +681,8 @@ After applying this patch, run these commands for a successful build:
 +      } else {
 +              strcpy(dest, "                    ");
 +      }
-+}     
- 
++}
++
  static void list_file(const char *fname)
  {
        STRUCT_STAT buf;
@@ -693,7 +694,7 @@ After applying this patch, run these commands for a successful build:
        char linkbuf[4096];
  
        if (do_lstat(fname, &buf) < 0)
-@@ -96,19 +113,8 @@ static void list_file(const char *fname)
+@@ -88,19 +108,8 @@ static void list_file(const char *fname)
  
        permstring(permbuf, buf.st_mode);
  
@@ -715,7 +716,7 @@ After applying this patch, run these commands for a successful build:
  
        /* TODO: Perhaps escape special characters in fname? */
  
-@@ -119,24 +125,55 @@ static void list_file(const char *fname)
+@@ -111,23 +120,55 @@ static void list_file(const char *fname)
                    (long)minor(buf.st_rdev));
        } else /* NB: use double for size since it might not fit in a long. */
                printf("%12.0f", (double)buf.st_size);
@@ -725,8 +726,8 @@ After applying this patch, run these commands for a successful build:
 -             datebuf, fname, linkbuf);
 +             mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
 +             fname, linkbuf);
- }
- 
++}
++
 +static struct poptOption long_options[] = {
 +  /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 +  {"atime",           'u', POPT_ARG_NONE,   &display_atime, 0,   0, 0},
@@ -739,7 +740,7 @@ After applying this patch, run these commands for a successful build:
 +      fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
 +          "Trivial file listing program for portably checking rsync\n");
 +      exit(ret);
-+}
+ }
  
  int
  main(int argc, char *argv[])
@@ -782,7 +783,7 @@ After applying this patch, run these commands for a successful build:
  }
 --- old/util.c
 +++ new/util.c
-@@ -126,7 +126,7 @@ void overflow_exit(char *str)
+@@ -116,7 +116,7 @@ void overflow_exit(char *str)
        exit_cleanup(RERR_MALLOC);
  }
  
@@ -791,7 +792,7 @@ After applying this patch, run these commands for a successful build:
  {
  #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
        if (S_ISLNK(mode))
-@@ -134,9 +134,13 @@ int set_modtime(char *fname, time_t modt
+@@ -124,9 +124,13 @@ int set_modtime(char *fname, time_t modt
  #endif
  
        if (verbose > 2) {
@@ -807,7 +808,7 @@ After applying this patch, run these commands for a successful build:
        }
  
        if (dry_run)
-@@ -145,7 +149,7 @@ int set_modtime(char *fname, time_t modt
+@@ -135,7 +139,7 @@ int set_modtime(char *fname, time_t modt
        {
  #ifdef HAVE_UTIMES
                struct timeval t[2];
@@ -816,7 +817,7 @@ After applying this patch, run these commands for a successful build:
                t[0].tv_usec = 0;
                t[1].tv_sec = modtime;
                t[1].tv_usec = 0;
-@@ -156,12 +160,12 @@ int set_modtime(char *fname, time_t modt
+@@ -146,12 +150,12 @@ int set_modtime(char *fname, time_t modt
                return utimes(fname, t);
  #elif defined HAVE_UTIMBUF
                struct utimbuf tbuf;

diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index 5b1c64b..e31ad3c 100644 (file)
--- a/netgroup-auth.diff
+++ b/netgroup-auth.diff
@@ -5,13 +5,12 @@ This patch still needs autoconf support for portability.
 
 --- old/access.c
 +++ new/access.c
-@@ -22,12 +22,15 @@
-   */
+@@ -20,11 +20,14 @@
+  */
  
  #include "rsync.h"
 +#include <netdb.h>
  
- 
  static int match_hostname(char *host, char *tok)
  {
        if (!host || !*host)