From: Wayne Davison <wayne@opencoder.net>
Date: Wed, 10 Jun 2020 00:21:51 +0000 (-0700)
Subject: The samba rsync server now requires ssl.
X-Git-Tag: v3.2.0pre1~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44af79223e30e1337a06361d1ccdb73ecdc8e46d;p=thirdparty%2Frsync.git

The samba rsync server now requires ssl.
---

diff --git a/README.md b/README.md
index 9007a25b..bcce1b8d 100644
--- a/README.md
+++ b/README.md
@@ -136,5 +136,10 @@ AVAILABILITY
 ------------
 
 The main web site for rsync is http://rsync.samba.org/
+
 The main ftp site is ftp://rsync.samba.org/pub/rsync/
-This is also available as rsync://rsync.samba.org/rsyncftp/
+
+This is also available as rsync://download.samba.org/rsyncftp/ if you
+connect via ssl. Use the `rsync-ssl` script if you have it, otherwise
+connect to the rsync server via a normal rsync command and it will
+output some instructions for how to connect.
diff --git a/prepare-source b/prepare-source
index b1e76282..3514a4c8 100755
--- a/prepare-source
+++ b/prepare-source
@@ -31,13 +31,13 @@ for action in "${@}"; do
 	else
 	    files='[cap]*'
 	fi
-	rsync -pvz rsync://rsync.samba.org/rsyncftp/generated-files/"$files" .
+	rsync -ipe ./ssl-rsh rsync://download.samba.org/rsyncftp/generated-files/"$files" .
 	;;
     fetchgen)
-	rsync -pvz rsync://rsync.samba.org/rsyncftp/generated-files/'*' .
+	rsync -ipe ./ssl-rsh rsync://download.samba.org/rsyncftp/generated-files/'*' .
 	;;
     fetchSRC)
-	rsync -pvrz --exclude=/.git/ rsync://rsync.samba.org/ftp/pub/unpacked/rsync/ .
+	rsync -ipre ./ssl-rsh --exclude=/.git/ rsync://download.samba.org/ftp/pub/unpacked/rsync/ .
 	;;
     *)
 	echo "Unknown action: $action"