aboutsummaryrefslogtreecommitdiffstats
path: root/net/rsync
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-04-08 23:48:29 +0800
committerobrien <obrien@FreeBSD.org>2001-04-08 23:48:29 +0800
commit42adf95880d950ae71ac9667f575382e117b99dc (patch)
tree8a3b084ac45bc43aeea2f72742550fd7dcff5ea0 /net/rsync
parentb008fc9015b8d3599477d19b5c5fc462e7c0f392 (diff)
downloadfreebsd-ports-gnome-42adf95880d950ae71ac9667f575382e117b99dc.tar.gz
freebsd-ports-gnome-42adf95880d950ae71ac9667f575382e117b99dc.tar.zst
freebsd-ports-gnome-42adf95880d950ae71ac9667f575382e117b99dc.zip
rsync sometimes freezes during execution if it is run over ssh.
rsync turns on blocking I/O mode if remote shell command is rsh (ie. matched RSYNC_RSH) to work around some broken rsh implementations on other platforms. The submitter of the rsh->ssh patches overloaded RSYNC_RSH for ssh. That turns out to be a Wrong Thing. This change implements the parallel RSYNC_SSH. PR: 26376 Submitted by: adrian
Diffstat (limited to 'net/rsync')
-rw-r--r--net/rsync/files/ssh-patch-main.c5
-rw-r--r--net/rsync/files/ssh-patch-rsync.h11
2 files changed, 12 insertions, 4 deletions
diff --git a/net/rsync/files/ssh-patch-main.c b/net/rsync/files/ssh-patch-main.c
new file mode 100644
index 000000000000..295429f2476e
--- /dev/null
+++ b/net/rsync/files/ssh-patch-main.c
@@ -0,0 +1,5 @@
+--- main.c.orig Tue Sep 5 19:46:43 2000
++++ main.c Sat Apr 7 23:32:25 2001
+@@ -134 +134 @@
+- cmd = RSYNC_RSH;
++ cmd = RSYNC_SSH;
diff --git a/net/rsync/files/ssh-patch-rsync.h b/net/rsync/files/ssh-patch-rsync.h
index 80ccdcc2bdfd..444182bf9967 100644
--- a/net/rsync/files/ssh-patch-rsync.h
+++ b/net/rsync/files/ssh-patch-rsync.h
@@ -1,5 +1,8 @@
--- rsync.h.orig Sat Aug 19 06:10:39 2000
-+++ rsync.h Thu Mar 8 03:31:33 2001
-@@ -75 +75 @@
--#define RSYNC_RSH "rsh"
-+#define RSYNC_RSH "ssh"
++++ rsync.h Sat Apr 7 23:31:00 2001
+@@ -75,4 +75,5 @@
+ #define RSYNC_RSH "rsh"
+ #endif
++#define RSYNC_SSH "ssh"
+
+ #include <sys/types.h>