Fix patch conflict.

diff --git a/backup-deleted.diff b/backup-deleted.diff
index 2539c7b3d0dc3aac1b755a024f89c7f2b3e6880b..a25f11e4d8784631c09312d0bf9a46431d212e97 100644 (file)
--- a/backup-deleted.diff
+++ b/backup-deleted.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index c1f83e7b46369a885adb52ca2d76279ea517c32e..59c2cedca489bfea508456a98f0088b50cf5659a 100644 (file)
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -25,7 +25,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                  (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h
@@ -65,7 +65,7 @@ diff --git a/main.c b/main.c
  }
  
  void write_del_stats(int f)
-@@ -1635,6 +1638,14 @@ void remember_children(UNUSED(int val))
+@@ -1630,6 +1633,14 @@ void remember_children(UNUSED(int val))
                                break;
                        }
                }
@@ -80,7 +80,7 @@ diff --git a/main.c b/main.c
        }
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1688,6 +1699,13 @@ static void rsync_panic_handler(UNUSED(int whatsig))
+@@ -1683,6 +1694,13 @@ static void rsync_panic_handler(UNUSED(int whatsig))
  }
  #endif
  
@@ -94,7 +94,7 @@ diff --git a/main.c b/main.c
  static void unset_env_var(const char *var)
  {
  #ifdef HAVE_UNSETENV
-@@ -1704,7 +1722,6 @@ static void unset_env_var(const char *var)
+@@ -1699,7 +1717,6 @@ static void unset_env_var(const char *var)
  #endif
  }
  
@@ -102,7 +102,7 @@ diff --git a/main.c b/main.c
  int main(int argc,char *argv[])
  {
        int ret;
-@@ -1728,6 +1745,11 @@ int main(int argc,char *argv[])
+@@ -1723,6 +1740,11 @@ int main(int argc,char *argv[])
        SIGACTMASK(SIGFPE, rsync_panic_handler);
        SIGACTMASK(SIGABRT, rsync_panic_handler);
        SIGACTMASK(SIGBUS, rsync_panic_handler);

diff --git a/checksum-reading.diff b/checksum-reading.diff
index 30166959bbe237ad5c2ff1cc4cfed2b404b9e578..e04406afa5cdc8df0b04555d12643805fcb385ac 100644 (file)
--- a/checksum-reading.diff
+++ b/checksum-reading.diff
@@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
@@ -733,7 +733,7 @@ diff --git a/rsync.1.md b/rsync.1.md
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -896,6 +896,10 @@ extern int xattrs_ndx;
+@@ -901,6 +901,10 @@ extern int xattrs_ndx;
  #define F_SUM(f) ((char*)OPT_EXTRA(f, START_BUMP(f) + HLINK_BUMP(f) \
                                    + SUM_EXTRA_CNT - 1))
  
@@ -744,7 +744,7 @@ diff --git a/rsync.h b/rsync.h
  /* Some utility defines: */
  #define F_IS_ACTIVE(f) (f)->basename[0]
  #define F_IS_HLINKED(f) ((f)->flags & FLAG_HLINKED)
-@@ -1109,6 +1113,13 @@ typedef struct {
+@@ -1114,6 +1118,13 @@ typedef struct {
  #define RELNAMECACHE_LEN (offsetof(relnamecache, fname))
  #endif
  

diff --git a/checksum-updating.diff b/checksum-updating.diff
index d80efd321dc653f8a07dcd4bec4b81531680e15b..a68e6ae6d0bdb0b406e1ec1aca2857bbe365157f 100644 (file)
--- a/checksum-updating.diff
+++ b/checksum-updating.diff
@@ -511,7 +511,7 @@ diff --git a/io.c b/io.c
  extern int daemon_connection;
  extern int protocol_version;
  extern int remove_source_files;
-@@ -1066,6 +1067,9 @@ static void got_flist_entry_status(enum festatus status, int ndx)
+@@ -1084,6 +1085,9 @@ static void got_flist_entry_status(enum festatus status, int ndx)
                                if (inc_recurse)
                                        flist->in_progress++;
                        }
@@ -607,7 +607,7 @@ diff --git a/rsync.1.md b/rsync.1.md
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -1115,6 +1115,8 @@ typedef struct {
+@@ -1120,6 +1120,8 @@ typedef struct {
  
  #define CSF_ENABLE (1<<1)
  #define CSF_LAX (1<<2)

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 0bebfeae27fb879f766260faa602bafea2c0858c..8e76d0df0dddf69675f1689928b906cdc9402cc1 100644 (file)
--- a/checksum-xattr.diff
+++ b/checksum-xattr.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/clone-dest.diff b/clone-dest.diff
index 930549d02e89a7e2e98acf469ac05dbff25feec1..78d10e9d6bfc2749da0cd89cbd08fb6e475eb7aa 100644 (file)
--- a/clone-dest.diff
+++ b/clone-dest.diff
@@ -13,7 +13,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -26,7 +26,7 @@ diff --git a/Makefile.in b/Makefile.in
  
  # Programs we must have to run the test cases
  CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
-@@ -163,7 +163,7 @@ getgroups$(EXEEXT): getgroups.o
+@@ -166,7 +166,7 @@ getgroups$(EXEEXT): getgroups.o
  getfsdev$(EXEEXT): getfsdev.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
  

diff --git a/congestion.diff b/congestion.diff
index 698b16c8f3cb3f31829438011640e33e9335edc8..c5ed7f8f6dbbb66b757e1ea4f43b17b1504149bc 100644 (file)
--- a/congestion.diff
+++ b/congestion.diff
@@ -27,7 +27,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt

diff --git a/copy-devices.diff b/copy-devices.diff
index e3cab951cf83b4c908ae12f26ae0861e36d62fcb..aba727c07078d42474c120232c70a333c536e1f4 100644 (file)
--- a/copy-devices.diff
+++ b/copy-devices.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/date-only.diff b/date-only.diff
index 291df0839871a1081cde6381532f9ebd62e43102..2dbbe16699eb07cd564c1b387893896d9f5eff0a 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -14,7 +14,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index b78b038d677a9a1e3d6708659f15f30a6a3355cd..52fa8649962312bbd537a1b0cf585b716e4f1398 100644 (file)
--- a/db.diff
+++ b/db.diff
@@ -21,11 +21,11 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
-@@ -31,6 +31,7 @@ aclocal.m4
+@@ -32,6 +32,7 @@ aclocal.m4
  /gists
  /gmon.out
  /rsync
@@ -75,9 +75,9 @@ diff --git a/Makefile.in b/Makefile.in
        if test -f rsyncd.conf.5; then $(INSTALLMAN) -m 644 rsyncd.conf.5 $(DESTDIR)$(mandir)/man5; fi
        if test "$(with_rrsync)" = yes; then \
            $(INSTALLCMD) -m 755 $(srcdir)/support/rrsync $(DESTDIR)$(bindir); \
-@@ -101,10 +104,13 @@ install-strip:
- rsync$(EXEEXT): $(OBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+@@ -104,10 +107,13 @@ rsync$(EXEEXT): $(OBJS)
+ rrsync: support/rrsync
+       cp -p $(srcdir)/support/rrsync rrsync
  
 +rsyncdb$(EXEEXT): rsync$(EXEEXT)
 +      ln -s rsync$(EXEEXT) rsyncdb$(EXEEXT)
@@ -90,7 +90,7 @@ diff --git a/Makefile.in b/Makefile.in
  loadparm.o: default-dont-compress.h daemon-parm.h
  
  flist.o: rounding.h
-@@ -115,6 +121,9 @@ default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
+@@ -118,6 +124,9 @@ default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
  help-rsync.h help-rsyncd.h: rsync.1.md help-from-md.awk
        $(AWK) -f $(srcdir)/help-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
  
@@ -100,20 +100,20 @@ diff --git a/Makefile.in b/Makefile.in
  daemon-parm.h: daemon-parm.txt daemon-parm.awk
        $(AWK) -f $(srcdir)/daemon-parm.awk $(srcdir)/daemon-parm.txt
  
-@@ -252,7 +261,7 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
+@@ -255,7 +264,7 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
        $(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
  
  .PHONY: man
 -man: rsync.1 rsync-ssl.1 rsyncd.conf.5 rrsync.1
 +man: rsync.1 rsync-ssl.1 rsyncd.conf.5 rrsync.1 rsyncdb.1
  
- rsync.1: rsync.1.md md2man version.h Makefile
+ rsync.1: rsync.1.md md-convert version.h Makefile
        @$(srcdir)/maybe-make-man $(srcdir) rsync.1.md
-@@ -266,9 +275,12 @@ rsyncd.conf.5: rsyncd.conf.5.md md2man version.h Makefile
- rrsync.1: support/rrsync.1.md md2man Makefile
+@@ -269,9 +278,12 @@ rsyncd.conf.5: rsyncd.conf.5.md md-convert version.h Makefile
+ rrsync.1: support/rrsync.1.md md-convert Makefile
        @$(srcdir)/maybe-make-man $(srcdir) support/rrsync.1.md
  
-+rsyncdb.1: rsyncdb.1.md md2man NEWS.md Makefile
++rsyncdb.1: rsyncdb.1.md md-convert NEWS.md Makefile
 +      @$(srcdir)/maybe-make-man $(srcdir) rsyncdb.1.md
 +
  .PHONY: clean
@@ -2375,7 +2375,7 @@ diff --git a/io.c b/io.c
  extern int io_error;
  extern int batch_fd;
  extern int eol_nulls;
-@@ -1492,6 +1494,32 @@ static void read_a_msg(void)
+@@ -1512,6 +1514,32 @@ static void read_a_msg(void)
                if (am_sender)
                        maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
                break;
@@ -2408,7 +2408,7 @@ diff --git a/io.c b/io.c
        case MSG_DELETED:
                if (msg_bytes >= sizeof data)
                        goto overflow;
-@@ -1643,6 +1671,7 @@ static void read_a_msg(void)
+@@ -1665,6 +1693,7 @@ static void read_a_msg(void)
                 * with a duplicate exit message. */
                _exit_cleanup(val, __FILE__, 0 - __LINE__);
        default:
@@ -2443,7 +2443,7 @@ diff --git a/main.c b/main.c
  extern char *shell_cmd;
  extern char *password_file;
  extern char *backup_dir;
-@@ -1245,6 +1248,9 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
+@@ -1240,6 +1243,9 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
        if (am_daemon && io_timeout && protocol_version >= 31)
                send_msg_int(MSG_IO_TIMEOUT, io_timeout);
  
@@ -2453,7 +2453,7 @@ diff --git a/main.c b/main.c
        if (am_sender) {
                keep_dirlinks = 0; /* Must be disabled on the sender. */
                if (need_messages_from_generator)
-@@ -1535,6 +1541,9 @@ static int start_client(int argc, char *argv[])
+@@ -1530,6 +1536,9 @@ static int start_client(int argc, char *argv[])
        else
                env_port = rsync_port;
  
@@ -2860,7 +2860,7 @@ diff --git a/rsync.h b/rsync.h
  #define NDX_DONE -1
  #define NDX_FLIST_EOF -2
  #define NDX_DEL_STATS -3
-@@ -1431,7 +1435,8 @@ extern short info_levels[], debug_levels[];
+@@ -1436,7 +1440,8 @@ extern short info_levels[], debug_levels[];
  #define DEBUG_CHDIR (DEBUG_BIND+1)
  #define DEBUG_CONNECT (DEBUG_CHDIR+1)
  #define DEBUG_CMD (DEBUG_CONNECT+1)

diff --git a/detect-renamed.diff b/detect-renamed.diff
index e9731ee111467f9346fb156f27bcc5e3b898c421..c7b9402ab1c8139f48e3fb91fbb4de7b00746322 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -38,7 +38,7 @@ TODO:
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c
@@ -589,7 +589,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -723,7 +723,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -718,7 +718,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
  
        if (mkpath_dest_arg && statret < 0 && (cp || file_total > 1)) {
                int save_errno = errno;

diff --git a/direct-io.diff b/direct-io.diff
index 1bee59e61c26085997eade098daeb619e7bce63a..9c96872b4fa9159a7ea2add53286affe3661fec0 100644 (file)
--- a/direct-io.diff
+++ b/direct-io.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/downdate.diff b/downdate.diff
index 1550403a766373bbfb39cbbb8e26b5a05a7dec07..3dd6dc8b8de425a39922e52d4937cbb82f39b5f1 100644 (file)
--- a/downdate.diff
+++ b/downdate.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index 6ed8bdb5346bb4e876cc471feab2f3e64113aa82..5266b01cc7fa12fad8bb78ac756d849b600c9cfd 100644 (file)
--- a/fileflags.diff
+++ b/fileflags.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -341,7 +341,7 @@ diff --git a/main.c b/main.c
  extern int msgs2stderr;
  extern int module_id;
  extern int read_only;
-@@ -974,6 +978,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
+@@ -969,6 +973,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
         * points to an identical file won't be replaced by the referent. */
        copy_links = copy_dirlinks = copy_unsafe_links = 0;
  
@@ -726,7 +726,7 @@ diff --git a/rsync.h b/rsync.h
  /* Find a variable that is either exactly 32-bits or longer.
   * If some code depends on 32-bit truncation, it will need to
   * take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -818,6 +845,7 @@ extern int pathname_ndx;
+@@ -823,6 +850,7 @@ extern int pathname_ndx;
  extern int depth_ndx;
  extern int uid_ndx;
  extern int gid_ndx;
@@ -734,7 +734,7 @@ diff --git a/rsync.h b/rsync.h
  extern int acls_ndx;
  extern int xattrs_ndx;
  
-@@ -872,6 +900,11 @@ extern int xattrs_ndx;
+@@ -877,6 +905,11 @@ extern int xattrs_ndx;
  /* When the associated option is on, all entries will have these present: */
  #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
  #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum

diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index c25ff96baaead1075149321241ad27df944242d3..ad08ae4d26b44c7993270d94e156569eda514934 100644 (file)
--- a/filter-attribute-mods.diff
+++ b/filter-attribute-mods.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -400,7 +400,7 @@ diff --git a/rsync.h b/rsync.h
  
  #define XFLG_FATAL_ERRORS     (1<<0)
  #define XFLG_OLD_PREFIXES     (1<<1)
-@@ -981,6 +984,8 @@ struct map_struct {
+@@ -986,6 +989,8 @@ struct map_struct {
        int status;             /* first errno from read errors         */
  };
  
@@ -409,7 +409,7 @@ diff --git a/rsync.h b/rsync.h
  #define NAME_IS_FILE          (0)    /* filter name as a file */
  #define NAME_IS_DIR           (1<<0) /* filter name as a dir */
  #define NAME_IS_XATTR         (1<<2) /* filter name as an xattr */
-@@ -1006,8 +1011,18 @@ struct map_struct {
+@@ -1011,8 +1016,18 @@ struct map_struct {
  #define FILTRULE_CLEAR_LIST   (1<<18)/* this item is the "!" token */
  #define FILTRULE_PERISHABLE   (1<<19)/* perishable if parent dir goes away */
  #define FILTRULE_XATTR                (1<<20)/* rule only applies to xattr names */
@@ -428,7 +428,7 @@ diff --git a/rsync.h b/rsync.h
  
  typedef struct filter_struct {
        struct filter_struct *next;
-@@ -1017,6 +1032,11 @@ typedef struct filter_struct {
+@@ -1022,6 +1037,11 @@ typedef struct filter_struct {
                int slash_cnt;
                struct filter_list_struct *mergelist;
        } u;

diff --git a/hfs-compression.diff b/hfs-compression.diff
index 5c6a12701562b442a4ab20381bfec24fc3be0313..a4a5bbb61c61650835a5a04cf8012e9c7a803894 100644 (file)
--- a/hfs-compression.diff
+++ b/hfs-compression.diff
@@ -169,7 +169,7 @@ diff --git a/main.c b/main.c
  int raw_argc, cooked_argc;
  char **raw_argv, **cooked_argv;
  
-@@ -672,6 +678,43 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
+@@ -667,6 +673,43 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
        return pid;
  }
  
@@ -213,7 +213,7 @@ diff --git a/main.c b/main.c
  /* The receiving side operates in one of two modes:
   *
   * 1. it receives any number of files into a destination directory,
-@@ -752,6 +795,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -747,6 +790,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                                exit_cleanup(RERR_FILESELECT);
                        }
                        filesystem_dev = st.st_dev; /* ensures --force works right w/-x */
@@ -223,7 +223,7 @@ diff --git a/main.c b/main.c
                        return NULL;
                }
                if (file_total > 1) {
-@@ -809,7 +855,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -804,7 +850,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                                full_fname(dest_path));
                        exit_cleanup(RERR_FILESELECT);
                }
@@ -234,7 +234,7 @@ diff --git a/main.c b/main.c
                return NULL;
        }
  
-@@ -829,6 +877,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -824,6 +872,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                        full_fname(dest_path));
                exit_cleanup(RERR_FILESELECT);
        }

diff --git a/ignore-case.diff b/ignore-case.diff
index b99de12ad52750aaf81d4f002c409ed3bc74f385..d9fd8a44a27480b441f9a8b6278a63974e849a01 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -12,7 +12,7 @@ TODO:
  - Make this code handle multibyte character encodings, and honor the
    --iconv setting when converting case.
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/kerberos.diff b/kerberos.diff
index 4a646e80561a96b770d5be9fc723e8c52b7a32bf..b97fee2b4fb65a3b114152efdf5829cdb7bdc018 100644 (file)
--- a/kerberos.diff
+++ b/kerberos.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -463,7 +463,7 @@ new file mode 100644
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -1578,7 +1578,7 @@ static int start_client(int argc, char *argv[])
+@@ -1573,7 +1573,7 @@ static int start_client(int argc, char *argv[])
         * remote shell command, we need to do the RSYNCD protocol first */
        if (daemon_connection) {
                int tmpret;

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 8cd879f39417d314f3be14f756bcb7e684e95f4b..8bcad601c5abf8d7b80d0c6a20d77375631ebb33 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -12,7 +12,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -387,7 +387,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -1440,7 +1440,8 @@ extern short info_levels[], debug_levels[];
+@@ -1445,7 +1445,8 @@ extern short info_levels[], debug_levels[];
  #define DEBUG_FUZZY (DEBUG_FLIST+1)
  #define DEBUG_GENR (DEBUG_FUZZY+1)
  #define DEBUG_HASH (DEBUG_GENR+1)

diff --git a/md5p8.diff b/md5p8.diff
index e6b61f8f65c435f70ab949442276a5ca9ca408d1..e28087d1320ba2d9cf7dc31041a55cf185eed714 100644 (file)
--- a/md5p8.diff
+++ b/md5p8.diff
@@ -27,7 +27,7 @@ xxHash is still preferred (and faster), but this provides a reasonably
 fast fallback for the case where xxHash libraries are not available at
 build time.
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -48,7 +48,7 @@ diff --git a/Makefile.in b/Makefile.in
        lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@
  zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
        zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
-@@ -148,6 +148,9 @@ simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
+@@ -151,6 +151,9 @@ simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
  simd-checksum-avx2.o: simd-checksum-avx2.S
        @$(srcdir)/cmd-or-msg disable-asm $(CC) $(CFLAGS) --include=$(srcdir)/rsync.h -DAVX2_ASM -I. @NOEXECSTACK@ -c -o $@ $(srcdir)/simd-checksum-avx2.S
  

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index e8617092243238bfc187cbdcc0da7e4e80399b8f..ee1b402741d87dbaed728caaa9f7bee39b25ebe5 100644 (file)
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/slow-down.diff b/slow-down.diff
index 8f225b7f4fe33dd3beb799197e6c882a8fff8796..45c37e52bbb9028ba14defe6562ab9ee8c48c985 100644 (file)
--- a/slow-down.diff
+++ b/slow-down.diff
@@ -14,7 +14,7 @@ To use this patch, run these commands for a successful build:
     ./configure                           (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index 105c358aa1a3550ef93e1ae0d66ebd4c6ca38323..e7255b6e764429b066a193ecbce4db511b5602aa 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 TODO: the configure changes should abort if the user requests --enable-slp
 and we can't honor that request.
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -39,8 +39,8 @@ diff --git a/Makefile.in b/Makefile.in
 -      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 +      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(LIBSLP)
  
- $(OBJS): $(HEADERS)
- $(CHECK_OBJS): $(HEADERS)
+ rrsync: support/rrsync
+       cp -p $(srcdir)/support/rrsync rrsync
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
@@ -108,7 +108,7 @@ diff --git a/daemon-parm.txt b/daemon-parm.txt
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -1409,6 +1409,22 @@ static int start_client(int argc, char *argv[])
+@@ -1404,6 +1404,22 @@ static int start_client(int argc, char *argv[])
  
        if (!read_batch) { /* for read_batch, NO source is specified */
                char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);

diff --git a/soften-links.diff b/soften-links.diff
index 853a224e30d3f60ed829193ad2f03815947936e6..a593fe07a876ccfacb956326071a9d7652203ff6 100644 (file)
--- a/soften-links.diff
+++ b/soften-links.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                           (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c

diff --git a/source-backup.diff b/source-backup.diff
index fc09baa4a4e151e109556568175912fafe4ce7d9..dc99299f447b97af526c11c6b2e1e98eb425c806 100644 (file)
--- a/source-backup.diff
+++ b/source-backup.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
 
 -- Matt McCutchen <hashproduct@gmail.com>
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 3b2d69a37eeafc7f578d0d822ad33fcf94ff3b4a..58f6276f7909fde18de0cd0a8672f1ef81e4c169 100644 (file)
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -30,7 +30,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/sparse-block.diff b/sparse-block.diff
index 41f5e94ab601a1470b36f70f9da167c6dfbaa362..03dc2fb1ce6a10723700a1f9bb9a90d9f1540dc2 100644 (file)
--- a/sparse-block.diff
+++ b/sparse-block.diff
@@ -18,7 +18,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c

diff --git a/stderr-compat.diff b/stderr-compat.diff
index c2189940ec78d5614d9029ef50399a6ed8cd3d9f..f3085c2d2088fc4dc770b6f785cad771409b5ddc 100644 (file)
--- a/stderr-compat.diff
+++ b/stderr-compat.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/NEWS.md b/NEWS.md
 --- a/NEWS.md
 +++ b/NEWS.md

diff --git a/transliterate.diff b/transliterate.diff
index a4e6e63f88ea1ddcd269a996973f7ccec8ca0ebd..eaf395c185426d911c46cb28f628b4521e0cb567 100644 (file)
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/xxh3-safety-check.diff b/xxh3-safety-check.diff
index d8a0bcdc8ac3cee1f97337ec9f6568d2ee848da7..a7c9bc37c7fbf9bf65b7003a7f0f97b588eafeeb 100644 (file)
--- a/xxh3-safety-check.diff
+++ b/xxh3-safety-check.diff
@@ -6,7 +6,7 @@ To use this patch, run these commands for a successful build:
     patch -p1 <patches/xxh3-safety-check.diff
     make
 
-based-on: 72adf49ba8cb81426e2b9799fbd43c6284b013a9
+based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c