X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=db.diff;h=f4efcdfecf7ec04e742f12b1065db5cc507013f0;hb=refs%2Fheads%2Fb3.0.x;hp=b71a56ef0e89566d4d44d8f81435681edeaffc6c;hpb=75fb8c6938caf8b2863a53fc207b1fba8c2f62ba;p=rsync.git%2Fpatches.git

diff --git a/db.diff b/db.diff
index b71a56e..f4efcdf 100644
--- a/db.diff
+++ b/db.diff
@@ -21,7 +21,7 @@ To use this patch, run these commands for a successful build:
 
     patch -p1 <patches/remote-option.diff
     patch -p1 <patches/db.diff
-    ./configure                               (optional if already run)
+    ./configure
     make
 
 based-on: patch/b3.0.x/remote-option
@@ -148,16 +148,15 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -331,7 +331,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
+@@ -326,6 +326,7 @@ AC_HEADER_DIRENT
+ AC_HEADER_TIME
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
++    mysql/mysql.h sqlite3.h \
+     unistd.h utime.h grp.h compat.h sys/param.h ctype.h sys/wait.h \
+     sys/ioctl.h sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h \
      sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
-     netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
-     sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
--    popt.h popt/popt.h)
-+    popt.h popt/popt.h mysql/mysql.h sqlite3.h)
- AC_HEADER_MAJOR
- 
- AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[
-@@ -1001,6 +1001,29 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
+@@ -1008,6 +1009,29 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
      fi
  fi
  
@@ -789,7 +788,7 @@ diff --git a/flist.c b/flist.c
  	if (basename_len == 0+1) {
  		if (!pool)
  			unmake_file(file);
-@@ -1989,6 +1992,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -1990,6 +1993,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
  		     | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0);
  	int implied_dot_dir = 0;
  
@@ -820,7 +819,7 @@ diff --git a/generator.c b/generator.c
  		return memcmp(sum, F_SUM(file), checksum_len) == 0;
  	}
  
-@@ -2272,6 +2274,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -2279,6 +2281,9 @@ void generate_files(int f_out, const char *local_name)
  	 * notice that and let us know via the message pipe (or its closing). */
  	ignore_timeout = 1;
  
@@ -987,7 +986,7 @@ diff --git a/pipe.c b/pipe.c
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -321,6 +321,7 @@ to the detailed description below for a complete description.  verb(
+@@ -334,6 +334,7 @@ to the detailed description below for a complete description.  verb(
   -q, --quiet                 suppress non-error messages
       --no-motd               suppress daemon-mode MOTD (see caveat)
   -c, --checksum              skip based on checksum, not mod-time & size
@@ -995,7 +994,7 @@ diff --git a/rsync.yo b/rsync.yo
   -a, --archive               archive mode; equals -rlptgoD (no -H,-A,-X)
       --no-OPTION             turn off an implied OPTION (e.g. --no-D)
   -r, --recursive             recurse into directories
-@@ -540,6 +541,47 @@ option's before-the-transfer "Does this file need to be updated?" check.
+@@ -559,6 +560,47 @@ option's before-the-transfer "Does this file need to be updated?" check.
  For protocol 30 and beyond (first supported in 3.0.0), the checksum used is
  MD5.  For older protocols, the checksum used is MD4.
  
@@ -1046,7 +1045,7 @@ diff --git a/rsync.yo b/rsync.yo
 diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 --- a/rsyncd.conf.yo
 +++ b/rsyncd.conf.yo
-@@ -270,6 +270,18 @@ is daemon.  This setting has no effect if the "log file" setting is a
+@@ -276,6 +276,18 @@ is daemon.  This setting has no effect if the "log file" setting is a
  non-empty string (either set in the per-modules settings, or inherited
  from the global settings).