The branch, master has been updated
via 353dec11 Avoid -e option to sed for BSD.
via d80da9e6 A few small tweaks.
from 6f0c5630 Preparing for release of 3.2.0pre2
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 353dec11024d1b1d762c0d197fd267fed36741bf
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Jun 15 15:08:42 2020 -0700
Avoid -e option to sed for BSD.
commit d80da9e674ea1d684564f03dfb09a65f9c5ab7a2
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Jun 15 13:35:14 2020 -0700
A few small tweaks.
-----------------------------------------------------------------------
Summary of changes:
NEWS.md | 8 ++++++--
help-from-md | 13 ++++++-------
md2man | 2 ++
packaging/md2html | 5 ++++-
rsyncd.conf.5.md | 1 -
5 files changed, 18 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS.md b/NEWS.md
index aa5b979c..efccab91 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -72,7 +72,8 @@ Protocol: 31 (unchanged)
strings (for checksums and compression). The first level just outputs the
result of each negotiation on the client, level 2 outputs the values of the
strings that were sent to and received from the server, and level 3 outputs
- all those values on the server side too (when given the debug option).
+ all those values on the server side too (when the server was given the debug
+ option).
- The --debug=OPTS command-line option is no longer auto-forwarded to the
remote rsync which allows for the client and server to have different levels
@@ -139,9 +140,12 @@ Protocol: 31 (unchanged)
- Forward -4 or -6 to the ssh command, making it easier to type than
`--rsh='ssh -4'` (or -6).
+ - More errors messages now mention if the error is coming from the sender or
+ the receiver.
+
### PACKAGING RELATED:
- - Add installed binary: /usr/bin/rsync-sll
+ - Add installed binary: /usr/bin/rsync-ssl
- Add installed man page: /usr/man/man1/rsync-ssl.1
diff --git a/help-from-md b/help-from-md
index 21f49cd2..a5b61577 100755
--- a/help-from-md
+++ b/help-from-md
@@ -10,13 +10,12 @@ helpfile="$2"
newfile="$helpfile.new"
findfile="${helpfile/./\\.}"
-sed -e '1,/^\[comment\].*'"$findfile"'/d' \
- -e '1,/^```/d' \
- -e '/^```/,$d' \
- -e 's/"/\\"/g' \
- -e 's/^/ rprintf(F,"/' \
- -e 's/$/\\n");/' \
- <"$mdfile" >"$newfile"
+sed '1,/^\[comment\].*'"$findfile"'/d' <"$mdfile" | \
+ sed '1,/^```/d' | \
+ sed '/^```/,$d' | \
+ sed 's/"/\\"/g' | \
+ sed 's/^/ rprintf(F,"/' | \
+ sed 's/$/\\n");/' >"$newfile"
if [[ ! -s "$newfile" ]]; then
rm "$newfile"
diff --git a/md2man b/md2man
index 7ee63f53..7c7e7a3c 100755
--- a/md2man
+++ b/md2man
@@ -181,6 +181,8 @@ class HtmlToManPage(HTMLParser):
tag = 'dt'
else:
st.html_out.append('<dt>')
+ elif tag == 'p':
+ st.at_first_tag_in_dd = True # Kluge to suppress a .P at the
start of an li.
st.at_first_tag_in_li = False
if tag == 'p':
if not st.at_first_tag_in_dd:
diff --git a/packaging/md2html b/packaging/md2html
index a1613aa7..6475434c 100755
--- a/packaging/md2html
+++ b/packaging/md2html
@@ -4,7 +4,7 @@
#
# This program is freely redistributable.
-import re, argparse
+import os, re, argparse
HTML_START = """\
<html><head>
@@ -63,6 +63,9 @@ def main():
html = html.replace('--', '‑‑').replace("\xa0-",
' ‑').replace("\xa0", ' ')
html = re.sub(r'(\W)-', r'\1‑', html)
+ if os.path.lexists(htfn):
+ os.unlink(htfn)
+
with open(htfn, 'w', encoding='utf-8') as fh:
fh.write(HTML_START % title)
fh.write(html)
diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
index a9193453..30774222 100644
--- a/rsyncd.conf.5.md
+++ b/rsyncd.conf.5.md
@@ -1077,7 +1077,6 @@ encryption.
- You should limit the access to the backend-rsyncd port to only allow the
proxy to connect. If it is on the same host as the proxy, then configuring
it to only listen on localhost is a good idea.
-
- You should consider turning on the `proxy protocol` parameter if your proxy
supports sending that information. The examples below assume that this is
enabled.
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
