Skip to content

Commit 8f80061

Browse files
committed
The patches for 3.2.5pre1.
1 parent 8b45d7a commit 8f80061

28 files changed

+97
-97
lines changed

backup-deleted.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
77
./configure (optional if already run)
88
make
99

10-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
10+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
1111
diff --git a/generator.c b/generator.c
1212
--- a/generator.c
1313
+++ b/generator.c
@@ -86,15 +86,15 @@ diff --git a/receiver.c b/receiver.c
8686
diff --git a/rsync.1.md b/rsync.1.md
8787
--- a/rsync.1.md
8888
+++ b/rsync.1.md
89-
@@ -366,6 +366,7 @@ has its own detailed description later in this manpage.
89+
@@ -365,6 +365,7 @@ has its own detailed description later in this manpage.
9090
--relative, -R use relative path names
9191
--no-implied-dirs don't send implied dirs with --relative
9292
--backup, -b make backups (see --suffix & --backup-dir)
9393
+--backup-deleted make backups only of deleted files
9494
--backup-dir=DIR make backups into hierarchy based in DIR
9595
--suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
9696
--update, -u skip files that are newer on the receiver
97-
@@ -939,6 +940,13 @@ option name from the pathname using a space if you want the shell to expand it.
97+
@@ -938,6 +939,13 @@ option name from the pathname using a space if you want the shell to expand it.
9898
rules specify a trailing inclusion/exclusion of `*`, the auto-added rule
9999
would never be reached).
100100

backup-dir-dels.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ diff --git a/options.c b/options.c
343343
diff --git a/rsync.1.md b/rsync.1.md
344344
--- a/rsync.1.md
345345
+++ b/rsync.1.md
346-
@@ -368,7 +368,9 @@ has its own detailed description later in this manpage.
346+
@@ -367,7 +367,9 @@ has its own detailed description later in this manpage.
347347
--backup, -b make backups (see --suffix & --backup-dir)
348348
--backup-deleted make backups only of deleted files
349349
--backup-dir=DIR make backups into hierarchy based in DIR
@@ -353,7 +353,7 @@ diff --git a/rsync.1.md b/rsync.1.md
353353
--update, -u skip files that are newer on the receiver
354354
--inplace update destination files in-place
355355
--append append data onto shorter files
356-
@@ -961,6 +963,11 @@ option name from the pathname using a space if you want the shell to expand it.
356+
@@ -960,6 +962,11 @@ option name from the pathname using a space if you want the shell to expand it.
357357
daemon is the receiver, the backup dir cannot go outside the module's path
358358
hierarchy, so take extra care not to delete it or copy into it.
359359

catch_crash_signals.diff

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To use this patch, run these commands for a successful build:
2525
./configure (optional if already run)
2626
make
2727

28-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
28+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
2929
diff --git a/errcode.h b/errcode.h
3030
--- a/errcode.h
3131
+++ b/errcode.h
@@ -65,7 +65,7 @@ diff --git a/main.c b/main.c
6565
}
6666

6767
void write_del_stats(int f)
68-
@@ -1636,6 +1639,14 @@ void remember_children(UNUSED(int val))
68+
@@ -1637,6 +1640,14 @@ void remember_children(UNUSED(int val))
6969
break;
7070
}
7171
}
@@ -80,7 +80,7 @@ diff --git a/main.c b/main.c
8080
}
8181
#endif
8282
#ifndef HAVE_SIGACTION
83-
@@ -1689,6 +1700,13 @@ static void rsync_panic_handler(UNUSED(int whatsig))
83+
@@ -1690,6 +1701,13 @@ static void rsync_panic_handler(UNUSED(int whatsig))
8484
}
8585
#endif
8686

@@ -94,15 +94,15 @@ diff --git a/main.c b/main.c
9494
static void unset_env_var(const char *var)
9595
{
9696
#ifdef HAVE_UNSETENV
97-
@@ -1705,7 +1723,6 @@ static void unset_env_var(const char *var)
97+
@@ -1706,7 +1724,6 @@ static void unset_env_var(const char *var)
9898
#endif
9999
}
100100

101101
-
102102
int main(int argc,char *argv[])
103103
{
104104
int ret;
105-
@@ -1729,6 +1746,11 @@ int main(int argc,char *argv[])
105+
@@ -1730,6 +1747,11 @@ int main(int argc,char *argv[])
106106
SIGACTMASK(SIGFPE, rsync_panic_handler);
107107
SIGACTMASK(SIGABRT, rsync_panic_handler);
108108
SIGACTMASK(SIGBUS, rsync_panic_handler);

checksum-reading.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build:
1616
./configure (optional if already run)
1717
make
1818

19-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
19+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
2020
diff --git a/clientserver.c b/clientserver.c
2121
--- a/clientserver.c
2222
+++ b/clientserver.c
@@ -710,15 +710,15 @@ diff --git a/options.c b/options.c
710710
diff --git a/rsync.1.md b/rsync.1.md
711711
--- a/rsync.1.md
712712
+++ b/rsync.1.md
713-
@@ -360,6 +360,7 @@ has its own detailed description later in this manpage.
713+
@@ -359,6 +359,7 @@ has its own detailed description later in this manpage.
714714
--quiet, -q suppress non-error messages
715715
--no-motd suppress daemon-mode MOTD
716716
--checksum, -c skip based on checksum, not mod-time & size
717717
+--sumfiles=MODE use .rsyncsums to speedup --checksum mode
718718
--archive, -a archive mode is -rlptgoD (no -A,-X,-U,-N,-H)
719719
--no-OPTION turn off an implied OPTION (e.g. --no-D)
720720
--recursive, -r recurse into directories
721-
@@ -747,6 +748,8 @@ option name from the pathname using a space if you want the shell to expand it.
721+
@@ -746,6 +747,8 @@ option name from the pathname using a space if you want the shell to expand it.
722722
file that has the same size as the corresponding sender's file: files with
723723
either a changed size or a changed checksum are selected for transfer.
724724

@@ -727,7 +727,7 @@ diff --git a/rsync.1.md b/rsync.1.md
727727
Note that rsync always verifies that each _transferred_ file was correctly
728728
reconstructed on the receiving side by checking a whole-file checksum that
729729
is generated as the file is transferred, but that automatic
730-
@@ -758,6 +761,38 @@ option name from the pathname using a space if you want the shell to expand it.
730+
@@ -757,6 +760,38 @@ option name from the pathname using a space if you want the shell to expand it.
731731
option or an environment variable that is discussed in that option's
732732
section.
733733

checksum-updating.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ diff --git a/receiver.c b/receiver.c
596596
diff --git a/rsync.1.md b/rsync.1.md
597597
--- a/rsync.1.md
598598
+++ b/rsync.1.md
599-
@@ -772,9 +772,13 @@ option name from the pathname using a space if you want the shell to expand it.
599+
@@ -771,9 +771,13 @@ option name from the pathname using a space if you want the shell to expand it.
600600

601601
The MODE value is either "lax", for relaxed checking (which compares size
602602
and mtime), "strict" (which also compares ctime and inode), or "none" to

checksum-xattr.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
88
./configure (optional if already run)
99
make
1010

11-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
11+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
1212
diff --git a/flist.c b/flist.c
1313
--- a/flist.c
1414
+++ b/flist.c

clone-dest.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To use this patch, run these commands for a successful build:
1313
./configure (optional if already run)
1414
make
1515

16-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
16+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
1717
diff --git a/Makefile.in b/Makefile.in
1818
--- a/Makefile.in
1919
+++ b/Makefile.in
@@ -129,15 +129,15 @@ diff --git a/options.c b/options.c
129129
diff --git a/rsync.1.md b/rsync.1.md
130130
--- a/rsync.1.md
131131
+++ b/rsync.1.md
132-
@@ -448,6 +448,7 @@ has its own detailed description later in this manpage.
132+
@@ -447,6 +447,7 @@ has its own detailed description later in this manpage.
133133
--compare-dest=DIR also compare destination files relative to DIR
134134
--copy-dest=DIR ... and include copies of unchanged files
135135
--link-dest=DIR hardlink to files in DIR when unchanged
136136
+--clone-dest=DIR clone (reflink) files from DIR when unchanged
137137
--compress, -z compress file data during the transfer
138138
--compress-choice=STR choose the compression algorithm (aka --zc)
139139
--compress-level=NUM explicitly set compression level (aka --zl)
140-
@@ -2585,6 +2586,18 @@ option name from the pathname using a space if you want the shell to expand it.
140+
@@ -2584,6 +2585,18 @@ option name from the pathname using a space if you want the shell to expand it.
141141
this bug by avoiding the `-o` option (or using `--no-o`) when sending to an
142142
old rsync.
143143

congestion.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ To use this patch, run these commands for a successful build:
2727
./configure (optional if already run)
2828
make
2929

30-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
30+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
3131
diff --git a/daemon-parm.txt b/daemon-parm.txt
3232
--- a/daemon-parm.txt
3333
+++ b/daemon-parm.txt
@@ -71,7 +71,7 @@ diff --git a/options.c b/options.c
7171
diff --git a/rsync.1.md b/rsync.1.md
7272
--- a/rsync.1.md
7373
+++ b/rsync.1.md
74-
@@ -468,6 +468,8 @@ has its own detailed description later in this manpage.
74+
@@ -467,6 +467,8 @@ has its own detailed description later in this manpage.
7575
--address=ADDRESS bind address for outgoing socket to daemon
7676
--port=PORT specify double-colon alternate port number
7777
--sockopts=OPTIONS specify custom TCP options

date-only.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To use this patch, run these commands for a successful build:
1414
./configure (optional if already run)
1515
make
1616

17-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
17+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
1818
diff --git a/generator.c b/generator.c
1919
--- a/generator.c
2020
+++ b/generator.c
@@ -68,15 +68,15 @@ diff --git a/options.c b/options.c
6868
diff --git a/rsync.1.md b/rsync.1.md
6969
--- a/rsync.1.md
7070
+++ b/rsync.1.md
71-
@@ -442,6 +442,7 @@ has its own detailed description later in this manpage.
71+
@@ -441,6 +441,7 @@ has its own detailed description later in this manpage.
7272
--contimeout=SECONDS set daemon connection timeout in seconds
7373
--ignore-times, -I don't skip files that match size and time
7474
--size-only skip files that match in size
7575
+--date-only skip files that match in mod-time
7676
--modify-window=NUM, -@ set the accuracy for mod-time comparisons
7777
--temp-dir=DIR, -T create temporary files in directory DIR
7878
--fuzzy, -y find similar file for basis if no dest file
79-
@@ -709,6 +710,14 @@ option name from the pathname using a space if you want the shell to expand it.
79+
@@ -708,6 +709,14 @@ option name from the pathname using a space if you want the shell to expand it.
8080
after using another mirroring system which may not preserve timestamps
8181
exactly.
8282

db.diff

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ To use this patch, run these commands for a successful build:
2121
./configure
2222
make
2323

24-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
24+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
2525
diff --git a/.gitignore b/.gitignore
2626
--- a/.gitignore
2727
+++ b/.gitignore
@@ -230,7 +230,7 @@ diff --git a/configure.ac b/configure.ac
230230
netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \
231231
sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \
232232
popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \
233-
@@ -1434,6 +1435,48 @@ if test x"$enable_acl_support" = x"no" || test x"$enable_xattr_support" = x"no"
233+
@@ -1438,6 +1439,48 @@ if test x"$enable_acl_support" = x"no" || test x"$enable_xattr_support" = x"no"
234234
fi
235235
fi
236236

@@ -2446,7 +2446,7 @@ diff --git a/main.c b/main.c
24462446
extern char *shell_cmd;
24472447
extern char *password_file;
24482448
extern char *backup_dir;
2449-
@@ -1239,6 +1242,9 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
2449+
@@ -1240,6 +1243,9 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
24502450
if (am_daemon && io_timeout && protocol_version >= 31)
24512451
send_msg_int(MSG_IO_TIMEOUT, io_timeout);
24522452

@@ -2456,7 +2456,7 @@ diff --git a/main.c b/main.c
24562456
if (am_sender) {
24572457
keep_dirlinks = 0; /* Must be disabled on the sender. */
24582458
if (need_messages_from_generator)
2459-
@@ -1536,6 +1542,9 @@ static int start_client(int argc, char *argv[])
2459+
@@ -1537,6 +1543,9 @@ static int start_client(int argc, char *argv[])
24602460
else
24612461
env_port = rsync_port;
24622462

@@ -2812,7 +2812,7 @@ diff --git a/receiver.c b/receiver.c
28122812
diff --git a/rsync.1.md b/rsync.1.md
28132813
--- a/rsync.1.md
28142814
+++ b/rsync.1.md
2815-
@@ -408,6 +408,9 @@ has its own detailed description later in this manpage.
2815+
@@ -407,6 +407,9 @@ has its own detailed description later in this manpage.
28162816
--dry-run, -n perform a trial run with no changes made
28172817
--whole-file, -W copy files whole (w/o delta-xfer algorithm)
28182818
--checksum-choice=STR choose the checksum algorithm (aka --cc)

detect-renamed-lax.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ diff --git a/options.c b/options.c
9191
diff --git a/rsync.1.md b/rsync.1.md
9292
--- a/rsync.1.md
9393
+++ b/rsync.1.md
94-
@@ -446,6 +446,8 @@ has its own detailed description later in this manpage.
94+
@@ -445,6 +445,8 @@ has its own detailed description later in this manpage.
9595
--temp-dir=DIR, -T create temporary files in directory DIR
9696
--fuzzy, -y find similar file for basis if no dest file
9797
--detect-renamed try to find renamed files to speed the xfer
@@ -100,7 +100,7 @@ diff --git a/rsync.1.md b/rsync.1.md
100100
--compare-dest=DIR also compare destination files relative to DIR
101101
--copy-dest=DIR ... and include copies of unchanged files
102102
--link-dest=DIR hardlink to files in DIR when unchanged
103-
@@ -2517,6 +2519,20 @@ option name from the pathname using a space if you want the shell to expand it.
103+
@@ -2516,6 +2518,20 @@ option name from the pathname using a space if you want the shell to expand it.
104104
otential alternate-basis files will be removed as the transfer progresses.
105105
This option conflicts with [`--inplace`](#opt) and [`--append`](#opt).
106106

detect-renamed.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ TODO:
3838
a file that can't use it, while missing out on giving it to a file
3939
that could use it.
4040

41-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
41+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
4242
diff --git a/backup.c b/backup.c
4343
--- a/backup.c
4444
+++ b/backup.c
@@ -658,15 +658,15 @@ diff --git a/receiver.c b/receiver.c
658658
diff --git a/rsync.1.md b/rsync.1.md
659659
--- a/rsync.1.md
660660
+++ b/rsync.1.md
661-
@@ -445,6 +445,7 @@ has its own detailed description later in this manpage.
661+
@@ -444,6 +444,7 @@ has its own detailed description later in this manpage.
662662
--modify-window=NUM, -@ set the accuracy for mod-time comparisons
663663
--temp-dir=DIR, -T create temporary files in directory DIR
664664
--fuzzy, -y find similar file for basis if no dest file
665665
+--detect-renamed try to find renamed files to speed the xfer
666666
--compare-dest=DIR also compare destination files relative to DIR
667667
--copy-dest=DIR ... and include copies of unchanged files
668668
--link-dest=DIR hardlink to files in DIR when unchanged
669-
@@ -2500,6 +2501,22 @@ option name from the pathname using a space if you want the shell to expand it.
669+
@@ -2499,6 +2500,22 @@ option name from the pathname using a space if you want the shell to expand it.
670670
potential fuzzy-match files, so either use [`--delete-after`](#opt) or
671671
specify some filename exclusions if you need to prevent this.
672672

direct-io.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
1010
./configure (optional if already run)
1111
make
1212

13-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
13+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
1414
diff --git a/options.c b/options.c
1515
--- a/options.c
1616
+++ b/options.c
@@ -34,15 +34,15 @@ diff --git a/options.c b/options.c
3434
diff --git a/rsync.1.md b/rsync.1.md
3535
--- a/rsync.1.md
3636
+++ b/rsync.1.md
37-
@@ -433,6 +433,7 @@ has its own detailed description later in this manpage.
37+
@@ -432,6 +432,7 @@ has its own detailed description later in this manpage.
3838
--partial keep partially transferred files
3939
--partial-dir=DIR put a partially transferred file into DIR
4040
--delay-updates put all updated files into place at end
4141
+--direct-io don't use buffer cache for xfer file I/O
4242
--prune-empty-dirs, -m prune empty directory chains from file-list
4343
--numeric-ids don't map uid/gid values by user/group name
4444
--usermap=STRING custom username mapping
45-
@@ -3300,6 +3301,17 @@ option name from the pathname using a space if you want the shell to expand it.
45+
@@ -3299,6 +3300,17 @@ option name from the pathname using a space if you want the shell to expand it.
4646
update algorithm that is even more atomic (it uses [`--link-dest`](#opt)
4747
and a parallel hierarchy of files).
4848

downdate.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
77
./configure (optional if already run)
88
make
99

10-
based-on: 43f70b961e92d88387fecd3c7f6dbefc044ce4a3
10+
based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
1111
diff --git a/generator.c b/generator.c
1212
--- a/generator.c
1313
+++ b/generator.c
@@ -70,7 +70,7 @@ diff --git a/options.c b/options.c
7070
diff --git a/rsync.1.md b/rsync.1.md
7171
--- a/rsync.1.md
7272
+++ b/rsync.1.md
73-
@@ -369,6 +369,7 @@ has its own detailed description later in this manpage.
73+
@@ -368,6 +368,7 @@ has its own detailed description later in this manpage.
7474
--backup-dir=DIR make backups into hierarchy based in DIR
7575
--suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
7676
--update, -u skip files that are newer on the receiver

0 commit comments

Comments
 (0)