AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2005-02-22 02:10:16
+--- orig/flist.c 2005-02-23 02:57:26
+++ flist.c 2005-02-14 02:45:34
@@ -979,6 +979,8 @@ void send_file_name(int f, struct file_l
file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
if (f >= 0) {
/* Now send the uid/gid list. This was introduced in
* protocol version 15 */
---- orig/generator.c 2005-02-20 22:13:19
+--- orig/generator.c 2005-02-23 02:57:26
+++ generator.c 2005-02-20 00:02:51
-@@ -489,6 +489,10 @@ static void recv_generator(char *fname,
+@@ -491,6 +491,10 @@ static void recv_generator(char *fname,
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && code && f_out != -1)
rprintf(code, "%s/\n", safe_fname(fname));
next;
}
---- orig/options.c 2005-02-21 10:51:52
+--- orig/options.c 2005-02-23 02:57:26
+++ options.c 2005-02-14 02:46:05
@@ -44,6 +44,7 @@ int keep_dirlinks = 0;
int copy_links = 0;
int preserve_perms = 0;
int preserve_devices = 0;
int preserve_uid = 0;
-@@ -178,6 +179,7 @@ static void print_rsync_version(enum log
+@@ -177,6 +178,7 @@ static void print_rsync_version(enum log
char const *got_socketpair = "no ";
char const *have_inplace = "no ";
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-@@ -194,6 +196,10 @@ static void print_rsync_version(enum log
+@@ -193,6 +195,10 @@ static void print_rsync_version(enum log
hardlinks = "";
#endif
#ifdef SUPPORT_LINKS
links = "";
#endif
-@@ -208,9 +214,9 @@ static void print_rsync_version(enum log
+@@ -207,9 +213,9 @@ static void print_rsync_version(enum log
"Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
-@@ -280,6 +286,7 @@ void usage(enum logcode F)
+@@ -279,6 +285,7 @@ void usage(enum logcode F)
rprintf(F," -H, --hard-links preserve hard links\n");
rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
rprintf(F," -p, --perms preserve permissions\n");
rprintf(F," -o, --owner preserve owner (root only)\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
-@@ -403,6 +410,7 @@ static struct poptOption long_options[]
+@@ -401,6 +408,7 @@ static struct poptOption long_options[]
{"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
{"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
{"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 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
-@@ -860,6 +868,24 @@ int parse_arguments(int *argc, const cha
+@@ -852,6 +860,24 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1266,6 +1292,8 @@ void server_options(char **args,int *arg
+@@ -1258,6 +1284,8 @@ void server_options(char **args,int *arg
if (preserve_hard_links)
argstr[x++] = 'H';
if (verbose > 1 && flags & PERMS_REPORT) {
enum logcode code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
---- orig/rsync.h 2005-02-20 00:02:23
+--- orig/rsync.h 2005-02-23 02:57:27
+++ rsync.h 2004-07-03 20:11:58
-@@ -627,6 +627,40 @@ struct stats {
+@@ -628,6 +628,40 @@ struct stats {
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#include "proto.h"
/* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2005-02-20 01:12:43
+--- orig/rsync.yo 2005-02-23 02:57:27
+++ rsync.yo 2004-07-03 20:11:58
@@ -317,6 +317,7 @@ to the detailed description below for a
-H, --hard-links preserve hard links
-o, --owner preserve owner (root only)
-g, --group preserve group
-D, --devices preserve devices (root only)
-@@ -625,6 +626,11 @@ source file's permissions and the umask
+@@ -624,6 +625,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).