From a7219d2067fb9923061cfe7da56477d85e03d51a Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 3 Feb 2005 02:12:24 +0000 Subject: [PATCH] Updated to apply cleanly. --- ODBC-dblog.diff | 54 ++++++++++++++--------------- acls.diff | 38 ++++++++++---------- atimes.diff | 78 ++++++++++++++++++++--------------------- backup-dir-dels.diff | 20 +++++------ chmod-option.diff | 28 +++++++-------- date-only.diff | 12 +++---- fsync.diff | 34 +++++++++--------- fuzzy.diff | 44 ++++++++++++------------ ignore-case.diff | 24 ++++++------- link-by-hash.diff | 40 ++++++++++----------- links-depth.diff | 14 ++++---- netgroup-auth.diff | 2 +- openssl-support.diff | 82 ++++++++++++++++++++++---------------------- owner-group-mod.diff | 22 ++++++------ soften-links.diff | 4 +-- time-limit.diff | 20 +++++------ tru64.diff | 2 +- 17 files changed, 259 insertions(+), 259 deletions(-) diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index 8f2d019..22515d8 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -99,45 +99,45 @@ This patch adds the following options: OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \ fileio.o batch.o clientname.o OBJS3=progress.o pipe.o ---- orig/cleanup.c 2005-01-10 09:46:11 +--- orig/cleanup.c 2005-01-28 23:01:07 +++ cleanup.c 2004-07-03 20:22:18 -@@ -143,8 +143,12 @@ void _exit_cleanup(int code, const char +@@ -142,8 +142,12 @@ void _exit_cleanup(int code, const char code = RERR_VANISHED; } - if (code) + if (code) { log_exit(code, file, line); -+#ifdef HAVE_LIBODBC ++#if HAVE_LIBODBC + db_log_exit(code,file,line); +#endif + } if (verbose > 2) { rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", ---- orig/clientserver.c 2005-01-25 12:14:14 +--- orig/clientserver.c 2005-02-01 10:39:22 +++ clientserver.c 2004-07-03 20:22:18 -@@ -341,6 +341,9 @@ static int rsync_module(int f_in, int f_ - XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE); +@@ -344,6 +344,9 @@ static int rsync_module(int f_in, int f_ + XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE); log_init(); -+#ifdef HAVE_LIBODBC ++#if HAVE_LIBODBC + db_log_open(); +#endif if (use_chroot) { /* -@@ -459,6 +462,9 @@ static int rsync_module(int f_in, int f_ +@@ -463,6 +466,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); -+#ifdef HAVE_LIBODBC ++#if HAVE_LIBODBC + db_log_session(); +#endif } else { rprintf(FLOG, "rsync %s %s from %s (%s)\n", am_sender ? "on" : "to", ---- orig/configure.in 2005-01-10 00:21:12 +--- orig/configure.in 2005-01-28 23:01:08 +++ configure.in 2004-07-03 20:22:18 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path, [ --with-rsync-path=PATH set default --rsync-path to PATH (default: rsync)], @@ -148,7 +148,7 @@ This patch adds the following options: AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine]) -@@ -500,6 +502,14 @@ then +@@ -524,6 +526,14 @@ then AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) fi @@ -269,26 +269,26 @@ This patch adds the following options: + +#include "rsync.h" + -+#ifdef HAVE_SQL_H ++#if HAVE_SQL_H +#include +#else -+#ifdef HAVE_ODBC_SQL_H ++#if HAVE_ODBC_SQL_H +#include +#endif +#endif + -+#ifdef HAVE_SQLEXT_H ++#if HAVE_SQLEXT_H +#include +#else -+#ifdef HAVE_ODBC_SQLEXT_H ++#if HAVE_ODBC_SQLEXT_H +#include +#endif +#endif + -+#ifdef HAVE_SQLTYPES_H ++#if HAVE_SQLTYPES_H +#include +#else -+#ifdef HAVE_ODBC_SQLTYPES_H ++#if HAVE_ODBC_SQLTYPES_H +#include +#endif +#endif @@ -686,7 +686,7 @@ This patch adds the following options: FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors) FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable) FN_LOCAL_STRING(lp_uid, uid) ---- orig/log.c 2004-09-07 19:54:51 +--- orig/log.c 2005-02-01 10:39:22 +++ log.c 2004-07-03 20:22:18 @@ -75,7 +75,7 @@ struct { /* @@ -697,37 +697,37 @@ This patch adds the following options: { int i; for (i = 0; rerr_names[i].name; i++) { ---- orig/main.c 2005-01-25 12:14:14 +--- orig/main.c 2005-01-30 10:07:21 +++ main.c 2004-07-03 20:22:18 -@@ -139,6 +139,9 @@ static void report(int f) +@@ -137,6 +137,9 @@ static void report(int f) if (am_daemon) { log_exit(0, __FILE__, __LINE__); -+#ifdef HAVE_LIBODBC ++#if HAVE_LIBODBC + db_log_exit(0,__FILE__,__LINE__); +#endif if (f == -1 || !am_sender) return; } ---- orig/receiver.c 2005-01-25 12:14:14 +--- orig/receiver.c 2005-02-03 02:04:20 +++ receiver.c 2004-07-20 21:47:47 -@@ -490,6 +490,9 @@ int recv_files(int f_in, struct file_lis +@@ -504,6 +504,9 @@ int recv_files(int f_in, struct file_lis fname, fd2, file->length); log_recv(file, &initial_stats); -+#ifdef HAVE_LIBODBC ++#if HAVE_LIBODBC + db_log_transfer(file, &initial_stats, "receive"); +#endif if (fd1 != -1) close(fd1); ---- orig/sender.c 2005-01-25 00:00:31 +--- orig/sender.c 2005-02-03 02:04:20 +++ sender.c 2004-07-15 02:37:48 -@@ -231,6 +231,9 @@ void send_files(struct file_list *flist, +@@ -236,6 +236,9 @@ void send_files(struct file_list *flist, match_sums(f_out, s, mbuf, st.st_size); log_send(file, &initial_stats); -+#ifdef HAVE_LIBODBC ++#if HAVE_LIBODBC + db_log_transfer(file, &initial_stats,"send"); +#endif diff --git a/acls.diff b/acls.diff index 53d753f..8d28b9a 100644 --- a/acls.diff +++ b/acls.diff @@ -1285,9 +1285,9 @@ ACLs to a non-ACL-supporting disk should complain. AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT ---- orig/flist.c 2005-01-30 10:07:21 +--- orig/flist.c 2005-02-03 02:04:20 +++ flist.c 2004-07-03 20:11:58 -@@ -976,6 +976,8 @@ void send_file_name(int f, struct file_l +@@ -983,6 +983,8 @@ void send_file_name(int f, struct file_l if (!file) return; @@ -1296,7 +1296,7 @@ ACLs to a non-ACL-supporting disk should complain. maybe_emit_filelist_progress(flist); -@@ -984,6 +986,10 @@ void send_file_name(int f, struct file_l +@@ -991,6 +993,10 @@ void send_file_name(int f, struct file_l if (file->basename[0]) { flist->files[flist->count++] = file; send_file_entry(file, f, base_flags); @@ -1307,16 +1307,16 @@ ACLs to a non-ACL-supporting disk should complain. } if (recursive && S_ISDIR(file->mode) -@@ -1316,6 +1322,8 @@ struct file_list *recv_file_list(int f) +@@ -1309,6 +1315,8 @@ struct file_list *recv_file_list(int f) flags |= read_byte(f) << 8; - receive_file_entry(&flist->files[i], flags, flist, f); + receive_file_entry(flist, i, flags, f); + RECEIVE_ACL(flist->files[i], f); + if (S_ISREG(flist->files[i]->mode)) stats.total_size += flist->files[i]->length; -@@ -1338,6 +1346,8 @@ struct file_list *recv_file_list(int f) +@@ -1331,6 +1339,8 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); @@ -1325,9 +1325,9 @@ ACLs to a non-ACL-supporting disk should complain. if (f != -1) { /* Now send the uid/gid list. This was introduced in * protocol version 15 */ ---- orig/generator.c 2005-01-30 10:07:21 +--- orig/generator.c 2005-02-03 02:04:20 +++ generator.c 2005-01-30 10:09:44 -@@ -315,6 +315,10 @@ static void recv_generator(char *fname, +@@ -313,6 +313,10 @@ static void recv_generator(char *fname, if (set_perms(fname, file, statret ? NULL : &st, 0) && verbose && f_out != -1) rprintf(FINFO, "%s/\n", safe_fname(fname)); @@ -1336,8 +1336,8 @@ ACLs to a non-ACL-supporting disk should complain. + SET_ACL(fname, file); +#endif if (delete_during && f_out != -1 && csum_length != SUM_LENGTH - && (file->flags & FLAG_DEL_START)) - delete_in_dir(flist, fname); + && (file->flags & FLAG_DEL_HERE)) + delete_in_dir(flist, fname, file); --- orig/lib/sysacls.c 2004-10-20 15:35:58 +++ lib/sysacls.c 2004-10-20 15:35:58 @@ -0,0 +1,3217 @@ @@ -4597,7 +4597,7 @@ ACLs to a non-ACL-supporting disk should complain. next; } ---- orig/options.c 2005-01-30 10:07:21 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2004-08-19 17:38:57 @@ -44,6 +44,7 @@ int keep_dirlinks = 0; int copy_links = 0; @@ -4679,7 +4679,7 @@ ACLs to a non-ACL-supporting disk should complain. default: /* A large opt value means that set_refuse_options() * turned this option off (opt-BASE is its index). */ -@@ -1141,6 +1167,8 @@ void server_options(char **args,int *arg +@@ -1144,6 +1170,8 @@ void server_options(char **args,int *arg if (preserve_hard_links) argstr[x++] = 'H'; @@ -4688,9 +4688,9 @@ ACLs to a non-ACL-supporting disk should complain. if (preserve_uid) argstr[x++] = 'o'; if (preserve_gid) ---- orig/rsync.c 2005-01-28 19:08:20 +--- orig/rsync.c 2005-02-01 10:39:22 +++ rsync.c 2004-07-03 20:11:58 -@@ -234,6 +234,14 @@ int set_perms(char *fname,struct file_st +@@ -235,6 +235,14 @@ int set_perms(char *fname,struct file_st } #endif @@ -4705,9 +4705,9 @@ ACLs to a non-ACL-supporting disk should complain. if (verbose > 1 && flags & PERMS_REPORT) { if (updated) rprintf(FINFO,"%s\n",fname); ---- orig/rsync.h 2005-01-30 10:07:21 +--- orig/rsync.h 2005-02-03 02:04:20 +++ rsync.h 2004-07-03 20:11:58 -@@ -609,6 +609,40 @@ static inline int flist_up(struct file_l +@@ -605,6 +605,40 @@ struct stats { #include "lib/permstring.h" #include "lib/addrinfo.h" @@ -4748,9 +4748,9 @@ 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 2005-01-30 10:07:21 +--- orig/rsync.yo 2005-02-01 10:39:23 +++ rsync.yo 2004-07-03 20:11:58 -@@ -328,6 +328,7 @@ verb( +@@ -317,6 +317,7 @@ to the detailed description below for a -H, --hard-links preserve hard links -K, --keep-dirlinks treat symlinked dir on receiver as dir -p, --perms preserve permissions @@ -4758,7 +4758,7 @@ ACLs to a non-ACL-supporting disk should complain. -o, --owner preserve owner (root only) -g, --group preserve group -D, --devices preserve devices (root only) -@@ -623,6 +624,11 @@ source file's permissions and the umask +@@ -612,6 +613,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). diff --git a/atimes.diff b/atimes.diff index 2b01e9f..bdad561 100644 --- a/atimes.diff +++ b/atimes.diff @@ -4,9 +4,9 @@ command before "make": make proto ---- orig/batch.c 2004-08-02 05:02:24 +--- orig/batch.c 2005-02-03 02:04:20 +++ batch.c 2004-07-03 20:15:41 -@@ -184,6 +184,8 @@ void show_flist(int index, struct file_s +@@ -204,6 +204,8 @@ void show_flist(int index, struct file_s rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags); rprintf(FINFO, "flist->modtime=%#lx\n", (long unsigned) fptr[i]->modtime); @@ -15,8 +15,8 @@ command before "make": rprintf(FINFO, "flist->length=%.0f\n", (double) fptr[i]->length); rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode); ---- orig/flist.c 2005-01-25 00:53:58 -+++ flist.c 2004-07-03 20:15:41 +--- orig/flist.c 2005-02-03 02:04:20 ++++ flist.c 2005-02-01 10:42:59 @@ -63,6 +63,7 @@ extern int make_backups; extern int backup_suffix_len; extern int copy_links; @@ -25,7 +25,7 @@ command before "make": extern int protocol_version; extern int sanitize_paths; extern int delete_excluded; -@@ -147,17 +148,17 @@ static void list_file_entry(struct file_ +@@ -150,17 +151,17 @@ static void list_file_entry(struct file_ #if SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { @@ -47,7 +47,7 @@ command before "make": } } -@@ -333,6 +334,7 @@ void send_file_entry(struct file_struct +@@ -323,6 +324,7 @@ void send_file_entry(struct file_struct { unsigned short flags; static time_t modtime; @@ -55,7 +55,7 @@ command before "make": static mode_t mode; static int64 dev; static dev_t rdev; -@@ -348,7 +350,7 @@ void send_file_entry(struct file_struct +@@ -338,7 +340,7 @@ void send_file_entry(struct file_struct if (!file) { write_byte(f, 0); @@ -64,7 +64,7 @@ command before "make": dev = 0, rdev = makedev(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -397,6 +399,12 @@ void send_file_entry(struct file_struct +@@ -387,6 +389,12 @@ void send_file_entry(struct file_struct flags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -77,7 +77,7 @@ command before "make": #if SUPPORT_HARD_LINKS if (file->link_u.idev) { -@@ -452,6 +460,8 @@ void send_file_entry(struct file_struct +@@ -442,6 +450,8 @@ void send_file_entry(struct file_struct write_int(f, modtime); if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -86,24 +86,24 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -525,6 +535,7 @@ void receive_file_entry(struct file_stru - struct file_list *flist, int f) +@@ -515,6 +525,7 @@ static void receive_file_entry(struct fi + unsigned short flags, int f) { static time_t modtime; + static time_t atime; static mode_t mode; static int64 dev; static dev_t rdev; -@@ -543,7 +554,7 @@ void receive_file_entry(struct file_stru +@@ -533,7 +544,7 @@ static void receive_file_entry(struct fi struct file_struct *file; - if (!fptr) { + if (!flist) { - modtime = 0, mode = 0; + modtime = 0, atime = 0, mode = 0; dev = 0, rdev = makedev(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -599,6 +610,8 @@ void receive_file_entry(struct file_stru +@@ -589,6 +600,8 @@ static void receive_file_entry(struct fi modtime = (time_t)read_int(f); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -112,7 +112,7 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -649,6 +662,7 @@ void receive_file_entry(struct file_stru +@@ -639,6 +652,7 @@ static void receive_file_entry(struct fi file->flags = 0; file->modtime = modtime; @@ -120,7 +120,7 @@ command before "make": file->length = file_length; file->mode = mode; file->uid = uid; -@@ -889,6 +903,7 @@ skip_excludes: +@@ -885,6 +899,7 @@ skip_filters: file->flags = flags; file->modtime = st.st_mtime; @@ -128,7 +128,7 @@ command before "make": file->length = st.st_size; file->mode = st.st_mode; file->uid = st.st_uid; ---- orig/generator.c 2005-01-24 06:20:37 +--- orig/generator.c 2005-02-03 02:04:20 +++ generator.c 2004-11-03 23:02:12 @@ -99,7 +99,7 @@ static int unchanged_file(char *fn, stru if (ignore_times) @@ -139,7 +139,7 @@ command before "make": } -@@ -499,7 +499,7 @@ static void recv_generator(char *fname, +@@ -497,7 +497,7 @@ static void recv_generator(char *fname, } if (update_only && fnamecmp_type == FNAMECMP_FNAME @@ -148,9 +148,9 @@ command before "make": if (verbose > 1) rprintf(FINFO, "%s is newer\n", safe_fname(fname)); return; ---- orig/options.c 2005-01-25 03:26:51 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2005-01-24 01:51:48 -@@ -49,6 +49,7 @@ int preserve_uid = 0; +@@ -50,6 +50,7 @@ int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; int omit_dir_times = 0; @@ -158,7 +158,7 @@ command before "make": int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -266,6 +267,7 @@ void usage(enum logcode F) +@@ -270,6 +271,7 @@ void usage(enum logcode F) rprintf(F," -g, --group preserve group\n"); rprintf(F," -D, --devices preserve devices (root only)\n"); rprintf(F," -t, --times preserve times\n"); @@ -166,7 +166,7 @@ command before "make": rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run show what would have been transferred\n"); -@@ -382,6 +384,7 @@ static struct poptOption long_options[] +@@ -389,6 +391,7 @@ static struct poptOption long_options[] {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 }, {"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 }, {"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 }, @@ -174,7 +174,7 @@ command before "make": {"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 }, {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 }, -@@ -1128,6 +1131,8 @@ void server_options(char **args,int *arg +@@ -1152,6 +1155,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -183,7 +183,7 @@ command before "make": if (omit_dir_times && am_sender) argstr[x++] = 'O'; if (preserve_perms) ---- orig/rsync.c 2005-01-24 00:57:24 +--- orig/rsync.c 2005-02-01 10:39:22 +++ rsync.c 2005-01-24 01:59:12 @@ -26,6 +26,7 @@ extern int verbose; extern int dry_run; @@ -191,9 +191,9 @@ command before "make": extern int omit_dir_times; +extern int copy_atimes; extern int am_root; + extern int am_server; extern int am_sender; - extern int am_generator; -@@ -153,6 +154,7 @@ int set_perms(char *fname,struct file_st +@@ -155,6 +156,7 @@ int set_perms(char *fname,struct file_st int updated = 0; STRUCT_STAT st2; int change_uid, change_gid; @@ -201,7 +201,7 @@ command before "make": if (!st) { if (dry_run) -@@ -165,18 +167,28 @@ int set_perms(char *fname,struct file_st +@@ -167,18 +169,28 @@ int set_perms(char *fname,struct file_st st = &st2; } @@ -236,7 +236,7 @@ command before "make": } change_uid = am_root && preserve_uid && st->st_uid != file->uid; ---- orig/rsync.h 2005-01-25 00:53:58 +--- orig/rsync.h 2005-02-03 02:04:20 +++ rsync.h 2004-07-03 20:15:41 @@ -54,6 +54,7 @@ #define XMIT_HAS_IDEV_DATA (1<<9) @@ -246,7 +246,7 @@ command before "make": /* These flags are used in the live flist data. */ -@@ -117,6 +118,7 @@ +@@ -118,6 +119,7 @@ #define PERMS_REPORT (1<<0) #define PERMS_SKIP_MTIME (1<<1) @@ -254,7 +254,7 @@ command before "make": #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -435,6 +437,7 @@ struct file_struct { +@@ -485,6 +487,7 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; @@ -262,19 +262,19 @@ command before "make": uid_t uid; gid_t gid; mode_t mode; ---- orig/rsync.yo 2005-01-25 03:26:51 +--- orig/rsync.yo 2005-02-01 10:39:23 +++ rsync.yo 2005-01-24 01:57:18 -@@ -332,6 +332,7 @@ verb( +@@ -322,6 +322,7 @@ to the detailed description below for a -D, --devices preserve devices (root only) -t, --times preserve times -O, --omit-dir-times omit directories when preserving times + -A, --copy-atimes copy access times -S, --sparse handle sparse files efficiently -n, --dry-run show what would have been transferred - -W, --whole-file copy whole files, no incremental checks -@@ -648,6 +649,11 @@ dit(bf(-O, --omit-dir-times)) This tells - it is preserving modification times (see --times). If NFS is sharing - the directories on the receiving side, it is a good idea to use -O. + -W, --whole-file copy files whole +@@ -641,6 +642,11 @@ dit(bf(-O, --omit-dir-times)) This tells + it is preserving modification times (see bf(--times)). If NFS is sharing + the directories on the receiving side, it is a good idea to use bf(-O). +dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times +along with the files and update them on the remote system. Note that @@ -489,7 +489,7 @@ command before "make": return 0; } ---- orig/util.c 2005-01-20 23:05:34 +--- orig/util.c 2005-01-28 19:08:20 +++ util.c 2005-01-21 18:56:05 @@ -128,12 +128,20 @@ void overflow(char *str) @@ -517,13 +517,13 @@ command before "make": if (dry_run) @@ -142,17 +150,17 @@ int set_modtime(char *fname, time_t modt { - #ifdef HAVE_UTIMBUF + #if HAVE_UTIMBUF struct utimbuf tbuf; - tbuf.actime = time(NULL); + tbuf.actime = atime; tbuf.modtime = modtime; return utime(fname,&tbuf); - #elif defined(HAVE_UTIME) + #elif HAVE_UTIME time_t t[2]; - t[0] = time(NULL); + t[0] = atime; diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 7afa507..45099ee 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -105,7 +105,7 @@ Marc St-Onge + deleting = 0; + return ret; +} ---- orig/flist.c 2005-01-30 10:07:21 +--- orig/flist.c 2005-02-03 02:04:20 +++ flist.c 2005-01-30 10:11:42 @@ -47,6 +47,8 @@ extern char curr_dir[MAXPATHLEN]; extern unsigned int curr_dir_len; @@ -124,7 +124,7 @@ Marc St-Onge extern int copy_links; extern int copy_unsafe_links; extern int protocol_version; -@@ -1659,10 +1662,14 @@ char *f_name(struct file_struct *f) +@@ -1647,10 +1650,14 @@ char *f_name(struct file_struct *f) } @@ -140,7 +140,7 @@ Marc St-Onge } -@@ -1759,11 +1766,12 @@ void delete_missing(struct file_list *fu +@@ -1739,11 +1746,12 @@ void delete_missing(struct file_list *fu || (delete_during && S_ISDIR(mode) && !S_ISDIR(full_list->files[j]->mode))) { char *f = f_name(dir_list->files[i]); @@ -156,7 +156,7 @@ Marc St-Onge safe_fname(f)); } } else if (S_ISDIR(mode)) { ---- orig/options.c 2005-01-30 10:07:21 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2005-01-28 19:17:35 @@ -119,10 +119,14 @@ int no_detach = 0; int write_batch = 0; @@ -208,7 +208,7 @@ Marc St-Onge {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 }, {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 }, {"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 }, -@@ -935,6 +945,8 @@ int parse_arguments(int *argc, const cha +@@ -938,6 +948,8 @@ int parse_arguments(int *argc, const cha partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); if (backup_dir) backup_dir = sanitize_path(NULL, backup_dir, NULL, 0); @@ -217,7 +217,7 @@ Marc St-Onge if (files_from) files_from = sanitize_path(NULL, files_from, NULL, 0); } -@@ -961,6 +973,12 @@ int parse_arguments(int *argc, const cha +@@ -964,6 +976,12 @@ int parse_arguments(int *argc, const cha if (check_filter(elp, backup_dir, 1) < 0) goto options_rejected; } @@ -230,7 +230,7 @@ Marc St-Onge } if (server_filter_list.head && files_from) { clean_fname(files_from, 1); -@@ -981,6 +999,16 @@ int parse_arguments(int *argc, const cha +@@ -984,6 +1002,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -247,7 +247,7 @@ Marc St-Onge if (backup_dir) { backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf); backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len; -@@ -1000,6 +1028,31 @@ int parse_arguments(int *argc, const cha +@@ -1003,6 +1031,31 @@ int parse_arguments(int *argc, const cha "--suffix cannot be a null string without --backup-dir\n"); return 0; } @@ -279,7 +279,7 @@ Marc St-Onge if (do_progress && !verbose) verbose = 1; -@@ -1217,6 +1270,10 @@ void server_options(char **args,int *arg +@@ -1220,6 +1273,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -290,7 +290,7 @@ Marc St-Onge /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1225,7 +1282,13 @@ void server_options(char **args,int *arg +@@ -1228,7 +1285,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; } diff --git a/chmod-option.diff b/chmod-option.diff index c7645b6..eb61b21 100644 --- a/chmod-option.diff +++ b/chmod-option.diff @@ -202,7 +202,7 @@ command before "make": + } + return 0; +} ---- orig/flist.c 2005-01-25 00:53:58 +--- orig/flist.c 2005-02-03 02:04:20 +++ flist.c 2004-09-18 01:51:11 @@ -70,6 +70,8 @@ extern int max_delete; extern int orig_umask; @@ -213,7 +213,7 @@ command before "make": extern struct filter_list_struct filter_list; extern struct filter_list_struct server_filter_list; -@@ -890,7 +892,10 @@ skip_excludes: +@@ -886,7 +888,10 @@ skip_filters: file->flags = flags; file->modtime = st.st_mtime; file->length = st.st_size; @@ -225,7 +225,7 @@ command before "make": file->uid = st.st_uid; file->gid = st.st_gid; ---- orig/options.c 2005-01-25 03:26:51 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2005-01-24 01:48:30 @@ -132,6 +132,7 @@ char *log_format = NULL; char *password_file = NULL; @@ -244,15 +244,15 @@ command before "make": static int daemon_opt; /* sets am_daemon after option error-reporting */ static int F_option_cnt = 0; static int modify_window_set; -@@ -267,6 +270,7 @@ void usage(enum logcode F) +@@ -271,6 +274,7 @@ void usage(enum logcode F) rprintf(F," -D, --devices preserve devices (root only)\n"); rprintf(F," -t, --times preserve times\n"); rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); + rprintf(F," --chmod=CHMOD change destination permissions\n"); rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run show what would have been transferred\n"); - rprintf(F," -W, --whole-file copy whole files, no incremental checks\n"); -@@ -379,6 +383,7 @@ static struct poptOption long_options[] + rprintf(F," -W, --whole-file copy files whole\n"); +@@ -386,6 +390,7 @@ static struct poptOption long_options[] {"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 }, {"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 }, {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 }, @@ -260,7 +260,7 @@ command before "make": {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 }, {"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 }, {"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 }, -@@ -984,6 +989,13 @@ int parse_arguments(int *argc, const cha +@@ -1004,6 +1009,13 @@ int parse_arguments(int *argc, const cha return 0; } @@ -274,7 +274,7 @@ command before "make": if (do_progress && !verbose) verbose = 1; -@@ -1277,6 +1289,11 @@ void server_options(char **args,int *arg +@@ -1305,6 +1317,11 @@ void server_options(char **args,int *arg } } @@ -286,19 +286,19 @@ command before "make": if (files_from && (!am_sender || remote_filesfrom_file)) { if (remote_filesfrom_file) { args[ac++] = "--files-from"; ---- orig/rsync.yo 2005-01-25 03:26:51 +--- orig/rsync.yo 2005-02-01 10:39:23 +++ rsync.yo 2005-01-24 01:48:43 -@@ -332,6 +332,7 @@ verb( +@@ -322,6 +322,7 @@ to the detailed description below for a -D, --devices preserve devices (root only) -t, --times preserve times -O, --omit-dir-times omit directories when preserving times + --chmod=CHMOD change destination permissions -S, --sparse handle sparse files efficiently -n, --dry-run show what would have been transferred - -W, --whole-file copy whole files, no incremental checks -@@ -648,6 +649,14 @@ dit(bf(-O, --omit-dir-times)) This tells - it is preserving modification times (see --times). If NFS is sharing - the directories on the receiving side, it is a good idea to use -O. + -W, --whole-file copy files whole +@@ -641,6 +642,14 @@ dit(bf(-O, --omit-dir-times)) This tells + it is preserving modification times (see bf(--times)). If NFS is sharing + the directories on the receiving side, it is a good idea to use bf(-O). +dit(bf(--chmod)) This options tells rsync to apply the listed "chmod" pattern +to the permission of the files on the destination. In addition to the normal diff --git a/date-only.diff b/date-only.diff index 8d6d3f4..d195396 100644 --- a/date-only.diff +++ b/date-only.diff @@ -15,7 +15,7 @@ Jeremy Bornstein [Patched update to have context and apply to latest CVS source.] ---- orig/generator.c 2005-01-25 12:14:14 +--- orig/generator.c 2005-02-03 02:04:20 +++ generator.c 2004-11-11 22:15:27 @@ -43,6 +43,7 @@ extern int inplace; extern int make_backups; @@ -34,7 +34,7 @@ Jeremy Bornstein if (st->st_size != file->length) return 0; ---- orig/options.c 2005-01-28 19:08:20 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2005-01-28 19:14:15 @@ -88,6 +88,7 @@ int keep_partial = 0; int safe_symlinks = 0; @@ -60,7 +60,7 @@ Jeremy Bornstein {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 }, -@@ -1241,6 +1244,9 @@ void server_options(char **args,int *arg +@@ -1247,6 +1250,9 @@ void server_options(char **args,int *arg if (size_only) args[ac++] = "--size-only"; @@ -70,9 +70,9 @@ Jeremy Bornstein if (modify_window_set) { if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) goto oom; ---- orig/rsync.yo 2005-01-28 17:12:14 +--- orig/rsync.yo 2005-02-01 10:39:23 +++ rsync.yo 2005-01-28 19:14:37 -@@ -360,6 +360,7 @@ verb( +@@ -349,6 +349,7 @@ to the detailed description below for a --timeout=TIME set I/O timeout in seconds -I, --ignore-times don't skip files that match size and time --size-only skip files that match in size @@ -80,7 +80,7 @@ Jeremy Bornstein --modify-window=NUM compare mod-times with reduced accuracy -T --temp-dir=DIR create temporary files in directory DIR --compare-dest=DIR also compare received files relative to DIR -@@ -448,6 +449,12 @@ regardless of timestamp. This is useful +@@ -434,6 +435,12 @@ regardless of timestamp. This is useful after using another mirroring system which may not preserve timestamps exactly. diff --git a/fsync.diff b/fsync.diff index ef06810..f380cda 100644 --- a/fsync.diff +++ b/fsync.diff @@ -1,9 +1,9 @@ This patch from Sami Farin lets you specify --fsync if you want fsync() to be called on every file we write. ---- orig/options.c 2005-01-24 01:43:10 -+++ options.c 2004-11-27 18:10:44 -@@ -38,6 +38,7 @@ int make_backups = 0; +--- orig/options.c 2005-02-01 10:39:22 ++++ options.c 2005-01-28 19:30:47 +@@ -39,6 +39,7 @@ int make_backups = 0; **/ int whole_file = -1; @@ -11,15 +11,15 @@ to be called on every file we write. int archive_mode = 0; int keep_dirlinks = 0; int copy_links = 0; -@@ -251,6 +252,7 @@ void usage(enum logcode F) - rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); - rprintf(F," --backup-dir make backups into this directory\n"); - rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); +@@ -294,6 +295,7 @@ void usage(enum logcode F) + rprintf(F," --partial keep partially transferred files\n"); + rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n"); + rprintf(F," --delay-updates put all updated files into place at transfer's end\n"); + rprintf(F," --fsync fsync every written file\n"); - rprintf(F," -u, --update update only (don't overwrite newer files)\n"); - rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n"); - rprintf(F," -d, --dirs transfer directories without recursing\n"); -@@ -358,6 +360,7 @@ static struct poptOption long_options[] + rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n"); + rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); + rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); +@@ -371,6 +373,7 @@ static struct poptOption long_options[] {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 }, {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, @@ -27,7 +27,7 @@ to be called on every file we write. {"dry-run", 'n', POPT_ARG_NONE, &dry_run, 0, 0, 0 }, {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 }, {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 }, -@@ -1227,6 +1230,9 @@ void server_options(char **args,int *arg +@@ -1293,6 +1296,9 @@ void server_options(char **args,int *arg args[ac++] = tmpdir; } @@ -37,9 +37,9 @@ to be called on every file we write. if (basis_dir[0] && am_sender) { /* the server only needs this option if it is not the sender, * and it may be an older version that doesn't know this ---- orig/receiver.c 2005-01-24 01:43:10 +--- orig/receiver.c 2005-02-03 02:04:20 +++ receiver.c 2004-07-16 20:13:31 -@@ -35,6 +35,7 @@ extern int keep_dirlinks; +@@ -34,6 +34,7 @@ extern int keep_dirlinks; extern int preserve_hard_links; extern int preserve_perms; extern int io_error; @@ -47,7 +47,7 @@ to be called on every file we write. extern char *tmpdir; extern char *partial_dir; extern char *basis_dir[]; -@@ -237,6 +238,12 @@ static int receive_data(int f_in, char * +@@ -242,6 +243,12 @@ static int receive_data(int f_in, char * exit_cleanup(RERR_FILEIO); } @@ -60,7 +60,7 @@ to be called on every file we write. sum_end(file_sum1); if (mapbuf) ---- orig/t_stub.c 2004-07-29 16:08:04 +--- orig/t_stub.c 2005-01-25 12:14:14 +++ t_stub.c 2004-10-09 04:03:09 @@ -28,6 +28,7 @@ @@ -70,7 +70,7 @@ to be called on every file we write. char *partial_dir; struct filter_list_struct server_filter_list; ---- orig/util.c 2005-01-20 23:05:34 +--- orig/util.c 2005-01-28 19:08:20 +++ util.c 2004-07-03 20:18:13 @@ -33,6 +33,7 @@ extern int module_id; extern int modify_window; diff --git a/fuzzy.diff b/fuzzy.diff index 2aecf46..9ce20dc 100644 --- a/fuzzy.diff +++ b/fuzzy.diff @@ -4,8 +4,8 @@ Lightly tested. Be sure to run "make proto" before "make". ---- orig/generator.c 2005-01-25 12:14:14 -+++ generator.c 2005-01-19 18:39:15 +--- orig/generator.c 2005-02-03 02:04:20 ++++ generator.c 2005-02-03 02:11:10 @@ -47,6 +47,7 @@ extern int size_only; extern OFF_T max_size; extern int io_timeout; @@ -101,9 +101,9 @@ Be sure to run "make proto" before "make". +} + - /* - * Acts on file number @p i from @p flist, whose name is @p fname. -@@ -479,6 +562,15 @@ static void recv_generator(char *fname, + /* Acts on flist->file's ndx'th item, whose name is fname. If a directory, + * make sure it exists, and has the right permissions/timestamp info. For +@@ -477,6 +560,15 @@ static void recv_generator(char *fname, } else partialptr = NULL; @@ -119,7 +119,7 @@ Be sure to run "make proto" before "make". if (statret == -1) { if (preserve_hard_links && hard_link_check(file, HL_SKIP)) return; -@@ -507,6 +599,8 @@ static void recv_generator(char *fname, +@@ -505,6 +597,8 @@ static void recv_generator(char *fname, if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; @@ -128,8 +128,8 @@ Be sure to run "make proto" before "make". else if (unchanged_file(fnamecmp, file, &st)) { if (fnamecmp_type == FNAMECMP_FNAME) set_perms(fname, file, &st, PERMS_REPORT); -@@ -581,8 +675,24 @@ notify_others: - write_int(f_out, i); +@@ -579,8 +673,24 @@ notify_others: + write_int(f_out, ndx); if (protocol_version >= 29 && inplace && !read_batch) write_byte(f_out, fnamecmp_type); - if (f_out_name >= 0) @@ -154,9 +154,9 @@ Be sure to run "make proto" before "make". if (dry_run || read_batch) return; ---- orig/main.c 2005-01-28 19:08:20 +--- orig/main.c 2005-01-30 10:07:21 +++ main.c 2005-01-14 18:33:15 -@@ -49,6 +49,7 @@ extern int keep_dirlinks; +@@ -48,6 +48,7 @@ extern int keep_dirlinks; extern int preserve_hard_links; extern int protocol_version; extern int recurse; @@ -164,7 +164,7 @@ Be sure to run "make proto" before "make". extern int relative_paths; extern int rsync_port; extern int whole_file; -@@ -485,7 +486,8 @@ static int do_recv(int f_in,int f_out,st +@@ -491,7 +492,8 @@ static int do_recv(int f_in,int f_out,st int pid; int status = 0; int error_pipe[2], name_pipe[2]; @@ -174,7 +174,7 @@ Be sure to run "make proto" before "make". /* The receiving side mustn't obey this, or an existing symlink that * points to an identical file won't be replaced by the referent. */ ---- orig/options.c 2005-01-28 19:08:20 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2005-01-28 19:31:20 @@ -90,6 +90,7 @@ int copy_unsafe_links = 0; int size_only = 0; @@ -200,7 +200,7 @@ Be sure to run "make proto" before "make". /* TODO: Should this take an optional int giving the compression level? */ {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, -@@ -1315,6 +1318,9 @@ void server_options(char **args,int *arg +@@ -1321,6 +1324,9 @@ void server_options(char **args,int *arg if (!implied_dirs && !am_sender) args[ac++] = "--no-implied-dirs"; @@ -210,9 +210,9 @@ Be sure to run "make proto" before "make". *argc = ac; return; ---- orig/receiver.c 2005-01-28 19:08:20 +--- orig/receiver.c 2005-02-03 02:04:20 +++ receiver.c 2005-01-15 21:21:02 -@@ -252,6 +252,27 @@ static int receive_data(int f_in, char * +@@ -256,6 +256,27 @@ static int receive_data(int f_in, char * } @@ -240,7 +240,7 @@ Be sure to run "make proto" before "make". static void discard_receive_data(int f_in, OFF_T length) { receive_data(f_in, NULL, -1, 0, NULL, -1, length); -@@ -390,6 +411,10 @@ int recv_files(int f_in, struct file_lis +@@ -395,6 +416,10 @@ int recv_files(int f_in, struct file_lis case FNAMECMP_BACKUP: fnamecmp = get_backup_name(fname); break; @@ -251,9 +251,9 @@ Be sure to run "make proto" before "make". default: if (j >= basis_dir_cnt) { rprintf(FERROR, ---- orig/rsync.h 2005-01-28 19:08:20 +--- orig/rsync.h 2005-02-03 02:04:20 +++ rsync.h 2005-01-19 18:36:47 -@@ -130,6 +130,7 @@ +@@ -131,6 +131,7 @@ #define FNAMECMP_FNAME 0x80 #define FNAMECMP_PARTIAL_DIR 0x81 #define FNAMECMP_BACKUP 0x82 @@ -261,9 +261,9 @@ Be sure to run "make proto" before "make". /* For calling delete_file() */ #define DEL_DIR (1<<0) ---- orig/rsync.yo 2005-01-28 17:12:14 +--- orig/rsync.yo 2005-02-01 10:39:23 +++ rsync.yo 2005-01-28 19:31:36 -@@ -365,6 +365,7 @@ verb( +@@ -354,6 +354,7 @@ to the detailed description below for a --compare-dest=DIR also compare received files relative to DIR --copy-dest=DIR ... and include copies of unchanged files --link-dest=DIR hardlink to files in DIR when unchanged @@ -271,8 +271,8 @@ Be sure to run "make proto" before "make". -z, --compress compress file data -C, --cvs-exclude auto-ignore files in the same way CVS does -f, --filter=RULE add a file-filtering RULE -@@ -949,6 +950,14 @@ Note that rsync versions prior to 2.6.1 - (or implied by -a). You can work-around this bug by avoiding the -o option +@@ -937,6 +938,14 @@ bf(--link-dest) from working properly fo + (or implied by bf(-a)). You can work-around this bug by avoiding the bf(-o) option when sending to an old rsync. +dit(bf(--fuzzy)) This option tells rsync that it should look around for a diff --git a/ignore-case.diff b/ignore-case.diff index 44603c5..37c7102 100644 --- a/ignore-case.diff +++ b/ignore-case.diff @@ -1,7 +1,7 @@ This adds the --ignore-case option, which makes rsync compare filenames in a case-insensitive manner. ---- orig/lib/wildmatch.c 2003-07-14 15:12:59 +--- orig/lib/wildmatch.c 2005-01-28 23:01:12 +++ lib/wildmatch.c 2004-08-13 16:43:27 @@ -53,6 +53,8 @@ #define ISUPPER(c) (ISASCII(c) && isupper(c)) @@ -12,7 +12,7 @@ in a case-insensitive manner. #ifdef WILD_TEST_ITERATIONS int wildmatch_iteration_count; #endif -@@ -76,9 +78,19 @@ static int domatch(const unsigned char * +@@ -76,9 +78,19 @@ static int domatch(const uchar *p, const ch = *++p; /* FALLTHROUGH */ default: @@ -35,9 +35,9 @@ in a case-insensitive manner. case '?': /* Match anything but '/'. */ if (*text == '/') ---- orig/options.c 2005-01-01 21:11:00 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2004-10-14 17:22:51 -@@ -94,6 +94,7 @@ int max_delete = 0; +@@ -97,6 +97,7 @@ int max_delete = 0; OFF_T max_size = 0; int ignore_errors = 0; int modify_window = 0; @@ -45,15 +45,15 @@ in a case-insensitive manner. int blocking_io = -1; int checksum_seed = 0; int inplace = 0; -@@ -297,6 +298,7 @@ void usage(enum logcode F) - rprintf(F," --include-from=FILE don't exclude patterns listed in FILE\n"); - rprintf(F," --files-from=FILE read FILE for list of source-file names\n"); +@@ -314,6 +315,7 @@ void usage(enum logcode F) + rprintf(F," --include-from=FILE read include patterns from FILE\n"); + rprintf(F," --files-from=FILE read list of source-file names from FILE\n"); rprintf(F," -0, --from0 all *-from file lists are delimited by nulls\n"); + rprintf(F," --ignore-case ignore case when comparing filenames\n"); rprintf(F," --version print version number\n"); rprintf(F," --port=PORT specify double-colon alternate port number\n"); rprintf(F," --blocking-io use blocking I/O for the remote shell\n"); -@@ -347,6 +349,7 @@ static struct poptOption long_options[] +@@ -368,6 +370,7 @@ static struct poptOption long_options[] {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 }, {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 }, {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 }, @@ -61,7 +61,7 @@ in a case-insensitive manner. {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 }, {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, -@@ -1182,6 +1185,9 @@ void server_options(char **args,int *arg +@@ -1259,6 +1262,9 @@ void server_options(char **args,int *arg args[ac++] = arg; } @@ -71,7 +71,7 @@ in a case-insensitive manner. if (partial_dir && am_sender) { args[ac++] = "--partial-dir"; args[ac++] = partial_dir; ---- orig/t_stub.c 2004-07-29 16:08:04 +--- orig/t_stub.c 2005-01-25 12:14:14 +++ t_stub.c 2004-08-13 17:19:56 @@ -28,6 +28,7 @@ @@ -81,7 +81,7 @@ in a case-insensitive manner. char *partial_dir; struct filter_list_struct server_filter_list; ---- orig/util.c 2004-09-07 21:45:30 +--- orig/util.c 2005-01-28 19:08:20 +++ util.c 2004-08-13 16:40:34 @@ -31,6 +31,7 @@ extern int verbose; extern int dry_run; @@ -91,7 +91,7 @@ in a case-insensitive manner. extern char *partial_dir; extern struct filter_list_struct server_filter_list; -@@ -1015,11 +1016,23 @@ int u_strcmp(const char *cs1, const char +@@ -1011,11 +1012,23 @@ int u_strcmp(const char *cs1, const char { const uchar *s1 = (const uchar *)cs1; const uchar *s2 = (const uchar *)cs2; diff --git a/link-by-hash.diff b/link-by-hash.diff index d8bd437..903827b 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -365,7 +365,7 @@ the file's name. +} + +#endif ---- orig/options.c 2005-01-28 19:08:20 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2005-01-28 19:32:26 @@ -132,6 +132,7 @@ char *log_format = NULL; char *password_file = NULL; @@ -422,7 +422,7 @@ the file's name. default: /* A large opt value means that set_refuse_options() * turned this option off (opt-BASE is its index). */ -@@ -1299,6 +1317,11 @@ void server_options(char **args,int *arg +@@ -1305,6 +1323,11 @@ void server_options(char **args,int *arg } } @@ -434,9 +434,9 @@ the file's name. if (files_from && (!am_sender || remote_filesfrom_file)) { if (remote_filesfrom_file) { args[ac++] = "--files-from"; ---- orig/receiver.c 2005-01-28 19:08:20 +--- orig/receiver.c 2005-02-03 02:04:20 +++ receiver.c 2005-01-15 21:29:13 -@@ -36,6 +36,7 @@ extern int preserve_hard_links; +@@ -35,6 +35,7 @@ extern int preserve_hard_links; extern int preserve_perms; extern int io_error; extern char *tmpdir; @@ -444,7 +444,7 @@ the file's name. extern char *partial_dir; extern char *basis_dir[]; extern int basis_dir_cnt; -@@ -132,12 +133,13 @@ static int get_tmpname(char *fnametmp, c +@@ -136,12 +137,13 @@ static int get_tmpname(char *fnametmp, c static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, @@ -459,7 +459,7 @@ the file's name. int32 len; OFF_T offset = 0; OFF_T offset2; -@@ -157,6 +159,9 @@ static int receive_data(int f_in, char * +@@ -161,6 +163,9 @@ static int receive_data(int f_in, char * } else mapbuf = NULL; @@ -469,7 +469,7 @@ the file's name. sum_init(checksum_seed); while ((i = recv_token(f_in, &data)) != 0) { -@@ -173,6 +178,8 @@ static int receive_data(int f_in, char * +@@ -177,6 +182,8 @@ static int receive_data(int f_in, char * cleanup_got_literal = 1; sum_update(data, i); @@ -478,7 +478,7 @@ the file's name. if (fd != -1 && write_file(fd,data,i) != i) goto report_write_error; -@@ -199,6 +206,8 @@ static int receive_data(int f_in, char * +@@ -203,6 +210,8 @@ static int receive_data(int f_in, char * see_token(map, len); sum_update(map, len); @@ -487,7 +487,7 @@ the file's name. } if (inplace) { -@@ -239,6 +248,8 @@ static int receive_data(int f_in, char * +@@ -243,6 +252,8 @@ static int receive_data(int f_in, char * } sum_end(file_sum1); @@ -496,7 +496,7 @@ the file's name. if (mapbuf) unmap_file(mapbuf); -@@ -254,7 +265,7 @@ static int receive_data(int f_in, char * +@@ -258,7 +269,7 @@ static int receive_data(int f_in, char * static void discard_receive_data(int f_in, OFF_T length) { @@ -505,7 +505,7 @@ the file's name. } -@@ -495,8 +506,12 @@ int recv_files(int f_in, struct file_lis +@@ -500,8 +511,12 @@ int recv_files(int f_in, struct file_lis rprintf(FINFO, "%s\n", safe_fname(fname)); /* recv file data */ @@ -519,9 +519,9 @@ the file's name. log_recv(file, &initial_stats); ---- orig/rsync.c 2005-01-28 19:08:20 +--- orig/rsync.c 2005-02-01 10:39:22 +++ rsync.c 2004-08-13 18:14:34 -@@ -35,6 +35,7 @@ extern int force_delete; +@@ -36,6 +36,7 @@ extern int force_delete; extern int recurse; extern int keep_dirlinks; extern int make_backups; @@ -529,7 +529,7 @@ the file's name. extern char *backup_dir; extern int inplace; -@@ -281,7 +282,12 @@ void finish_transfer(char *fname, char * +@@ -282,7 +283,12 @@ void finish_transfer(char *fname, char * /* move tmp file over real file */ if (verbose > 2) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); @@ -543,9 +543,9 @@ the file's name. if (ret < 0) { rsyserr(FERROR, errno, "%s %s -> \"%s\"", ret == -2 ? "copy" : "rename", ---- orig/rsync.h 2005-01-28 19:08:20 +--- orig/rsync.h 2005-02-03 02:04:20 +++ rsync.h 2004-07-03 20:20:15 -@@ -599,6 +599,14 @@ struct stats { +@@ -598,6 +598,14 @@ struct stats { int current_file_index; }; @@ -558,11 +558,11 @@ the file's name. +}; + - /* we need this function because of the silly way in which duplicate - entries are handled in the file lists - we can't change this ---- orig/rsync.yo 2005-01-28 17:12:14 + #include "byteorder.h" + #include "lib/mdfour.h" +--- orig/rsync.yo 2005-02-01 10:39:23 +++ rsync.yo 2005-01-28 19:32:45 -@@ -365,6 +365,7 @@ verb( +@@ -354,6 +354,7 @@ to the detailed description below for a --compare-dest=DIR also compare received files relative to DIR --copy-dest=DIR ... and include copies of unchanged files --link-dest=DIR hardlink to files in DIR when unchanged diff --git a/links-depth.diff b/links-depth.diff index 2a7cba6..da3f6c1 100644 --- a/links-depth.diff +++ b/links-depth.diff @@ -6,7 +6,7 @@ with the latest codebase, but even in its original form it didn't handle relative symlinks properly, and that has not yet been fixed in this modified version. ---- orig/flist.c 2005-01-28 19:08:20 +--- orig/flist.c 2005-02-03 02:04:20 +++ flist.c 2004-07-16 16:58:04 @@ -52,6 +52,7 @@ extern int filesfrom_fd; extern int one_file_system; @@ -16,7 +16,7 @@ in this modified version. extern int preserve_hard_links; extern int preserve_perms; extern int preserve_devices; -@@ -740,6 +741,30 @@ void receive_file_entry(struct file_stru +@@ -738,6 +739,30 @@ static void receive_file_entry(struct fi } @@ -47,7 +47,7 @@ in this modified version. /** * Create a file_struct for a named file by reading its stat() * information and performing extensive checks against global -@@ -864,7 +889,13 @@ skip_filters: +@@ -862,7 +887,13 @@ skip_filters: basename_len = strlen(basename) + 1; /* count the '\0' */ #if SUPPORT_LINKS @@ -62,9 +62,9 @@ in this modified version. #else linkname_len = 0; #endif ---- orig/options.c 2005-01-28 19:08:20 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2005-01-28 19:33:24 -@@ -42,6 +42,7 @@ int archive_mode = 0; +@@ -43,6 +43,7 @@ int archive_mode = 0; int keep_dirlinks = 0; int copy_links = 0; int preserve_links = 0; @@ -88,9 +88,9 @@ in this modified version. {"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 }, {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 }, {"whole-file", 'W', POPT_ARG_VAL, &whole_file, 1, 0, 0 }, ---- orig/rsync.yo 2005-01-28 17:12:14 +--- orig/rsync.yo 2005-02-01 10:39:23 +++ rsync.yo 2005-01-28 19:33:40 -@@ -322,6 +322,7 @@ verb( +@@ -311,6 +311,7 @@ to the detailed description below for a --inplace update destination files in-place -d, --dirs transfer directories without recursing -l, --links copy symlinks as symlinks diff --git a/netgroup-auth.diff b/netgroup-auth.diff index 2865908..e135646 100644 --- a/netgroup-auth.diff +++ b/netgroup-auth.diff @@ -3,7 +3,7 @@ and hosts deny. This patch still needs autoconf support for portability. ---- orig/access.c 2005-01-15 20:06:58 +--- orig/access.c 2005-01-28 19:08:19 +++ access.c 2005-01-15 20:09:59 @@ -22,12 +22,15 @@ */ diff --git a/openssl-support.diff b/openssl-support.diff index 2127ad7..aa04ccc 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -48,23 +48,23 @@ can't say if I've left any cleanup/compatibility errors in the code. TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o ---- orig/cleanup.c 2005-01-10 09:46:11 +--- orig/cleanup.c 2005-01-28 23:01:07 +++ cleanup.c 2005-01-10 10:43:22 @@ -22,6 +22,9 @@ #include "rsync.h" extern int io_error; -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL +extern int use_ssl; +#endif extern int keep_partial; extern int log_got_error; extern char *partial_dir; -@@ -98,6 +101,11 @@ void _exit_cleanup(int code, const char +@@ -97,6 +100,11 @@ void _exit_cleanup(int code, const char signal(SIGUSR1, SIG_IGN); signal(SIGUSR2, SIG_IGN); -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + if (use_ssl) + end_tls(); +#endif @@ -72,13 +72,13 @@ can't say if I've left any cleanup/compatibility errors in the code. if (verbose > 3) { rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", code, file, line); ---- orig/clientserver.c 2005-01-25 00:53:58 +--- orig/clientserver.c 2005-02-01 10:39:22 +++ clientserver.c 2004-10-08 20:44:59 -@@ -47,6 +47,9 @@ extern int select_timeout; +@@ -45,6 +45,9 @@ extern int select_timeout; extern int orig_umask; extern int no_detach; extern int default_af_hint; -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL +extern int use_ssl; +#endif extern char *bind_address; @@ -91,7 +91,7 @@ can't say if I've left any cleanup/compatibility errors in the code. + if (ret < 0) + return ret; + -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + if (use_ssl) { + int f_in = get_tls_rfd(); + int f_out = get_tls_wfd(); @@ -108,7 +108,7 @@ can't say if I've left any cleanup/compatibility errors in the code. if (verbose > 1) print_child_argv(sargs); -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + if (use_ssl) { + io_printf(f_out, "#starttls\n"); + while (1) { @@ -142,7 +142,7 @@ can't say if I've left any cleanup/compatibility errors in the code. * server to terminate the listing of modules. * We don't want to go on and transfer * anything; just exit. */ -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + if (use_ssl) + end_tls(); +#endif @@ -153,14 +153,14 @@ can't say if I've left any cleanup/compatibility errors in the code. rprintf(FERROR, "%s\n", line); /* This is always fatal; the server will now * close the socket. */ -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + if (use_ssl) + end_tls(); +#endif return RERR_STARTCLIENT; } else { rprintf(FINFO,"%s\n", line); -@@ -519,6 +567,7 @@ static void send_listing(int fd) +@@ -523,6 +571,7 @@ static void send_listing(int fd) io_printf(fd,"@RSYNCD: EXIT\n"); } @@ -168,7 +168,7 @@ can't say if I've left any cleanup/compatibility errors in the code. /* this is called when a connection is established to a client and we want to start talking. The setup of the system is done from here */ -@@ -568,6 +617,9 @@ int start_daemon(int f_in, int f_out) +@@ -572,6 +621,9 @@ int start_daemon(int f_in, int f_out) if (protocol_version > remote_protocol) protocol_version = remote_protocol; @@ -178,7 +178,7 @@ can't say if I've left any cleanup/compatibility errors in the code. line[0] = 0; if (!read_line(f_in, line, sizeof line - 1)) return -1; -@@ -577,6 +629,20 @@ int start_daemon(int f_in, int f_out) +@@ -581,6 +633,20 @@ int start_daemon(int f_in, int f_out) return -1; } @@ -199,7 +199,7 @@ can't say if I've left any cleanup/compatibility errors in the code. if (*line == '#') { /* it's some sort of command that I don't understand */ io_printf(f_out, "@ERROR: Unknown command '%s'\n", line); ---- orig/configure.in 2005-01-10 00:21:12 +--- orig/configure.in 2005-01-28 23:01:08 +++ configure.in 2004-07-03 20:22:28 @@ -271,6 +271,21 @@ yes AC_SEARCH_LIBS(getaddrinfo, inet6) @@ -223,19 +223,19 @@ can't say if I've left any cleanup/compatibility errors in the code. AC_MSG_CHECKING([whether to call shutdown on all sockets]) case $host_os in *cygwin* ) AC_MSG_RESULT(yes) ---- orig/main.c 2005-01-24 01:43:10 +--- orig/main.c 2005-01-30 10:07:21 +++ main.c 2004-10-08 20:15:28 -@@ -57,6 +57,9 @@ extern int write_batch; +@@ -56,6 +56,9 @@ extern int write_batch; extern int batch_fd; extern int batch_gen_fd; extern int filesfrom_fd; -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL +extern int use_ssl; +#endif extern pid_t cleanup_child_pid; extern char *files_from; extern char *remote_filesfrom_file; -@@ -808,33 +811,48 @@ static int start_client(int argc, char * +@@ -835,33 +838,48 @@ static int start_client(int argc, char * if ((rc = copy_argv(argv))) return rc; @@ -265,7 +265,7 @@ can't say if I've left any cleanup/compatibility errors in the code. - *p = '\0'; + /* rsync:// always uses rsync server over direct socket connection */ + if (strncasecmp(URL_PREFIX, argv[0], url_prefix_len) != 0) { -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + url_prefix_len = sizeof SSL_URL_PREFIX - 1; + if (strncasecmp(SSL_URL_PREFIX, argv[0], url_prefix_len) != 0) + url_prefix_len = 0; @@ -308,7 +308,7 @@ can't say if I've left any cleanup/compatibility errors in the code. p = find_colon(argv[0]); if (p) { /* source is remote */ if (remote_filesfrom_file -@@ -866,12 +884,26 @@ static int start_client(int argc, char * +@@ -893,12 +911,26 @@ static int start_client(int argc, char * argv++; } else { /* source is local */ am_sender = 1; @@ -317,7 +317,7 @@ can't say if I've left any cleanup/compatibility errors in the code. /* rsync:// destination uses rsync server over direct socket */ - if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) { + if (strncasecmp(URL_PREFIX, argv[argc-1], url_prefix_len) != 0) { -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + url_prefix_len = sizeof SSL_URL_PREFIX - 1; + if (strncasecmp(SSL_URL_PREFIX, argv[argc-1], url_prefix_len) != 0) + url_prefix_len = 0; @@ -338,13 +338,13 @@ can't say if I've left any cleanup/compatibility errors in the code. p = strchr(host,'/'); if (p) { *p = '\0'; ---- orig/options.c 2005-01-25 03:26:51 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2004-11-27 18:31:46 @@ -144,6 +144,14 @@ int quiet = 0; int always_checksum = 0; int list_only = 0; -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL +int use_ssl = 0; +char *ssl_cert_path = NULL; +char *ssl_key_path = NULL; @@ -362,12 +362,12 @@ can't say if I've left any cleanup/compatibility errors in the code. + char const *ssl = "no "; STRUCT_STAT *dumstat; - #ifdef HAVE_SOCKETPAIR + #if HAVE_SOCKETPAIR @@ -188,6 +197,10 @@ static void print_rsync_version(enum log ipv6 = ""; #endif -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + ssl = ""; +#endif + @@ -387,11 +387,11 @@ can't say if I've left any cleanup/compatibility errors in the code. #ifdef MAINTAINER_MODE rprintf(f, " panic action: \"%s\"\n", get_panic_action()); -@@ -325,6 +338,13 @@ void usage(enum logcode F) +@@ -331,6 +344,13 @@ void usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + rprintf(F," --ssl allow socket connections to use SSL\n"); + rprintf(F," --ssl-cert=FILE path to server's SSL certificate\n"); + rprintf(F," --ssl-key=FILE path to server's SSL private key\n"); @@ -401,7 +401,7 @@ can't say if I've left any cleanup/compatibility errors in the code. rprintf(F," -h, --help show this help screen\n"); rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n"); -@@ -335,7 +355,7 @@ void usage(enum logcode F) +@@ -341,7 +361,7 @@ void usage(enum logcode F) enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, @@ -410,11 +410,11 @@ can't say if I've left any cleanup/compatibility errors in the code. OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -428,6 +448,13 @@ static struct poptOption long_options[] +@@ -436,6 +456,13 @@ static struct poptOption long_options[] {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, {"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, #endif -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + {"ssl", 0, POPT_ARG_NONE, 0, OPT_USE_SSL, 0, 0}, + {"ssl-cert", 0, POPT_ARG_STRING, &ssl_cert_path, OPT_USE_SSL, 0, 0}, + {"ssl-key", 0, POPT_ARG_STRING, &ssl_key_path, OPT_USE_SSL, 0, 0}, @@ -424,12 +424,12 @@ can't say if I've left any cleanup/compatibility errors in the code. /* All these options switch us into daemon-mode option-parsing. */ {"address", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, {"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, -@@ -788,6 +815,12 @@ int parse_arguments(int *argc, const cha +@@ -802,6 +829,12 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; + case OPT_USE_SSL: -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + use_ssl = 1; +#endif + break; @@ -437,11 +437,11 @@ can't say if I've left any cleanup/compatibility errors in the code. default: /* A large opt value means that set_refuse_options() * turned this option off (opt-BASE is its index). */ -@@ -995,6 +1028,17 @@ int parse_arguments(int *argc, const cha - bwlimit_writemax = 512; - } +@@ -1018,6 +1051,17 @@ int parse_arguments(int *argc, const cha + if (delay_updates && !partial_dir) + partial_dir = ".~tmp~"; -+#ifdef HAVE_OPENSSL ++#if HAVE_OPENSSL + if (use_ssl) { + if (init_tls()) { + snprintf(err_buf, sizeof(err_buf), @@ -455,7 +455,7 @@ can't say if I've left any cleanup/compatibility errors in the code. if (inplace) { #if HAVE_FTRUNCATE if (partial_dir) { ---- orig/rsync.h 2005-01-25 00:53:58 +--- orig/rsync.h 2005-02-03 02:04:20 +++ rsync.h 2004-10-08 21:01:33 @@ -32,6 +32,7 @@ @@ -465,8 +465,8 @@ can't say if I've left any cleanup/compatibility errors in the code. #define BACKUP_SUFFIX "~" -@@ -339,6 +340,11 @@ enum msgcode { - #define INT64_IS_OFF_T +@@ -386,6 +387,11 @@ enum msgcode { + # define SIZEOF_INT64 SIZEOF_OFF_T #endif +#if HAVE_OPENSSL @@ -502,7 +502,7 @@ can't say if I've left any cleanup/compatibility errors in the code. + +#include "rsync.h" + -+#ifdef HAVE_SYS_SELECT_H ++#if HAVE_SYS_SELECT_H +#include +#else +#include diff --git a/owner-group-mod.diff b/owner-group-mod.diff index fb0eb67..104ec52 100644 --- a/owner-group-mod.diff +++ b/owner-group-mod.diff @@ -5,7 +5,7 @@ groups, even if they weren't returned by getgroups(). E.g.: rsync -avoogg host:/from/ /to/ ---- orig/compat.c 2004-07-21 23:59:35 +--- orig/compat.c 2005-02-01 10:39:22 +++ compat.c 2004-09-09 01:59:08 @@ -28,8 +28,11 @@ int remote_protocol = 0; @@ -31,9 +31,9 @@ groups, even if they weren't returned by getgroups(). E.g.: + preserve_gid = 2; + } } ---- orig/options.c 2005-01-24 01:43:10 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2004-09-09 01:59:08 -@@ -371,8 +371,8 @@ static struct poptOption long_options[] +@@ -384,8 +384,8 @@ static struct poptOption long_options[] {"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 }, {"copy-unsafe-links", 0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 }, {"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 }, @@ -44,7 +44,7 @@ groups, even if they weren't returned by getgroups(). E.g.: {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 }, {"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 }, {"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 }, -@@ -654,6 +654,14 @@ int parse_arguments(int *argc, const cha +@@ -690,6 +690,14 @@ int parse_arguments(int *argc, const cha usage(FINFO); exit_cleanup(0); @@ -59,7 +59,7 @@ groups, even if they weren't returned by getgroups(). E.g.: case 'v': verbose++; break; -@@ -849,8 +857,8 @@ int parse_arguments(int *argc, const cha +@@ -901,8 +909,8 @@ int parse_arguments(int *argc, const cha #endif preserve_perms = 1; preserve_times = 1; @@ -70,7 +70,7 @@ groups, even if they weren't returned by getgroups(). E.g.: preserve_devices = 1; } -@@ -1080,10 +1088,16 @@ void server_options(char **args,int *arg +@@ -1144,10 +1152,16 @@ void server_options(char **args,int *arg if (preserve_hard_links) argstr[x++] = 'H'; @@ -89,17 +89,17 @@ groups, even if they weren't returned by getgroups(). E.g.: if (preserve_devices) argstr[x++] = 'D'; if (preserve_times) ---- orig/rsync.c 2005-01-24 00:57:24 -+++ rsync.c 2005-01-24 02:07:24 +--- orig/rsync.c 2005-02-01 10:39:22 ++++ rsync.c 2005-02-01 10:46:04 @@ -26,7 +26,6 @@ extern int verbose; extern int dry_run; extern int preserve_times; extern int omit_dir_times; -extern int am_root; + extern int am_server; extern int am_sender; extern int am_generator; - extern int preserve_uid; -@@ -179,7 +178,7 @@ int set_perms(char *fname,struct file_st +@@ -181,7 +180,7 @@ int set_perms(char *fname,struct file_st updated = 1; } @@ -108,7 +108,7 @@ groups, even if they weren't returned by getgroups(). E.g.: change_gid = preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid; #if !HAVE_LCHOWN && !CHOWN_MODIFIES_SYMLINK ---- orig/uidlist.c 2004-04-29 19:37:25 +--- orig/uidlist.c 2005-01-28 19:08:20 +++ uidlist.c 2004-09-09 01:59:08 @@ -35,7 +35,6 @@ extern int verbose; extern int preserve_uid; diff --git a/soften-links.diff b/soften-links.diff index 8270410..f23dc65 100644 --- a/soften-links.diff +++ b/soften-links.diff @@ -9,9 +9,9 @@ polished version of this patch for inclusion in rsync? [Updated to latest CVS source by Wayne Davison.] ---- orig/syscall.c 2004-08-02 21:56:59 +--- orig/syscall.c 2005-01-28 23:01:10 +++ syscall.c 2004-04-22 23:48:45 -@@ -58,9 +58,14 @@ int do_symlink(char *fname1, char *fname +@@ -62,9 +62,14 @@ int do_symlink(char *fname1, char *fname #if HAVE_LINK int do_link(char *fname1, char *fname2) { diff --git a/time-limit.diff b/time-limit.diff index 149cb50..9ddfb65 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -3,7 +3,7 @@ to be simpler and more efficient by Wayne Davison. Do we need configure support for mktime()? ---- orig/io.c 2005-01-28 06:51:59 +--- orig/io.c 2005-02-03 02:04:20 +++ io.c 2004-07-17 15:28:36 @@ -51,6 +51,7 @@ extern int eol_nulls; extern int csum_length; @@ -39,9 +39,9 @@ Do we need configure support for mktime()? - if (t - last_io >= io_timeout) { + if (io_timeout && t - last_io >= io_timeout) { if (!am_server && !am_daemon) { - rprintf(FERROR, "io timeout after %d seconds - exiting\n", + rprintf(FERROR, "io timeout after %d seconds -- exiting\n", (int)(t-last_io)); ---- orig/options.c 2005-01-28 19:08:20 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2005-01-28 19:35:23 @@ -102,6 +102,7 @@ int checksum_seed = 0; int inplace = 0; @@ -114,7 +114,7 @@ Do we need configure support for mktime()? default: /* A large opt value means that set_refuse_options() * turned this option off (opt-BASE is its index). */ -@@ -1210,6 +1246,15 @@ void server_options(char **args,int *arg +@@ -1216,6 +1252,15 @@ void server_options(char **args,int *arg args[ac++] = arg; } @@ -130,18 +130,18 @@ Do we need configure support for mktime()? if (backup_dir) { args[ac++] = "--backup-dir"; args[ac++] = backup_dir; ---- orig/rsync.yo 2005-01-28 17:12:14 -+++ rsync.yo 2005-01-28 19:35:35 -@@ -387,6 +387,8 @@ verb( +--- orig/rsync.yo 2005-02-01 10:39:23 ++++ rsync.yo 2005-02-01 10:46:35 +@@ -376,6 +376,8 @@ to the detailed description below for a --password-file=FILE read password from FILE --list-only list the files instead of copying them --bwlimit=KBPS limit I/O bandwidth; KBytes per second + --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute + --time-limit=MINS Stop rsync after MINS minutes have elapsed - --write-batch=FILE write a batched update to FILE + --write-batch=FILE write a batched update to FILE --read-batch=FILE read a batched update from FILE --checksum-seed=NUM set block/file checksum seed (advanced) -@@ -1124,6 +1126,19 @@ transfer was too fast, it will wait befo +@@ -1108,6 +1110,19 @@ transfer was too fast, it will wait befo result is an average transfer rate equaling the specified limit. A value of zero specifies no limit. @@ -159,7 +159,7 @@ Do we need configure support for mktime()? +number of minutes rsync will run for. + dit(bf(--write-batch=FILE)) Record a file that can later be applied to - another identical destination with --read-batch. See the "BATCH MODE" + another identical destination with bf(--read-batch). See the "BATCH MODE" section for details. --- orig/util.c 2005-01-28 19:08:20 +++ util.c 2004-07-03 20:23:22 diff --git a/tru64.diff b/tru64.diff index 851dea8..3d1d15e 100644 --- a/tru64.diff +++ b/tru64.diff @@ -23,7 +23,7 @@ This is an adapted version of the original by Zoong Pham. #if defined(__KAME__) && defined(INET6) # define FAITH #endif ---- orig/syscall.c 2004-10-06 00:12:16 +--- orig/syscall.c 2005-01-28 23:01:10 +++ syscall.c 2004-10-06 00:17:22 @@ -27,6 +27,7 @@ #include "rsync.h" -- 2.34.1