From: Wayne Davison Date: Sat, 16 Dec 2006 19:30:11 +0000 (+0000) Subject: Fixing failing hunks. X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/590329e57985753d7ff895d6a95dbf314e4dd905 Fixing failing hunks. --- diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index 4b70c94..f0ef396 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -14,10 +14,10 @@ See the newly-created file "instructions" for more info. @@ -32,7 +32,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/ 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 -+ main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@ - OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \ + OBJS1=flist.o 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 ++ util.o main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@ + OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \ fileio.o batch.o clientname.o chmod.o OBJS3=progress.o pipe.o --- old/cleanup.c @@ -47,7 +47,7 @@ See the newly-created file "instructions" for more info. #include "case_N.h" --- old/clientserver.c +++ new/clientserver.c -@@ -394,6 +394,9 @@ static int rsync_module(int f_in, int f_ +@@ -396,6 +396,9 @@ static int rsync_module(int f_in, int f_ XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); log_init(1); @@ -57,7 +57,7 @@ See the newly-created file "instructions" for more info. #ifdef HAVE_PUTENV if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) { -@@ -633,6 +636,9 @@ static int rsync_module(int f_in, int f_ +@@ -635,6 +638,9 @@ static int rsync_module(int f_in, int f_ rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n", am_sender ? "on" : "to", request, auth_user, host, addr); @@ -1119,7 +1119,7 @@ See the newly-created file "instructions" for more info. } else { if (remove_source_files || (preserve_hard_links && F_IS_HLINKED(file))) -@@ -419,6 +441,9 @@ int recv_files(int f_in, struct file_lis +@@ -414,6 +436,9 @@ int recv_files(int f_in, struct file_lis if (server_filter_list.head && check_filter(&server_filter_list, fname, 0) < 0) { rprintf(FERROR, "attempt to hack rsync failed.\n"); @@ -1129,7 +1129,7 @@ See the newly-created file "instructions" for more info. exit_cleanup(RERR_PROTOCOL); } -@@ -475,6 +500,11 @@ int recv_files(int f_in, struct file_lis +@@ -470,6 +495,11 @@ int recv_files(int f_in, struct file_lis rprintf(FERROR, "invalid basis_dir index: %d.\n", fnamecmp_type); @@ -1141,7 +1141,7 @@ See the newly-created file "instructions" for more info. exit_cleanup(RERR_PROTOCOL); } pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, -@@ -523,6 +553,9 @@ int recv_files(int f_in, struct file_lis +@@ -518,6 +548,9 @@ int recv_files(int f_in, struct file_lis } else if (do_fstat(fd1,&st) != 0) { rsyserr(FERROR, errno, "fstat %s failed", full_fname(fnamecmp)); @@ -1151,7 +1151,7 @@ See the newly-created file "instructions" for more info. discard_receive_data(f_in, F_LENGTH(file)); close(fd1); continue; -@@ -536,6 +569,9 @@ int recv_files(int f_in, struct file_lis +@@ -531,6 +564,9 @@ int recv_files(int f_in, struct file_lis */ rprintf(FERROR,"recv_files: %s is a directory\n", full_fname(fnamecmp)); @@ -1161,7 +1161,7 @@ See the newly-created file "instructions" for more info. discard_receive_data(f_in, F_LENGTH(file)); close(fd1); continue; -@@ -559,6 +595,9 @@ int recv_files(int f_in, struct file_lis +@@ -554,6 +590,9 @@ int recv_files(int f_in, struct file_lis if (fd2 == -1) { rsyserr(FERROR, errno, "open %s failed", full_fname(fname)); @@ -1171,7 +1171,7 @@ See the newly-created file "instructions" for more info. discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); -@@ -592,6 +631,10 @@ int recv_files(int f_in, struct file_lis +@@ -587,6 +626,10 @@ int recv_files(int f_in, struct file_lis if (fd2 == -1) { rsyserr(FERROR, errno, "mkstemp %s failed", full_fname(fnametmp)); @@ -1182,7 +1182,7 @@ See the newly-created file "instructions" for more info. discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); -@@ -612,12 +655,19 @@ int recv_files(int f_in, struct file_lis +@@ -607,12 +650,19 @@ int recv_files(int f_in, struct file_lis fname, fd2, F_LENGTH(file)); log_item(log_code, file, &initial_stats, iflags, NULL); @@ -1202,7 +1202,7 @@ See the newly-created file "instructions" for more info. exit_cleanup(RERR_FILEIO); } -@@ -674,6 +724,12 @@ int recv_files(int f_in, struct file_lis +@@ -669,6 +719,12 @@ int recv_files(int f_in, struct file_lis rprintf(msgtype, "%s: %s failed verification -- update %s%s.\n", errstr, fname, keptstr, redostr); @@ -1214,7 +1214,7 @@ See the newly-created file "instructions" for more info. +#endif } if (!phase) - send_msg_int(MSG_REDO, i); + send_msg_int(MSG_REDO, ndx); --- old/sender.c +++ new/sender.c @@ -305,6 +305,9 @@ void send_files(struct file_list *flist, diff --git a/acls.diff b/acls.diff index 7f8aa6b..698da2c 100644 --- a/acls.diff +++ b/acls.diff @@ -21,9 +21,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. + lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@ 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 \ + OBJS1=flist.o 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 io.o compat.o hlink.o token.o uidlist.o socket.o \ - fileio.o batch.o clientname.o chmod.o + fileio.o batch.o clientname.o chmod.o acls.o OBJS3=progress.o pipe.o @@ -1316,7 +1316,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. --- old/flist.c +++ new/flist.c -@@ -40,6 +40,7 @@ extern int filesfrom_fd; +@@ -41,6 +41,7 @@ extern int filesfrom_fd; extern int one_file_system; extern int copy_dirlinks; extern int keep_dirlinks; @@ -1324,7 +1324,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; -@@ -147,6 +148,8 @@ static void list_file_entry(struct file_ +@@ -148,6 +149,8 @@ static void list_file_entry(struct file_ permstring(permbuf, f->mode); len = F_LENGTH(f); @@ -1333,7 +1333,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { rprintf(FINFO, "%s %11.0f %s %s -> %s\n", -@@ -662,6 +665,12 @@ static struct file_struct *recv_file_ent +@@ -663,6 +666,12 @@ static struct file_struct *recv_file_ent } #endif @@ -1346,7 +1346,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (always_checksum && S_ISREG(mode)) extra_len += SUM_EXTRA_CNT * EXTRA_LEN; -@@ -787,6 +796,11 @@ static struct file_struct *recv_file_ent +@@ -793,6 +802,11 @@ static struct file_struct *recv_file_ent read_buf(f, bp, checksum_len); } @@ -1358,7 +1358,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. return file; } -@@ -1047,6 +1061,9 @@ static struct file_struct *send_file_nam +@@ -1062,6 +1076,9 @@ static struct file_struct *send_file_nam unsigned short flags) { struct file_struct *file; @@ -1368,7 +1368,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. file = make_file(fname, flist, stp, flags, f == -2 ? SERVER_FILTERS : ALL_FILTERS); -@@ -1056,12 +1073,26 @@ static struct file_struct *send_file_nam +@@ -1071,12 +1088,26 @@ static struct file_struct *send_file_nam if (chmod_modes && !S_ISLNK(file->mode)) file->mode = tweak_mode(file->mode, chmod_modes); @@ -5970,8 +5970,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. + #define GID_NONE ((gid_t)-1) - struct file_struct { -@@ -558,11 +566,13 @@ extern int preserve_gid; + union file_extras { +@@ -559,11 +567,13 @@ extern int preserve_gid; /* When the associated option is on, all entries will have these present: */ #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid @@ -5985,7 +5985,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. /* This optional item might follow an F_HL_*() item. * (Note: a device doesn't need to check LEN64_BUMP(f).) */ -@@ -698,6 +708,17 @@ struct stats { +@@ -699,6 +709,17 @@ struct stats { struct chmod_mode_struct; @@ -6003,7 +6003,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. #include "byteorder.h" #include "lib/mdfour.h" #include "lib/wildmatch.h" -@@ -716,6 +737,16 @@ struct chmod_mode_struct; +@@ -717,6 +738,16 @@ struct chmod_mode_struct; #define NORETURN __attribute__((__noreturn__)) #endif @@ -6074,7 +6074,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. +works if the remote rsync also supports it. bf(--acls) implies bf(--perms). + +The ACL-sending protocol used by this version was first introduced in -+the patch that was shipped with 2.6.8. Sending files to an older version ++the patch that was shipped with 2.6.8. Sending ACLs to an older version +of the ACL patch is not supported. + dit(bf(--chmod)) This option tells rsync to apply one or more diff --git a/atimes.diff b/atimes.diff index 5c32110..79adc3a 100644 --- a/atimes.diff +++ b/atimes.diff @@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build: --- old/flist.c +++ new/flist.c -@@ -46,6 +46,7 @@ extern int preserve_devices; +@@ -47,6 +47,7 @@ extern int preserve_devices; extern int preserve_specials; extern int preserve_uid; extern int preserve_gid; @@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build: extern int relative_paths; extern int implied_dirs; extern int flist_extra_cnt; -@@ -137,6 +138,7 @@ void show_flist_stats(void) +@@ -138,6 +139,7 @@ void show_flist_stats(void) static void list_file_entry(struct file_struct *f) { char permbuf[PERMSTRING_SIZE]; @@ -24,7 +24,7 @@ To use this patch, run these commands for a successful build: double len; if (!F_IS_ACTIVE(f)) { -@@ -149,14 +151,16 @@ static void list_file_entry(struct file_ +@@ -150,14 +152,16 @@ static void list_file_entry(struct file_ #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { @@ -43,7 +43,7 @@ To use this patch, run these commands for a successful build: f_name(f, NULL)); } } -@@ -314,6 +318,7 @@ static void send_file_entry(struct file_ +@@ -315,6 +319,7 @@ static void send_file_entry(struct file_ { unsigned short flags; static time_t modtime; @@ -51,7 +51,7 @@ To use this patch, run these commands for a successful build: static mode_t mode; static int64 dev; static dev_t rdev; -@@ -367,6 +372,13 @@ static void send_file_entry(struct file_ +@@ -368,6 +373,13 @@ static void send_file_entry(struct file_ flags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -65,7 +65,7 @@ To use this patch, run these commands for a successful build: #ifdef SUPPORT_HARD_LINKS if (tmp_idev.dev != 0) { -@@ -434,6 +446,8 @@ static void send_file_entry(struct file_ +@@ -435,6 +447,8 @@ static void send_file_entry(struct file_ write_int(f, modtime); if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -74,7 +74,7 @@ To use this patch, run these commands for a successful build: if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -501,7 +515,7 @@ static void send_file_entry(struct file_ +@@ -502,7 +516,7 @@ static void send_file_entry(struct file_ static struct file_struct *recv_file_entry(struct file_list *flist, unsigned short flags, int f) { @@ -83,7 +83,7 @@ To use this patch, run these commands for a successful build: static mode_t mode; static int64 dev; static dev_t rdev; -@@ -522,7 +536,7 @@ static struct file_struct *recv_file_ent +@@ -523,7 +537,7 @@ static struct file_struct *recv_file_ent struct file_struct *file; if (!flist) { @@ -92,7 +92,7 @@ To use this patch, run these commands for a successful build: dev = 0, rdev = MAKEDEV(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -610,6 +624,8 @@ static struct file_struct *recv_file_ent +@@ -611,6 +625,8 @@ static struct file_struct *recv_file_ent modtime = (time_t)read_int(f); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -101,7 +101,7 @@ To use this patch, run these commands for a successful build: if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); -@@ -695,6 +711,8 @@ static struct file_struct *recv_file_ent +@@ -701,6 +717,8 @@ static struct file_struct *recv_file_ent F_UID(file) = uid; if (preserve_gid) F_GID(file) = gid; @@ -110,7 +110,7 @@ To use this patch, run these commands for a successful build: if (dirname_len) { file->dirname = lastdir = bp; -@@ -985,6 +1003,8 @@ struct file_struct *make_file(const char +@@ -996,6 +1014,8 @@ struct file_struct *make_file(const char F_UID(file) = st.st_uid; if (preserve_gid) F_GID(file) = st.st_gid; @@ -294,14 +294,14 @@ To use this patch, run these commands for a successful build: #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -514,6 +516,7 @@ struct file_struct { - union flist_extras { - uid_t uid; /* The user ID number */ - uid_t gid; /* The group ID number or GID_NONE */ -+ time_t utime; /* A unix-time value */ - struct idev *idev; /* The hard-link info during matching */ - int32 num; /* A signed number */ - uint32 unum; /* An unsigned number */ +@@ -513,6 +515,7 @@ struct idev_node { + union file_extras { + uid_t uid; /* The user ID number */ + uid_t gid; /* The group ID number or GID_NONE */ ++ time_t utime; /* A unix-time value */ + struct idev *idev; /* The hard-link info during matching */ + int32 num; /* A signed number */ + uint32 unum; /* An unsigned number */ @@ -559,6 +562,7 @@ extern int preserve_gid; /* When the associated option is on, all entries will have these present: */ #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid diff --git a/xattrs.diff b/xattrs.diff index ff1d1da..9d474e1 100644 --- a/xattrs.diff +++ b/xattrs.diff @@ -36,9 +36,9 @@ TODO: + lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattr.o @LIBOBJS@ 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 \ + OBJS1=flist.o 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 io.o compat.o hlink.o token.o uidlist.o socket.o \ - fileio.o batch.o clientname.o chmod.o acls.o + fileio.o batch.o clientname.o chmod.o acls.o xattr.o OBJS3=progress.o pipe.o @@ -145,7 +145,7 @@ TODO: --- old/flist.c +++ new/flist.c -@@ -41,6 +41,7 @@ extern int one_file_system; +@@ -42,6 +42,7 @@ extern int one_file_system; extern int copy_dirlinks; extern int keep_dirlinks; extern int preserve_acls; @@ -153,7 +153,7 @@ TODO: extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; -@@ -800,6 +801,10 @@ static struct file_struct *recv_file_ent +@@ -806,6 +807,10 @@ static struct file_struct *recv_file_ent if (preserve_acls) receive_acl(file, f); #endif @@ -164,7 +164,7 @@ TODO: return file; } -@@ -1061,7 +1066,7 @@ static struct file_struct *send_file_nam +@@ -1076,7 +1081,7 @@ static struct file_struct *send_file_nam unsigned short flags) { struct file_struct *file; @@ -173,7 +173,7 @@ TODO: statx sx; #endif -@@ -1081,6 +1086,13 @@ static struct file_struct *send_file_nam +@@ -1096,6 +1101,13 @@ static struct file_struct *send_file_nam return NULL; } #endif @@ -187,7 +187,7 @@ TODO: maybe_emit_filelist_progress(flist->count + flist_count_offset); -@@ -1092,6 +1104,10 @@ static struct file_struct *send_file_nam +@@ -1107,6 +1119,10 @@ static struct file_struct *send_file_nam if (preserve_acls) send_acl(&sx, f); #endif @@ -505,7 +505,7 @@ TODO: + #define GID_NONE ((gid_t)-1) - struct file_struct { + union file_extras { @@ -568,6 +572,7 @@ extern int preserve_gid; #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid @@ -543,9 +543,9 @@ TODO: -o, --owner preserve owner (super-user only) -g, --group preserve group --devices preserve device files (super-user only) -@@ -819,6 +820,11 @@ version makes it incompatible with sendi - rsync unless you double the bf(--acls) option (e.g. bf(-AA)). This - doubling is not needed when pulling files from an older rsync. +@@ -818,6 +819,11 @@ The ACL-sending protocol used by this ve + the patch that was shipped with 2.6.8. Sending ACLs to an older version + of the ACL patch is not supported. +dit(bf(-X, --xattrs)) This option causes rsync to update the remote +extended attributes to be the same as the local ones. This will work