After applying this patch, run these commands for a successful build:
- autoconf
- autoheader
+ ./prepare-source
./configure --enable-ODBC
- make proto
make
See the file "instructions" (after applying this patch) for more info.
---- orig/Makefile.in 2006-01-14 08:14:29
+--- orig/Makefile.in 2006-02-06 05:03:50
+++ Makefile.in 2005-09-23 15:59:02
@@ -31,7 +31,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
fileio.o batch.o clientname.o chmod.o
OBJS3=progress.o pipe.o
---- orig/cleanup.c 2006-01-14 08:14:29
+--- orig/cleanup.c 2006-02-03 20:00:35
+++ cleanup.c 2005-09-23 15:59:19
@@ -23,6 +23,7 @@
extern int log_got_error;
extern char *partial_dir;
-@@ -144,8 +145,13 @@ void _exit_cleanup(int code, const char
+@@ -149,8 +150,13 @@ void _exit_cleanup(int code, const char
code = RERR_PARTIAL;
}
if (verbose > 2) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c 2006-01-14 08:14:29
+--- orig/clientserver.c 2006-02-03 20:41:03
+++ clientserver.c 2005-09-23 15:59:36
-@@ -387,6 +387,9 @@ static int rsync_module(int f_in, int f_
+@@ -392,6 +392,9 @@ static int rsync_module(int f_in, int f_
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
log_init();
#ifdef HAVE_PUTENV
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -624,6 +627,9 @@ static int rsync_module(int f_in, int f_
+@@ -630,6 +633,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);
} else {
rprintf(FLOG, "rsync %s %s from %s (%s)\n",
am_sender ? "on" : "to",
---- orig/configure.in 2006-01-15 14:52:33
+--- orig/configure.in 2006-02-05 04:53:34
+++ configure.in 2005-09-24 18:38:47
-@@ -552,6 +552,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -536,6 +536,12 @@ if test x"$with_included_popt" != x"yes"
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
+ sequence is used for unique IDs). If False the statement will be executed
+ after the session row is inserted (as is done when the session ID is
+ automatically generates unique IDs). Defaults to True.
---- orig/loadparm.c 2005-09-19 17:21:10
+--- orig/loadparm.c 2006-01-30 21:47:45
+++ loadparm.c 2005-09-24 18:29:59
@@ -120,9 +120,16 @@ typedef struct
{
char *filter;
char *gid;
char *hosts_allow;
-@@ -137,13 +144,19 @@ typedef struct
+@@ -139,13 +146,19 @@ typedef struct
char *prexfer_exec;
char *refuse_options;
char *secrets_file;
BOOL ignore_errors;
BOOL ignore_nonreadable;
BOOL list;
-@@ -163,9 +176,16 @@ static service sDefault =
+@@ -165,9 +178,16 @@ static service sDefault =
{
/* auth_users; */ NULL,
/* comment; */ NULL,
/* filter; */ NULL,
/* gid; */ NOBODY_GROUP,
/* hosts_allow; */ NULL,
-@@ -180,13 +200,19 @@ static service sDefault =
+@@ -184,13 +204,19 @@ static service sDefault =
/* prexfer_exec; */ NULL,
/* refuse_options; */ NULL,
/* secrets_file; */ NULL,
/* ignore_errors; */ False,
/* ignore_nonreadable; */ False,
/* list; */ True,
-@@ -287,10 +313,19 @@ static struct parm_struct parm_table[] =
+@@ -291,10 +317,19 @@ static struct parm_struct parm_table[] =
{"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
{"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL,0},
{"gid", P_STRING, P_LOCAL, &sDefault.gid, NULL,0},
{"hosts allow", P_STRING, P_LOCAL, &sDefault.hosts_allow, NULL,0},
{"hosts deny", P_STRING, P_LOCAL, &sDefault.hosts_deny, NULL,0},
-@@ -312,11 +347,15 @@ static struct parm_struct parm_table[] =
+@@ -318,11 +353,15 @@ static struct parm_struct parm_table[] =
{"read only", P_BOOL, P_LOCAL, &sDefault.read_only, NULL,0},
{"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options, NULL,0},
{"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file, NULL,0},
{"use chroot", P_BOOL, P_LOCAL, &sDefault.use_chroot, NULL,0},
{"write only", P_BOOL, P_LOCAL, &sDefault.write_only, NULL,0},
{NULL, P_BOOL, P_NONE, NULL, NULL,0}
-@@ -377,9 +416,16 @@ FN_GLOBAL_INTEGER(lp_syslog_facility, &G
+@@ -383,9 +422,16 @@ FN_GLOBAL_INTEGER(lp_syslog_facility, &G
FN_LOCAL_STRING(lp_auth_users, auth_users)
FN_LOCAL_STRING(lp_comment, comment)
FN_LOCAL_STRING(lp_filter, filter)
FN_LOCAL_STRING(lp_gid, gid)
FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
-@@ -394,13 +440,19 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
+@@ -402,13 +448,19 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec)
FN_LOCAL_STRING(lp_refuse_options, refuse_options)
FN_LOCAL_STRING(lp_secrets_file, secrets_file)
FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
FN_LOCAL_BOOL(lp_list, list)
---- orig/log.c 2006-01-17 02:16:40
+--- orig/log.c 2006-02-05 04:53:34
+++ log.c 2005-09-23 16:01:13
-@@ -87,7 +87,7 @@ struct {
+@@ -93,7 +93,7 @@ struct {
/*
* Map from rsync error code to name, or return NULL.
*/
{
int i;
for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c 2006-01-15 14:46:15
+--- orig/main.c 2006-02-05 04:53:34
+++ main.c 2005-09-23 16:01:22
-@@ -159,6 +159,9 @@ static void handle_stats(int f)
+@@ -168,6 +168,9 @@ static void handle_stats(int f)
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender)
return;
}
---- orig/receiver.c 2006-01-14 20:27:09
+--- orig/receiver.c 2006-01-31 02:30:18
+++ receiver.c 2006-01-14 08:27:51
@@ -174,6 +174,10 @@ static int get_tmpname(char *fnametmp, c
exit_cleanup(RERR_FILEIO);
}
-@@ -727,6 +773,12 @@ int recv_files(int f_in, struct file_lis
+@@ -730,6 +776,12 @@ int recv_files(int f_in, struct file_lis
rprintf(msgtype,
"%s: %s failed verification -- update %s%s.\n",
errstr, fname, keptstr, redostr);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff