After applying this patch, run these commands for a successful build:
- autoconf
- autoheader
+ ./prepare-source
./configure
- make proto
make
Casey Marshall writes:
can't say if I've left any cleanup/compatibility errors in the code.
---- orig/Makefile.in 2006-01-14 08:14:29
-+++ Makefile.in 2004-10-08 20:17:06
+--- old/Makefile.in
++++ new/Makefile.in
@@ -38,7 +38,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 \
TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
---- orig/cleanup.c 2006-02-02 02:41:08
-+++ cleanup.c 2005-01-10 10:43:22
-@@ -22,6 +22,9 @@
- #include "rsync.h"
-
+--- old/cleanup.c
++++ new/cleanup.c
+@@ -26,6 +26,9 @@
+ extern int am_server;
+ extern int am_daemon;
extern int io_error;
+#if HAVE_OPENSSL
+extern int use_ssl;
extern int keep_partial;
extern int log_got_error;
extern char *partial_dir;
-@@ -101,6 +104,11 @@ void _exit_cleanup(int code, const char
+@@ -106,6 +109,11 @@ void _exit_cleanup(int code, const char
SIGACTION(SIGUSR1, SIG_IGN);
SIGACTION(SIGUSR2, SIG_IGN);
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, file, line);
---- orig/clientserver.c 2006-02-01 19:37:05
-+++ clientserver.c 2005-04-09 17:39:57
-@@ -45,6 +45,9 @@ extern int io_timeout;
- extern int orig_umask;
- extern int no_detach;
- extern int default_af_hint;
+--- old/clientserver.c
++++ new/clientserver.c
+@@ -29,6 +29,9 @@ extern int am_sender;
+ extern int am_server;
+ extern int am_daemon;
+ extern int am_root;
+#if HAVE_OPENSSL
+extern int use_ssl;
+#endif
- extern char *bind_address;
- extern char *sockopts;
- extern char *config_file;
-@@ -104,8 +107,18 @@ int start_socket_client(char *host, char
+ extern int rsync_port;
+ extern int kluge_around_eof;
+ extern int daemon_over_rsh;
+@@ -105,8 +108,18 @@ int start_socket_client(char *host, char
set_socket_options(fd, sockopts);
ret = start_inband_exchange(user, path, fd, fd, argc);
+ return client_run(fd, fd, -1, argc, argv);
}
- int start_inband_exchange(char *user, char *path, int f_in, int f_out,
-@@ -166,6 +179,33 @@ int start_inband_exchange(char *user, ch
+ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
+@@ -167,6 +180,33 @@ int start_inband_exchange(char *user, ch
if (verbose > 1)
print_child_argv(sargs);
p = strchr(path,'/');
if (p) *p = 0;
io_printf(f_out, "%s\n", path);
-@@ -194,6 +234,10 @@ int start_inband_exchange(char *user, ch
+@@ -195,6 +235,10 @@ int start_inband_exchange(char *user, ch
* server to terminate the listing of modules.
* We don't want to go on and transfer
* anything; just exit. */
exit(0);
}
-@@ -201,6 +245,10 @@ int start_inband_exchange(char *user, ch
+@@ -202,6 +246,10 @@ int start_inband_exchange(char *user, ch
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
return -1;
}
-@@ -716,6 +764,7 @@ static void send_listing(int fd)
+@@ -719,6 +767,7 @@ static void send_listing(int fd)
io_printf(fd,"@RSYNCD: EXIT\n");
}
/* 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 */
-@@ -768,6 +817,9 @@ int start_daemon(int f_in, int f_out)
+@@ -777,6 +826,9 @@ int start_daemon(int f_in, int f_out)
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
line[0] = 0;
if (!read_line(f_in, line, sizeof line - 1))
return -1;
-@@ -777,6 +829,20 @@ int start_daemon(int f_in, int f_out)
+@@ -788,6 +840,20 @@ int start_daemon(int f_in, int f_out)
return -1;
}
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 2006-02-02 02:41:09
-+++ configure.in 2004-07-03 20:22:28
+--- old/configure.in
++++ new/configure.in
@@ -282,6 +282,21 @@ if test x"$enable_locale" != x"no"; then
AC_DEFINE(CONFIG_LOCALE)
fi
AC_MSG_CHECKING([whether to call shutdown on all sockets])
case $host_os in
*cygwin* ) AC_MSG_RESULT(yes)
---- orig/options.c 2006-02-02 11:40:45
-+++ options.c 2006-02-02 11:49:06
-@@ -167,6 +167,14 @@ int log_format_has_o_or_i = 0;
+--- old/options.c
++++ new/options.c
+@@ -172,6 +172,14 @@ int logfile_format_has_o_or_i = 0;
int always_checksum = 0;
int list_only = 0;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
-@@ -195,6 +203,7 @@ static void print_rsync_version(enum log
+@@ -200,6 +208,7 @@ static void print_rsync_version(enum log
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#ifdef HAVE_SOCKETPAIR
-@@ -217,6 +226,10 @@ static void print_rsync_version(enum log
+@@ -222,6 +231,10 @@ static void print_rsync_version(enum log
ipv6 = "";
#endif
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -229,9 +242,9 @@ static void print_rsync_version(enum log
+@@ -234,9 +247,9 @@ static void print_rsync_version(enum log
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
* macros. */
(int) (sizeof dumstat->st_ino * 8),
(int) (sizeof (int64) * 8));
#ifdef MAINTAINER_MODE
-@@ -371,6 +384,13 @@ void usage(enum logcode F)
+@@ -378,6 +391,13 @@ void usage(enum logcode F)
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
+ rprintf(F," --ssl-ca-certs=FILE path to trusted CA certificates\n");
+#endif
rprintf(F," --version print version number\n");
- rprintf(F," --help show this help screen\n");
+ rprintf(F,"(-h) --help show this help (-h works with no other options)\n");
-@@ -383,7 +403,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -390,7 +410,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -520,6 +540,13 @@ static struct poptOption long_options[]
+@@ -532,6 +552,13 @@ static struct poptOption long_options[]
{"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 },
{"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 },
{"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 },
/* All the following options switch us into daemon-mode option-parsing. */
{"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
-@@ -1057,6 +1084,12 @@ int parse_arguments(int *argc, const cha
+@@ -1080,6 +1107,12 @@ int parse_arguments(int *argc, const cha
usage(FINFO);
exit_cleanup(0);
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1335,6 +1368,17 @@ int parse_arguments(int *argc, const cha
+@@ -1361,6 +1394,17 @@ int parse_arguments(int *argc, const cha
if (delay_updates && !partial_dir)
partial_dir = tmp_partialdir;
if (inplace) {
#ifdef HAVE_FTRUNCATE
if (partial_dir) {
-@@ -1746,11 +1790,28 @@ char *check_for_hostspec(char *s, char *
+@@ -1774,11 +1818,28 @@ char *check_for_hostspec(char *s, char *
{
char *p;
int not_host;
if ((p = strchr(s, '/')) != NULL) {
hostlen = p - s;
path = p + 1;
---- orig/rsync.h 2006-02-02 02:41:09
-+++ rsync.h 2004-10-08 21:01:33
+--- old/rsync.h
++++ new/rsync.h
@@ -32,6 +32,7 @@
#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
#define BACKUP_SUFFIX "~"
-@@ -410,6 +411,11 @@ enum msgcode {
+@@ -413,6 +414,11 @@ enum msgcode {
# define SIZEOF_INT64 SIZEOF_OFF_T
#endif
/* Starting from protocol version 26, we always use 64-bit
* ino_t and dev_t internally, even if this platform does not
* allow files to have 64-bit inums. That's because the
---- orig/ssl.c 2004-10-08 19:37:22
-+++ ssl.c 2004-10-08 19:37:22
+--- old/ssl.c
++++ new/ssl.c
@@ -0,0 +1,366 @@
+/* -*- c-file-style: "linux" -*-
+ * ssl.c: operations for negotiating SSL rsync connections.
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff