The branch, master has been updated
via 88c18ef6 Make the g++ check more lenient.
via 7dc9431f A few minor man page improvements.
from 07a3e1f9 Enhance compatibility with older python3 versions.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 88c18ef6483fbc7dd89cbab969c1f325b7b55b8e
Author: Wayne Davison <wa...@opencoder.net>
Date: Thu Jun 18 09:31:47 2020 -0700
Make the g++ check more lenient.
commit 7dc9431f60b358620b4a2f8ba105a5732028c545
Author: Wayne Davison <wa...@opencoder.net>
Date: Wed Jun 17 11:25:38 2020 -0700
A few minor man page improvements.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 11 +++++++----
rsync-ssl.1.md | 17 ++++++++++++++---
2 files changed, 21 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/configure.ac b/configure.ac
index 9a0e4d1e..f9a88986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,14 +202,17 @@ AC_ARG_ENABLE(simd,
if test x"$enable_simd" = x"yes"; then
# For x86-64 SIMD, g++ is also required
if test x"$build_cpu" = x"x86_64"; then
- if test x"$CXX" = x"g++"; then
- # AC_MSG_RESULT() called below
+ case "$CXX" in
+ *g++)
+ # AC_MSG_RESULT() is called below.
SIMD="$SIMD x86_64"
- else
+ ;;
+ *)
AC_MSG_RESULT(no)
AC_MSG_ERROR(Failed to find g++ for SIMD speedups.
Omit --enable-simd to continue without it.)
- fi
+ ;;
+ esac
fi
fi
diff --git a/rsync-ssl.1.md b/rsync-ssl.1.md
index c2903425..31cb465f 100644
--- a/rsync-ssl.1.md
+++ b/rsync-ssl.1.md
@@ -13,6 +13,13 @@ rsync-ssl [--type=SSL_TYPE] RSYNC_ARGS
The rsync-ssl script helps you to run an rsync copy to/from an rsync daemon
that requires ssl connections.
+The script requires that you specify an rsync-daemon arg in the style of either
+`hostname::` (with 2 colons) or `rsync://hostname/`. The default port used for
+connecting is 874 (one higher than the normal 873) unless overridden in the
+environment. You can specify an overriding port via `--port` or by including
+it in the normal spot in the URL format, though both of those require your
+rsync version to be at least 3.2.0.
+
# OPTIONS
If the **first** arg is a `--type=SSL_TYPE` option, the script will only use
@@ -23,7 +30,7 @@ option must specify one of `openssl` or `stunnel`. The equal
sign is
required for this particular option.
All the other options are passed through to the rsync command, so consult the
-**rsync** manpage for more information on how it works.
+**rsync**(1) manpage for more information on how it works.
# ENVIRONMENT VARIABLES
@@ -53,9 +60,13 @@ The ssl helper scripts are affected by the following
environment variables:
# EXAMPLES
-> rsync-ssl -aiv example.com::src/ dest
+> rsync-ssl -aiv example.com::mod/ dest
+
+> rsync-ssl --type=openssl -aiv example.com::mod/ dest
+
+> rsync-ssl -aiv --port 9874 example.com::mod/ dest
-> rsync-ssl --type=openssl -aiv example.com::src/ dest
+> rsync-ssl -aiv rsync://example.com:9874/mod/ dest
# SEE ALSO
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
