From ea238f1cf5038ad498b55223edca4b981b3067a8 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sun, 9 May 2004 03:40:00 +0000 Subject: [PATCH] Updated to apply cleanly. --- ODBC-dblog.diff | 36 +++++++++++++------------- atimes.diff | 58 +++++++++++++++++++++--------------------- checksum-seed.diff | 57 +++++++++++++++++++++-------------------- chmod-option.diff | 26 +++++++++---------- date-only.diff | 20 +++++++-------- early-chmod.diff | 12 ++++----- filter.diff | 26 +++++++++---------- fuzzy.diff | 32 +++++++++++------------ ignore-case.diff | 10 ++++---- inplace.diff | 16 ++++++------ openssl-support.diff | 44 ++++++++++++++++---------------- remove-sent-files.diff | 44 ++++++++++++++++---------------- time-limit.diff | 18 ++++++------- 13 files changed, 200 insertions(+), 199 deletions(-) diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index 4871be9..eff227f 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -13,7 +13,7 @@ dblog.c file has a compile problem, it's probably my fault...) --- Makefile.in 10 Feb 2004 17:06:11 -0000 1.98 -+++ Makefile.in 24 Apr 2004 08:14:37 -0000 ++++ Makefile.in 30 Apr 2004 18:08:05 -0000 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \ zlib/zutil.o zlib/adler32.o @@ -24,7 +24,7 @@ dblog.c file has a compile problem, it's probably my fault...) fileio.o batch.o clientname.o OBJS3=progress.o pipe.o --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ README-ODBC 24 Apr 2004 08:14:37 -0000 ++++ README-ODBC 30 Apr 2004 18:08:05 -0000 @@ -0,0 +1,80 @@ +This patch adds the following options: + @@ -107,7 +107,7 @@ dblog.c file has a compile problem, it's probably my fault...) +unique IDs). +Defaults to True. --- cleanup.c 27 Jan 2004 08:14:33 -0000 1.21 -+++ cleanup.c 24 Apr 2004 08:14:37 -0000 ++++ cleanup.c 30 Apr 2004 18:08:06 -0000 @@ -138,7 +138,12 @@ void _exit_cleanup(int code, const char code = RERR_VANISHED; } @@ -123,7 +123,7 @@ dblog.c file has a compile problem, it's probably my fault...) if (verbose > 2) rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", --- clientserver.c 14 Apr 2004 23:33:34 -0000 1.121 -+++ clientserver.c 24 Apr 2004 08:14:37 -0000 ++++ clientserver.c 30 Apr 2004 18:08:06 -0000 @@ -311,6 +311,9 @@ static int rsync_module(int f_in, int f_ exclude_path_prefix = NULL; @@ -144,8 +144,8 @@ dblog.c file has a compile problem, it's probably my fault...) } else { rprintf(FINFO,"rsync %s %s from %s (%s)\n", am_sender?"on":"to", ---- configure.in 17 Apr 2004 18:40:16 -0000 1.191 -+++ configure.in 24 Apr 2004 08:14:38 -0000 +--- configure.in 30 Apr 2004 18:03:33 -0000 1.196 ++++ configure.in 30 Apr 2004 18:08:06 -0000 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path, [ --with-rsync-path=PATH set default --rsync-path to PATH (default: rsync)], [ RSYNC_PATH="$with_rsync_path" ], @@ -155,7 +155,7 @@ dblog.c file has a compile problem, it's probably my fault...) AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine]) -@@ -458,6 +460,14 @@ fi +@@ -463,6 +465,14 @@ fi if test x"$with_included_popt" != x"yes" then AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) @@ -171,7 +171,7 @@ dblog.c file has a compile problem, it's probably my fault...) AC_MSG_CHECKING([whether to use included libpopt]) --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ dblog-tables-mysql.sql 24 Apr 2004 08:14:38 -0000 ++++ dblog-tables-mysql.sql 30 Apr 2004 18:08:06 -0000 @@ -0,0 +1,43 @@ +drop table transfer; +drop table exit; @@ -217,7 +217,7 @@ dblog.c file has a compile problem, it's probably my fault...) + foreign key (session_id) references session (id) +); --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ dblog-tables-postgresql.sql 24 Apr 2004 08:14:38 -0000 ++++ dblog-tables-postgresql.sql 30 Apr 2004 18:08:06 -0000 @@ -0,0 +1,45 @@ +drop table transfer; +drop table exit; @@ -265,7 +265,7 @@ dblog.c file has a compile problem, it's probably my fault...) + foreign key (session_id) references session (id) +); --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ dblog.c 24 Apr 2004 08:14:38 -0000 ++++ dblog.c 30 Apr 2004 18:08:06 -0000 @@ -0,0 +1,352 @@ +/* + * ODBC Database logging functions @@ -620,7 +620,7 @@ dblog.c file has a compile problem, it's probably my fault...) + } +} --- loadparm.c 4 Feb 2004 07:31:29 -0000 1.50 -+++ loadparm.c 24 Apr 2004 08:14:38 -0000 ++++ loadparm.c 30 Apr 2004 18:08:07 -0000 @@ -122,6 +122,17 @@ typedef struct BOOL list; BOOL use_chroot; @@ -693,8 +693,8 @@ dblog.c file has a compile problem, it's probably my fault...) FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors) FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable) FN_LOCAL_STRING(lp_uid, uid) ---- log.c 20 Jan 2004 05:15:14 -0000 1.71 -+++ log.c 24 Apr 2004 08:14:38 -0000 +--- log.c 29 Apr 2004 19:34:31 -0000 1.72 ++++ log.c 30 Apr 2004 18:08:07 -0000 @@ -75,7 +75,7 @@ struct { /* * Map from rsync error code to name, or return NULL. @@ -705,7 +705,7 @@ dblog.c file has a compile problem, it's probably my fault...) int i; for (i = 0; rerr_names[i].name; i++) { --- main.c 10 Feb 2004 03:54:47 -0000 1.192 -+++ main.c 24 Apr 2004 08:14:38 -0000 ++++ main.c 30 Apr 2004 18:08:07 -0000 @@ -120,6 +120,9 @@ static void report(int f) if (am_daemon) { @@ -717,7 +717,7 @@ dblog.c file has a compile problem, it's probably my fault...) } --- proto.h 22 Apr 2004 09:58:09 -0000 1.189 -+++ proto.h 24 Apr 2004 08:14:38 -0000 ++++ proto.h 30 Apr 2004 18:08:07 -0000 @@ -51,6 +51,12 @@ int start_daemon(int f_in, int f_out); int daemon_main(void); void setup_protocol(int f_out,int f_in); @@ -757,8 +757,8 @@ dblog.c file has a compile problem, it's probably my fault...) void log_init(void); void log_open(void); void log_close(void); ---- receiver.c 23 Mar 2004 16:50:40 -0000 1.75 -+++ receiver.c 24 Apr 2004 08:14:39 -0000 +--- receiver.c 27 Apr 2004 19:51:33 -0000 1.76 ++++ receiver.c 30 Apr 2004 18:08:08 -0000 @@ -453,7 +453,9 @@ int recv_files(int f_in,struct file_list recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length); @@ -771,7 +771,7 @@ dblog.c file has a compile problem, it's probably my fault...) if (fd1 != -1) { close(fd1); --- sender.c 17 Feb 2004 21:57:44 -0000 1.38 -+++ sender.c 24 Apr 2004 08:14:39 -0000 ++++ sender.c 30 Apr 2004 18:08:08 -0000 @@ -283,6 +283,9 @@ void send_files(struct file_list *flist, } else { match_sums(f_out, s, buf, st.st_size); diff --git a/atimes.diff b/atimes.diff index f731257..e96b702 100644 --- a/atimes.diff +++ b/atimes.diff @@ -1,6 +1,6 @@ ---- backup.c 13 Mar 2004 20:18:03 -0000 1.28 -+++ backup.c 20 Apr 2004 23:44:16 -0000 -@@ -101,7 +101,7 @@ static int make_bak_dir(char *fullpath) +--- backup.c 4 May 2004 03:10:45 -0000 1.29 ++++ backup.c 8 May 2004 18:35:15 -0000 +@@ -102,7 +102,7 @@ static int make_bak_dir(char *fullpath) "make_bak_dir stat %s failed: %s\n", full_fname(rel), strerror(errno)); } else { @@ -10,7 +10,7 @@ do_chmod(fullpath, st.st_mode); } --- batch.c 6 Mar 2004 07:45:52 -0000 1.31 -+++ batch.c 20 Apr 2004 23:44:16 -0000 ++++ batch.c 8 May 2004 18:35:16 -0000 @@ -342,6 +342,8 @@ void show_flist(int index, struct file_s rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags); rprintf(FINFO, "flist->modtime=%#lx\n", @@ -20,8 +20,8 @@ rprintf(FINFO, "flist->length=%.0f\n", (double) fptr[i]->length); rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode); ---- flist.c 22 Apr 2004 22:17:15 -0000 1.216 -+++ flist.c 20 Apr 2004 23:44:17 -0000 +--- flist.c 3 May 2004 01:24:10 -0000 1.220 ++++ flist.c 8 May 2004 18:35:16 -0000 @@ -58,6 +58,7 @@ extern int relative_paths; extern int implied_dirs; extern int copy_links; @@ -107,7 +107,7 @@ dev = 0, rdev = makedev(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -588,6 +599,8 @@ void receive_file_entry(struct file_stru +@@ -589,6 +600,8 @@ void receive_file_entry(struct file_stru modtime = (time_t)read_int(f); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -116,7 +116,7 @@ if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -638,6 +651,7 @@ void receive_file_entry(struct file_stru +@@ -639,6 +652,7 @@ void receive_file_entry(struct file_stru file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0; file->modtime = modtime; @@ -124,7 +124,7 @@ file->length = file_length; file->mode = mode; file->uid = uid; -@@ -852,6 +866,7 @@ skip_excludes: +@@ -853,6 +867,7 @@ skip_excludes: file->flags = flags; file->modtime = st.st_mtime; @@ -132,9 +132,9 @@ file->length = st.st_size; file->mode = st.st_mode; file->uid = st.st_uid; ---- generator.c 15 Apr 2004 16:55:23 -0000 1.79 -+++ generator.c 20 Apr 2004 23:44:17 -0000 -@@ -97,7 +97,7 @@ static int skip_file(char *fname, struct +--- generator.c 5 May 2004 17:15:03 -0000 1.81 ++++ generator.c 8 May 2004 18:35:16 -0000 +@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct return 0; } @@ -143,7 +143,7 @@ } -@@ -464,7 +464,7 @@ void recv_generator(char *fname, struct +@@ -465,7 +465,7 @@ void recv_generator(char *fname, struct return; } @@ -152,8 +152,8 @@ if (verbose > 1) rprintf(FINFO,"%s is newer\n",fname); return; ---- options.c 17 Apr 2004 17:07:23 -0000 1.147 -+++ options.c 20 Apr 2004 23:44:17 -0000 +--- options.c 6 May 2004 21:08:01 -0000 1.148 ++++ options.c 8 May 2004 18:35:16 -0000 @@ -46,6 +46,7 @@ int preserve_devices = 0; int preserve_uid = 0; int preserve_gid = 0; @@ -188,7 +188,7 @@ argstr[x++] = 'p'; if (recurse) --- proto.h 22 Apr 2004 09:58:09 -0000 1.189 -+++ proto.h 20 Apr 2004 23:44:17 -0000 ++++ proto.h 8 May 2004 18:35:17 -0000 @@ -242,7 +242,7 @@ int fd_pair(int fd[2]); void print_child_argv(char **cmd); void out_of_memory(char *str); @@ -208,7 +208,7 @@ void *_new_array(unsigned int size, unsigned long num); void *_realloc_array(void *ptr, unsigned int size, unsigned long num); --- rsync.c 23 Mar 2004 16:16:15 -0000 1.135 -+++ rsync.c 20 Apr 2004 23:44:17 -0000 ++++ rsync.c 8 May 2004 18:35:17 -0000 @@ -25,6 +25,7 @@ extern int verbose; extern int dry_run; @@ -250,8 +250,8 @@ } change_uid = am_root && preserve_uid && st->st_uid != file->uid; ---- rsync.h 22 Apr 2004 09:58:24 -0000 1.198 -+++ rsync.h 20 Apr 2004 23:44:18 -0000 +--- rsync.h 2 May 2004 16:34:33 -0000 1.200 ++++ rsync.h 8 May 2004 18:35:17 -0000 @@ -54,6 +54,7 @@ #define XMIT_HAS_IDEV_DATA (1<<9) #define XMIT_SAME_DEV (1<<10) @@ -268,8 +268,8 @@ uid_t uid; gid_t gid; mode_t mode; ---- rsync.yo 24 Apr 2004 06:16:04 -0000 1.164 -+++ rsync.yo 24 Apr 2004 07:33:19 -0000 +--- rsync.yo 7 May 2004 00:18:37 -0000 1.169 ++++ rsync.yo 8 May 2004 18:35:18 -0000 @@ -299,6 +299,7 @@ verb( -g, --group preserve group -D, --devices preserve devices (root only) @@ -278,7 +278,7 @@ -S, --sparse handle sparse files efficiently -n, --dry-run show what would have been transferred -W, --whole-file copy whole files, no incremental checks -@@ -543,6 +544,11 @@ modified cannot be effective; in other w +@@ -545,6 +546,11 @@ modified cannot be effective; in other w cause the next transfer to behave as if it used -I, and all files will have their checksums compared and show up in log messages even if they haven't changed. @@ -291,7 +291,7 @@ dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers, instead it will just report the actions it would have taken. --- tls.c 9 Apr 2004 20:22:44 -0000 1.19 -+++ tls.c 20 Apr 2004 23:44:18 -0000 ++++ tls.c 8 May 2004 18:35:18 -0000 @@ -39,6 +39,7 @@ @@ -427,8 +427,8 @@ return 0; } ---- util.c 22 Apr 2004 22:17:15 -0000 1.138 -+++ util.c 20 Apr 2004 23:44:19 -0000 +--- util.c 27 Apr 2004 19:59:37 -0000 1.141 ++++ util.c 8 May 2004 18:35:18 -0000 @@ -124,32 +124,40 @@ void overflow(char *str) @@ -476,7 +476,7 @@ t[0].tv_usec = 0; t[1].tv_sec = modtime; t[1].tv_usec = 0; -@@ -1051,8 +1059,8 @@ int msleep(int t) +@@ -1060,8 +1068,8 @@ int msleep(int t) /** @@ -487,7 +487,7 @@ * --modify-window). * * @retval 0 if the times should be treated as the same -@@ -1061,7 +1069,7 @@ int msleep(int t) +@@ -1070,7 +1078,7 @@ int msleep(int t) * * @retval -1 if the 2nd is later **/ @@ -497,7 +497,7 @@ extern int modify_window; --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ testsuite/copy-atimes.test 20 Apr 2004 23:44:19 -0000 ++++ testsuite/copy-atimes.test 8 May 2004 18:35:18 -0000 @@ -0,0 +1,22 @@ +#! /bin/sh + @@ -522,7 +522,7 @@ +# The script would have aborted on error, so getting here means we've won. +exit 0 --- testsuite/rsync.fns 4 Feb 2004 07:32:48 -0000 1.59 -+++ testsuite/rsync.fns 20 Apr 2004 23:44:19 -0000 ++++ testsuite/rsync.fns 8 May 2004 18:35:18 -0000 @@ -51,7 +51,7 @@ printmsg() { diff --git a/checksum-seed.diff b/checksum-seed.diff index 6847c26..2ec4662 100644 --- a/checksum-seed.diff +++ b/checksum-seed.diff @@ -1,47 +1,49 @@ ---- options.c 2004-04-17 10:07:23.000000000 -0700 -+++ options.c 2004-05-01 16:24:44.380672000 -0700 -@@ -290,6 +290,7 @@ +--- options.c 6 May 2004 21:08:01 -0000 1.148 ++++ options.c 8 May 2004 18:32:36 -0000 +@@ -290,6 +290,7 @@ void usage(enum logcode F) rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n"); + rprintf(F," --checksum-seed=NUM set block/file checksum seed\n"); - rprintf(F," -h, --help show this help screen\n"); #ifdef INET6 - rprintf(F," -4 prefer IPv4\n"); -@@ -386,6 +387,7 @@ + rprintf(F," -4 --ipv4 prefer IPv4\n"); + rprintf(F," -6 --ipv6 prefer IPv6\n"); +@@ -386,6 +387,7 @@ static struct poptOption long_options[] {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0}, {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 }, {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, + {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 }, #ifdef INET6 - {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, - {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, -@@ -911,6 +913,11 @@ - goto oom; - args[ac++] = arg; - } -+ if (checksum_seed) { -+ if (asprintf(&arg, "--checksum_seed=%d", checksum_seed) < 0) + {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, + {"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, +@@ -908,6 +910,12 @@ void server_options(char **args,int *arg + + if (modify_window_set) { + if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) + goto oom; + args[ac++] = arg; + } - - if (keep_partial) - args[ac++] = "--partial"; ---- rsync.yo 2004-04-30 11:02:43.000000000 -0700 -+++ rsync.yo 2004-05-01 16:59:48.546313600 -0700 -@@ -348,6 +348,7 @@ ++ ++ if (checksum_seed) { ++ if (asprintf(&arg, "--checksum_seed=%d", checksum_seed) < 0) + goto oom; + args[ac++] = arg; + } +--- rsync.yo 7 May 2004 00:18:37 -0000 1.169 ++++ rsync.yo 8 May 2004 18:32:36 -0000 +@@ -348,6 +348,7 @@ verb( --bwlimit=KBPS limit I/O bandwidth, KBytes per second --write-batch=PREFIX write batch fileset starting with PREFIX --read-batch=PREFIX read batch fileset starting with PREFIX + --checksum-seed=NUM set block/file checksum seed + -4 --ipv4 prefer IPv4 + -6 --ipv6 prefer IPv6 -h, --help show this help screen - - -@@ -897,6 +898,20 @@ - using the fileset whose filenames start with PREFIX. See the "BATCH - MODE" section for details. - +@@ -907,6 +908,20 @@ listen for connections. One of these op + versions of Linux to work around an IPv6 bug in the kernel (if you see + an "address already in use" error when nothing else is using the port, + try specifying --ipv6 or --ipv4 when starting the daemon). ++ +dit(bf(--checksum-seed=NUM)) Set the MD4 checksum seed to the integer +NUM. This 4 byte checksum seed is included in each block and file +MD4 checksum calculation. By default the checksum seed is generated @@ -55,7 +57,6 @@ +set the checksum seed to 32761, so --checksum-seed=NUM needs to +follow these options if you want to specify a different checksum +seed in batch mode. -+ + enddit() - manpagesection(EXCLUDE PATTERNS) diff --git a/chmod-option.diff b/chmod-option.diff index 1951940..749afa6 100644 --- a/chmod-option.diff +++ b/chmod-option.diff @@ -1,5 +1,5 @@ ---- Makefile.in 10 Feb 2004 17:06:11 -0000 1.98 -+++ Makefile.in 22 Apr 2004 23:39:42 -0000 +--- Makefile.in 2 May 2004 17:04:14 -0000 1.100 ++++ Makefile.in 8 May 2004 18:34:49 -0000 @@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z 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 @@ -10,7 +10,7 @@ DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ chmod.c 22 Apr 2004 23:39:43 -0000 ++++ chmod.c 8 May 2004 18:34:49 -0000 @@ -0,0 +1,184 @@ +#include "rsync.h" + @@ -196,8 +196,8 @@ + } + return 0; +} ---- flist.c 22 Apr 2004 22:17:15 -0000 1.216 -+++ flist.c 22 Apr 2004 23:39:43 -0000 +--- flist.c 3 May 2004 01:24:10 -0000 1.220 ++++ flist.c 8 May 2004 18:34:49 -0000 @@ -33,6 +33,7 @@ extern int verbose; extern int do_progress; extern int am_root; @@ -215,7 +215,7 @@ extern struct exclude_list_struct exclude_list; extern struct exclude_list_struct server_exclude_list; extern struct exclude_list_struct local_exclude_list; -@@ -853,7 +856,10 @@ skip_excludes: +@@ -854,7 +857,10 @@ skip_excludes: file->flags = flags; file->modtime = st.st_mtime; file->length = st.st_size; @@ -227,8 +227,8 @@ file->uid = st.st_uid; file->gid = st.st_gid; ---- options.c 17 Apr 2004 17:07:23 -0000 1.147 -+++ options.c 22 Apr 2004 23:39:43 -0000 +--- options.c 6 May 2004 21:08:01 -0000 1.148 ++++ options.c 8 May 2004 18:34:49 -0000 @@ -121,6 +121,7 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; @@ -289,7 +289,7 @@ if (files_from && (!am_sender || remote_filesfrom_file)) { --- proto.h 22 Apr 2004 09:58:09 -0000 1.189 -+++ proto.h 22 Apr 2004 23:39:43 -0000 ++++ proto.h 8 May 2004 18:34:49 -0000 @@ -25,6 +25,9 @@ void file_checksum(char *fname,char *sum void sum_init(void); void sum_update(char *p, int len); @@ -300,8 +300,8 @@ void close_all(void); void _exit_cleanup(int code, const char *file, int line); void cleanup_disable(void); ---- rsync.yo 24 Apr 2004 06:16:04 -0000 1.164 -+++ rsync.yo 24 Apr 2004 07:32:05 -0000 +--- rsync.yo 7 May 2004 00:18:37 -0000 1.169 ++++ rsync.yo 8 May 2004 18:34:50 -0000 @@ -299,6 +299,7 @@ verb( -g, --group preserve group -D, --devices preserve devices (root only) @@ -310,7 +310,7 @@ -S, --sparse handle sparse files efficiently -n, --dry-run show what would have been transferred -W, --whole-file copy whole files, no incremental checks -@@ -543,6 +544,14 @@ modified cannot be effective; in other w +@@ -545,6 +546,14 @@ modified cannot be effective; in other w cause the next transfer to behave as if it used -I, and all files will have their checksums compared and show up in log messages even if they haven't changed. @@ -326,7 +326,7 @@ dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers, instead it will just report the actions it would have taken. --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ testsuite/chmod.test 22 Apr 2004 23:39:44 -0000 ++++ testsuite/chmod.test 8 May 2004 18:34:50 -0000 @@ -0,0 +1,43 @@ +#! /bin/sh + diff --git a/date-only.diff b/date-only.diff index 908a00b..e6c531d 100644 --- a/date-only.diff +++ b/date-only.diff @@ -15,9 +15,9 @@ Jeremy Bornstein [Patched update to have context and apply to latest CVS source.] ---- generator.c 15 Apr 2004 16:55:23 -0000 1.79 -+++ generator.c 15 Apr 2004 19:06:13 -0000 -@@ -50,11 +50,14 @@ extern int list_only; +--- generator.c 5 May 2004 17:15:03 -0000 1.81 ++++ generator.c 8 May 2004 18:36:12 -0000 +@@ -51,11 +51,14 @@ extern int list_only; extern int only_existing; extern int orig_umask; extern int safe_symlinks; @@ -32,8 +32,8 @@ Jeremy Bornstein if (st->st_size != file->length) { return 0; } ---- options.c 14 Apr 2004 23:33:34 -0000 1.146 -+++ options.c 15 Apr 2004 19:06:13 -0000 +--- options.c 6 May 2004 21:08:01 -0000 1.148 ++++ options.c 8 May 2004 18:36:13 -0000 @@ -82,6 +82,7 @@ int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; @@ -51,7 +51,7 @@ Jeremy Bornstein rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n"); rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); @@ -316,6 +318,7 @@ static struct poptOption long_options[] - {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, + {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, + {"date-only", 0, POPT_ARG_NONE, &date_only, 0, 0, 0 }, @@ -68,9 +68,9 @@ Jeremy Bornstein if (modify_window_set) { if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) ---- rsync.yo 15 Apr 2004 18:32:24 -0000 1.157 -+++ rsync.yo 15 Apr 2004 19:06:15 -0000 -@@ -320,6 +320,7 @@ +--- rsync.yo 7 May 2004 00:18:37 -0000 1.169 ++++ rsync.yo 8 May 2004 18:36:13 -0000 +@@ -320,6 +320,7 @@ verb( --timeout=TIME set I/O timeout in seconds -I, --ignore-times turn off mod time & file size quick check --size-only ignore mod time for quick check (use size) @@ -78,7 +78,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 -@@ -390,6 +391,12 @@ +@@ -392,6 +393,12 @@ already the same size and have the same regardless of timestamp. This is useful when starting to use rsync after using another mirroring system which may not preserve timestamps exactly. diff --git a/early-chmod.diff b/early-chmod.diff index 5819a3f..b012f66 100644 --- a/early-chmod.diff +++ b/early-chmod.diff @@ -1,5 +1,5 @@ --- rsync.c 23 Mar 2004 16:16:15 -0000 1.135 -+++ rsync.c 22 Apr 2004 23:43:44 -0000 ++++ rsync.c 29 Apr 2004 19:49:59 -0000 @@ -235,6 +235,9 @@ void finish_transfer(char *fname, char * if (make_backups && !make_backup(fname)) return; @@ -23,7 +23,7 @@ } --- t_stub.c 22 Apr 2004 09:58:11 -0000 1.7 -+++ t_stub.c 22 Apr 2004 23:43:44 -0000 ++++ t_stub.c 29 Apr 2004 19:49:59 -0000 @@ -26,6 +26,7 @@ * functions, so that module test harnesses can run standalone. **/ @@ -32,8 +32,8 @@ int modify_window = 0; int module_id = -1; struct exclude_list_struct server_exclude_list; ---- util.c 22 Apr 2004 22:17:15 -0000 1.138 -+++ util.c 22 Apr 2004 23:43:44 -0000 +--- util.c 27 Apr 2004 19:59:37 -0000 1.141 ++++ util.c 29 Apr 2004 19:49:59 -0000 @@ -28,6 +28,7 @@ #include "rsync.h" @@ -51,7 +51,7 @@ ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode); if (ofd == -1) { rprintf(FERROR,"open %s: %s\n", -@@ -354,8 +357,8 @@ int robust_unlink(char *fname) +@@ -364,8 +367,8 @@ int robust_unlink(char *fname) #endif } @@ -62,7 +62,7 @@ int robust_rename(char *from, char *to, int mode) { int tries = 4; -@@ -372,10 +375,12 @@ int robust_rename(char *from, char *to, +@@ -382,10 +385,12 @@ int robust_rename(char *from, char *to, break; #endif case EXDEV: diff --git a/filter.diff b/filter.diff index 18dcd82..1ed3c98 100644 --- a/filter.diff +++ b/filter.diff @@ -24,7 +24,7 @@ for the current dir because its name contained a slash. ..wayne.. --- exclude.c 27 Apr 2004 01:36:06 -0000 1.75 -+++ exclude.c 27 Apr 2004 01:44:51 -0000 ++++ exclude.c 8 May 2004 18:38:51 -0000 @@ -30,32 +30,65 @@ extern int verbose; extern int eol_nulls; extern int list_only; @@ -453,8 +453,8 @@ for the current dir because its name contained a slash. add_exclude(&exclude_list, default_cvsignore, XFLG_WORD_SPLIT | XFLG_WORDS_ONLY); ---- flist.c 27 Apr 2004 01:36:10 -0000 1.217 -+++ flist.c 27 Apr 2004 01:44:52 -0000 +--- flist.c 3 May 2004 01:24:10 -0000 1.220 ++++ flist.c 8 May 2004 18:38:52 -0000 @@ -39,8 +39,6 @@ extern int module_id; extern int ignore_errors; extern int numeric_ids; @@ -493,7 +493,7 @@ for the current dir because its name contained a slash. return 1; return 0; } -@@ -946,11 +938,7 @@ void send_file_name(int f, struct file_l +@@ -947,11 +939,7 @@ void send_file_name(int f, struct file_l if (recursive && S_ISDIR(file->mode) && !(file->flags & FLAG_MOUNT_POINT)) { @@ -505,7 +505,7 @@ for the current dir because its name contained a slash. } } -@@ -961,6 +949,7 @@ static void send_directory(int f, struct +@@ -962,6 +950,7 @@ static void send_directory(int f, struct struct dirent *di; char fname[MAXPATHLEN]; unsigned int offset; @@ -513,7 +513,7 @@ for the current dir because its name contained a slash. char *p; d = opendir(dir); -@@ -985,18 +974,7 @@ static void send_directory(int f, struct +@@ -986,18 +975,7 @@ static void send_directory(int f, struct offset++; } @@ -533,7 +533,7 @@ for the current dir because its name contained a slash. for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { char *dname = d_name(di); -@@ -1017,6 +995,8 @@ static void send_directory(int f, struct +@@ -1018,6 +996,8 @@ static void send_directory(int f, struct rprintf(FERROR, "readdir(%s): (%d) %s\n", dir, errno, strerror(errno)); } @@ -543,7 +543,7 @@ for the current dir because its name contained a slash. closedir(d); } --- proto.h 22 Apr 2004 09:58:09 -0000 1.189 -+++ proto.h 27 Apr 2004 01:44:52 -0000 ++++ proto.h 8 May 2004 18:38:52 -0000 @@ -51,7 +51,8 @@ int start_daemon(int f_in, int f_out); int daemon_main(void); void setup_protocol(int f_out,int f_in); @@ -554,8 +554,8 @@ for the current dir because its name contained a slash. int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir); void add_exclude(struct exclude_list_struct *listp, const char *pattern, int xflags); ---- rsync.h 27 Apr 2004 01:36:16 -0000 1.199 -+++ rsync.h 27 Apr 2004 01:44:52 -0000 +--- rsync.h 2 May 2004 16:34:33 -0000 1.200 ++++ rsync.h 8 May 2004 18:38:52 -0000 @@ -490,18 +490,21 @@ struct map_struct { #define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */ #define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with '**' */ @@ -582,9 +582,9 @@ for the current dir because its name contained a slash. char *debug_type; }; ---- rsync.yo 24 Apr 2004 06:16:04 -0000 1.164 -+++ rsync.yo 27 Apr 2004 01:44:53 -0000 -@@ -1064,6 +1064,72 @@ itemize( +--- rsync.yo 7 May 2004 00:18:37 -0000 1.169 ++++ rsync.yo 8 May 2004 18:38:53 -0000 +@@ -1075,6 +1075,72 @@ itemize( it would be excluded by the "*") ) diff --git a/fuzzy.diff b/fuzzy.diff index 69c0182..0bae7d3 100644 --- a/fuzzy.diff +++ b/fuzzy.diff @@ -12,8 +12,8 @@ test suite, but otherwise UNTESTED.] -- Anyone who quotes me in their sig is an idiot. -- Rusty Russell. ---- Makefile.in 10 Feb 2004 17:06:11 -0000 1.98 -+++ Makefile.in 22 Apr 2004 23:48:20 -0000 +--- Makefile.in 2 May 2004 17:04:14 -0000 1.100 ++++ Makefile.in 8 May 2004 18:41:35 -0000 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \ zlib/zutil.o zlib/adler32.o @@ -23,9 +23,9 @@ test suite, but otherwise UNTESTED.] 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 ---- generator.c 15 Apr 2004 16:55:23 -0000 1.79 -+++ generator.c 22 Apr 2004 23:48:20 -0000 -@@ -50,6 +50,7 @@ extern int list_only; +--- generator.c 5 May 2004 17:15:03 -0000 1.81 ++++ generator.c 8 May 2004 18:41:36 -0000 +@@ -51,6 +51,7 @@ extern int list_only; extern int only_existing; extern int orig_umask; extern int safe_symlinks; @@ -33,7 +33,7 @@ test suite, but otherwise UNTESTED.] /* choose whether to skip a particular file */ -@@ -255,7 +256,62 @@ static void generate_and_send_sums(struc +@@ -256,7 +257,62 @@ static void generate_and_send_sums(struc } } @@ -96,7 +96,7 @@ test suite, but otherwise UNTESTED.] /** * Acts on file number @p i from @p flist, whose name is @p fname. -@@ -271,8 +327,6 @@ void recv_generator(char *fname, struct +@@ -272,8 +328,6 @@ void recv_generator(char *fname, struct STRUCT_STAT st; struct map_struct *mapbuf; int statret; @@ -105,7 +105,7 @@ test suite, but otherwise UNTESTED.] if (list_only) return; -@@ -396,108 +450,38 @@ void recv_generator(char *fname, struct +@@ -397,108 +451,38 @@ void recv_generator(char *fname, struct } #endif @@ -234,7 +234,7 @@ test suite, but otherwise UNTESTED.] return; } -@@ -507,7 +491,7 @@ void recv_generator(char *fname, struct +@@ -508,7 +492,7 @@ void recv_generator(char *fname, struct mapbuf = NULL; if (verbose > 3) { @@ -243,8 +243,8 @@ test suite, but otherwise UNTESTED.] (double)st.st_size); } ---- options.c 17 Apr 2004 17:07:23 -0000 1.147 -+++ options.c 22 Apr 2004 23:48:20 -0000 +--- options.c 6 May 2004 21:08:01 -0000 1.148 ++++ options.c 8 May 2004 18:41:36 -0000 @@ -91,6 +91,7 @@ int ignore_errors = 0; int modify_window = 0; int blocking_io = -1; @@ -258,9 +258,9 @@ test suite, but otherwise UNTESTED.] rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n"); + rprintf(F," --fuzzy use similar file as basis if it does't exist\n"); - rprintf(F," -h, --help show this help screen\n"); #ifdef INET6 - rprintf(F," -4 prefer IPv4\n"); + rprintf(F," -4 --ipv4 prefer IPv4\n"); + rprintf(F," -6 --ipv6 prefer IPv6\n"); @@ -385,6 +387,7 @@ static struct poptOption long_options[] {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 }, {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0}, @@ -268,7 +268,7 @@ test suite, but otherwise UNTESTED.] + {"fuzzy", 0, POPT_ARG_NONE, &fuzzy, 0, 0, 0 }, {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, #ifdef INET6 - {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, + {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, @@ -964,6 +967,9 @@ void server_options(char **args,int *arg args[ac++] = "--from0"; } @@ -279,8 +279,8 @@ test suite, but otherwise UNTESTED.] *argc = ac; return; ---- receiver.c 23 Mar 2004 16:50:40 -0000 1.75 -+++ receiver.c 22 Apr 2004 23:48:20 -0000 +--- receiver.c 27 Apr 2004 19:51:33 -0000 1.76 ++++ receiver.c 8 May 2004 18:41:36 -0000 @@ -45,6 +45,7 @@ extern int cleanup_got_literal; extern int module_id; extern int ignore_errors; diff --git a/ignore-case.diff b/ignore-case.diff index d7483ca..206ae68 100644 --- a/ignore-case.diff +++ b/ignore-case.diff @@ -37,7 +37,7 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED! - - - - - - - - - - - - - - - - - - - - - - - - - --- options.c 17 Apr 2004 17:07:23 -0000 1.147 -+++ options.c 22 Apr 2004 23:44:15 -0000 ++++ options.c 29 Apr 2004 19:50:13 -0000 @@ -89,6 +89,7 @@ int opt_ignore_existing = 0; int max_delete = 0; int ignore_errors = 0; @@ -72,9 +72,9 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED! if (keep_partial) args[ac++] = "--partial"; ---- util.c 22 Apr 2004 22:17:15 -0000 1.138 -+++ util.c 22 Apr 2004 23:44:15 -0000 -@@ -924,6 +924,19 @@ int u_strcmp(const char *cs1, const char +--- util.c 27 Apr 2004 19:59:37 -0000 1.141 ++++ util.c 29 Apr 2004 19:50:13 -0000 +@@ -933,6 +933,19 @@ int u_strcmp(const char *cs1, const char { const uchar *s1 = (const uchar *)cs1; const uchar *s2 = (const uchar *)cs2; @@ -95,7 +95,7 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED! while (*s1 && *s2 && (*s1 == *s2)) { s1++; s2++; --- lib/wildmatch.c 14 Jul 2003 15:12:59 -0000 1.12 -+++ lib/wildmatch.c 22 Apr 2004 23:44:15 -0000 ++++ lib/wildmatch.c 29 Apr 2004 19:50:13 -0000 @@ -76,8 +76,20 @@ static int domatch(const unsigned char * ch = *++p; /* FALLTHROUGH */ diff --git a/inplace.diff b/inplace.diff index 7e273ea..0ba548d 100644 --- a/inplace.diff +++ b/inplace.diff @@ -1,7 +1,7 @@ Patch from Mark Curtis to implement the --inplace option. --- match.c 3 Jan 2004 19:28:03 -0000 1.60 -+++ match.c 27 Apr 2004 23:26:09 -0000 ++++ match.c 8 May 2004 18:38:33 -0000 @@ -22,6 +22,7 @@ extern int verbose; extern int am_server; @@ -21,8 +21,8 @@ Patch from Mark Curtis to implement the --inplace option. continue; if (verbose > 3) ---- options.c 17 Apr 2004 17:07:23 -0000 1.147 -+++ options.c 27 Apr 2004 23:26:10 -0000 +--- options.c 6 May 2004 21:08:01 -0000 1.148 ++++ options.c 8 May 2004 18:38:33 -0000 @@ -91,6 +91,7 @@ int ignore_errors = 0; int modify_window = 0; int blocking_io = -1; @@ -68,7 +68,7 @@ Patch from Mark Curtis to implement the --inplace option. if (tmpdir) { args[ac++] = "--temp-dir"; --- receiver.c 27 Apr 2004 19:51:33 -0000 1.76 -+++ receiver.c 27 Apr 2004 23:26:10 -0000 ++++ receiver.c 8 May 2004 18:38:33 -0000 @@ -45,6 +45,7 @@ extern int cleanup_got_literal; extern int module_id; extern int ignore_errors; @@ -190,7 +190,7 @@ Patch from Mark Curtis to implement the --inplace option. cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2); --- rsync.c 23 Mar 2004 16:16:15 -0000 1.135 -+++ rsync.c 27 Apr 2004 23:26:11 -0000 ++++ rsync.c 8 May 2004 18:38:33 -0000 @@ -33,6 +33,7 @@ extern int preserve_uid; extern int preserve_gid; extern int preserve_perms; @@ -211,8 +211,8 @@ Patch from Mark Curtis to implement the --inplace option. /* move tmp file over real file */ ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS); ---- rsync.yo 27 Apr 2004 03:55:37 -0000 1.165 -+++ rsync.yo 27 Apr 2004 23:26:12 -0000 +--- rsync.yo 7 May 2004 00:18:37 -0000 1.169 ++++ rsync.yo 8 May 2004 18:38:34 -0000 @@ -289,6 +289,7 @@ verb( --backup-dir make backups into this directory --suffix=SUFFIX backup suffix (default ~ w/o --backup-dir) @@ -221,7 +221,7 @@ Patch from Mark Curtis to implement the --inplace option. -l, --links copy symlinks as symlinks -L, --copy-links copy the referent of all symlinks --copy-unsafe-links copy the referent of "unsafe" symlinks -@@ -475,6 +476,17 @@ is on the objects. In other words, if t +@@ -477,6 +478,17 @@ is on the objects. In other words, if t symlink where the destination has a file, the transfer would occur regardless of the timestamps. This might change in the future (feel free to comment on this on the mailing list if you have an opinion). diff --git a/openssl-support.diff b/openssl-support.diff index 9ec481c..ceb98c1 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -47,8 +47,8 @@ LEvhhkUglOm3xMyrdJT4u9Q= =aT/N -----END PGP SIGNATURE----- ---- Makefile.in 10 Feb 2004 17:06:11 -0000 1.98 -+++ Makefile.in 25 Apr 2004 18:37:22 -0000 +--- Makefile.in 2 May 2004 17:04:14 -0000 1.100 ++++ Makefile.in 8 May 2004 18:40:16 -0000 @@ -39,7 +39,7 @@ OBJS3=progress.o pipe.o DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ @@ -59,7 +59,7 @@ LEvhhkUglOm3xMyrdJT4u9Q= TLS_OBJ = tls.o syscall.o lib/permstring.o --- cleanup.c 27 Jan 2004 08:14:33 -0000 1.21 -+++ cleanup.c 25 Apr 2004 18:37:22 -0000 ++++ cleanup.c 8 May 2004 18:40:16 -0000 @@ -87,6 +87,9 @@ void _exit_cleanup(int code, const char int ocode = code; extern int keep_partial; @@ -83,7 +83,7 @@ LEvhhkUglOm3xMyrdJT4u9Q= if (verbose > 3) rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", --- clientserver.c 14 Apr 2004 23:33:34 -0000 1.121 -+++ clientserver.c 25 Apr 2004 18:37:23 -0000 ++++ clientserver.c 8 May 2004 18:40:16 -0000 @@ -46,6 +46,9 @@ extern int io_timeout; extern int orig_umask; extern int no_detach; @@ -199,8 +199,8 @@ LEvhhkUglOm3xMyrdJT4u9Q= if (*line == '#') { /* it's some sort of command that I don't understand */ ---- config.h.in 9 Apr 2004 18:09:30 -0000 1.89 -+++ config.h.in 25 Apr 2004 18:37:23 -0000 +--- config.h.in 29 Apr 2004 19:40:39 -0000 1.90 ++++ config.h.in 8 May 2004 18:40:16 -0000 @@ -167,6 +167,9 @@ /* */ #undef HAVE_OFF64_T @@ -211,9 +211,9 @@ LEvhhkUglOm3xMyrdJT4u9Q= /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK ---- configure.in 17 Apr 2004 18:40:16 -0000 1.191 -+++ configure.in 25 Apr 2004 18:37:23 -0000 -@@ -266,6 +266,21 @@ yes +--- configure.in 30 Apr 2004 18:03:33 -0000 1.196 ++++ configure.in 8 May 2004 18:40:16 -0000 +@@ -271,6 +271,21 @@ yes AC_SEARCH_LIBS(getaddrinfo, inet6) fi @@ -236,7 +236,7 @@ LEvhhkUglOm3xMyrdJT4u9Q= case $host_os in *cygwin* ) AC_MSG_RESULT(yes) --- main.c 10 Feb 2004 03:54:47 -0000 1.192 -+++ main.c 25 Apr 2004 18:37:23 -0000 ++++ main.c 8 May 2004 18:40:16 -0000 @@ -51,6 +51,9 @@ extern int rsync_port; extern int read_batch; extern int write_batch; @@ -312,8 +312,8 @@ LEvhhkUglOm3xMyrdJT4u9Q= p = strchr(host,'/'); if (p) { *p = 0; ---- options.c 17 Apr 2004 17:07:23 -0000 1.147 -+++ options.c 25 Apr 2004 18:37:24 -0000 +--- options.c 6 May 2004 21:08:01 -0000 1.148 ++++ options.c 8 May 2004 18:40:17 -0000 @@ -130,6 +130,14 @@ int quiet = 0; int always_checksum = 0; int list_only = 0; @@ -368,9 +368,9 @@ LEvhhkUglOm3xMyrdJT4u9Q= #ifdef MAINTAINER_MODE rprintf(f, " panic action: \"%s\"\n", get_panic_action()); -@@ -295,6 +307,13 @@ void usage(enum logcode F) - rprintf(F," -4 prefer IPv4\n"); - rprintf(F," -6 prefer IPv6\n"); +@@ -294,6 +306,13 @@ void usage(enum logcode F) + rprintf(F," -4 --ipv4 prefer IPv4\n"); + rprintf(F," -6 --ipv6 prefer IPv6\n"); #endif +#ifdef HAVE_OPENSSL + rprintf(F," --ssl allow socket connections to use SSL\n"); @@ -379,9 +379,9 @@ LEvhhkUglOm3xMyrdJT4u9Q= + rprintf(F," --ssl-key-passwd=PASS password for PEM-encoded private key\n"); + rprintf(F," --ssl-ca-certs=FILE path to trusted CA certificates\n"); +#endif + rprintf(F," -h, --help show this help screen\n"); rprintf(F,"\n"); - @@ -305,7 +324,7 @@ void usage(enum logcode F) enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, @@ -392,8 +392,8 @@ LEvhhkUglOm3xMyrdJT4u9Q= static struct poptOption long_options[] = { @@ -390,6 +409,13 @@ static struct poptOption long_options[] - {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, - {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, + {"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 + {"ssl", 0, POPT_ARG_NONE, 0, OPT_USE_SSL, 0, 0}, @@ -437,7 +437,7 @@ LEvhhkUglOm3xMyrdJT4u9Q= if (files_from) { char *colon; --- proto.h 22 Apr 2004 09:58:09 -0000 1.189 -+++ proto.h 25 Apr 2004 18:37:24 -0000 ++++ proto.h 8 May 2004 18:40:17 -0000 @@ -209,6 +209,12 @@ void start_accept_loop(int port, int (*f void set_socket_options(int fd, char *options); void become_daemon(void); @@ -451,8 +451,8 @@ LEvhhkUglOm3xMyrdJT4u9Q= int do_unlink(char *fname); int do_symlink(char *fname1, char *fname2); int do_link(char *fname1, char *fname2); ---- rsync.h 22 Apr 2004 09:58:24 -0000 1.198 -+++ rsync.h 25 Apr 2004 18:37:24 -0000 +--- rsync.h 2 May 2004 16:34:33 -0000 1.200 ++++ rsync.h 8 May 2004 18:40:17 -0000 @@ -32,6 +32,7 @@ #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" @@ -474,7 +474,7 @@ LEvhhkUglOm3xMyrdJT4u9Q= /* Starting from protocol version 26, we always use 64-bit --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ ssl.c 25 Apr 2004 18:37:24 -0000 ++++ ssl.c 8 May 2004 18:40:17 -0000 @@ -0,0 +1,366 @@ +/* -*- c-file-style: "linux" -*- + * ssl.c: operations for negotiating SSL rsync connections. diff --git a/remove-sent-files.diff b/remove-sent-files.diff index 7d32641..38143e4 100644 --- a/remove-sent-files.diff +++ b/remove-sent-files.diff @@ -1,5 +1,5 @@ ---- io.c 16 Jan 2004 16:31:47 -0000 1.119 -+++ io.c 24 Apr 2004 07:35:03 -0000 +--- io.c 8 May 2004 18:03:43 -0000 1.120 ++++ io.c 8 May 2004 18:48:44 -0000 @@ -222,6 +222,14 @@ static void read_msg_fd(void) read_loop(fd, buf, 4); redo_list_add(IVAL(buf,0)); @@ -33,7 +33,7 @@ case MSG_INFO: case MSG_ERROR: --- main.c 10 Feb 2004 03:54:47 -0000 1.192 -+++ main.c 24 Apr 2004 07:35:04 -0000 ++++ main.c 8 May 2004 18:48:45 -0000 @@ -42,6 +42,7 @@ extern int list_only; extern int local_server; extern int log_got_error; @@ -61,8 +61,8 @@ if (argc == 0) { list_only = 1; ---- options.c 17 Apr 2004 17:07:23 -0000 1.147 -+++ options.c 24 Apr 2004 07:35:04 -0000 +--- options.c 6 May 2004 21:08:01 -0000 1.148 ++++ options.c 8 May 2004 18:48:45 -0000 @@ -84,6 +84,7 @@ int copy_unsafe_links = 0; int size_only = 0; int bwlimit = 0; @@ -129,7 +129,7 @@ *argc = ac; return; --- proto.h 22 Apr 2004 09:58:09 -0000 1.189 -+++ proto.h 24 Apr 2004 07:35:04 -0000 ++++ proto.h 8 May 2004 18:48:45 -0000 @@ -197,6 +197,7 @@ void sig_int(void); void finish_transfer(char *fname, char *fnametmp, struct file_struct *file); const char *who_am_i(void); @@ -138,8 +138,8 @@ void send_files(struct file_list *flist, int f_out, int f_in); int try_bind_local(int s, int ai_family, int ai_socktype, const char *bind_address); ---- receiver.c 23 Mar 2004 16:50:40 -0000 1.75 -+++ receiver.c 24 Apr 2004 07:35:04 -0000 +--- receiver.c 27 Apr 2004 19:51:33 -0000 1.76 ++++ receiver.c 8 May 2004 18:48:45 -0000 @@ -45,6 +45,7 @@ extern int cleanup_got_literal; extern int module_id; extern int ignore_errors; @@ -157,7 +157,7 @@ char fnamecmpbuf[MAXPATHLEN]; struct map_struct *mapbuf; int i; -@@ -467,16 +468,20 @@ int recv_files(int f_in,struct file_list +@@ -471,16 +472,20 @@ int recv_files(int f_in,struct file_list cleanup_disable(); @@ -182,8 +182,8 @@ } } } ---- rsync.h 22 Apr 2004 09:58:24 -0000 1.198 -+++ rsync.h 24 Apr 2004 07:35:04 -0000 +--- rsync.h 8 May 2004 18:48:09 -0000 1.201 ++++ rsync.h 8 May 2004 18:48:45 -0000 @@ -60,6 +60,7 @@ #define FLAG_TOP_DIR (1<<0) #define FLAG_HLINK_EOL (1<<1) /* generator only */ @@ -192,16 +192,16 @@ /* update this if you make incompatible changes */ #define PROTOCOL_VERSION 28 -@@ -124,6 +125,7 @@ enum msgcode { - MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */ - MSG_REDO=4, /* reprocess indicated flist index */ - MSG_DONE=5, /* current phase is done */ +@@ -120,6 +121,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3 + /* Messages types that are sent over the message channel. The logcode + * values must all be present here with identical numbers. */ + enum msgcode { + MSG_SUCCESS=6, /* successfully updated indicated flist index */ - }; - - #include "errcode.h" ---- rsync.yo 24 Apr 2004 06:16:04 -0000 1.164 -+++ rsync.yo 24 Apr 2004 07:35:05 -0000 + MSG_DONE=5, /* current phase is done */ + MSG_REDO=4, /* reprocess indicated flist index */ + MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */ +--- rsync.yo 7 May 2004 00:18:37 -0000 1.169 ++++ rsync.yo 8 May 2004 18:48:46 -0000 @@ -312,6 +312,7 @@ verb( --delete delete files that don't exist on sender --delete-excluded also delete excluded files on receiver @@ -210,7 +210,7 @@ --ignore-errors delete even if there are I/O errors --max-delete=NUM don't delete more than NUM files --partial keep partially transferred files -@@ -594,6 +595,11 @@ dit(bf(--delete-after)) By default rsync +@@ -596,6 +597,11 @@ dit(bf(--delete-after)) By default rsync receiving side before transferring files to try to ensure that there is sufficient space on the receiving filesystem. If you want to delete after transferring, use the --delete-after switch. Implies --delete. @@ -223,7 +223,7 @@ dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files even when there are I/O errors. --- sender.c 17 Feb 2004 21:57:44 -0000 1.38 -+++ sender.c 24 Apr 2004 07:35:05 -0000 ++++ sender.c 8 May 2004 18:48:46 -0000 @@ -27,6 +27,7 @@ extern int dry_run; extern int am_server; extern int am_daemon; diff --git a/time-limit.diff b/time-limit.diff index 105ba4f..3e434b4 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -3,8 +3,8 @@ to be simpler and more efficient by Wayne Davison. Do we need configure support for mktime() and strptime()? ---- io.c 16 Jan 2004 16:31:47 -0000 1.119 -+++ io.c 27 Apr 2004 02:56:33 -0000 +--- io.c 8 May 2004 18:03:43 -0000 1.120 ++++ io.c 8 May 2004 18:42:14 -0000 @@ -44,6 +44,7 @@ static int io_multiplexing_in; static int multiplex_in_fd = -1; static int multiplex_out_fd = -1; @@ -38,8 +38,8 @@ Do we need configure support for mktime() and strptime()? if (last_io && io_timeout && (t-last_io) >= io_timeout) { if (!am_server && !am_daemon) { ---- options.c 17 Apr 2004 17:07:23 -0000 1.147 -+++ options.c 27 Apr 2004 02:56:33 -0000 +--- options.c 6 May 2004 21:08:01 -0000 1.148 ++++ options.c 8 May 2004 18:42:14 -0000 @@ -92,6 +92,7 @@ int modify_window = 0; int blocking_io = -1; int checksum_seed = 0; @@ -56,7 +56,7 @@ Do we need configure support for mktime() and strptime()? + rprintf(F," --time-limit=TIME Stop rsync after TIME minutes have elapsed\n"); rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n"); - rprintf(F," -h, --help show this help screen\n"); + #ifdef INET6 @@ -305,7 +308,7 @@ void usage(enum logcode F) enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, @@ -137,8 +137,8 @@ Do we need configure support for mktime() and strptime()? goto oom; args[ac++] = arg; } ---- rsync.yo 24 Apr 2004 06:16:04 -0000 1.164 -+++ rsync.yo 27 Apr 2004 02:56:35 -0000 +--- rsync.yo 7 May 2004 00:18:37 -0000 1.169 ++++ rsync.yo 8 May 2004 18:42:15 -0000 @@ -346,6 +346,8 @@ verb( --log-format=FORMAT log file transfers using specified format --password-file=FILE get password from FILE @@ -147,8 +147,8 @@ Do we need configure support for mktime() and strptime()? + --time-limit=TIME Stop rsync after TIME minutes have elapsed --write-batch=PREFIX write batch fileset starting with PREFIX --read-batch=PREFIX read batch fileset starting with PREFIX - -h, --help show this help screen -@@ -888,6 +890,13 @@ of rsync transfers, blocks of data are s + -4 --ipv4 prefer IPv4 +@@ -890,6 +892,13 @@ of rsync transfers, blocks of data are s transfer was too fast, it will wait before sending the next data block. The result is an average transfer rate equaling the specified limit. A value of zero specifies no limit. -- 2.34.1