diff options
| author | kim <kim@pkgsrc.org> | 2000-04-20 03:22:49 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2000-04-20 03:22:49 +0000 |
| commit | ab8de61c9762a43538b93c9af5828c2888f485b2 (patch) | |
| tree | 697aa87489579855569715d2d7feb66f2dda123e /net/mirror | |
| parent | d804ecdf80225b9967a190958c56d8fd06c0dc40 (diff) | |
| download | pkgsrc-ab8de61c9762a43538b93c9af5828c2888f485b2.tar.gz | |
If your mirrors are timing out on reading the remote directory listing
(and if they aren't now they will eventually) get this patch.
Diffstat (limited to 'net/mirror')
| -rw-r--r-- | net/mirror/files/patch-sum | 4 | ||||
| -rw-r--r-- | net/mirror/patches/patch-ae | 42 |
2 files changed, 40 insertions, 6 deletions
diff --git a/net/mirror/files/patch-sum b/net/mirror/files/patch-sum index 69c9470c8a0..11b11890d50 100644 --- a/net/mirror/files/patch-sum +++ b/net/mirror/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.4 2000/04/19 16:16:52 kim Exp $ +$NetBSD: patch-sum,v 1.5 2000/04/20 03:22:49 kim Exp $ MD5 (patch-aa) = de64e92f143eca516427df46633f3459 MD5 (patch-ab) = b7ed2b99a3e7cfa0f1f0c02664e4f70a MD5 (patch-ac) = 54872e85faa939e28bc6b050d39c44f7 MD5 (patch-ad) = 02f9cc76255af7ba20ea4c379426ca78 -MD5 (patch-ae) = af6231899d4e90bb0cdad11cecfa1476 +MD5 (patch-ae) = 6019dae14d6ec270cf2f701516f33a03 MD5 (patch-af) = 6c00954622125e920728fea8177b76d4 diff --git a/net/mirror/patches/patch-ae b/net/mirror/patches/patch-ae index c0dd8abb3c5..52d17c9d889 100644 --- a/net/mirror/patches/patch-ae +++ b/net/mirror/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.5 2000/03/26 22:33:18 kim Exp $ +$NetBSD: patch-ae,v 1.6 2000/04/20 03:22:50 kim Exp $ --- ftp.pl.orig Fri Jun 5 05:10:27 1998 -+++ ftp.pl Sat Mar 25 03:00:20 2000 ++++ ftp.pl Wed Apr 19 23:14:00 2000 @@ -233,7 +233,7 @@ } else { @@ -11,7 +11,22 @@ $NetBSD: patch-ae,v 1.5 2000/03/26 22:33:18 kim Exp $ return 0; } } -@@ -486,7 +486,7 @@ +@@ -270,6 +270,14 @@ + $SIG{ 'PIPE' } = "ftp'ftp__sighandler"; + } + ++# Setup a signal handler for user interrupts. ++sub ftp'set_user_signals ++{ ++ $ftp_logger = @_; ++ $SIG{ 'INT' } = "ftp'ftp__sighandler"; ++} ++ ++ + # &ftp'set_namemap( function to map outgoing name, function to map incoming ) + sub ftp'set_namemap + { +@@ -486,7 +494,7 @@ return 0; } if( $ret == 1 ) { @@ -20,7 +35,26 @@ $NetBSD: patch-ae,v 1.5 2000/03/26 22:33:18 kim Exp $ $newhost = sprintf( "%d.%d.%d.%d", $1, $2, $3, $4 ); $newport = $5 * 256 + $6; } -@@ -708,6 +708,7 @@ +@@ -581,6 +589,9 @@ + return 0; + } + ++ # shut down our end of the socket ++ &close_data_socket; ++ + # read the close + # + $ret = &expect($timeout, +@@ -590,8 +601,6 @@ + $ret = 0; + } + +- # shut down our end of the socket +- &close_data_socket; + + if( ! $ret ){ + return 0; +@@ -708,6 +717,7 @@ if( ! $service_open ){ return 0; } |