The branch, master has been updated
via 76064b1b Fix rebuilding configure.sh in an alternate build dir
via 8df76691 A bit more man page & NEWS tweaking.
from 299430a6 Lack of "saw" values now reported as "INVALID"; tweak a
comment.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 76064b1bf29b132bbc684a27520d9cf465239f0f
Author: Wayne Davison <wa...@opencoder.net>
Date: Sun Jun 28 11:18:55 2020 -0700
Fix rebuilding configure.sh in an alternate build dir
commit 8df766917e3408399b1cb1d65a767eb99d5b18d2
Author: Wayne Davison <wa...@opencoder.net>
Date: Sun Jun 28 09:14:57 2020 -0700
A bit more man page & NEWS tweaking.
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 15 +++++++++------
NEWS.md | 16 ++++++++++------
packaging/patch-update | 6 +++---
rsync.1.md | 25 +++++++++++++------------
4 files changed, 35 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index e13e241b..24156d4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -172,17 +172,16 @@ aclocal.m4: $(srcdir)/m4/*.m4
aclocal -I $(srcdir)/m4
configure.sh config.h.in: configure.ac aclocal.m4
- @if test -f configure.sh; then cp -p configure.sh configure.sh.old;
else touch configure.sh.old; fi
- @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else
touch config.h.in.old; fi
- autoconf -o configure.sh
- autoheader && touch config.h.in
- @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
+ @test -f "$(srcdir)/configure.sh" && cp -p "$(srcdir)/configure.sh"
configure.sh.old || touch configure.sh.old
+ @test -f "$(srcdir)/config.h.in" && cp -p "$(srcdir)/config.h.in"
config.h.in.old || touch config.h.in.old
+ (cd "$(srcdir)" && autoconf -o configure.sh && autoheader && touch
config.h.in)
+ @if diff "$(srcdir)/configure.sh" configure.sh.old >/dev/null 2>&1;
then \
echo "configure.sh is unchanged."; \
rm configure.sh.old; \
else \
echo "configure.sh has CHANGED."; \
fi
- @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
+ @if diff "$(srcdir)/config.h.in" config.h.in.old >/dev/null 2>&1; then \
echo "config.h.in is unchanged."; \
rm config.h.in.old; \
else \
@@ -203,6 +202,10 @@ reconfigure: configure.sh
./config.status --recheck
./config.status
+.PHONY: restatus
+restatus:
+ ./config.status
+
Makefile: Makefile.in config.status configure.sh config.h.in
@if test -f Makefile; then cp -p Makefile Makefile.old; else touch
Makefile.old; fi
@./config.status
diff --git a/NEWS.md b/NEWS.md
index 1d813a3f..7e48765a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -10,6 +10,8 @@ Protocol: 31 (unchanged)
- Fixed installing rsync-ssl script from an alternate build dir.
+ - Fixed the updating of configure.sh from an alternate build dir.
+
- Apple requires the asm function name to begin with an underscore.
- Avoid a test failure in the daemon test when --atimes is disabled.
@@ -22,7 +24,7 @@ Protocol: 31 (unchanged)
apply to both.
- Simplify how the negotiation environment variables apply when interacting
- with an older rsync version.
+ with an older rsync version and when they contain only invalid names.
- Do not allow a negotiated checksum or compression choice of "none" unless
the user authorized it via an environment variable or command-line option.
@@ -43,11 +45,13 @@ Protocol: 31 (unchanged)
### PACKAGING RELATED:
- Prepared the checksum code for an upcoming xxHash release that provides new
- XXH3 & XXH128 checksum routines. These will not be compiled into rsync
- until the xxhash v0.8.0 include files are installed on the build host, and
- that release is a few weeks away at the time this was written. So, if it's
- now the future and you have packaged and installed xxhash-0.8.0-devel, a
- fresh rebuild of rsync 3.2.2 will give you the new checksum routines.
+ XXH3 (64-bit) & XXH128 (128-bit) checksum routines. These will not be
+ compiled into rsync until the xxhash v0.8.0 include files are installed on
+ the build host, and that release is a few weeks away at the time this was
+ written. So, if it's now the future and you have packaged and installed
+ xxhash-0.8.0-devel, a fresh rebuild of rsync 3.2.2 will give you the new
+ checksum routines. Just make sure that the new rsync package depends on
+ xxhash >= 0.8.0.
------------------------------------------------------------------------------
<a name="3.2.1"></a>
diff --git a/packaging/patch-update b/packaging/patch-update
index 0970d299..c5bbe1c3 100755
--- a/packaging/patch-update
+++ b/packaging/patch-update
@@ -31,9 +31,11 @@ def main():
starting_branch, args.base_branch = check_git_state(args.base_branch, not
args.skip_check, args.patches_dir)
+ if not os.path.isdir('.gen-stash'):
+ os.mkdir('.gen-stash', 0o700)
gen_stash(starting_branch)
if starting_branch == 'master':
- cmd_run('md5sum configure.ac >.gen-stash/configure.ac.sum')
+ cmd_chk('md5sum configure.ac >.gen-stash/configure.ac.sum')
master_commit = latest_git_hash(args.base_branch)
@@ -213,8 +215,6 @@ def gen_stash(branch):
for fn in files:
if not os.path.exists(fn):
return
- if not os.path.isdir('.gen-stash'):
- os.mkdir('.gen-stash', 0o700)
tar_fn = gen_stash_prep(branch)
cmd_run(['./prepare-source'])
cmd_chk(['tar', 'czf', tar_fn, *files])
diff --git a/rsync.1.md b/rsync.1.md
index 07691efc..d1ffd444 100644
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -1495,7 +1495,7 @@ your home directory (remove the '=' for that).
When both sides of the transfer are at least 3.2.0, rsync chooses the first
algorithm in the client's list of choices that is also in the server's list
- of choices. If no common checksum choice is found, the client exits with
+ of choices. If no common checksum choice is found, rsync exits with
an error. If the remote rsync is too old to support checksum negotiation,
a value is chosen based on the protocol version (which chooses between MD5
and various flavors of MD4 based on protocol age).
@@ -1503,12 +1503,12 @@ your home directory (remove the '=' for that).
The default order can be customized by setting the environment variable
RSYNC_CHECKSUM_LIST to a space-separated list of acceptable checksum names.
If the environment variable contains a "`&`" character, the string is
- separated into the "client list & server list". If the resulting string is
- empty (or contains only whitespace) the default checksum list is used.
- This method does not allow you to specify the transfer checksum separately
- from the pre-transfer checksum, and it discards "auto" and all unknown
- checksum names. A list with only invalid names will result in a failed
- negotiation.
+ separated into the "client list & server list" otherwise the same string
+ applies to both. If the string (or string portion) contains no
+ non-whitespace characters, the default checksum list is used. This method
+ does not allow you to specify the transfer checksum separately from the
+ pre-transfer checksum, and it discards "auto" and all unknown checksum
+ names. A list with only invalid names results in a failed negotiation.
The use of the `--checksum-choice` option overrides this environment list.
@@ -2297,17 +2297,18 @@ your home directory (remove the '=' for that).
When both sides of the transfer are at least 3.2.0, rsync chooses the first
algorithm in the client's list of choices that is also in the server's list
- of choices. If no common compress choice is found, the client exits with
+ of choices. If no common compress choice is found, rsync exits with
an error. If the remote rsync is too old to support checksum negotiation,
its list is assumed to be "zlib".
The default order can be customized by setting the environment variable
RSYNC_COMPRESS_LIST to a space-separated list of acceptable compression
names. If the environment variable contains a "`&`" character, the string
- is separated into the "client list & server list". If the resulting string
- is empty (or contains only whitespace) the default compress list is used.
- Any unknown compression names are discarded from the list, but a list with
- only invalid names will result in a failed negotiation.
+ is separated into the "client list & server list" otherwise the same string
+ applies to both. If the string (or string portion) contains no
+ non-whitespace characters, the default compress list is used. Any unknown
+ compression names are discarded from the list, but a list with only invalid
+ names results in a failed negotiation.
There are some older rsync versions that were configured to reject a `-z`
option and require the use of `-zz` because their compression library was
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
