aboutsummaryrefslogtreecommitdiffstats
path: root/lang/erlang14
diff options
context:
space:
mode:
authorolgeni <olgeni@FreeBSD.org>2006-06-20 04:45:43 +0800
committerolgeni <olgeni@FreeBSD.org>2006-06-20 04:45:43 +0800
commit1f4a21194b8b8314221002d3da863e98eba1c271 (patch)
treea3014fd9d4d76d8b565168fdaf1328fa5965d3fc /lang/erlang14
parent4931bf6e85dfa005987b5a359994e87aaadd5627 (diff)
downloadfreebsd-ports-gnome-1f4a21194b8b8314221002d3da863e98eba1c271.tar.gz
freebsd-ports-gnome-1f4a21194b8b8314221002d3da863e98eba1c271.tar.zst
freebsd-ports-gnome-1f4a21194b8b8314221002d3da863e98eba1c271.zip
Bugfix: ssh_sftp:connect/2,3 hangs when remote the host is unknown.
Obtained from: Dmitriy Kargapolov <dmitry.kargapolov(at)corp.idt.net>
Diffstat (limited to 'lang/erlang14')
-rw-r--r--lang/erlang14/Makefile1
-rw-r--r--lang/erlang14/files/patch-lib_ssh_src_ssh__sftp.erl16
2 files changed, 17 insertions, 0 deletions
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 163892524ebe..6dd5d54169e1 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -7,6 +7,7 @@
PORTNAME= erlang
PORTVERSION= r11b0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= lang parallel
MASTER_SITES= http://www.erlang.org/download/ \
diff --git a/lang/erlang14/files/patch-lib_ssh_src_ssh__sftp.erl b/lang/erlang14/files/patch-lib_ssh_src_ssh__sftp.erl
new file mode 100644
index 000000000000..2d165fe159af
--- /dev/null
+++ b/lang/erlang14/files/patch-lib_ssh_src_ssh__sftp.erl
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- lib/ssh/src/ssh_sftp.erl.orig
++++ lib/ssh/src/ssh_sftp.erl
+@@ -283,8 +283,10 @@
+ {stop, Error }
+ end;
+ init([Host,Port,Opts]) ->
++ SaveFlag = process_flag(trap_exit, true),
+ case ssh_xfer:connect(Host, Port, Opts) of
+ {ok, Xf, RBuf} ->
++ process_flag(trap_exit, SaveFlag),
+ {ok, #state { req_id = 0, xf = Xf, rep_buf=RBuf }};
+ Error ->
+ {stop, Error}