From: Wayne Davison <wayne@opencoder.net>
Date: Tue, 16 Jun 2020 19:10:41 +0000 (-0700)
Subject: Add g++ failure info; add mention of SSL rsyncd examples.
X-Git-Tag: v3.2.0pre3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dfcbf7df6e0dd1b9e475839924e75e4808f30d5;p=thirdparty%2Frsync.git

Add g++ failure info; add mention of SSL rsyncd examples.
---

diff --git a/Makefile.in b/Makefile.in
index a4766650..a30d1022 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,6 +125,7 @@ rounding.h: rounding.c rsync.h proto.h
 	@rm -f rounding.out
 
 simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
+	@echo "If this fails to compile and you can't fix it, re-run configure with --disable-simd."
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
 
 lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s
diff --git a/NEWS.md b/NEWS.md
index b55519d3..dc3afe39 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -140,6 +140,8 @@ Protocol: 31 (unchanged)
  - Forward -4 or -6 to the ssh command, making it easier to type than
    `--rsh='ssh -4'` (or -6).
 
+ - Added example config for rsyncd SSL proxy configs to rsyncd.conf.
+
  - More errors messages now mention if the error is coming from the sender or
    the receiver.